Commit be734b06ad7601d6b25c154b4c5668c40b2b9d39 - grpc

+1

-0

debian/changelog less more

0	0	grpc (1.15.0-1) UNRELEASED; urgency=medium
1	1
2	2	* New upstream release.
	3	* Update patches.
3	4
4	5	-- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 15 Sep 2018 15:33:29 +0000
5	6

+1

-1

debian/patches/add-wrap-memcpy-flags.diff less more

0	0	--- a/Makefile
1	1	+++ b/Makefile
2		@@ -3768,7 +3768,7 @@
	2	@@ -3824,7 +3824,7 @@
3	3	ifeq ($(SYSTEM),Darwin)
4	4	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5	5	else

+1

-1

debian/patches/add_grpc_libdir.patch less more

7	7
8	8	--- grpc-1.13.0~pre2.orig/src/ruby/ext/grpc/extconf.rb
9	9	+++ grpc-1.13.0~pre2/src/ruby/ext/grpc/extconf.rb
10		@@ -66,6 +66,8 @@ ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPA
	10	@@ -41,6 +41,8 @@ ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPA
11	11	output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
12	12	grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
13	13	ENV['BUILDDIR'] = output_dir

+6

-6

debian/patches/fix-libgrpc++-soname.diff less more

0	0	--- a/Makefile
1	1	+++ b/Makefile
2		@@ -3009,7 +3009,7 @@
	2	@@ -3050,7 +3050,7 @@
3	3	ifeq ($(SYSTEM),MINGW32)
4	4	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++.a
5	5	else ifneq ($(SYSTEM),Darwin)

8	8	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so
9	9	endif
10	10	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
11		@@ -3018,7 +3018,7 @@
	11	@@ -3059,7 +3059,7 @@
12	12	ifeq ($(SYSTEM),MINGW32)
13	13	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_cronet.a
14	14	else ifneq ($(SYSTEM),Darwin)

17	17	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so
18	18	endif
19	19	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
20		@@ -3027,7 +3027,7 @@
	20	@@ -3068,7 +3068,7 @@
21	21	ifeq ($(SYSTEM),MINGW32)
22	22	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_error_details.a
23	23	else ifneq ($(SYSTEM),Darwin)

26	26	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so
27	27	endif
28	28	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
29		@@ -3036,7 +3036,7 @@
	29	@@ -3077,7 +3077,7 @@
30	30	ifeq ($(SYSTEM),MINGW32)
31	31	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_reflection.a
32	32	else ifneq ($(SYSTEM),Darwin)

35	35	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so
36	36	endif
37	37	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
38		@@ -3045,7 +3045,7 @@
	38	@@ -3086,7 +3086,7 @@ endif
39	39	ifeq ($(SYSTEM),MINGW32)
40	40	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_unsecure.a
41	41	else ifneq ($(SYSTEM),Darwin)

43	43	+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so.1
44	44	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so
45	45	endif
46		ifneq ($(SYSTEM),MINGW32)
	46	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"

+25

-4

debian/patches/install_libdir.patch less more

0	0	--- a/Makefile 2018-05-04 17:12:19.000000000 +0000
1	1	+++ b/Makefile 2018-05-04 19:59:00.702313203 +0000
2		@@ -2915,85 +2915,85 @@ install-static: install-static_c install
	2	@@ -2953,88 +2953,88 @@ install-static: install-static_c install
3	3
4	4	install-static_c: static_c strip-static_c install-pkg-config_c
5	5	$(E) "[INSTALL] Installing libaddress_sorting.a"

54	54	- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(prefix)/lib/libgrpc++_unsecure.a
55	55	+ $(Q) $(INSTALL) -d $(prefix)/$(INSTALL_LIBDIR)
56	56	+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
	57	$(E) "[INSTALL] Installing libgrpcpp_channelz.a"
	58	- $(Q) $(INSTALL) -d $(prefix)/lib
	59	- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a $(prefix)/lib/libgrpcpp_channelz.a
	60	+ $(Q) $(INSTALL) -d $(prefix)/$(INSTALL_LIBDIR)
	61	+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
57	62
58	63
59	64

130	135	endif
131	136	ifneq ($(SYSTEM),MINGW32)
132	137	ifneq ($(SYSTEM),Darwin)
133		@@ -3004,49 +3004,49 @@ endif
	138	@@ -3045,58 +3045,58 @@ endif
134	139
135	140	install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
136	141	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"

203	208	+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
204	209	+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
205	210	endif
	211	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
	212	- $(Q) $(INSTALL) -d $(prefix)/lib
	213	- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
	214	+ $(Q) $(INSTALL) -d $(prefix)/$(INSTALL_LIBDIR)
	215	+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
	216	ifeq ($(SYSTEM),MINGW32)
	217	- $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpcpp_channelz.a
	218	+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
	219	else ifneq ($(SYSTEM),Darwin)
	220	- $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so.6
	221	- $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so
	222	+ $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.6
	223	+ $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so
	224	endif
206	225	ifneq ($(SYSTEM),MINGW32)
207	226	ifneq ($(SYSTEM),Darwin)
208		@@ -3057,13 +3057,13 @@ endif
	227	@@ -3107,13 +3107,13 @@ endif
209	228
210	229	install-shared_csharp: shared_csharp strip-shared_csharp
211	230	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)"

224	243	endif
225	244	ifneq ($(SYSTEM),MINGW32)
226	245	ifneq ($(SYSTEM),Darwin)
227		@@ -3096,15 +3096,15 @@ install-grpc-cli: grpc_cli
	246	@@ -3146,16 +3146,16 @@ install-grpc-cli: grpc_cli
228	247
229	248	install-pkg-config_c: pc_c pc_c_unsecure
230	249	$(E) "[INSTALL] Installing C pkg-config files"
231	250	- $(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
	251	- $(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc $(prefix)/lib/pkgconfig/gpr.pc
232	252	- $(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(prefix)/lib/pkgconfig/grpc.pc
233	253	- $(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(prefix)/lib/pkgconfig/grpc_unsecure.pc
234	254	+ $(Q) $(INSTALL) -d $(prefix)/$(INSTALL_LIBDIR)/pkgconfig
	255	+ $(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc $(prefix)/$(INSTALL_LIBDIR)/pkgconfig/gpr.pc
235	256	+ $(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(prefix)/$(INSTALL_LIBDIR)/pkgconfig/grpc.pc
236	257	+ $(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(prefix)/$(INSTALL_LIBDIR)/pkgconfig/grpc_unsecure.pc
237	258

+1

-1

debian/patches/no-embed-libs.patch less more

0	0	--- a/src/ruby/ext/grpc/extconf.rb
1	1	+++ b/src/ruby/ext/grpc/extconf.rb
2		@@ -56,9 +56,9 @@
	2	@@ -31,9 +31,9 @@
3	3
4	4	ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/
5	5

+1

-1

debian/patches/no-make-in-extconf.patch less more

0	0	--- a/src/ruby/ext/grpc/extconf.rb
1	1	+++ b/src/ruby/ext/grpc/extconf.rb
2		@@ -67,17 +67,8 @@
	2	@@ -42,17 +42,8 @@
3	3	grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
4	4	ENV['BUILDDIR'] = output_dir
5	5

+3

-3

debian/patches/remove-missing-files-in-gemspec.patch less more

11	11	s.files += %w( include/grpc/support/alloc.h )
12	12	s.files += %w( include/grpc/support/atm.h )
13	13	s.files += %w( include/grpc/support/atm_gcc_atomic.h )
14		@@ -255,10 +250,6 @@ Gem::Specification.new do \|s\|
	14	@@ -258,10 +253,6 @@ Gem::Specification.new do \|s\|
15	15	s.files += %w( src/core/tsi/alts/handshaker/altscontext.pb.h )
16	16	s.files += %w( src/core/tsi/alts/handshaker/handshaker.pb.h )
17	17	s.files += %w( src/core/tsi/alts/handshaker/transport_security_common.pb.h )

22	22	s.files += %w( src/core/tsi/transport_security.h )
23	23	s.files += %w( src/core/tsi/transport_security_interface.h )
24	24	s.files += %w( src/core/ext/transport/chttp2/client/authority.h )
25		@@ -683,9 +674,6 @@ Gem::Specification.new do \|s\|
	25	@@ -689,9 +670,6 @@ Gem::Specification.new do \|s\|
26	26	s.files += %w( src/core/tsi/alts/handshaker/altscontext.pb.c )
27	27	s.files += %w( src/core/tsi/alts/handshaker/handshaker.pb.c )
28	28	s.files += %w( src/core/tsi/alts/handshaker/transport_security_common.pb.c )

32	32	s.files += %w( src/core/tsi/transport_security.cc )
33	33	s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.cc )
34	34	s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc )
35		@@ -753,535 +741,5 @@ Gem::Specification.new do \|s\|
	35	@@ -762,535 +750,5 @@ Gem::Specification.new do \|s\|
36	36	s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc )
37	37	s.files += %w( src/core/ext/filters/workarounds/workaround_utils.cc )
38	38	s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )

+3

-3

debian/patches/unvendor-zlib.diff less more

2	2
3	3	--- a/Makefile
4	4	+++ b/Makefile
5		@@ -1392,7 +1392,7 @@ plugins: $(PROTOC_PLUGINS)
	5	@@ -1407,7 +1407,7 @@ plugins: $(PROTOC_PLUGINS)
6	6
7	7	privatelibs: privatelibs_c privatelibs_cxx
8	8
9	9	-privatelibs_c: $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBDIR)/$(CONFIG)/libcxxabi.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
10	10	+privatelibs_c: $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBDIR)/$(CONFIG)/libcxxabi.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libares.a $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
11		pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc
	11	pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc
12	12
13		pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc
	13	pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc