From 6b348fad04e2d7172c12fbe1671e8a8473a343e8 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Fri, 24 May 2019 20:01:59 +0200
Subject: [PATCH] Used one branch for both fixes in caldav-go

---
 go.mod                                                | 2 +-
 go.sum                                                | 5 ++---
 vendor/github.com/samedi/caldav-go/handlers/report.go | 4 ++--
 vendor/modules.txt                                    | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index b689e33ed8..7c86a06b05 100644
--- a/go.mod
+++ b/go.mod
@@ -77,5 +77,5 @@ require (
 
 replace (
 	github.com/labstack/echo/v4 => github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803 // Branch: feature/report-method, PR https://github.com/labstack/echo/pull/1332
-	github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6
+	github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
 )
diff --git a/go.sum b/go.sum
index ca744c8b4b..5449a8bc85 100644
--- a/go.sum
+++ b/go.sum
@@ -27,7 +27,6 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/cweill/gotests v1.5.3 h1:k3t4wW/x/YNixWZJhUIn+mivmK5iV1tJVOwVYkx0UcU=
 github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
 github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -111,8 +110,8 @@ github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb/go.mod h1:82Txj
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible h1:jS8lhZO9A2UuKdtqahyLbYvP5dRIB+ze7u6kxtkKIUI=
-github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible/go.mod h1:y1UhTNI4g0hVymJrI6yJ5/ohy09hNBeU8iJEZjgdDOw=
+github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible h1:PkEEpmbrFXlMul8cOplR8nkcIM/NDbx+H6fq2+vaKAA=
+github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible/go.mod h1:y1UhTNI4g0hVymJrI6yJ5/ohy09hNBeU8iJEZjgdDOw=
 github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803 h1:SmVrdODUE6KErl2Xo7nqNOqGG1X8UaXnTeU7zzJiNQw=
 github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803/go.mod h1:3LbYC6VkwmUnmLPZ8WFdHdQHG77e9GQbjyhWdb1QvC4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
diff --git a/vendor/github.com/samedi/caldav-go/handlers/report.go b/vendor/github.com/samedi/caldav-go/handlers/report.go
index 662bc02ae4..87238a64db 100644
--- a/vendor/github.com/samedi/caldav-go/handlers/report.go
+++ b/vendor/github.com/samedi/caldav-go/handlers/report.go
@@ -113,8 +113,8 @@ func (rh reportHandler) fetchResourcesByFilters(origin *data.Resource, filtersXM
 			return reps, err
 		}
 
-		for _, resource := range resources {
-			reps = append(reps, reportRes{resource.Path, &resource, true})
+		for in, resource := range resources {
+			reps = append(reps, reportRes{resource.Path, &resources[in], true})
 		}
 	} else {
 		// the origin resource is not a collection, so returns just that as the result
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ae46d9b270..f08d6b9d43 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -134,7 +134,7 @@ github.com/prometheus/procfs
 github.com/prometheus/procfs/nfs
 github.com/prometheus/procfs/xfs
 github.com/prometheus/procfs/internal/util
-# github.com/samedi/caldav-go v3.0.0+incompatible => github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible
+# github.com/samedi/caldav-go v3.0.0+incompatible => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible
 github.com/samedi/caldav-go
 github.com/samedi/caldav-go/data
 github.com/samedi/caldav-go/errs