From 23d2098247cf5b1960b8e4726f9f5da706ef2ccbd042800a13a5eb29b5cb7222 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 6 Dec 2020 19:23:27 +0000 Subject: [PATCH 1/2] Accepting request 853409 from home:badshah400:branches:devel:tools * Update to version 1.34.0. * Pass ZLIB_LIBRARY location to cmake as it fails to find zlib using find_package() after the zlib libraries were moved to %{_libdir} in openSUSE:Factory (sr#851291). * Update so version in keeping with upstream. * Leave a comment on why tests cannot be run (because of `make clean` required to pkg sources). OBS-URL: https://build.opensuse.org/request/show/853409 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=78 --- googletest-1.10.0.tar.gz | 3 +++ grpc-correct-pkgconfig-path.patch | 8 ++++---- grpc.changes | 32 +++++++++++++++++++++++++++++++ grpc.spec | 10 +++++++--- v1.33.2.tar.gz | 3 --- v1.34.0.tar.gz | 3 +++ 6 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 googletest-1.10.0.tar.gz delete mode 100644 v1.33.2.tar.gz create mode 100644 v1.34.0.tar.gz diff --git a/googletest-1.10.0.tar.gz b/googletest-1.10.0.tar.gz new file mode 100644 index 0000000..ca3c00c --- /dev/null +++ b/googletest-1.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb +size 904349 diff --git a/grpc-correct-pkgconfig-path.patch b/grpc-correct-pkgconfig-path.patch index 42d9812..1f5a6ed 100644 --- a/grpc-correct-pkgconfig-path.patch +++ b/grpc-correct-pkgconfig-path.patch @@ -1,8 +1,8 @@ -Index: grpc-1.33.1/CMakeLists.txt +Index: grpc-1.34.0/CMakeLists.txt =================================================================== ---- grpc-1.33.1.orig/CMakeLists.txt -+++ grpc-1.33.1/CMakeLists.txt -@@ -15805,7 +15805,7 @@ function(generate_pkgconfig name descrip +--- grpc-1.34.0.orig/CMakeLists.txt ++++ grpc-1.34.0/CMakeLists.txt +@@ -16203,7 +16203,7 @@ function(generate_pkgconfig name descrip "${output_filepath}" @ONLY) install(FILES "${output_filepath}" diff --git a/grpc.changes b/grpc.changes index 22de33e..ecf4427 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sun Dec 6 13:01:52 UTC 2020 - Atri Bhattacharya + +- Update to version 1.34.0: + * Core: + - Protect xds security code with the environment variable + "GRPC_XDS_EXPERIMENTAL_SECURITY_SUPPORT" + (gh#grpc/grpc#24782). + - Add support for "unix-abstract:" URIs to support abstract + unix domain sockets (gh#grpc/grpc#24500). + - Increment Index when parsing not plumbed SAN fields + (gh#grpc/grpc#24601). + - Revert "Revert "Deprecate + GRPC_ARG_HTTP2_MIN_SENT_PING_INTERVAL_WITHOUT_DATA_MS"" + (gh#grpc/grpc#24518). + - xds: Set status code to INVALID_ARGUMENT when NACKing + (gh#grpc/grpc#24516). + - Include stddef.h in address_sorting.h (gh#grpc/grpc#24514). + - xds: Add support for case_sensitive option in RouteMatch + (gh#grpc/grpc#24381). + * C++: + - Fix --define=grpc_no_xds=true builds (gh#grpc/grpc#24503). + - Experimental support and tests for + CreateCustomInsecureChannelWithInterceptorsFromFd + (gh#grpc/grpc#24362). +- Pass ZLIB_LIBRARY location to cmake as it fails to find zlib + using find_package() after the zlib libraries were moved to + %{_libdir} in openSUSE:Factory (sr#851291). +- Update so version in keeping with upstream. +- Leave a comment on why tests cannot be run (because of + `make clean` required to pkg sources). + ------------------------------------------------------------------- Wed Nov 11 13:26:47 UTC 2020 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index f0da3e1..b36155d 100644 --- a/grpc.spec +++ b/grpc.spec @@ -16,12 +16,12 @@ # -%define lver 13 +%define lver 14 %define lverp 1 %define lverplugin 1 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.33.2 +Version: 1.34.0 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 @@ -141,11 +141,12 @@ export CXXFLAGS="$CFLAGS" %cmake -DgRPC_INSTALL=ON \ -DgRPC_INSTALL_LIBDIR:PATH="%_lib" \ -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \ - -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_ABSL_PROVIDER=package \ -DgRPC_CARES_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ + -DZLIB_LIBRARY=%{_libdir}/libz.so \ -DgRPC_ZLIB_PROVIDER=package %cmake_build @@ -173,6 +174,9 @@ cp -r * "%buildroot/%src_install_dir" %fdupes %buildroot/%_prefix +# Checks cannot be run because of `make clean` above +#%%check + %post -n libgrpc%lver -p /sbin/ldconfig %postun -n libgrpc%lver -p /sbin/ldconfig %post -n libgrpc++%lverp -p /sbin/ldconfig diff --git a/v1.33.2.tar.gz b/v1.33.2.tar.gz deleted file mode 100644 index c0a2176..0000000 --- a/v1.33.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a -size 7270924 diff --git a/v1.34.0.tar.gz b/v1.34.0.tar.gz new file mode 100644 index 0000000..3035438 --- /dev/null +++ b/v1.34.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39 +size 7723327 From b74655db3c9d51ca5a6b839d4dcce084f37d69effc31f9db8d41ea6b4a163751 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 13 Jan 2021 23:51:49 +0000 Subject: [PATCH 2/2] Accepting request 862994 from home:badshah400:branches:devel:tools * Update to version 1.34.1. * Drop untracked googletest-1.10.0.tar.gz source. OBS-URL: https://build.opensuse.org/request/show/862994 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=79 --- googletest-1.10.0.tar.gz | 3 --- grpc.changes | 10 ++++++++++ grpc.spec | 4 ++-- v1.34.0.tar.gz | 3 --- v1.34.1.tar.gz | 3 +++ 5 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 googletest-1.10.0.tar.gz delete mode 100644 v1.34.0.tar.gz create mode 100644 v1.34.1.tar.gz diff --git a/googletest-1.10.0.tar.gz b/googletest-1.10.0.tar.gz deleted file mode 100644 index ca3c00c..0000000 --- a/googletest-1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb -size 904349 diff --git a/grpc.changes b/grpc.changes index ecf4427..3255494 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 13 20:20:44 UTC 2021 - Atri Bhattacharya + +- Update to version 1.34.1: + * Backport "Lazily import grpc_tools when using runtime + stub/message generation" to 1.34.x (gh#grpc/grpc#25011). + * Backport "do not use true on + non-windows" to 1.34.x (gh#grpc/grpc#24995). +- Drop untracked googletest-1.10.0.tar.gz source. + ------------------------------------------------------------------- Sun Dec 6 13:01:52 UTC 2020 - Atri Bhattacharya diff --git a/grpc.spec b/grpc.spec index b36155d..86dad03 100644 --- a/grpc.spec +++ b/grpc.spec @@ -1,7 +1,7 @@ # # spec file for package grpc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define lverplugin 1 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.34.0 +Version: 1.34.1 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 diff --git a/v1.34.0.tar.gz b/v1.34.0.tar.gz deleted file mode 100644 index 3035438..0000000 --- a/v1.34.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39 -size 7723327 diff --git a/v1.34.1.tar.gz b/v1.34.1.tar.gz new file mode 100644 index 0000000..6387f7e --- /dev/null +++ b/v1.34.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c260a1dcdd26a78a9596494a3f41f9594ab5ec3a4d65cba4658bdee2b55ac844 +size 7723754