upgpkg: tengine-extra 2.3.1-2

 * Apply HTTP/2 security patches from upstream

3 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5221e22b3e8..0f95fd03efd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tengine-extra
 	pkgdesc = A web server based on Nginx and has many advanced features, originated by Taobao. Some extra modules enabled.
 	pkgver = 2.3.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://tengine.taobao.org
 	install = tengine.install
 	arch = x86_64
@@ -30,11 +30,17 @@ pkgbase = tengine-extra
 	source = logrotate
 	source = pagespeed-v1.13.35.2-stable.zip::https://github.com/apache/incubator-pagespeed-ngx/archive/v1.13.35.2-stable.zip
 	source = psol-v1.13.35.2.zip::https://dl.google.com/dl/page-speed/psol/1.13.35.2-x64.tar.gz
+	source = 0001-http2-reject-zero-length-headers.patch::https://github.com/nginx/nginx/commit/dbdd9ffea81d9db46fb88b5eba828f2ad080d388.patch
+	source = 0002-http2-limit-number-of-DATA.patch::https://github.com/nginx/nginx/commit/94c5eb142e58a86f81eb1369fa6fcb96c2f23d6b.patch
+	source = 0003-http2-limit-number-of-PRIORITY.patch::https://github.com/nginx/nginx/commit/39bb3b9d4a33bd03c8ae0134dedc8a7700ae7b2b.patch
 	sha256sums = 0dd5f05b5a821e37c7ec2ecfaedbb5df832e017d6925d51283c2042cea6eede5
 	sha256sums = c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb
 	sha256sums = 7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97
 	sha256sums = 474ef99dcfb678684394c9064c340772633c6dafe630ed90a0f1f319931df139
 	sha256sums = df3ba3c8fc54e13845d0a1daa7a6e3d983126c23912851bbf8ba35be646a434f
+	sha256sums = 67b369edc0d2518e07aaea37f24fe59eae3a394ee25ce04e6776a52e2c73d270
+	sha256sums = 55c212c39eff86a6b3cf971884940cee71c5fe83f7f998a8dcfb55d48deb6dc0
+	sha256sums = 5d8cc9b917dda0a65dd8afd637b0654bd6934f3ca936e8c2f9e4569cf3429d05
 
 pkgname = tengine-extra
 
diff --git a/.gitignore b/.gitignore
index 46edeb316ca3..a2379aec9b52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ pkg/
 *.o
 
 nginx_tcp_proxy_module/
-fix-tengine-version-2.3.0.patch
+*.patch
diff --git a/PKGBUILD b/PKGBUILD
index 367b0b3a11ea..5dd3f08bec85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _tcp_module_gitname=nginx_tcp_proxy_module
 pkgname=tengine-extra
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A web server based on Nginx and has many advanced features, originated by Taobao. Some extra modules enabled.'
 arch=('x86_64')
 url='http://tengine.taobao.org'
@@ -33,15 +33,27 @@ source=(tengine-$pkgver.tar.gz::https://github.com/alibaba/tengine/archive/$pkgv
         logrotate
         pagespeed-v${_nps_ver}.zip::https://github.com/apache/incubator-pagespeed-ngx/archive/v${_nps_ver}.zip
         psol-v${_psol_ver}.zip::https://dl.google.com/dl/page-speed/psol/${_psol_ver}-x64.tar.gz
+        "0001-http2-reject-zero-length-headers.patch::https://github.com/nginx/nginx/commit/dbdd9ffea81d9db46fb88b5eba828f2ad080d388.patch"
+        "0002-http2-limit-number-of-DATA.patch::https://github.com/nginx/nginx/commit/94c5eb142e58a86f81eb1369fa6fcb96c2f23d6b.patch"
+        "0003-http2-limit-number-of-PRIORITY.patch::https://github.com/nginx/nginx/commit/39bb3b9d4a33bd03c8ae0134dedc8a7700ae7b2b.patch"
         )
 sha256sums=('0dd5f05b5a821e37c7ec2ecfaedbb5df832e017d6925d51283c2042cea6eede5'
             'c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb'
             '7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97'
             '474ef99dcfb678684394c9064c340772633c6dafe630ed90a0f1f319931df139'
-            'df3ba3c8fc54e13845d0a1daa7a6e3d983126c23912851bbf8ba35be646a434f')
+            'df3ba3c8fc54e13845d0a1daa7a6e3d983126c23912851bbf8ba35be646a434f'
+            '67b369edc0d2518e07aaea37f24fe59eae3a394ee25ce04e6776a52e2c73d270'
+            '55c212c39eff86a6b3cf971884940cee71c5fe83f7f998a8dcfb55d48deb6dc0'
+            '5d8cc9b917dda0a65dd8afd637b0654bd6934f3ca936e8c2f9e4569cf3429d05')
 
 prepare() {
     mv psol incubator-pagespeed-ngx-${_nps_ver}/
+
+    cd tengine-$pkgver
+    for i in $srcdir/*.patch; do
+        msg2 "Applying $i"
+        patch -Np1 -i $i
+    done
 }
 
 build() {