updpkg: envoyproxy 1.21.1-1

5 files changed, 19 insertions, 115 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f41616c3371..342348adea2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 6.0.1
-# Wed Jan 12 04:55:08 UTC 2022
 pkgbase = envoyproxy
 	pkgdesc = A high performance, open source, general RPC framework that puts mobile and HTTP/2 first.
-	pkgver = 1.20.1
+	pkgver = 1.21.1
 	pkgrel = 1
 	url = https://envoyproxy.io
 	arch = i686
@@ -18,17 +16,11 @@ pkgbase = envoyproxy
 	makedepends = llvm
 	makedepends = perl
 	makedepends = python
-	source = https://github.com/envoyproxy/envoy/archive/v1.20.1.tar.gz
+	source = https://github.com/envoyproxy/envoy/archive/v1.21.1.tar.gz
 	source = use_bazelisk.patch
 	source = fix_wee8_build.patch
-	source = add-extra-wee8-patch.patch
-	source = wee8-jinja2-python-collections.patch
-	source = remove-deprecated-copy-constructor.patch
-	sha512sums = 67ecdbf0c136b95c6fdb15b5d8ba7828a814b0c9c584ed194a0488cd1948955603b1bd122951901a8c73b2dd27f86b7384237b3ef08035c137bf7a5fc5f1bf70
+	sha512sums = 520fc2958e48b4e472f855bc5e0a923c25ed44091d3d137ed981457eeb98b29fa468efa0958e9b6555e6177cf881ad6e3909813fe8e0bddfafb2ed17a128a0c7
 	sha512sums = 248d0903c0aaa680065cdb308068e7f999f2ba7e2ffbc3b743715d2db968858f41cf104c59e1e98d6cda74baea54755e7c9edc29711c3b1daa87d63107ee4017
 	sha512sums = e16e4949c7b66797f85d4e9547f4e47be689c2e3eb320514ba83a2c54f22f860bfc5a729b3be56b89c31336f0e414880d373b5f4d1f8b859710f80da650e9c31
-	sha512sums = f10a18f829cc9bf99b9fdfa149b6881dd882fc78adb189de3c6bacebfe39c9db085186f0e2eeba7a1f9d64e0e7d4a524f42966bc637d9fe101a630f59fbb56a5
-	sha512sums = 53518bb0711d5abc7c6fe9dfb9f4e2c2c279b2082bfdaecf24be3bf1177aa78abf4407ca9699632825ab670056d20a587ae34bb982227332037185d7cad5b193
-	sha512sums = 650d3b9ee7456c1695d60721ccea183fca9b7ed9b3fcc2c85aaca95c0c18dcf67c5e39a4955b00ee1f8de20e7b75e66e9f3ae90020b590fdb8712f9089652246
 
 pkgname = envoyproxy
diff --git a/PKGBUILD b/PKGBUILD
index 8d2c86c88756..7731cfa04c93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Dan Fuhry <dan@fuhry.com>
 
 pkgname=envoyproxy
-pkgver=1.20.1
+pkgver=1.21.1
 pkgrel=1
 pkgdesc="A high performance, open source, general RPC framework that puts mobile and HTTP/2 first."
 arch=('i686' 'x86_64')
@@ -25,35 +25,34 @@ source=(
     "https://github.com/$pkgname/envoy/archive/v$pkgver.tar.gz"
     use_bazelisk.patch
     fix_wee8_build.patch
-    add-extra-wee8-patch.patch
-    wee8-jinja2-python-collections.patch
-    remove-deprecated-copy-constructor.patch
 )
-sha512sums=('67ecdbf0c136b95c6fdb15b5d8ba7828a814b0c9c584ed194a0488cd1948955603b1bd122951901a8c73b2dd27f86b7384237b3ef08035c137bf7a5fc5f1bf70'
+sha512sums=('520fc2958e48b4e472f855bc5e0a923c25ed44091d3d137ed981457eeb98b29fa468efa0958e9b6555e6177cf881ad6e3909813fe8e0bddfafb2ed17a128a0c7'
             '248d0903c0aaa680065cdb308068e7f999f2ba7e2ffbc3b743715d2db968858f41cf104c59e1e98d6cda74baea54755e7c9edc29711c3b1daa87d63107ee4017'
-            'e16e4949c7b66797f85d4e9547f4e47be689c2e3eb320514ba83a2c54f22f860bfc5a729b3be56b89c31336f0e414880d373b5f4d1f8b859710f80da650e9c31'
-            'f10a18f829cc9bf99b9fdfa149b6881dd882fc78adb189de3c6bacebfe39c9db085186f0e2eeba7a1f9d64e0e7d4a524f42966bc637d9fe101a630f59fbb56a5'
-            '53518bb0711d5abc7c6fe9dfb9f4e2c2c279b2082bfdaecf24be3bf1177aa78abf4407ca9699632825ab670056d20a587ae34bb982227332037185d7cad5b193'
-            '650d3b9ee7456c1695d60721ccea183fca9b7ed9b3fcc2c85aaca95c0c18dcf67c5e39a4955b00ee1f8de20e7b75e66e9f3ae90020b590fdb8712f9089652246')
+            'e16e4949c7b66797f85d4e9547f4e47be689c2e3eb320514ba83a2c54f22f860bfc5a729b3be56b89c31336f0e414880d373b5f4d1f8b859710f80da650e9c31')
+
 
 prepare() {
   cd "envoy-$pkgver"
 
-  patch -Np1 -i ../use_bazelisk.patch
-  patch -Np1 -i ../fix_wee8_build.patch
-  patch -Np1 -i ../add-extra-wee8-patch.patch
-  patch -Np1 -i ../remove-deprecated-copy-constructor.patch
-
-  cp -L "${srcdir}/wee8-jinja2-python-collections.patch" "${srcdir}/envoy-${pkgver}/bazel/external/"
+  for f in ${source[@]}; do
+    # test that "$f" ends in ".patch"
+    if [ "${f%.patch}" != "$f" ]; then
+      msg "Applying patch: $f"
+	  patch -Np1 -i "../$f"
+	fi
+  done
 
   export GOPATH="$srcdir"/go
 
-  go get github.com/bazelbuild/bazelisk
+  msg "Building bazelisk"
+  go install github.com/bazelbuild/bazelisk@latest
   export BAZELISK="$GOPATH/bin/bazelisk"
 
+  msg "Setting SOURCE_VERSION"
   # https://github.com/envoyproxy/envoy/blob/main/bazel/get_workspace_status
-  echo "98c1c9e9a40804b93b074badad1cdf284b47d58b" > SOURCE_VERSION
+  echo "65a0228c93d2b7ca20c2ec56940735e5b6d76a38" > SOURCE_VERSION
 
+  msg "Setting build environment for Clang"
   ./bazel/setup_clang.sh
 }
 
diff --git a/add-extra-wee8-patch.patch b/add-extra-wee8-patch.patch
deleted file mode 100644
index f141a48f149a..000000000000
--- a/add-extra-wee8-patch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur envoy-1.20.1.a/bazel/repositories.bzl envoy-1.20.1.b/bazel/repositories.bzl
---- envoy-1.20.1.a/bazel/repositories.bzl	2021-11-30 15:28:08.000000000 -0500
-+++ envoy-1.20.1.b/bazel/repositories.bzl	2022-01-11 23:16:56.949821344 -0500
-@@ -804,7 +804,10 @@
-         name = "com_googlesource_chromium_v8",
-         genrule_cmd_file = "@envoy//bazel/external:wee8.genrule_cmd",
-         build_file = "@envoy//bazel/external:wee8.BUILD",
--        patches = ["@envoy//bazel/external:wee8.patch"],
-+        patches = [
-+            "@envoy//bazel/external:wee8.patch",
-+            "@envoy//bazel/external:wee8-jinja2-python-collections.patch",
-+		],
-     )
-     native.bind(
-         name = "wee8",
diff --git a/remove-deprecated-copy-constructor.patch b/remove-deprecated-copy-constructor.patch
deleted file mode 100644
index 441fe5b3ef2b..000000000000
--- a/remove-deprecated-copy-constructor.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/envoy/network/socket.h b/envoy/network/socket.h
-index 225b76297a..d5e0253b6e 100644
---- a/envoy/network/socket.h
-+++ b/envoy/network/socket.h
-@@ -23,7 +23,6 @@ namespace Network {
- // avoid #ifdef proliferation.
- struct SocketOptionName {
-   SocketOptionName() = default;
--  SocketOptionName(const SocketOptionName&) = default;
-   SocketOptionName(int level, int option, const std::string& name)
-       : value_(std::make_tuple(level, option, name)) {}
- 
-diff --git a/source/common/grpc/typed_async_client.h b/source/common/grpc/typed_async_client.h
-index af9e8df949..9a385bb2af 100644
---- a/source/common/grpc/typed_async_client.h
-+++ b/source/common/grpc/typed_async_client.h
-@@ -35,7 +35,6 @@ template <typename Request> class AsyncStream /* : public RawAsyncStream */ {
- public:
-   AsyncStream() = default;
-   AsyncStream(RawAsyncStream* stream) : stream_(stream) {}
--  AsyncStream(const AsyncStream& other) = default;
-   void sendMessage(const Protobuf::Message& request, bool end_stream) {
-     Internal::sendMessageUntyped(stream_, std::move(request), end_stream);
-   }
diff --git a/wee8-jinja2-python-collections.patch b/wee8-jinja2-python-collections.patch
deleted file mode 100644
index d9b924626f97..000000000000
--- a/wee8-jinja2-python-collections.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur wee8/third_party/jinja2/runtime.py wee8/third_party/jinja2/runtime.py
---- wee8/third_party/jinja2/runtime.py	1969-12-31 19:00:00.000000000 -0500
-+++ wee8/third_party/jinja2/runtime.py	2022-01-11 23:12:21.255314274 -0500
-@@ -315,7 +315,7 @@
-
- # register the context as mapping if possible
- try:
--    from collections import Mapping
-+    from collections.abc import Mapping
-     Mapping.register(Context)
- except ImportError:
-     pass
-diff -Naur wee8/third_party/jinja2/sandbox.py wee8/third_party/jinja2/sandbox.py
---- wee8/third_party/jinja2/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ wee8/third_party/jinja2/sandbox.py	2022-01-11 23:12:17.075247170 -0500
-@@ -14,7 +14,7 @@
- """
- import types
- import operator
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.environment import Environment
- from jinja2.exceptions import SecurityError
- from jinja2._compat import string_types, PY2
-diff -Naur wee8/third_party/jinja2/tests.py wee8/third_party/jinja2/tests.py
---- wee8/third_party/jinja2/tests.py	1969-12-31 19:00:00.000000000 -0500
-+++ wee8/third_party/jinja2/tests.py	2022-01-11 23:12:13.205185090 -0500
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
-diff -Naur wee8/third_party/jinja2/utils.py wee8/third_party/jinja2/utils.py
---- wee8/third_party/jinja2/utils.py	1969-12-31 19:00:00.000000000 -0500
-+++ wee8/third_party/jinja2/utils.py	2022-01-11 23:12:45.035696828 -0500
-@@ -482,7 +482,7 @@
-
- # register the LRU cache as mutable mapping if possible
- try:
--    from collections import MutableMapping
-+    from collections.abc import MutableMapping
-     MutableMapping.register(LRUCache)
- except ImportError:
-     pass