From e7c209785771684211b8ac0a00e3e6bbac963d06 Mon Sep 17 00:00:00 2001 From: Xavier Lange Date: Tue, 26 Jul 2016 12:33:08 -0700 Subject: [PATCH 1/5] Update sarama to upstream 1.9. Also updates sarama dependencies. --- cmake/externals.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/externals.cmake b/cmake/externals.cmake index 213f6c6f4..32c1c5ae0 100644 --- a/cmake/externals.cmake +++ b/cmake/externals.cmake @@ -162,11 +162,12 @@ git_clone(https://github.com/crankycoder/xmlpath 670b185b686fd11aa115291fb2f6dc3 git_clone(https://github.com/thoj/go-ircevent 90dc7f966b95d133f1c65531c6959b52effd5e40) git_clone(https://github.com/cactus/gostrftime d329f83c5ce9c416f8983f0a0044734db54ee24d) -git_clone(https://github.com/golang/snappy 723cc1e459b8eea2dea4583200fd60757d40097a) -git_clone(https://github.com/eapache/go-resiliency v1.0.0) +git_clone(https://github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380) +git_clone(https://github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3) git_clone(https://github.com/eapache/queue v1.0.2) -git_clone_to_path(https://github.com/rafrombrc/sarama f742e1e20b15b31320e0b6ff2f995bc5f0482fed github.com/Shopify/sarama) -git_clone(https://github.com/davecgh/go-spew 2df174808ee097f90d259e432cc04442cf60be21) +git_clone(https://github.com/Shopify/sarama 38d579a708d2f87dd4e35342241048e361d1e66a) +git_clone(https://github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720) +git_clone(https://github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d) add_dependencies(sarama snappy) From 16b034ea011f8e723fa1031114f287f193bea7e5 Mon Sep 17 00:00:00 2001 From: Xavier Lange Date: Tue, 26 Jul 2016 17:25:39 -0700 Subject: [PATCH 2/5] sarama update to skip message header check --- cmake/externals.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/externals.cmake b/cmake/externals.cmake index 32c1c5ae0..bf8635069 100644 --- a/cmake/externals.cmake +++ b/cmake/externals.cmake @@ -165,7 +165,7 @@ git_clone(https://github.com/cactus/gostrftime d329f83c5ce9c416f8983f0a0044734db git_clone(https://github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380) git_clone(https://github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3) git_clone(https://github.com/eapache/queue v1.0.2) -git_clone(https://github.com/Shopify/sarama 38d579a708d2f87dd4e35342241048e361d1e66a) +git_clone(https://github.com/Shopify/sarama e8020bffa1cae3ddf8068cb03416fc53d1627f3d) git_clone(https://github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720) git_clone(https://github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d) From 0312c102c32850156acbc9811d3b8179d9a0f658 Mon Sep 17 00:00:00 2001 From: Xavier Lange Date: Tue, 26 Jul 2016 17:34:32 -0700 Subject: [PATCH 3/5] latest sarama needs xerial-snappy. removes golang/snappy --- cmake/externals.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/externals.cmake b/cmake/externals.cmake index bf8635069..174fc4329 100644 --- a/cmake/externals.cmake +++ b/cmake/externals.cmake @@ -162,7 +162,7 @@ git_clone(https://github.com/crankycoder/xmlpath 670b185b686fd11aa115291fb2f6dc3 git_clone(https://github.com/thoj/go-ircevent 90dc7f966b95d133f1c65531c6959b52effd5e40) git_clone(https://github.com/cactus/gostrftime d329f83c5ce9c416f8983f0a0044734db54ee24d) -git_clone(https://github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380) +git_clone(github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c) git_clone(https://github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3) git_clone(https://github.com/eapache/queue v1.0.2) git_clone(https://github.com/Shopify/sarama e8020bffa1cae3ddf8068cb03416fc53d1627f3d) From 5c18821871ad8a3a9e00944f5d4d1492c755b94f Mon Sep 17 00:00:00 2001 From: Xavier Lange Date: Tue, 26 Jul 2016 17:39:22 -0700 Subject: [PATCH 4/5] forgot the https spec --- cmake/externals.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/externals.cmake b/cmake/externals.cmake index 174fc4329..c0d8b8538 100644 --- a/cmake/externals.cmake +++ b/cmake/externals.cmake @@ -162,7 +162,7 @@ git_clone(https://github.com/crankycoder/xmlpath 670b185b686fd11aa115291fb2f6dc3 git_clone(https://github.com/thoj/go-ircevent 90dc7f966b95d133f1c65531c6959b52effd5e40) git_clone(https://github.com/cactus/gostrftime d329f83c5ce9c416f8983f0a0044734db54ee24d) -git_clone(github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c) +git_clone(https://github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c) git_clone(https://github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3) git_clone(https://github.com/eapache/queue v1.0.2) git_clone(https://github.com/Shopify/sarama e8020bffa1cae3ddf8068cb03416fc53d1627f3d) From 1e453ef6e77efe4cc58e8bf7f353485ce13019d2 Mon Sep 17 00:00:00 2001 From: Xavier Lange Date: Tue, 26 Jul 2016 17:45:40 -0700 Subject: [PATCH 5/5] add back golang/snappy --- cmake/externals.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/externals.cmake b/cmake/externals.cmake index c0d8b8538..29f2b8f7a 100644 --- a/cmake/externals.cmake +++ b/cmake/externals.cmake @@ -162,6 +162,7 @@ git_clone(https://github.com/crankycoder/xmlpath 670b185b686fd11aa115291fb2f6dc3 git_clone(https://github.com/thoj/go-ircevent 90dc7f966b95d133f1c65531c6959b52effd5e40) git_clone(https://github.com/cactus/gostrftime d329f83c5ce9c416f8983f0a0044734db54ee24d) +git_clone(https://github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380) git_clone(https://github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c) git_clone(https://github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3) git_clone(https://github.com/eapache/queue v1.0.2)