testing/grpc: rebuild against openssl 1.1

1 files changed, 78 insertions, 0 deletions

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