testing/grpc: rebuild against openssl 1.1

2 files changed, 85 insertions, 4 deletions

diff --git a/testing/grpc/APKBUILD b/testing/grpc/APKBUILD
index 7906509574..faa834ab3b 100644
--- a/testing/grpc/APKBUILD
+++ b/testing/grpc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wener <wenermail@gmail.com>
 pkgname=grpc
 pkgver=1.14.2
-pkgrel=0
+pkgrel=1
 pkgdesc="The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#) "
 url="https://grpc.io/"
 giturl="https://github.com/grpc/grpc"
@@ -10,12 +10,14 @@ arch="all"
 license="Apache2"
 depends="protobuf"
 depends_dev="protobuf-dev"
-makedepends="autoconf automake libtool libstdc++ protobuf-dev c-ares-dev libressl-dev gflags-dev gtest-dev zlib-dev yaml-dev"
+makedepends="autoconf automake libtool libstdc++ protobuf-dev c-ares-dev openssl-dev gflags-dev gtest-dev zlib-dev yaml-dev"
 subpackages="$pkgname-dev $pkgname-cli"
 _googletest_rev=ec44c6c1675c25b9827aacd08c02433cccde7780
 source="$pkgname-$pkgver.tar.gz::https://github.com/grpc/grpc/archive/v$pkgver.tar.gz
 		googletest-$_googletest_rev.tar.gz::https://github.com/google/googletest/archive/$_googletest_rev.tar.gz
-		01-chttp2-maybe-uninitialized.patch"
+		01-chttp2-maybe-uninitialized.patch
+		disable-Werror.patch
+		"
 builddir="$srcdir/$pkgname-$pkgver"
 options="!check"
 
@@ -44,4 +46,5 @@ cli() {
 
 sha512sums="1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385  grpc-1.14.2.tar.gz
 dd55ab745c43c5c953d8cebd2fb44b4bb2cb87c95194965bffd0bd8219332d5f073c22947c8a8b1e2652805dff1cff4b93fe69645d4c0d635f98ae2cf54af14a  googletest-ec44c6c1675c25b9827aacd08c02433cccde7780.tar.gz
-7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5  01-chttp2-maybe-uninitialized.patch"
+7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5  01-chttp2-maybe-uninitialized.patch
+9c6cf4044922de4567a769c932bdefa554a46a74efb4d9a580a0d8922f7a7faf3b6f8fbb697832fcb48f215dbe820f7de7d69b024159c9f2f4e343b6eaaa8131  disable-Werror.patch"
diff --git a/testing/grpc/disable-Werror.patch b/testing/grpc/disable-Werror.patch
new file mode 100644
index 0000000000..37d9e0482c
--- /dev/null
+++ b/testing/grpc/disable-Werror.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile b/Makefile
+index b1a7553..8b5283e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -300,37 +300,37 @@ else
+ TMPOUT = `mktemp /tmp/test-out-XXXXXX`
+ endif
+ 
+-CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Werror -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc
++CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc
+ HAS_WORKING_NO_CXX14_COMPAT = $(shell $(CHECK_NO_CXX14_COMPAT_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_CXX14_COMPAT),true)
+ W_NO_CXX14_COMPAT=-Wno-c++14-compat
+ endif
+ 
+-CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Werror -Wshadow -o $(TMPOUT) -c test/build/shadow.c
++CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Wshadow -o $(TMPOUT) -c test/build/shadow.c
+ HAS_WORKING_SHADOW = $(shell $(CHECK_SHADOW_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_SHADOW),true)
+ W_SHADOW=-Wshadow
+ NO_W_SHADOW=-Wno-shadow
+ endif
+-CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Werror -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c
++CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c
+ HAS_WORKING_EXTRA_SEMI = $(shell $(CHECK_EXTRA_SEMI_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_EXTRA_SEMI),true)
+ W_EXTRA_SEMI=-Wextra-semi
+ NO_W_EXTRA_SEMI=-Wno-extra-semi
+ endif
+-CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-shift-negative-value -o $(TMPOUT) -c test/build/no-shift-negative-value.c
++CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -Wno-shift-negative-value -o $(TMPOUT) -c test/build/no-shift-negative-value.c
+ HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE = $(shell $(CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE),true)
+ W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value
+ NO_W_NO_SHIFT_NEGATIVE_VALUE=-Wshift-negative-value
+ endif
+-CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c
++CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c
+ HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE = $(shell $(CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE),true)
+ W_NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
+ NO_W_NO_UNUSED_BUT_SET_VARIABLE=-Wunused-but-set-variable
+ endif
+-CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-maybe-uninitialized -o $(TMPOUT) -c test/build/no-maybe-uninitialized.c
++CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD = $(CC) -std=c99 -Wno-maybe-uninitialized -o $(TMPOUT) -c test/build/no-maybe-uninitialized.c
+ HAS_WORKING_NO_MAYBE_UNINITIALIZED = $(shell $(CHECK_NO_MAYBE_UNINITIALIZED_WORKS_CMD) 2> /dev/null && echo true || echo false)
+ ifeq ($(HAS_WORKING_NO_MAYBE_UNINITIALIZED),true)
+ W_NO_MAYBE_UNINITIALIZED=-Wno-maybe-uninitialized
+@@ -352,7 +352,7 @@ CXXFLAGS += -std=c++11
+ ifeq ($(SYSTEM),Darwin)
+ CXXFLAGS += -stdlib=libc++
+ endif
+-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
++CPPFLAGS += -g -Wall -Wextra -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
+ COREFLAGS += -fno-rtti -fno-exceptions
+ LDFLAGS += -g
+ 
+diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
+index 8f3ad6c..34bb081 100644
+--- a/src/core/lib/surface/channel.cc
++++ b/src/core/lib/surface/channel.cc
+@@ -82,7 +82,7 @@ grpc_channel* grpc_channel_create_with_builder(
+   char* target = gpr_strdup(grpc_channel_stack_builder_get_target(builder));
+   grpc_channel_args* args = grpc_channel_args_copy(
+       grpc_channel_stack_builder_get_channel_arguments(builder));
+-  grpc_channel* channel;
++  grpc_channel* channel = {};
+   if (channel_stack_type == GRPC_SERVER_CHANNEL) {
+     GRPC_STATS_INC_SERVER_CHANNELS_CREATED();
+   } else {
+@@ -100,7 +100,6 @@ grpc_channel* grpc_channel_create_with_builder(
+     return channel;
+   }
+ 
+-  memset(channel, 0, sizeof(*channel));
+   channel->target = target;
+   channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
+   size_t channel_tracer_max_nodes = 0;  // default to off