bump to v1.12.1

Signed-off-by: kXuan <kxuanobj@gmail.com>

3 files changed, 9 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ffa21548888..9b9e5bc25e56 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.11.2
+	pkgver = 1.12.1
 	pkgrel = 1
 	url = https://envoyproxy.io
 	arch = i686
@@ -13,16 +13,8 @@ pkgbase = envoyproxy
 	makedepends = ninja
 	makedepends = perl
 	makedepends = python
-	source = https://github.com/envoyproxy/envoy/archive/v1.11.2.tar.gz
-	source = 0001-Patch-in-ecf04cc-and-49f0fb9-from-gRPC.-7850.patch
-	source = 0002-bazel-patch-gRPC-to-fix-Envoy-builds-with-glibc-v2.3.patch
-	source = 0003-fix-com_github_datadog_dd_opentracing_cpp-build-fail.patch
-	source = 0004-use-python2.patch
-	sha512sums = b3605028dbcc54730b372a877df2b8c86ee1c14a3be7c7f42814d00687930936c481bfd576fd924fd167ae4d09fe83e2509d5d739b73deb7c9ac812b1945418e
-	sha512sums = c2907a1a0b1379c8d46c3989596341e42581bb14f2bc6fcd865ad4ee6ac18ba63df913d9d82622364652f749bb758cf31210ac3fcb823b5dfc6b137ac6685cbc
-	sha512sums = d39017b7747b74e0e9492637896dded25dd1f28187cb81438e491a23c5520331ca5987357f135c8bfa875abb69d1b4dda73a5c2847614d939c0f87a51537f0ec
-	sha512sums = 9cfe6ef8f41082bbfff97842d58b022c34d5e3666786a86c991bec0cb0d9a955eae6343ea0ae53d4245f84082b88847e5d1b2cf1519b99e649b7848673536fff
-	sha512sums = a3dc84ab896622f52ffe47b333a90649b49a8fa97d6e10cc06ab691c4dcb8a7e1bf5522f2af93d6e74ca765bb41d33c0ff00a60e6daaa3ee596413ccc298171a
+	source = https://github.com/envoyproxy/envoy/archive/v1.12.1.tar.gz
+	sha512sums = 5308d8b46b6ff64aa2d6665878c67eda99af16fbb8f93cd93547d1a898108c9d8d171bfd10fa555a8c4b9bd7860b168dde5d6f85659bf5017b8f37e121c53d95
 
 pkgname = envoyproxy
 
diff --git a/0004-use-python2.patch b/0004-use-python2.patch
deleted file mode 100644
index c7676e9f41dc..000000000000
--- a/0004-use-python2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4e8fbd40c975090f1201aa74d8e2a837fea812d9 Mon Sep 17 00:00:00 2001
-From: kXuan <kxuanobj@gmail.com>
-Date: Thu, 10 Oct 2019 15:06:30 +0800
-Subject: [PATCH] use python2
-
-Signed-off-by: kXuan <kxuanobj@gmail.com>
----
- bazel/cc_wrapper.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bazel/cc_wrapper.py b/bazel/cc_wrapper.py
-index c4883edd0..981268c36 100755
---- a/bazel/cc_wrapper.py
-+++ b/bazel/cc_wrapper.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- import contextlib
- import os
- import shlex
--- 
-2.23.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 3d40daff844a..e7475751f48d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: kXuan <kxuanobj@gmail.com>
 
 pkgname=envoyproxy
-pkgver=1.11.2
+pkgver=1.12.1
 pkgrel=1
 pkgdesc="A high performance, open source, general RPC framework that puts mobile and HTTP/2 first."
 arch=('i686' 'x86_64')
@@ -10,23 +10,15 @@ license=('Apache2')
 makedepends=('bazel' 'cmake' 'git' 'go' 'ninja' 'perl' 'python')
 source=(
     "https://github.com/$pkgname/envoy/archive/v$pkgver.tar.gz"
-    "0001-Patch-in-ecf04cc-and-49f0fb9-from-gRPC.-7850.patch"
-    "0002-bazel-patch-gRPC-to-fix-Envoy-builds-with-glibc-v2.3.patch"
-    "0003-fix-com_github_datadog_dd_opentracing_cpp-build-fail.patch"
-    "0004-use-python2.patch"
 )
-sha512sums=('b3605028dbcc54730b372a877df2b8c86ee1c14a3be7c7f42814d00687930936c481bfd576fd924fd167ae4d09fe83e2509d5d739b73deb7c9ac812b1945418e'
-            'c2907a1a0b1379c8d46c3989596341e42581bb14f2bc6fcd865ad4ee6ac18ba63df913d9d82622364652f749bb758cf31210ac3fcb823b5dfc6b137ac6685cbc'
-            'd39017b7747b74e0e9492637896dded25dd1f28187cb81438e491a23c5520331ca5987357f135c8bfa875abb69d1b4dda73a5c2847614d939c0f87a51537f0ec'
-            '9cfe6ef8f41082bbfff97842d58b022c34d5e3666786a86c991bec0cb0d9a955eae6343ea0ae53d4245f84082b88847e5d1b2cf1519b99e649b7848673536fff'
-            'a3dc84ab896622f52ffe47b333a90649b49a8fa97d6e10cc06ab691c4dcb8a7e1bf5522f2af93d6e74ca765bb41d33c0ff00a60e6daaa3ee596413ccc298171a')
+sha512sums=('5308d8b46b6ff64aa2d6665878c67eda99af16fbb8f93cd93547d1a898108c9d8d171bfd10fa555a8c4b9bd7860b168dde5d6f85659bf5017b8f37e121c53d95')
 
 prepare() {
   cd "envoy-$pkgver"
-  for p in "${srcdir}"/*.patch; do
-      echo "Apply patch $p"
-      patch --forward --strip=1 --input="$p"
-  done
+#  for p in "${srcdir}"/*.patch; do
+#      echo "Apply patch $p"
+#      patch --forward --strip=1 --input="$p"
+#  done
   go get github.com/bazelbuild/buildtools/buildifier
   # The commit id of $pkgver
   echo "7a12f379e47a9f7cf7211c727fe8fc70b6a0a9ab" > SOURCE_VERSION