Accepting request 759048 from devel:tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/759048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grpc?expand=0&rev=21

0001-bazel-Replace-boringssl-with-openssl.patch

@@ -5,16 +5,16 @@ Subject: [PATCH] bazel: Replace boringssl with openssl
 
 Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
 ---
- BUILD               |  8 ++------
+ BUILD               |    8 ++------
- WORKSPACE           | 18 ++++++++++++++++++
+ WORKSPACE           |   18 ++++++++++++++++++
- bazel/grpc_deps.bzl | 14 --------------
+ bazel/grpc_deps.bzl |   13 -------------
- 3 files changed, 20 insertions(+), 20 deletions(-)
+ 3 files changed, 20 insertions(+), 19 deletions(-)
 
-diff --git a/BUILD b/BUILD
+Index: grpc-1.25.0/BUILD
-index 2e03ed86c0..4c6c0f4dd2 100644
+===================================================================
---- a/BUILD
+--- grpc-1.25.0.orig/BUILD
-+++ b/BUILD
++++ grpc-1.25.0/BUILD
-@@ -1886,15 +1886,13 @@ grpc_cc_library(
+@@ -1915,15 +1915,13 @@ grpc_cc_library(
          "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h",
          "src/core/tsi/transport_security_grpc.h",
      ],
@@ -31,7 +31,7 @@ index 2e03ed86c0..4c6c0f4dd2 100644
      ],
  )
  
-@@ -1978,9 +1976,6 @@ grpc_cc_library(
+@@ -1982,9 +1980,6 @@ grpc_cc_library(
          "src/core/tsi/ssl_types.h",
          "src/core/tsi/transport_security_grpc.h",
      ],
@@ -41,7 +41,7 @@ index 2e03ed86c0..4c6c0f4dd2 100644
      language = "c++",
      deps = [
          "alts_frame_protector",
-@@ -1990,6 +1985,7 @@ grpc_cc_library(
+@@ -1994,6 +1989,7 @@ grpc_cc_library(
          "grpc_shadow_boringssl",
          "grpc_transport_chttp2_client_insecure",
          "tsi_interface",
@@ -49,11 +49,11 @@ index 2e03ed86c0..4c6c0f4dd2 100644
      ],
  )
  
-diff --git a/WORKSPACE b/WORKSPACE
+Index: grpc-1.25.0/WORKSPACE
-index 6cfa9d67b7..7258626215 100644
+===================================================================
---- a/WORKSPACE
+--- grpc-1.25.0.orig/WORKSPACE
-+++ b/WORKSPACE
++++ grpc-1.25.0/WORKSPACE
-@@ -4,6 +4,24 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+@@ -4,6 +4,24 @@ load("@bazel_tools//tools/build_defs/rep
  load("//bazel:grpc_deps.bzl", "grpc_deps", "grpc_test_only_deps")
  load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
  
@@ -78,38 +78,34 @@ index 6cfa9d67b7..7258626215 100644
  grpc_deps()
  
  grpc_test_only_deps()
-diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
+Index: grpc-1.25.0/bazel/grpc_deps.bzl
-index cce2f88fe8..2465a223e7 100644
+===================================================================
---- a/bazel/grpc_deps.bzl
+--- grpc-1.25.0.orig/bazel/grpc_deps.bzl
-+++ b/bazel/grpc_deps.bzl
++++ grpc-1.25.0/bazel/grpc_deps.bzl
-@@ -26,11 +26,6 @@ def grpc_deps():
+@@ -23,11 +23,6 @@ def grpc_deps():
-         actual = "@com_google_absl//absl/time:time",
      )
  
--    native.bind(
+     native.bind(
 -        name = "libssl",
 -        actual = "@boringssl//:ssl",
 -    )
 -
-     native.bind(
+-    native.bind(
          name = "madler_zlib",
          actual = "@zlib//:zlib",
-@@ -101,15 +96,6 @@ def grpc_deps():
+     )
+@@ -97,14 +92,6 @@ def grpc_deps():
          actual = "@io_opencensus_cpp//opencensus/stats:test_utils",
      )
  
 -    if "boringssl" not in native.existing_rules():
 -        http_archive(
 -            name = "boringssl",
--            # on the chromium-stable-with-bazel branch
 -            # NOTE: This URL generates a tarball containing dynamic date
 -            # information, so the sha256 is not consistent.
--            url = "https://boringssl.googlesource.com/boringssl/+archive/afc30d43eef92979b05776ec0963c9cede5fb80f.tar.gz",
+-            url = "https://boringssl.googlesource.com/boringssl/+archive/83da28a68f32023fd3b95a8ae94991a07b1f6c62.tar.gz",
 -        )
 -
      if "zlib" not in native.existing_rules():
          http_archive(
              name = "zlib",
--- 
-2.16.4
-

gettid.patch

@@ -1,54 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2019-10-02 20:41:05.480291530 +0200
-
-Avoid collision with glibc's gettid.
-
----
- src/core/lib/gpr/log_linux.cc          |    4 ++--
- src/core/lib/iomgr/ev_epollex_linux.cc |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: grpc-1.23.1/src/core/lib/gpr/log_linux.cc
-===================================================================
---- grpc-1.23.1.orig/src/core/lib/gpr/log_linux.cc
-+++ grpc-1.23.1/src/core/lib/gpr/log_linux.cc
-@@ -40,7 +40,7 @@
- #include <time.h>
- #include <unistd.h>
- 
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long my_gettid(void) { return syscall(__NR_gettid); }
- 
- void gpr_log(const char* file, int line, gpr_log_severity severity,
-              const char* format, ...) {
-@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args*
-   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
-   struct tm tm;
-   static __thread long tid = 0;
--  if (tid == 0) tid = gettid();
-+  if (tid == 0) tid = my_gettid();
- 
-   timer = static_cast<time_t>(now.tv_sec);
-   final_slash = strrchr(args->file, '/');
-Index: grpc-1.23.1/src/core/lib/iomgr/ev_epollex_linux.cc
-===================================================================
---- grpc-1.23.1.orig/src/core/lib/iomgr/ev_epollex_linux.cc
-+++ grpc-1.23.1/src/core/lib/iomgr/ev_epollex_linux.cc
-@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pol
- }
- 
- #ifndef NDEBUG
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long my_gettid(void) { return syscall(__NR_gettid); }
- #endif
- 
- /* pollset->mu lock must be held by the caller before calling this.
-@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pol
- #define WORKER_PTR (&worker)
- #endif
- #ifndef NDEBUG
--  WORKER_PTR->originator = gettid();
-+  WORKER_PTR->originator = my_gettid();
- #endif
-   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
-     gpr_log(GPR_INFO,

grpc.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec 16 23:36:51 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.25
+  * Change RR to consider a subchannel in TF if it has failed
+    since it was READY.
+  * Do not create streams after a GOAWAY has been received.
+  * Prevent HTTP2 parser from queueing a lot of induced frames.
+- Drop gettid.patch
+
 -------------------------------------------------------------------
 Mon Nov 11 15:37:45 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
 

grpc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grpc
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,20 @@
 #
 
 
-%define lver 7
+%define lver 8
 %define lverp 1
 %define src_install_dir /usr/src/%name
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           grpc
-Version:        1.23.1
+Version:        1.25.0
 Release:        0
-%define rver	1.23.1
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
 Group:          Development/Tools/Building
 URL:            https://grpc.io/
-Source0:        https://github.com/grpc/grpc/archive/v%rver.tar.gz
+Source:         https://github.com/grpc/grpc/archive/v%version.tar.gz
-Source1:        %{name}-rpmlintrc
+Source2:        %name-rpmlintrc
-Patch1:         gettid.patch
+Patch1:         0001-bazel-Replace-boringssl-with-openssl.patch
-Patch2:         0001-bazel-Replace-boringssl-with-openssl.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
@@ -114,8 +112,8 @@ Requires:       python = %python3_version
 This subpackage contains the python3 bindings.
 
 %prep
-%autosetup -n grpc-%rver -p1
+%autosetup -p1
-sed -i -e "s|%%LIBDIR%%|%{_libdir}|" bazel/grpc_deps.bzl
+sed -i -e "s|%%LIBDIR%%|%_libdir|" bazel/grpc_deps.bzl
 
 %build
 %define _lto_cflags %nil

v1.23.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd7da002b15641e4841f20a1f3eb1e359edb69d5ccf8ac64c362823b05f523d9
-size 15210322

v1.25.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffbe61269160ea745e487f79b0fd06b6edd3d50c6d9123f053b5634737cf2f69
+size 16460163