Hello community, here is the log from the commit of package envoy-proxy for openSUSE:Factory checked in at 2019-03-21 09:52:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/envoy-proxy (Old) and /work/SRC/openSUSE:Factory/.envoy-proxy.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "envoy-proxy" Thu Mar 21 09:52:44 2019 rev:3 rq:686696 version:1.8.0+git20181105 Changes: -------- --- /work/SRC/openSUSE:Factory/envoy-proxy/cilium-proxy.changes 2019-03-13 09:15:20.543386038 +0100 +++ /work/SRC/openSUSE:Factory/.envoy-proxy.new.28833/cilium-proxy.changes 2019-03-21 09:52:48.738796776 +0100 @@ -1,0 +2,8 @@ +Tue Mar 19 13:35:44 UTC 2019 - Michal Rostecki <[email protected]> + +- Add patch which allows to use grpc 1.19.x. + * 0001-bazel-transport-sockets-Update-grpc-to-1.19.1.patch +- Use source packages of grpc-httpjson-transcoding, opentracing-cpp + and lightstep-tracer-cpp. (boo#1129568) + +------------------------------------------------------------------- envoy-proxy.changes: same change istio-proxy.changes: same change New: ---- 0001-bazel-transport-sockets-Update-grpc-to-1.19.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium-proxy.spec ++++++ --- /var/tmp/diff_new_pack.AsDZW4/_old 2019-03-21 09:52:51.214796107 +0100 +++ /var/tmp/diff_new_pack.AsDZW4/_new 2019-03-21 09:52:51.218796106 +0100 @@ -1,7 +1,7 @@ # # spec file for package cilium-proxy # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -46,6 +46,7 @@ Source13: %{name}-WORKSPACE Patch0: 0001-Remove-deprecated-Blaze-PACKAGE_NAME-macro-5330.patch Patch1: 0001-Upgrade-gabime-spdlog-dependency-to-1.3.0-5604.patch +Patch2: 0001-bazel-transport-sockets-Update-grpc-to-1.19.1.patch BuildRequires: abseil-cpp-devel BuildRequires: backward-cpp-devel BuildRequires: bazel @@ -63,10 +64,9 @@ BuildRequires: git BuildRequires: golang-org-x-tools BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.10.4 BuildRequires: googleapis-source BuildRequires: gperftools-devel -BuildRequires: grpc-httpjson-transcoding-devel +BuildRequires: grpc-httpjson-transcoding-source BuildRequires: grpc-source BuildRequires: gtest BuildRequires: http-parser-devel @@ -76,32 +76,33 @@ BuildRequires: libnghttp2-devel BuildRequires: libprotobuf-mutator-devel BuildRequires: libtool -BuildRequires: lightstep-tracer-cpp-devel +BuildRequires: lightstep-tracer-cpp-source BuildRequires: lua51-luajit-devel BuildRequires: msgpack-devel BuildRequires: nanopb-source BuildRequires: openssl-devel -BuildRequires: opentracing-cpp-devel +BuildRequires: opentracing-cpp-source BuildRequires: prometheus-client-model-source BuildRequires: protobuf-source BuildRequires: protoc-gen-go-source BuildRequires: protoc-gen-gogo-source BuildRequires: protoc-gen-validate-source BuildRequires: python +BuildRequires: python-xml BuildRequires: python2-Jinja2 BuildRequires: python2-MarkupSafe BuildRequires: python2-six BuildRequires: python2-thrift -BuildRequires: python2-twitter.common.lang BuildRequires: python2-twitter.common.finagle-thrift +BuildRequires: python2-twitter.common.lang BuildRequires: python2-twitter.common.rpc -BuildRequires: python-xml BuildRequires: rapidjson-devel BuildRequires: spdlog-devel BuildRequires: tclap BuildRequires: xxhash-devel BuildRequires: yaml-cpp-devel BuildRequires: zlib-devel +BuildRequires: golang(API) >= 1.10.4 ExcludeArch: %ix86 %description @@ -158,6 +159,7 @@ # Patch Envoy. patch -p1 -d ./../envoy-proxy-%{envoy_version} < %{PATCH0} patch -p1 -d ./../envoy-proxy-%{envoy_version} < %{PATCH1} +patch -p1 -d ./../envoy-proxy-%{envoy_version} < %{PATCH2} # To avoid conflicts with openssl development files, boringssl package in # openSUSE installs headers to /usr/include/boringssl. ++++++ envoy-proxy.spec ++++++ --- /var/tmp/diff_new_pack.AsDZW4/_old 2019-03-21 09:52:51.246796098 +0100 +++ /var/tmp/diff_new_pack.AsDZW4/_new 2019-03-21 09:52:51.254796096 +0100 @@ -1,7 +1,7 @@ # # spec file for package envoy-proxy # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -32,6 +32,7 @@ Source6: java_grpc_library.bzl Patch0: 0001-Remove-deprecated-Blaze-PACKAGE_NAME-macro-5330.patch Patch1: 0001-Upgrade-gabime-spdlog-dependency-to-1.3.0-5604.patch +Patch2: 0001-bazel-transport-sockets-Update-grpc-to-1.19.1.patch BuildRequires: abseil-cpp-devel BuildRequires: backward-cpp-devel BuildRequires: bazel @@ -49,10 +50,9 @@ BuildRequires: git BuildRequires: golang-org-x-tools BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.10.4 BuildRequires: googleapis-source BuildRequires: gperftools-devel -BuildRequires: grpc-httpjson-transcoding-devel +BuildRequires: grpc-httpjson-transcoding-source BuildRequires: grpc-source BuildRequires: gtest BuildRequires: http-parser-devel @@ -62,12 +62,12 @@ BuildRequires: libnghttp2-devel BuildRequires: libprotobuf-mutator-devel BuildRequires: libtool -BuildRequires: lightstep-tracer-cpp-devel +BuildRequires: lightstep-tracer-cpp-source BuildRequires: lua51-luajit-devel BuildRequires: msgpack-devel BuildRequires: nanopb-source BuildRequires: openssl-devel -BuildRequires: opentracing-cpp-devel +BuildRequires: opentracing-cpp-source BuildRequires: prometheus-client-model-source BuildRequires: protobuf-source BuildRequires: protoc-gen-go-source @@ -78,8 +78,8 @@ BuildRequires: python2-MarkupSafe BuildRequires: python2-six BuildRequires: python2-thrift -BuildRequires: python2-twitter.common.lang BuildRequires: python2-twitter.common.finagle-thrift +BuildRequires: python2-twitter.common.lang BuildRequires: python2-twitter.common.rpc BuildRequires: rapidjson-devel BuildRequires: spdlog-devel @@ -87,6 +87,7 @@ BuildRequires: xxhash-devel BuildRequires: yaml-cpp-devel BuildRequires: zlib-devel +BuildRequires: golang(API) >= 1.10.4 ExcludeArch: %ix86 %description @@ -111,6 +112,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Copy our custom Bazel rules. cp %{SOURCE1} ./WORKSPACE ++++++ istio-proxy.spec ++++++ --- /var/tmp/diff_new_pack.AsDZW4/_old 2019-03-21 09:52:51.282796088 +0100 +++ /var/tmp/diff_new_pack.AsDZW4/_new 2019-03-21 09:52:51.282796088 +0100 @@ -1,7 +1,7 @@ # # spec file for package istio-proxy # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -42,6 +42,7 @@ Source11: %{name}-repositories.bzl Patch0: 0001-Remove-deprecated-Blaze-PACKAGE_NAME-macro-5330.patch Patch1: 0001-Upgrade-gabime-spdlog-dependency-to-1.3.0-5604.patch +Patch2: 0001-bazel-transport-sockets-Update-grpc-to-1.19.1.patch BuildRequires: abseil-cpp-devel BuildRequires: backward-cpp-devel BuildRequires: bazel @@ -60,10 +61,9 @@ BuildRequires: gmock BuildRequires: golang-org-x-tools BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.10.4 BuildRequires: googleapis-source BuildRequires: gperftools-devel -BuildRequires: grpc-httpjson-transcoding-devel +BuildRequires: grpc-httpjson-transcoding-source BuildRequires: grpc-source BuildRequires: gtest BuildRequires: http-parser-devel @@ -73,12 +73,12 @@ BuildRequires: libnghttp2-devel BuildRequires: libprotobuf-mutator-devel BuildRequires: libtool -BuildRequires: lightstep-tracer-cpp-devel +BuildRequires: lightstep-tracer-cpp-source BuildRequires: lua51-luajit-devel BuildRequires: msgpack-devel BuildRequires: nanopb-source BuildRequires: openssl-devel -BuildRequires: opentracing-cpp-devel +BuildRequires: opentracing-cpp-source BuildRequires: prometheus-client-model-source BuildRequires: protobuf-source BuildRequires: protoc-gen-go-source @@ -90,8 +90,8 @@ BuildRequires: python2-MarkupSafe BuildRequires: python2-six BuildRequires: python2-thrift -BuildRequires: python2-twitter.common.lang BuildRequires: python2-twitter.common.finagle-thrift +BuildRequires: python2-twitter.common.lang BuildRequires: python2-twitter.common.rpc BuildRequires: rapidjson-devel BuildRequires: spdlog-devel @@ -99,6 +99,7 @@ BuildRequires: xxhash-devel BuildRequires: yaml-cpp-devel BuildRequires: zlib-devel +BuildRequires: golang(API) >= 1.10.4 ExcludeArch: %ix86 %description @@ -149,6 +150,7 @@ # Patch Envoy. patch -p1 -d ./../envoy-proxy-%{envoy_version} < %{PATCH0} patch -p1 -d ./../envoy-proxy-%{envoy_version} < %{PATCH1} +patch -p1 -d ./../envoy-proxy-%{envoy_version} < %{PATCH2} # To avoid conflicts with openssl development files, boringssl package in # openSUSE installs headers to /usr/include/boringssl. ++++++ 0001-bazel-transport-sockets-Update-grpc-to-1.19.1.patch ++++++ >From cafc72d3713e03b28ae14a7fe70de69e20ae44d7 Mon Sep 17 00:00:00 2001 From: Michal Rostecki <[email protected]> Date: Mon, 18 Mar 2019 15:20:43 +0100 Subject: [PATCH] bazel: transport sockets: Update grpc to 1.19.1 Risk Level: Low Testing: Unit tests Docs Changes: N/A Release Notes: N/A Signed-off-by: Michal Rostecki <[email protected]> --- bazel/repository_locations.bzl | 6 +++--- source/extensions/transport_sockets/alts/config.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index e6863079f..824cfdd73 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -64,9 +64,9 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://github.com/google/libprotobuf-mutator/archive/c3d2faf04a1070b0b852b0efdef81e1a81ba925e.tar.gz";], ), com_github_grpc_grpc = dict( - sha256 = "d99db0b39b490d2469a8ef74197d5f211fa740fc9581dccecbb76c56d080fce1", - strip_prefix = "grpc-1.16.0", - urls = ["https://github.com/grpc/grpc/archive/v1.16.0.tar.gz";], + sha256 = "f869c648090e8bddaa1260a271b1089caccbe735bf47ac9cd7d44d35a02fb129", + strip_prefix = "grpc-1.19.1", + urls = ["https://github.com/grpc/grpc/archive/v1.19.1.tar.gz";], ), com_github_nanopb_nanopb = dict( # From: https://github.com/grpc/grpc/blob/v1.14.0/bazel/grpc_deps.bzl#L123 diff --git a/source/extensions/transport_sockets/alts/config.cc b/source/extensions/transport_sockets/alts/config.cc index c128562ee..708570d6c 100644 --- a/source/extensions/transport_sockets/alts/config.cc +++ b/source/extensions/transport_sockets/alts/config.cc @@ -85,7 +85,7 @@ createTransportSocketFactoryHelper(const Protobuf::Message& message, bool is_ups // Specifying target name as empty since TSI won't take care of validating peer identity // in this use case. The validation will be performed by TsiSocket with the validator. tsi_result status = alts_tsi_handshaker_create( - options.get(), target_name, handshaker_service.c_str(), is_upstream, &handshaker); + options.get(), target_name, handshaker_service.c_str(), is_upstream, nullptr, &handshaker); CHandshakerPtr handshaker_ptr{handshaker}; if (status != TSI_OK) { -- 2.16.4 ++++++ envoy-proxy-BUILD ++++++ --- /var/tmp/diff_new_pack.AsDZW4/_old 2019-03-21 09:52:51.394796058 +0100 +++ /var/tmp/diff_new_pack.AsDZW4/_new 2019-03-21 09:52:51.394796058 +0100 @@ -195,25 +195,6 @@ ) cc_library( - name = "grpc_transcoding", - hdrs = glob(["thirdparty_build/include/grpc_transcoding/**/*.h"]), - copts = ["-I/usr/include/grpc_transcoding"], - linkopts = [ - "-lhttp_template", - "-ljson_request_translator", - "-lmessage_reader", - "-lmessage_stream", - "-lpath_matcher", - "-lprefix_writer", - "-lrequest_message_translator", - "-lrequest_stream_translator", - "-lrequest_weaver", - "-lresponse_to_json_translator", - "-ltype_helper", - ], -) - -cc_library( name = "fmtlib", hdrs = glob(["thirdparty_build/include/fmt/**/*.h"]), copts = ["-I/usr/include/fmt"], @@ -245,20 +226,6 @@ ) cc_library( - name = "opentracing", - hdrs = glob(["thirdparty_build/include/opentracing/**/*.h"]), - copts = ["-I/usr/include/opentracing"], - linkopts = ["-lopentracing", "-lopentracing_mocktracer"], -) - -cc_library( - name = "lightstep", - hdrs = glob(["thirdparty_build/include/lightstep"]), - copts = ["-I/usr/include/lightstep"], - linkopts = ["-llightstep_tracer"], -) - -cc_library( name = "http_parser", hdrs = glob(["thirdparty_build/include/http_parser.h"]), copts = [], ++++++ envoy-proxy-repositories.bzl ++++++ --- /var/tmp/diff_new_pack.AsDZW4/_old 2019-03-21 09:52:51.430796049 +0100 +++ /var/tmp/diff_new_pack.AsDZW4/_new 2019-03-21 09:52:51.430796049 +0100 @@ -129,6 +129,21 @@ }, ) +# Bazel native C++ dependencies. For the dependencies that doesn't provide autoconf/automake builds. +def _cc_deps(): + native.local_repository( + name = "grpc_httpjson_transcoding", + path = "/usr/src/grpc-httpjson-transcoding", + ) + native.bind( + name = "path_matcher", + actual = "@grpc_httpjson_transcoding//src:path_matcher", + ) + native.bind( + name = "grpc_transcoding", + actual = "@grpc_httpjson_transcoding//src:transcoding", + ) + def _go_deps(skip_targets): # Keep the skip_targets check around until Istio Proxy has stopped using # it to exclude the Go rules. @@ -210,13 +225,40 @@ # The long repo names (`com_github_fmtlib_fmt` instead of `fmtlib`) are # semi-standard in the Bazel community, intended to avoid both duplicate # dependencies and name conflicts. + _io_opentracing_cpp() + _com_lightstep_tracer_cpp() _com_github_grpc_grpc() _com_github_nanopb_nanopb() _com_google_protobuf() + _cc_deps() _go_deps(skip_targets) _envoy_api_deps() +def _io_opentracing_cpp(): + native.local_repository( + name = "io_opentracing_cpp", + path = "/usr/src/opentracing-cpp", + ) + native.bind( + name = "opentracing", + actual = "@io_opentracing_cpp//:opentracing", + ) + +def _com_lightstep_tracer_cpp(): + native.local_repository( + name = "com_lightstep_tracer_cpp", + path = "/usr/src/lightstep-tracer-cpp", + ) + native.local_repository( + name = "lightstep_vendored_googleapis", + path = "/usr/src/lightstep-tracer-cpp/lightstep-tracer-common/third_party/googleapis", + ) + native.bind( + name = "lightstep", + actual = "@com_lightstep_tracer_cpp//:lightstep_tracer", + ) + def _com_google_protobuf(): native.local_repository( name = "com_google_protobuf", ++++++ envoy-proxy-target_recipes.bzl ++++++ --- /var/tmp/diff_new_pack.AsDZW4/_old 2019-03-21 09:52:51.446796044 +0100 +++ /var/tmp/diff_new_pack.AsDZW4/_new 2019-03-21 09:52:51.450796043 +0100 @@ -23,13 +23,10 @@ "abseil_synchronization": "abseil_synchronization", "abseil_symbolize": "abseil_symbolize", "abseil_time": "abseil_time", - "grpc_transcoding": "grpc_transcoding", "fmtlib": "fmtlib", "spdlog": "spdlog", "backward": "backward", "dd_opentracing_cpp": "dd_opentracing_cpp", - "lightstep": "lightstep", - "opentracing": "opentracing", "http_parser": "http_parser", "libprotobuf_mutator": "libprotobuf_mutator", "rapidjson": "rapidjson",
