Hello community, here is the log from the commit of package envoy-proxy for openSUSE:Factory checked in at 2020-09-29 19:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/envoy-proxy (Old) and /work/SRC/openSUSE:Factory/.envoy-proxy.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "envoy-proxy" Tue Sep 29 19:00:20 2020 rev:11 rq:837198 version:1.14.4 Changes: -------- --- /work/SRC/openSUSE:Factory/envoy-proxy/envoy-proxy.changes 2020-07-02 23:59:26.089488464 +0200 +++ /work/SRC/openSUSE:Factory/.envoy-proxy.new.4249/envoy-proxy.changes 2020-09-29 19:00:45.189696940 +0200 @@ -1,0 +2,28 @@ +Thu Sep 17 08:45:39 UTC 2020 - Guillaume GARDET <[email protected]> + +- Relax constraints on aarch64 + +------------------------------------------------------------------- +Tue Aug 25 15:13:28 UTC 2020 - Michał Rostecki <[email protected]> + +- Update to 1.14.4 + * Release notes: https://www.envoyproxy.io/docs/envoy/v1.14.4/intro/version_history +- Remove patches which were either released upstream or are not + relevant anymore: + * 0001-server-add-getTransportSocketFactoryContext-to-Filte.patch + * 0002-test-Fix-mocks.patch + * 0003-test-Fix-format.patch + * 0004-server-Add-comments-pointing-out-implementation-deta.patch + * 0005-server-Move-setInitManager-to-TransportSocketFactory.patch + * 0006-fix-format.patch + * 0007-lua-Handle-the-default-case-in-scriptLog.patch + * logger-Use-spdlog-memory_buf_t-instead-of-fmt-memory.patch + * big-endian-support.patch + * bazel-Fix-optional-dynamic-linking-of-OpenSSL.patch + * compatibility-with-TLS-1.2-and-OpenSSL-1.1.0.patch +- Add patches which fix the offline build of the new version: + * 0001-build-Use-Go-from-host.patch + * 0002-build-update-several-go-dependencies-11581.patch + * 0003-build-Add-explicit-requirement-on-rules_cc.patch + +------------------------------------------------------------------- Old: ---- 0001-server-add-getTransportSocketFactoryContext-to-Filte.patch 0002-test-Fix-mocks.patch 0003-test-Fix-format.patch 0004-server-Add-comments-pointing-out-implementation-deta.patch 0005-server-Move-setInitManager-to-TransportSocketFactory.patch 0006-fix-format.patch 0007-lua-Handle-the-default-case-in-scriptLog.patch _servicedata bazel-Fix-optional-dynamic-linking-of-OpenSSL.patch big-endian-support.patch compatibility-with-TLS-1.2-and-OpenSSL-1.1.0.patch envoy-proxy-1.12.2+git.20200109.obscpio envoy-proxy.obsinfo logger-Use-spdlog-memory_buf_t-instead-of-fmt-memory.patch New: ---- 0001-build-Use-Go-from-host.patch 0002-build-update-several-go-dependencies-11581.patch 0003-build-Add-explicit-requirement-on-rules_cc.patch envoy-proxy-1.14.4.tar.gz vendor.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ envoy-proxy.spec ++++++ --- /var/tmp/diff_new_pack.9y3aYT/_old 2020-09-29 19:00:51.173704209 +0200 +++ /var/tmp/diff_new_pack.9y3aYT/_new 2020-09-29 19:00:51.177704213 +0200 @@ -16,103 +16,155 @@ # -%define moonjit_version %(rpm -q --qf '%%{VERSION}' moonjit) -%define moonjit_shortver %(cut -d . -f 1 <<< %{moonjit_version}).%(cut -d . -f 2 <<< %{moonjit_version}) %define src_install_dir /usr/src/%{name} Name: envoy-proxy -Version: 1.12.2+git.20200109 +Version: 1.14.4 Release: 0 Summary: L7 proxy and communication bus License: Apache-2.0 URL: https://www.envoyproxy.io/ -Source0: %{name}-%{version}.tar.xz -Source1: %{name}-rpmlintrc -Patch0: bazel-Fix-optional-dynamic-linking-of-OpenSSL.patch -Patch1: compatibility-with-TLS-1.2-and-OpenSSL-1.1.0.patch -Patch2: logger-Use-spdlog-memory_buf_t-instead-of-fmt-memory.patch -Patch3: 0001-server-add-getTransportSocketFactoryContext-to-Filte.patch -Patch4: 0002-test-Fix-mocks.patch -Patch5: 0003-test-Fix-format.patch -Patch6: 0004-server-Add-comments-pointing-out-implementation-deta.patch -Patch7: 0005-server-Move-setInitManager-to-TransportSocketFactory.patch -Patch8: 0006-fix-format.patch -Patch9: big-endian-support.patch -# PATCH-FIX-OPENSUSE 0007-lua-Handle-the-default-case-in-scriptLog.patch -# Submitted upstream, in review -# https://github.com/envoyproxy/envoy/pull/11844 -Patch10: 0007-lua-Handle-the-default-case-in-scriptLog.patch -BuildRequires: abseil-cpp-source -BuildRequires: backward-cpp-devel -BuildRequires: bazel-apple-support-source -BuildRequires: bazel-gazelle-source -BuildRequires: bazel-platforms -BuildRequires: bazel-rules-apple-source -BuildRequires: bazel-rules-cc-source -BuildRequires: bazel-rules-foreign-cc-source -BuildRequires: bazel-rules-go-source -BuildRequires: bazel-rules-java-source -BuildRequires: bazel-rules-proto-source -BuildRequires: bazel-rules-python-source -BuildRequires: bazel-rules-swift-source -BuildRequires: bazel-skylib-source -BuildRequires: bazel-toolchains-source +Source0: %{name}-%{version}.tar.gz +# AUTOGENERATED BY obs-service-bazel_repositories +# vendor.tar.gz contains the following dependencies: +# - https://github.com/Cyan4973/xxHash/archive/v0.7.3.tar.gz +# - https://github.com/DataDog/dd-opentracing-cpp/archive/v1.1.3.tar.gz +# - https://github.com/LuaJIT/LuaJIT/archive/v2.1.0-beta3.tar.gz +# - https://github.com/Tencent/rapidjson/archive/dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1.tar.gz +# - https://github.com/abseil/abseil-cpp/archive/06f0e767d13d4d68071c4fc51e25724e0fc8bc74.tar.gz +# - https://github.com/apache/kafka/archive/2.4.0.zip +# - https://github.com/bazelbuild/apple_support/releases/download/0.7.2/apple_support.0.7.2.tar.gz +# - https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz +# - https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz +# - https://github.com/bazelbuild/bazel-toolchains/releases/download/2.2.0/bazel-toolchains-2.2.0.tar.gz +# - https://github.com/bazelbuild/platforms/archive/9ded0f9c3144258dad27ad84628845bcd7ca6fe6.zip +# - https://github.com/bazelbuild/rules_apple/releases/download/0.19.0/rules_apple.0.19.0.tar.gz +# - https://github.com/bazelbuild/rules_cc/archive/818289e5613731ae410efb54218a4077fb9dbb03.tar.gz +# - https://github.com/bazelbuild/rules_foreign_cc/archive/7bc4be735b0560289f6b86ab6136ee25d20b65b7.tar.gz +# - https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz +# - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip +# - https://github.com/bazelbuild/rules_proto/archive/2c0468366367d7ed97a1f702f9cd7155ab3f73c5.tar.gz +# - https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz +# - https://github.com/bazelbuild/rules_swift/releases/download/0.13.0/rules_swift.0.13.0.tar.gz +# - https://github.com/c-ares/c-ares/archive/d7e070e7283f822b1d2787903cce3615536c5610.tar.gz +# - https://github.com/census-instrumentation/opencensus-cpp/archive/04ed0211931f12b03c1a76b3907248ca4db7bc90.tar.gz +# - https://github.com/census-instrumentation/opencensus-proto/archive/be218fb6bd674af7519b1850cdf8410d8cbd48e8.tar.gz +# - https://github.com/circonus-labs/libcircllhist/archive/63a16dd6f2fc7bc841bb17ff92be8318df60e2e1.tar.gz +# - https://github.com/cncf/udpa/archive/e8cd3a4bb307e2c810cffff99f93e96e6d7fee85.tar.gz +# - https://github.com/envoyproxy/envoy-build-tools/archive/84ca08de00eedd0ba08e7d5551108d6f03f5d362.tar.gz +# - https://github.com/envoyproxy/protoc-gen-validate/archive/ab56c3dd1cf9b516b62c5087e1ec1471bd63631e.tar.gz +# - https://github.com/envoyproxy/sql-parser/archive/b14d010afd4313f2372a1cc96aa2327e674cc798.tar.gz +# - https://github.com/fmtlib/fmt/archive/6.0.0.tar.gz +# - https://github.com/gabime/spdlog/archive/v1.4.0.tar.gz +# - https://github.com/golang/protobuf/archive/v1.4.1.zip +# - https://github.com/golang/tools/archive/2bc93b1c0c88b2406b967fcd19a623d1ff9ea0cd.zip +# - https://github.com/google/cel-cpp/archive/80e1cca533190d537a780ad007e8db64164c582e.tar.gz +# - https://github.com/google/jwt_verify_lib/archive/40e2cc938f4bcd059a97dc6c73f59ecfa5a71bac.tar.gz +# - https://github.com/google/re2/archive/2020-03-03.tar.gz +# - https://github.com/googleapis/googleapis/archive/82944da21578a53b74e547774cf62ed31a05b841.tar.gz +# - https://github.com/gperftools/gperftools/archive/gperftools-2.7.90.tar.gz +# - https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/faf8af1e9788cd4385b94c8f85edab5ea5d4b2d6.tar.gz +# - https://github.com/grpc/grpc/archive/d8f4928fa779f6005a7fe55a176bdb373b0f910f.tar.gz +# - https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz +# - https://github.com/libevent/libevent/archive/0d7d85c2083f7a4c9efe01c061486f332b576d28.tar.gz +# - https://github.com/lightstep/lightstep-tracer-cpp/archive/3efe2372ee3d7c2138d6b26e542d757494a7938d.tar.gz +# - https://github.com/mirror/tclap/archive/tclap-1-2-1-release-final.tar.gz +# - https://github.com/moonjit/moonjit/archive/2.2.0.tar.gz +# - https://github.com/msgpack/msgpack-c/releases/download/cpp-3.2.1/msgpack-3.2.1.tar.gz +# - https://github.com/nodejs/http-parser/archive/v2.9.3.tar.gz +# - https://github.com/opentracing/opentracing-cpp/archive/v1.5.1.tar.gz +# - https://github.com/openzipkin/zipkin-api/archive/0.2.2.tar.gz +# - https://github.com/pallets/jinja/archive/2.10.3.tar.gz +# - https://github.com/pallets/markupsafe/archive/1.1.1.tar.gz +# - https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz +# - https://github.com/protocolbuffers/protobuf-go/archive/v1.22.0.zip +# - https://github.com/protocolbuffers/protobuf/releases/download/v3.10.1/protobuf-all-3.10.1.tar.gz +# - https://github.com/protocolbuffers/upb/archive/8a3ae1ef3e3e3f26b45dec735c5776737fc7247f.tar.gz +# - https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/9ded0f9c3144258dad27ad84628845bcd7ca6fe6.zip +# - https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip +# - https://mirror.bazel.build/github.com/golang/protobuf/archive/v1.4.1.zip +# - https://mirror.bazel.build/github.com/golang/tools/archive/2bc93b1c0c88b2406b967fcd19a623d1ff9ea0cd.zip +# - https://mirror.bazel.build/github.com/protocolbuffers/protobuf-go/archive/v1.22.0.zip +Source1: vendor.tar.gz +# END obs-service-bazel_repositories +Source100: %{name}-rpmlintrc +Patch0: 0001-build-Use-Go-from-host.patch +Patch1: 0002-build-update-several-go-dependencies-11581.patch +Patch2: 0003-build-Add-explicit-requirement-on-rules_cc.patch +# AUTOGENERATED BY obs-service-bazel_repositories +Provides: bundled(abseil-cpp) = 06f0e767d13d4d68071c4fc51e25724e0fc8bc74 +Provides: bundled(apple_support) = 0.7.2 +Provides: bundled(bazel-gazelle) = 0.19.1 +Provides: bundled(bazel-skylib) = 0.9.0 +Provides: bundled(bazel-toolchains) = 2.2.0 +Provides: bundled(c-ares) = d7e070e7283f822b1d2787903cce3615536c5610 +Provides: bundled(cel-cpp) = 80e1cca533190d537a780ad007e8db64164c582e +Provides: bundled(client_model) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(dd-opentracing-cpp) = 1.1.3 +Provides: bundled(envoy-build-tools) = 84ca08de00eedd0ba08e7d5551108d6f03f5d362 +Provides: bundled(fmt) = 6.0.0 +Provides: bundled(googleapis) = 82944da21578a53b74e547774cf62ed31a05b841 +Provides: bundled(gperftools) = 2.7.90 +Provides: bundled(grpc) = d8f4928fa779f6005a7fe55a176bdb373b0f910f +Provides: bundled(grpc-httpjson-transcoding) = faf8af1e9788cd4385b94c8f85edab5ea5d4b2d6 +Provides: bundled(http-parser) = 2.9.3 +Provides: bundled(jinja) = 2.10.3 +Provides: bundled(jwt_verify_lib) = 40e2cc938f4bcd059a97dc6c73f59ecfa5a71bac +Provides: bundled(kafka) = 2.4.0 +Provides: bundled(libcircllhist) = 63a16dd6f2fc7bc841bb17ff92be8318df60e2e1 +Provides: bundled(libevent) = 0d7d85c2083f7a4c9efe01c061486f332b576d28 +Provides: bundled(lightstep-tracer-cpp) = 3efe2372ee3d7c2138d6b26e542d757494a7938d +Provides: bundled(luajit) = 2.1.0 +Provides: bundled(markupsafe) = 1.1.1 +Provides: bundled(moonjit) = 2.2.0 +Provides: bundled(msgpack-c) = 3.2.1 +Provides: bundled(opencensus-cpp) = 04ed0211931f12b03c1a76b3907248ca4db7bc90 +Provides: bundled(opencensus-proto) = be218fb6bd674af7519b1850cdf8410d8cbd48e8 +Provides: bundled(opentracing-cpp) = 1.5.1 +Provides: bundled(platforms) = 9ded0f9c3144258dad27ad84628845bcd7ca6fe6 +Provides: bundled(protobuf) = 1.4.1 +Provides: bundled(protobuf) = 3.10.1 +Provides: bundled(protobuf-go) = 1.22.0 +Provides: bundled(protoc-gen-validate) = ab56c3dd1cf9b516b62c5087e1ec1471bd63631e +Provides: bundled(rapidjson) = dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1 +Provides: bundled(re2) +Provides: bundled(rules_apple) = 0.19.0 +Provides: bundled(rules_cc) = 818289e5613731ae410efb54218a4077fb9dbb03 +Provides: bundled(rules_foreign_cc) = 7bc4be735b0560289f6b86ab6136ee25d20b65b7 +Provides: bundled(rules_go) = 0.23.3 +Provides: bundled(rules_java) = 7cf3cefd652008d0a64a419c34c13bdca6c8f178 +Provides: bundled(rules_proto) = 2c0468366367d7ed97a1f702f9cd7155ab3f73c5 +Provides: bundled(rules_python) = 0.0.1 +Provides: bundled(rules_swift) = 0.13.0 +Provides: bundled(spdlog) = 1.4.0 +Provides: bundled(sql-parser) = b14d010afd4313f2372a1cc96aa2327e674cc798 +Provides: bundled(tclap) +Provides: bundled(tools) = 2bc93b1c0c88b2406b967fcd19a623d1ff9ea0cd +Provides: bundled(udpa) = e8cd3a4bb307e2c810cffff99f93e96e6d7fee85 +Provides: bundled(upb) = 8a3ae1ef3e3e3f26b45dec735c5776737fc7247f +Provides: bundled(xxhash) = 0.7.3 +Provides: bundled(yaml-cpp) = 0.6.3 +Provides: bundled(zipkin-api) = 0.2.2 +# END obs-service-bazel_repositories +BuildRequires: bazel BuildRequires: bazel-workspaces -BuildRequires: bazel2.0 -BuildRequires: benchmark-devel +BuildRequires: boringssl-source BuildRequires: c-ares-devel -BuildRequires: cel-cpp-source BuildRequires: cmake -BuildRequires: dd-opentracing-cpp-devel -BuildRequires: envoy-build-tools -BuildRequires: envoy-protoc-gen-validate-source BuildRequires: fdupes BuildRequires: fmt-devel BuildRequires: gcc-c++ BuildRequires: gcovr BuildRequires: git -BuildRequires: golang-github-golang-protobuf -BuildRequires: golang-org-x-tools BuildRequires: golang-packaging -BuildRequires: googleapis-source -BuildRequires: gperftools-devel -BuildRequires: grpc-httpjson-transcoding-source -BuildRequires: grpc-source -BuildRequires: gtest -BuildRequires: http-parser-devel -BuildRequires: jwt_verify_lib-source -BuildRequires: kafka-source -BuildRequires: libcircllhist-devel BuildRequires: libcurl-devel -BuildRequires: libevent-devel BuildRequires: libnghttp2-devel -BuildRequires: libprotobuf-mutator-devel BuildRequires: libtool -BuildRequires: lightstep-tracer-cpp-source -BuildRequires: moonjit-devel -BuildRequires: msgpack-devel BuildRequires: nghttp2-devel BuildRequires: ninja -BuildRequires: opencensus-cpp-source -BuildRequires: opencensus-proto-source -BuildRequires: opentracing-cpp-source -BuildRequires: prometheus-client-model-source -BuildRequires: protobuf-source -BuildRequires: protoc-gen-gogo-source BuildRequires: python3 BuildRequires: python3-Jinja2 BuildRequires: python3-MarkupSafe -BuildRequires: rapidjson-devel -BuildRequires: re2-devel -BuildRequires: spdlog-devel -BuildRequires: sql-parser-devel -BuildRequires: tclap -BuildRequires: udpa-source -BuildRequires: upb-source -BuildRequires: vim -BuildRequires: xxhash-devel -BuildRequires: yaml-cpp-devel -BuildRequires: zipkin-api-source BuildRequires: zlib-devel BuildRequires: golang(API) >= 1.12 BuildRequires: pkgconfig(openssl) @@ -134,172 +186,60 @@ %prep %autosetup -p1 -# Tell Bazel to look for Python dependencies on Python 3 environment from host. -PATH_JINJA2=$(python3 -c "import jinja2; print(jinja2.__path__[0])") -PATH_MARKUPSAGE=$(python3 -c "import markupsafe; print(markupsafe.__path__[0])") -cat <<EOF >> WORKSPACE - -new_local_repository( - name = "com_github_pallets_jinja", - path = "${PATH_JINJA2}", - build_file_content = """py_library( - name = "jinja2", - srcs = glob(["**/*.py"]), - visibility = ["//visibility:public"], -) -""", -) - -new_local_repository( - name = "com_github_pallets_markupsafe", - path = "${PATH_MARKUPSAFE}", - build_file_content = """py_library( - name = "markupsafe", - srcs = glob(["**/*.py"]), - visibility = ["//visibility:public"], -) -""", -) -EOF +# Prevent bundling curl, nghttp2 and zlib, don't use foreign_cc on them. +sed -i \ + -e "s|@envoy//bazel/foreign_cc:curl|@com_github_curl//:curl|" \ + -e 's|patches = \["@envoy//bazel/foreign_cc:nghttp2.patch"\]|# patches = \["@envoy//bazel/foreign_cc:nghttp2.patch"\]|g' \ + -e "s|@envoy//bazel/foreign_cc:nghttp2|@com_github_nghttp2_nghttp2//:all|" \ + -e "s|@envoy//bazel/foreign_cc:zlib|@zlib//:zlib|" \ + bazel/repositories.bzl + +# Remove the script which requires /usr/bin/bash.exe and is meant to work only +# on Windows. +rm ci/windows_ci_steps.sh + +# AUTOGENERATED BY obs-service-bazel_repositories +%setup -q -T -D -a 1 +# END obs-service-bazel_repositories -# Envoy has to be built as a git repository, so let's create one... -git config --global user.email "[email protected]" +%build +git config --global user.email [email protected] git config --global user.name "Your Name" git init git add . -# use fixed date for reproducible builds (boo#1047218): GIT_AUTHOR_DATE=2000-01-01T01:01:01 GIT_COMMITTER_DATE=2000-01-01T01:01:01 \ git commit -m "Dummy commit just to satisfy bazel" &> /dev/null -# Tell Bazel to use Go from host. -sed -i -e "s|1.13.5|host|" envoy/bazel/dependency_imports.bzl - -# Get rid of: -# - Bazel rules for Python dependencies - to use them from host Python instead -# of creating a separate Python environment. -# - Dependencies using "foreign_cc" utility - thanks to our bazel-workspaces -# project, we can just link those C/C++ libraries dynamically. -sed -i \ - -e "/ _python_deps()/d" \ - -e "s|@envoy//bazel/foreign_cc:ares|@com_github_c_ares_c_ares//:ares|" \ - -e "s|@envoy//bazel/foreign_cc:yaml|@com_github_jbeder_yaml_cpp//:all|" \ - -e "s|@envoy//bazel/foreign_cc:event|@com_github_libevent_libevent//:libevent|" \ - -e "s|@envoy//bazel/foreign_cc:zlib|@zlib//:zlib|" \ - -e "s|@envoy//bazel/foreign_cc:nghttp2|@com_github_nghttp2_nghttp2//:all|" \ - -e "s|@envoy//bazel/foreign_cc:curl|@com_github_curl//:curl|" \ - -e "s|@envoy//bazel/foreign_cc:luajit|@com_github_luajit_luajit//:luajit|" \ - -e "s|@envoy//bazel/foreign_cc:gperftools|@com_github_gperftools_gperftools//:gperftools|" \ - envoy/bazel/repositories.bzl - -# Bump the version of luajit. -sed -i "s|luajit-2.1|moonjit-%{moonjit_shortver}|g" envoy/source/extensions/filters/common/lua/lua.h - -# Fix includes of sqlparser headers. -find . -type f "(" -name "*.cc" -o -name "*.h" ")" -exec sed -i -e "s|include/sqlparser|sqlparser|" {} + - -# Link OpenSSL dynamically. -sed -i \ - -e "s|openssl_repository()|# openssl_repository|" \ - -e "s|# openssl_shared_repository()|openssl_shared_repository()|" \ - WORKSPACE -sed -i "s|/usr/lib/x86_64-linux-gnu|%{_libdir}|g" openssl.bzl - -# Fix shebangs in scripts. -find . -type f -exec sed -i \ - -e "s|#!/usr/bin/env bash.*$|#!/bin/bash|" \ - -e "s|#!/usr/bin/env python.*$|#!/usr/bin/python3|" \ - -e "s|#!/usr/bin/env sh.*$|#!/bin/sh|" \ - "{}" + - -# Adjust envoy-openssl code to getTransportSocketFactoryContext changes. -sed -i \ - "s|context.statsScope|context.scope|" \ - source/extensions/transport_sockets/tls/config.cc - -# Yes, someone seriously added an executable bit to a header file... -find . -type f -name "*.h" -exec chmod -x "{}" + - -%build -# TODO(mrostecki): Create a macro in bazel package. -GO_PROTOBUF_DIR=$(find %{_datadir}/go -name protobuf -type d | grep -v vendor) -GO_TOOLS_DIR=$(find %{_datadir}/go -name tools -type d | grep -v vendor) bazel build \ -c dbg \ --color=no \ + --copt="-fsigned-char" \ + --cxxopt="-fsigned-char" \ + --copt="-Wno-error=old-style-cast" \ + --cxxopt="-Wno-error=old-style-cast" \ --copt="-Wno-unused-parameter" \ - --copt="-Wno-deprecated-declarations" \ --cxxopt="-Wno-unused-parameter" \ - --cxxopt="-Wno-deprecated-declarations" \ + --copt="-Wno-implicit-fallthrough" \ + --cxxopt="-Wno-implicit-fallthrough"\ + --copt="-Wno-return-type" \ + --cxxopt="-Wno-return-type" \ --curses=no \ --host_force_python=PY3 \ - --incompatible_bzl_disallow_load_after_statement=false \ - --override_repository="bazel_gazelle=/usr/src/bazel-gazelle" \ - --override_repository="bazel_skylib=/usr/src/bazel-skylib" \ - --override_repository="bazel_toolchains=/usr/src/bazel-toolchains" \ - --override_repository="bssl_wrapper=%{_datadir}/bazel-workspaces/bsslwrapper" \ - --override_repository="build_bazel_apple_support=/usr/src/bazel-apple-support" \ - --override_repository="build_bazel_rules_apple=/usr/src/bazel-rules-apple" \ - --override_repository="build_bazel_rules_swift=/usr/src/bazel-rules-swift" \ - --override_repository="com_envoyproxy_protoc_gen_validate=/usr/src/envoy-protoc-gen-validate" \ - --override_repository="com_lightstep_tracer_cpp=/usr/src/lightstep-tracer-cpp" \ - --override_repository="com_github_c_ares_c_ares=%{_datadir}/bazel-workspaces/c-ares" \ - --override_repository="com_github_circonus_labs_libcircllhist=%{_datadir}/bazel-workspaces/libcircllhist" \ - --override_repository="com_github_cncf_udpa=/usr/src/udpa" \ - --override_repository="com_github_curl=%{_datadir}/bazel-workspaces/curl" \ - --override_repository="com_github_cyan4973_xxhash=%{_datadir}/bazel-workspaces/xxhash" \ - --override_repository="com_github_datadog_dd_opentracing_cpp=%{_datadir}/bazel-workspaces/dd-opentracing-cpp" \ - --override_repository="com_github_mirror_tclap=%{_datadir}/bazel-workspaces/tclap" \ - --override_repository="com_github_eile_tclap=%{_datadir}/bazel-workspaces/tclap" \ - --override_repository="com_github_envoyproxy_sqlparser=%{_datadir}/bazel-workspaces/sql-parser" \ - --override_repository="com_github_fmtlib_fmt=%{_datadir}/bazel-workspaces/fmtlib" \ - --override_repository="com_github_gabime_spdlog=%{_datadir}/bazel-workspaces/spdlog" \ - --override_repository="com_github_gogo_protobuf=/usr/src/protoc-gen-gogo" \ - --override_repository="com_github_golang_protobuf=${GO_PROTOBUF_DIR}" \ - --override_repository="com_github_google_jwt_verify=/usr/src/jwt_verify_lib" \ - --override_repository="com_github_google_jwt_verify_patched=/usr/src/jwt_verify_lib" \ - --override_repository="com_github_google_libprotobuf_mutator=%{_datadir}/bazel-workspaces/libprotobuf-mutator" \ - --override_repository="com_github_gperftools_gperftools=%{_datadir}/bazel-workspaces/gperftools" \ - --override_repository="com_github_grpc_grpc=/usr/src/grpc" \ - --override_repository="com_github_jbeder_yaml_cpp=%{_datadir}/bazel-workspaces/yaml-cpp" \ - --override_repository="com_github_libevent_libevent=%{_datadir}/bazel-workspaces/libevent" \ - --override_repository="com_github_luajit_luajit=%{_datadir}/bazel-workspaces/luajit" \ - --override_repository="com_github_nghttp2_nghttp2=%{_datadir}/bazel-workspaces/nghttp2" \ - --override_repository="com_github_nodejs_http_parser=%{_datadir}/bazel-workspaces/http-parser" \ - --override_repository="com_github_openzipkin_zipkinapi=/usr/src/zipkin-api" \ - --override_repository="com_github_tencent_rapidjson=%{_datadir}/bazel-workspaces/rapidjson" \ - --override_repository="com_google_absl=/usr/src/abseil-cpp" \ - --override_repository="com_google_cel_cpp=/usr/src/cel-cpp" \ - --override_repository="com_google_googleapis=/usr/src/googleapis" \ - --override_repository="com_google_protobuf=/usr/src/protobuf" \ - --override_repository="com_googlesource_code_re2=%{_datadir}/bazel-workspaces/re2" \ - --override_repository="envoy_build_tools=%{_datadir}/envoy-build-tools" \ - --override_repository="grpc_httpjson_transcoding=/usr/src/grpc-httpjson-transcoding" \ - --override_repository="io_bazel_rules_go=/usr/src/bazel-rules-go" \ - --override_repository="io_opencensus_cpp=/usr/src/opencensus-cpp" \ - --override_repository="io_opentracing_cpp=/usr/src/opentracing-cpp" \ - --override_repository="kafka_source=/usr/src/kafka" \ - --override_repository="opencensus_proto=/usr/src/opencensus-proto/src" \ - --override_repository="openssl_cbs=%{_datadir}/bazel-workspaces/openssl-cbs" \ - --override_repository="org_golang_x_tools=${GO_TOOLS_DIR}" \ - --override_repository="platforms=/usr/share/bazel-platforms" \ - --override_repository="prometheus_metrics_model=/usr/src/prometheus-client-model" \ - --override_repository="rules_cc=/usr/src/bazel-rules-cc" \ - --override_repository="rules_foreign_cc=/usr/src/bazel-rules-foreign-cc" \ - --override_repository="rules_java=/usr/src/bazel-rules-java" \ - --override_repository="rules_proto=/usr/src/bazel-rules-proto" \ - --override_repository="rules_python=/usr/src/bazel-rules-python" \ - --override_repository="upb=/usr/src/upb" \ - --override_repository="zlib=%{_datadir}/bazel-workspaces/zlib" \ + --repository_cache=BAZEL_CACHE \ --strip=never \ + --override_repository="boringssl=/usr/src/boringssl/" \ + --override_repository="com_github_curl=/usr/share/bazel-workspaces/curl" \ + --override_repository="com_github_nghttp2_nghttp2=/usr/share/bazel-workspaces/nghttp2" \ + --override_repository="zlib=/usr/share/bazel-workspaces/zlib" \ --verbose_failures \ %ifarch ppc64le --local_cpu_resources=HOST_CPUS*.5 \ %endif - //:envoy + //source/exe:envoy bazel shutdown %install -install -D -m0755 bazel-bin/envoy %{buildroot}%{_bindir}/envoy-proxy +install -D -m0755 bazel-bin/source/exe/envoy-static %{buildroot}%{_bindir}/envoy-proxy # Install sources rm -rf .git bazel-* ++++++ 0001-build-Use-Go-from-host.patch ++++++ >From b7298002d0d801506f9f88d9b7d17a075d49115c Mon Sep 17 00:00:00 2001 From: Michal Rostecki <[email protected]> Date: Thu, 20 Aug 2020 20:24:23 +0200 Subject: [PATCH 1/3] build: Use Go from host Signed-off-by: Michal Rostecki <[email protected]> --- bazel/dependency_imports.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index 051923e31..2e4c187b6 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -6,7 +6,7 @@ load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependenci load("@upb//bazel:repository_defs.bzl", upb_bazel_version_repository = "bazel_version_repository") # go version for rules_go -GO_VERSION = "1.13.5" +GO_VERSION = "host" def envoy_dependency_imports(go_version = GO_VERSION): rules_foreign_cc_dependencies() -- 2.28.0 ++++++ 0002-build-update-several-go-dependencies-11581.patch ++++++ >From 6c3d1e987d26d747b34540cc61c504bae3a4736e Mon Sep 17 00:00:00 2001 From: Lizan Zhou <[email protected]> Date: Sat, 13 Jun 2020 19:02:14 -0700 Subject: [PATCH 2/3] build: update several go dependencies (#11581) Signed-off-by: Lizan Zhou <[email protected]> --- bazel/dependency_imports.bzl | 4 ++-- bazel/repository_locations.bzl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index 2e4c187b6..7c74d2b34 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -21,8 +21,8 @@ def envoy_dependency_imports(go_version = GO_VERSION): name = "org_golang_google_grpc", build_file_proto_mode = "disable", importpath = "google.golang.org/grpc", - sum = "h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=", - version = "v1.23.0", + sum = "h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=", + version = "v1.29.1", ) go_repository( diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 3f24f410b..5591fbb78 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -241,8 +241,8 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/faf8af1e9788cd4385b94c8f85edab5ea5d4b2d6.tar.gz";], ), io_bazel_rules_go = dict( - sha256 = "e88471aea3a3a4f19ec1310a55ba94772d087e9ce46e41ae38ecebe17935de7b", - urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz";], + sha256 = "a8d6b1b354d371a646d2f7927319974e0f9e52f73a2452d2b3877118169eb6bb", + urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz";], ), rules_foreign_cc = dict( sha256 = "3184c244b32e65637a74213fc448964b687390eeeca42a36286f874c046bba15", -- 2.28.0 ++++++ 0003-build-Add-explicit-requirement-on-rules_cc.patch ++++++ >From 985ab6187924735a335a8ddb7b5e9c042e47cd81 Mon Sep 17 00:00:00 2001 From: Michal Rostecki <[email protected]> Date: Fri, 11 Sep 2020 00:24:03 +0200 Subject: [PATCH 3/3] build: Add explicit requirement on rules_cc Signed-off-by: Michal Rostecki <[email protected]> --- bazel/repositories.bzl | 1 + bazel/repository_locations.bzl | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 415455e58..29a8682c3 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -153,6 +153,7 @@ def envoy_dependencies(skip_targets = []): _repository_impl("bazel_toolchains") _repository_impl("bazel_compdb") _repository_impl("envoy_build_tools") + _repository_impl("rules_cc") # Unconditional, since we use this only for compiler-agnostic fuzzing utils. _org_llvm_releases_compiler_rt() diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 5591fbb78..ef9078f0e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -244,6 +244,12 @@ REPOSITORY_LOCATIONS = dict( sha256 = "a8d6b1b354d371a646d2f7927319974e0f9e52f73a2452d2b3877118169eb6bb", urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz";], ), + rules_cc = dict( + sha256 = "9d48151ea71b3e225adfb6867e6d2c7d0dce46cbdc8710d9a9a628574dfd40a0", + strip_prefix = "rules_cc-818289e5613731ae410efb54218a4077fb9dbb03", + # 2020-05-13 + urls = ["https://github.com/bazelbuild/rules_cc/archive/818289e5613731ae410efb54218a4077fb9dbb03.tar.gz";], + ), rules_foreign_cc = dict( sha256 = "3184c244b32e65637a74213fc448964b687390eeeca42a36286f874c046bba15", strip_prefix = "rules_foreign_cc-7bc4be735b0560289f6b86ab6136ee25d20b65b7", -- 2.28.0 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.9y3aYT/_old 2020-09-29 19:00:51.237704287 +0200 +++ /var/tmp/diff_new_pack.9y3aYT/_new 2020-09-29 19:00:51.241704291 +0200 @@ -3,7 +3,6 @@ <overwrite> <conditions> <arch>x86_64</arch> - <arch>aarch64</arch> </conditions> <hardware> <processors>4</processors> @@ -25,6 +24,7 @@ </overwrite> <overwrite> <conditions> + <arch>aarch64</arch> <arch>ppc64</arch> <arch>ppc64le</arch> </conditions> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9y3aYT/_old 2020-09-29 19:00:51.257704311 +0200 +++ /var/tmp/diff_new_pack.9y3aYT/_new 2020-09-29 19:00:51.261704316 +0200 @@ -1,16 +1,20 @@ <services> - <service mode="disabled" name="obs_scm"> - <param name="url">https://github.com/envoyproxy/envoy-openssl</param> + <service mode="disabled" name="tar_scm"> + <param name="url">https://github.com/envoyproxy/envoy</param> <param name="scm">git</param> <param name="changesgenerate">disable</param> <param name="filename">envoy-proxy</param> - <param name="versionformat">1.12.2+git.%cd</param> - <param name="revision">4274cb6bb10e9516089f05554338d662c320a447</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="versionrewrite-pattern">v(.*)</param> + <param name="revision">v1.14.4</param> </service> - <service mode="buildtime" name="tar" /> - <service mode="buildtime" name="recompress"> + <service mode="disabled" name="recompress"> <param name="file">*.tar</param> - <param name="compression">xz</param> + <param name="compression">gz</param> </service> <service mode="disabled" name="set_version" /> + <service mode="disabled" name="bazel_repositories"> + <param name="exclude">boringssl,curl,nghttp2,zlib</param> + <param name="target">//source/exe:envoy-static</param> + </service> </services>
