upgpkg: tengine-extra 2.3.1-1

2 files changed, 8 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acb8846711e9..d5221e22b3e8 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.0
-	pkgrel = 5
+	pkgver = 2.3.1
+	pkgrel = 1
 	url = http://tengine.taobao.org
 	install = tengine.install
 	arch = x86_64
@@ -25,16 +25,14 @@ pkgbase = tengine-extra
 	backup = etc/tengine/uwsgi_params
 	backup = etc/tengine/win-utf
 	backup = etc/logrotate.d/tengine
-	source = http://tengine.taobao.org/download/tengine-2.3.0.tar.gz
+	source = tengine-2.3.1.tar.gz::https://github.com/alibaba/tengine/archive/2.3.1.tar.gz
 	source = service
 	source = logrotate
-	source = fix-tengine-version-2.3.0.patch::https://github.com/alibaba/tengine/commit/5f7946e59a57b815d6ae0cb346b7922d9ec8250a.patch
 	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
-	sha256sums = 17cf1380d4faefb70707970437b3f8b66f6ff4530b5e6e61970b35f59b2e2624
+	sha256sums = 0dd5f05b5a821e37c7ec2ecfaedbb5df832e017d6925d51283c2042cea6eede5
 	sha256sums = c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb
 	sha256sums = 7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97
-	sha256sums = 57929b3f68456b58b29cdf72bfecfa5f898bf9ba40b51444364f165a68075c63
 	sha256sums = 474ef99dcfb678684394c9064c340772633c6dafe630ed90a0f1f319931df139
 	sha256sums = df3ba3c8fc54e13845d0a1daa7a6e3d983126c23912851bbf8ba35be646a434f
 
diff --git a/PKGBUILD b/PKGBUILD
index ed732c1ce9ca..367b0b3a11ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _tcp_module_gitname=nginx_tcp_proxy_module
 pkgname=tengine-extra
-pkgver=2.3.0
-pkgrel=5
+pkgver=2.3.1
+pkgrel=1
 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'
@@ -28,25 +28,20 @@ conflicts=('tengine')
 provides=('nginx' 'tengine')
 _psol_ver=1.13.35.2
 _nps_ver=${_psol_ver}-stable
-source=($url/download/tengine-$pkgver.tar.gz
+source=(tengine-$pkgver.tar.gz::https://github.com/alibaba/tengine/archive/$pkgver.tar.gz
         service
         logrotate
-        fix-tengine-version-2.3.0.patch::https://github.com/alibaba/tengine/commit/5f7946e59a57b815d6ae0cb346b7922d9ec8250a.patch
         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
         )
-sha256sums=('17cf1380d4faefb70707970437b3f8b66f6ff4530b5e6e61970b35f59b2e2624'
+sha256sums=('0dd5f05b5a821e37c7ec2ecfaedbb5df832e017d6925d51283c2042cea6eede5'
             'c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb'
             '7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97'
-            '57929b3f68456b58b29cdf72bfecfa5f898bf9ba40b51444364f165a68075c63'
             '474ef99dcfb678684394c9064c340772633c6dafe630ed90a0f1f319931df139'
             'df3ba3c8fc54e13845d0a1daa7a6e3d983126c23912851bbf8ba35be646a434f')
 
 prepare() {
     mv psol incubator-pagespeed-ngx-${_nps_ver}/
-
-    cd tengine-$pkgver
-    patch -Np1 -i ../fix-tengine-version-2.3.0.patch
 }
 
 build() {