bump v3.0.0

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7096766905a..1ce07bf18fcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tengine-extra
 	pkgdesc = A web server based on Nginx and has many advanced features, originated by Taobao. Some extra modules enabled.
-	pkgver = 2.4.1
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = http://tengine.taobao.org
 	install = tengine.install
@@ -27,14 +27,14 @@ pkgbase = tengine-extra
 	backup = etc/tengine/uwsgi_params
 	backup = etc/tengine/win-utf
 	backup = etc/logrotate.d/tengine
-	source = tengine-2.4.1.tar.gz::https://github.com/alibaba/tengine/archive/2.4.1.tar.gz
+	source = tengine-3.0.0.tar.gz::https://github.com/alibaba/tengine/archive/3.0.0.tar.gz
 	source = service
 	source = logrotate
 	source = brotli-v1.0.0rc.tar.gz::https://github.com/google/ngx_brotli/archive/refs/tags/v1.0.0rc.tar.gz
 	source = geoip2-v3.4.tar.gz::https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/3.4.tar.gz
 	source = fancyindex-v0.5.2.tar.xz::https://github.com/aperezdc/ngx-fancyindex/releases/download/v0.5.2/ngx-fancyindex-0.5.2.tar.xz
 	source = jdomain-v1.4.0.tar.gz::https://github.com/nicholaschiasson/ngx_upstream_jdomain/archive/refs/tags/1.4.0.tar.gz
-	sha256sums = 91ac76497e55a0d8237e8aa825ab460e95aa2e255a449cdc5798237861ad82db
+	sha256sums = a47dce983dd34389e4c4d1afda03c74c2d3fe1d7a0a51fc86cc2046d2f4a0e5b
 	sha256sums = c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb
 	sha256sums = 7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97
 	sha256sums = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
diff --git a/PKGBUILD b/PKGBUILD
index 87eabbc539e6..b604ae32f2d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,32 @@
 # $Id$
 # Maintainer: Allen Zhong <moeallenz@gmail.com>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: T.J. Townsend <blakkheim@archlinux.org>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Sébastien Luttringer
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
 
 _tcp_module_gitname=nginx_tcp_proxy_module
 pkgname=tengine-extra
-pkgver=2.4.1
+pkgver=3.0.0
 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'
 license=('custom')
 depends=('pcre' 'zlib' 'openssl' 'gperftools' 'geoip' 'mailcap' 'libxcrypt' 'luajit' 'libmaxminddb')
-backup=('etc/tengine/fastcgi.conf'
-        'etc/tengine/fastcgi_params'
-        'etc/tengine/koi-win'
-        'etc/tengine/koi-utf'
-        'etc/tengine/tengine.conf'
-        'etc/tengine/scgi_params'
-        'etc/tengine/uwsgi_params'
-        'etc/tengine/win-utf'
-        'etc/logrotate.d/tengine')
+backup=(etc/tengine/fastcgi.conf
+        etc/tengine/fastcgi_params
+        etc/tengine/koi-win
+        etc/tengine/koi-utf
+        etc/tengine/tengine.conf
+        etc/tengine/scgi_params
+        etc/tengine/uwsgi_params
+        etc/tengine/win-utf
+        etc/logrotate.d/tengine)
 install=tengine.install
 conflicts=('tengine')
 provides=('nginx' 'tengine')
@@ -38,7 +42,7 @@ source=(tengine-$pkgver.tar.gz::https://github.com/alibaba/tengine/archive/$pkgv
         fancyindex-v${_fancyidx_ver}.tar.xz::https://github.com/aperezdc/ngx-fancyindex/releases/download/v${_fancyidx_ver}/ngx-fancyindex-${_fancyidx_ver}.tar.xz
         jdomain-v${_jdomain_ver}.tar.gz::https://github.com/nicholaschiasson/ngx_upstream_jdomain/archive/refs/tags/${_jdomain_ver}.tar.gz
         )
-sha256sums=('91ac76497e55a0d8237e8aa825ab460e95aa2e255a449cdc5798237861ad82db'
+sha256sums=('a47dce983dd34389e4c4d1afda03c74c2d3fe1d7a0a51fc86cc2046d2f4a0e5b'
             'c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb'
             '7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97'
             'c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b'
@@ -68,7 +72,7 @@ build() {
         --http-scgi-temp-path=/var/lib/tengine/scgi \
         --http-uwsgi-temp-path=/var/lib/tengine/uwsgi \
         --with-cc-opt="$CFLAGS $CPPFLAGS" \
-        --with-ld-opt="$LDFLAGS" \
+        --with-ld-opt="${LDFLAGS// /,},-lpcre,-rpath,$LUAJIT_LIB" \
         --with-compat \
         --with-file-aio \
         --with-google_perftools_module \