From 84ab1ce226cd757e48ae1776c6f883ef250e2a29da9eb4714a47daf9c125201c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Rostecki?= Date: Fri, 17 Jan 2020 12:03:58 +0000 Subject: [PATCH] Accepting request 765229 from home:mrostecki:branches:devel:kubic - Remove patch for Bazel files, which is not needed anymore: * 0001-bazel-Replace-boringssl-with-openssl.patch OBS-URL: https://build.opensuse.org/request/show/765229 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=58 --- ...bazel-Replace-boringssl-with-openssl.patch | 111 ------------------ grpc.changes | 6 + grpc.spec | 4 +- 3 files changed, 7 insertions(+), 114 deletions(-) delete mode 100644 0001-bazel-Replace-boringssl-with-openssl.patch diff --git a/0001-bazel-Replace-boringssl-with-openssl.patch b/0001-bazel-Replace-boringssl-with-openssl.patch deleted file mode 100644 index dcf90d4..0000000 --- a/0001-bazel-Replace-boringssl-with-openssl.patch +++ /dev/null @@ -1,111 +0,0 @@ -From aeccd4691acdba64bcb2622be45d80735b0c61be Mon Sep 17 00:00:00 2001 -From: Michal Rostecki -Date: Tue, 5 Nov 2019 01:33:28 +0100 -Subject: [PATCH] bazel: Replace boringssl with openssl - -Signed-off-by: Michal Rostecki ---- - BUILD | 8 ++------ - WORKSPACE | 18 ++++++++++++++++++ - bazel/grpc_deps.bzl | 13 ------------- - 3 files changed, 20 insertions(+), 19 deletions(-) - -Index: grpc-1.25.0/BUILD -=================================================================== ---- grpc-1.25.0.orig/BUILD -+++ grpc-1.25.0/BUILD -@@ -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", - ], -- external_deps = [ -- "libssl", -- ], - language = "c++", - deps = [ - "gpr", - "grpc_base", - "grpc_shadow_boringssl", - "tsi_interface", -+ "@openssl//:openssl-lib", - ], - ) - -@@ -1982,9 +1980,6 @@ grpc_cc_library( - "src/core/tsi/ssl_types.h", - "src/core/tsi/transport_security_grpc.h", - ], -- external_deps = [ -- "libssl", -- ], - language = "c++", - deps = [ - "alts_frame_protector", -@@ -1994,6 +1989,7 @@ grpc_cc_library( - "grpc_shadow_boringssl", - "grpc_transport_chttp2_client_insecure", - "tsi_interface", -+ "@openssl//:openssl-lib", - ], - ) - -Index: grpc-1.25.0/WORKSPACE -=================================================================== ---- grpc-1.25.0.orig/WORKSPACE -+++ grpc-1.25.0/WORKSPACE -@@ -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") - -+GRPC_BUILD_CONTENT = """ -+cc_library( -+ name = "openssl-lib", -+ srcs = [ -+ "libssl.so.1.1", -+ "libcrypto.so.1.1", -+ ], -+ visibility = ["//visibility:public"], -+ linkstatic = False, -+) -+""" -+ -+new_local_repository( -+ name = "openssl", -+ path = "%LIBDIR%", -+ build_file_content = GRPC_BUILD_CONTENT, -+) -+ - grpc_deps() - - grpc_test_only_deps() -Index: grpc-1.25.0/bazel/grpc_deps.bzl -=================================================================== ---- grpc-1.25.0.orig/bazel/grpc_deps.bzl -+++ grpc-1.25.0/bazel/grpc_deps.bzl -@@ -23,11 +23,6 @@ def grpc_deps(): - ) - - native.bind( -- name = "libssl", -- actual = "@boringssl//:ssl", -- ) -- -- native.bind( - name = "madler_zlib", - actual = "@zlib//:zlib", - ) -@@ -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", -- # NOTE: This URL generates a tarball containing dynamic date -- # information, so the sha256 is not consistent. -- url = "https://boringssl.googlesource.com/boringssl/+archive/83da28a68f32023fd3b95a8ae94991a07b1f6c62.tar.gz", -- ) -- - if "zlib" not in native.existing_rules(): - http_archive( - name = "zlib", diff --git a/grpc.changes b/grpc.changes index e9f2c35..d552772 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 9 11:39:15 UTC 2020 - Michał Rostecki + +- Remove patch for Bazel files, which is not needed anymore: + * 0001-bazel-Replace-boringssl-with-openssl.patch + ------------------------------------------------------------------- Mon Dec 16 23:36:51 UTC 2019 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index e27e09f..897e583 100644 --- a/grpc.spec +++ b/grpc.spec @@ -1,7 +1,7 @@ # # spec file for package grpc # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,6 @@ Group: Development/Tools/Building URL: https://grpc.io/ Source: https://github.com/grpc/grpc/archive/v%version.tar.gz Source2: %name-rpmlintrc -Patch1: 0001-bazel-Replace-boringssl-with-openssl.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} @@ -113,7 +112,6 @@ This subpackage contains the python3 bindings. %prep %autosetup -p1 -sed -i -e "s|%%LIBDIR%%|%_libdir|" bazel/grpc_deps.bzl %build %define _lto_cflags %nil