Hello community, here is the log from the commit of package envoy-proxy for openSUSE:Factory checked in at 2020-04-22 20:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/envoy-proxy (Old) and /work/SRC/openSUSE:Factory/.envoy-proxy.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "envoy-proxy" Wed Apr 22 20:41:26 2020 rev:8 rq:794698 version:1.12.2+git.20200109 Changes: -------- --- /work/SRC/openSUSE:Factory/envoy-proxy/envoy-proxy.changes 2020-03-19 19:49:00.420139352 +0100 +++ /work/SRC/openSUSE:Factory/.envoy-proxy.new.2738/envoy-proxy.changes 2020-04-22 20:41:27.586037564 +0200 @@ -1,0 +2,6 @@ +Thu Apr 16 17:35:59 UTC 2020 - Dirk Mueller <[email protected]> + +- add big-endian-support.patch to fix build on s390x: + * backport of an already upstream patch at https://github.com/envoyproxy/envoy/pull/10250 + +------------------------------------------------------------------- New: ---- big-endian-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ envoy-proxy.spec ++++++ --- /var/tmp/diff_new_pack.z29lfz/_old 2020-04-22 20:41:29.114040556 +0200 +++ /var/tmp/diff_new_pack.z29lfz/_new 2020-04-22 20:41:29.118040563 +0200 @@ -37,6 +37,7 @@ 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 BuildRequires: abseil-cpp-source BuildRequires: backward-cpp-devel BuildRequires: bazel-apple-support-source ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.z29lfz/_old 2020-04-22 20:41:29.194040712 +0200 +++ /var/tmp/diff_new_pack.z29lfz/_new 2020-04-22 20:41:29.194040712 +0200 @@ -11,5 +11,16 @@ <size unit="M">16000</size> </memory> </hardware> +</overwrite> + <overwrite> + <conditions> + <arch>s390x</arch> + </conditions> + <hardware> + <processors>4</processors> + <memory> + <size unit="M">12384</size> + </memory> + </hardware> </overwrite> </constraints> ++++++ big-endian-support.patch ++++++ From https://github.com/envoyproxy/envoy/pull/10250 >From 13dc082d74dd41f89bb279f26f8bfbed0e4a0a60 Mon Sep 17 00:00:00 2001 From: Ilya Leoshkevich <[email protected]> Date: Thu, 27 Feb 2020 17:23:47 +0100 Subject: [PATCH] common: add big-endian support to Ip6ntohl and Ip6htonl This patch resolves the TODO from https://github.com/envoyproxy/envoy/pull/2431. Tests pass on a big-endian machine (IBM Z). Signed-off-by: Ilya Leoshkevich <[email protected]> --- source/common/network/utility.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/common/network/utility.cc b/source/common/network/utility.cc index f41e306f19f..fd920c67ef4 100644 --- a/envoy/source/common/network/utility.cc +++ b/envoy/source/common/network/utility.cc @@ -424,17 +424,19 @@ bool Utility::portInRangeList(const Address::Instance& address, const std::list< } absl::uint128 Utility::Ip6ntohl(const absl::uint128& address) { - // TODO(ccaraman): Support Ip6ntohl for big-endian. - static_assert(ABSL_IS_LITTLE_ENDIAN, - "Machines using big-endian byte order is not supported for IPv6."); +#ifdef ABSL_IS_LITTLE_ENDIAN return flipOrder(address); +#else + return address; +#endif } absl::uint128 Utility::Ip6htonl(const absl::uint128& address) { - // TODO(ccaraman): Support Ip6ntohl for big-endian. - static_assert(ABSL_IS_LITTLE_ENDIAN, - "Machines using big-endian byte order is not supported for IPv6."); +#ifdef ABSL_IS_LITTLE_ENDIAN return flipOrder(address); +#else + return address; +#endif } absl::uint128 Utility::flipOrder(const absl::uint128& input) {
