updpkg: envoyproxy 1.26.2-1

4 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d56490aca6c..c19ed534cb44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = envoyproxy
 	pkgdesc = A high performance, open source, general RPC framework that puts mobile and HTTP/2 first.
-	pkgver = 1.25.0
+	pkgver = 1.26.2
 	pkgrel = 1
 	url = https://envoyproxy.io
 	arch = i686
@@ -17,11 +17,9 @@ pkgbase = envoyproxy
 	makedepends = perl
 	makedepends = python
 	makedepends = libxcrypt-compat
-	source = https://github.com/envoyproxy/envoy/archive/v1.25.0.tar.gz
-	source = use_bazelisk.patch
+	source = https://github.com/envoyproxy/envoy/archive/v1.26.2.tar.gz
 	source = 0001-arch-dynamically-link-libpsl.patch
-	sha512sums = bb8beeaab9791fe242e66a405237946d37209212dcafb5cbf8c552735d1712c8c625789e94a0c07bba2b0021ba12567e2a054badb0da8c3071fd707d28c0425a
-	sha512sums = 248d0903c0aaa680065cdb308068e7f999f2ba7e2ffbc3b743715d2db968858f41cf104c59e1e98d6cda74baea54755e7c9edc29711c3b1daa87d63107ee4017
-	sha512sums = 0c5d5afd48ea87c8de030bbdf1a3c525be962983d6c09504599ff4be2dce90d2c98a5351ae34fa883feb8223f82b1e55d97b88cab4f3e1a7efff722dd30afbae
+	sha512sums = 12e138851f2f98e4c7f7c9e7e5f8c1198a9a0fc01f31527ff558ec48353f93dba63c36ba61d7a2e865bc5ad5c02c0c7b409683b975e05548210d27cdd60cb2ec
+	sha512sums = 58f7f40a420e1dc7ba845c5349a7596126b4eecc39ca15ebb94fbfe9cd944109318e7577329242164d4dd4ae3a99359723f41dc7265a0334cba06e556c7e8be3
 
 pkgname = envoyproxy
diff --git a/0001-arch-dynamically-link-libpsl.patch b/0001-arch-dynamically-link-libpsl.patch
index 91c6d3ca6def..1d7f30d81333 100644
--- a/0001-arch-dynamically-link-libpsl.patch
+++ b/0001-arch-dynamically-link-libpsl.patch
@@ -1,16 +1,16 @@
-diff -Naur envoy-1.24.0.a/.bazelrc envoy-1.24.0.b/.bazelrc
---- envoy-1.24.0.a/.bazelrc	2022-10-28 13:01:39.695492669 -0400
-+++ envoy-1.24.0.b/.bazelrc	2022-10-28 13:01:23.165203442 -0400
-@@ -43,7 +43,7 @@
+diff -Naur envoy-1.26.2.a/.bazelrc envoy-1.26.2.b/.bazelrc
+--- envoy-1.26.2.a/.bazelrc	2023-06-05 04:42:11.000000000 -0400
++++ envoy-1.26.2.b/.bazelrc	2023-06-26 18:38:28.905340126 -0400
+@@ -58,7 +58,7 @@
  build:linux --fission=dbg,opt
  build:linux --features=per_object_debug_info
  build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
 -build:linux --action_env=BAZEL_LINKOPTS=-lm
 +build:linux --action_env=BAZEL_LINKOPTS=-lm:-lpsl
  
- # We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
- build --define absl=1
-@@ -151,7 +151,7 @@
+ # TODO(keith): remove once https://github.com/DataDog/dd-opentracing-cpp/pull/252 is integrated
+ # this avoids warnings/errors on arm64 Linux builds
+@@ -170,7 +170,7 @@
  build:libc++ --action_env=LDFLAGS=-stdlib=libc++
  build:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
  build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
diff --git a/PKGBUILD b/PKGBUILD
index 6eb8f20bdcc0..879bb662ce38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Dan Fuhry <dan@fuhry.com>
 
 pkgname=envoyproxy
-pkgver=1.25.0
+pkgver=1.26.2
 pkgrel=1
 pkgdesc="A high performance, open source, general RPC framework that puts mobile and HTTP/2 first."
 arch=('i686' 'x86_64')
@@ -25,12 +25,10 @@ makedepends=(
 )
 source=(
     "https://github.com/$pkgname/envoy/archive/v$pkgver.tar.gz"
-    use_bazelisk.patch
     0001-arch-dynamically-link-libpsl.patch
 )
-sha512sums=('bb8beeaab9791fe242e66a405237946d37209212dcafb5cbf8c552735d1712c8c625789e94a0c07bba2b0021ba12567e2a054badb0da8c3071fd707d28c0425a'
-            '248d0903c0aaa680065cdb308068e7f999f2ba7e2ffbc3b743715d2db968858f41cf104c59e1e98d6cda74baea54755e7c9edc29711c3b1daa87d63107ee4017'
-            '0c5d5afd48ea87c8de030bbdf1a3c525be962983d6c09504599ff4be2dce90d2c98a5351ae34fa883feb8223f82b1e55d97b88cab4f3e1a7efff722dd30afbae')
+sha512sums=('12e138851f2f98e4c7f7c9e7e5f8c1198a9a0fc01f31527ff558ec48353f93dba63c36ba61d7a2e865bc5ad5c02c0c7b409683b975e05548210d27cdd60cb2ec'
+            '58f7f40a420e1dc7ba845c5349a7596126b4eecc39ca15ebb94fbfe9cd944109318e7577329242164d4dd4ae3a99359723f41dc7265a0334cba06e556c7e8be3')
 
 prepare() {
   cd "envoy-$pkgver"
@@ -72,6 +70,14 @@ build() {
     --copt=-DNDEBUG \
     --copt=-ffunction-sections \
     --copt=-fdata-sections \
+    --cxxopt=-std=c++17 \
+    --host_cxxopt=-std=c++17 \
+    --cxxopt='-includecstdint' \
+    --host_cxxopt='-includecstdint' \
+    --cxxopt='-includestring' \
+    --host_cxxopt='-includestring' \
+    --cxxopt='-includestring_view' \
+    --host_cxxopt='-includestring_view' \
     //source/exe:envoy-static
 }
 
diff --git a/use_bazelisk.patch b/use_bazelisk.patch
deleted file mode 100644
index 310f770ed7f9..000000000000
--- a/use_bazelisk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/bazel/setup_clang.sh b/bazel/setup_clang.sh
-index d0e58478d..bcefc0903 100755
---- a/bazel/setup_clang.sh
-+++ b/bazel/setup_clang.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
-
--BAZELRC_FILE="${BAZELRC_FILE:-$(bazel info workspace)/clang.bazelrc}"
-+BAZELRC_FILE="${BAZELRC_FILE:-$($BAZELISK info workspace)/clang.bazelrc}"
-
- LLVM_PREFIX=$1