add bortli and geoip2 modules

2 files changed, 21 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2287e4e149c1..9d82a8dec627 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.3
-	pkgrel = 2
+	pkgrel = 3
 	url = http://tengine.taobao.org
 	install = tengine.install
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = tengine-extra
 	depends = geoip
 	depends = mailcap
 	depends = luajit
+	depends = libmaxminddb
 	provides = nginx
 	provides = tengine
 	conflicts = tengine
@@ -30,11 +31,14 @@ pkgbase = tengine-extra
 	source = logrotate
 	source = pagespeed-v1.14.33.1-RC1.zip::https://github.com/apache/incubator-pagespeed-ngx/archive/v1.14.33.1-RC1.zip
 	source = psol-v1.14.36.1.tar.gz::https://dist.apache.org/repos/dist/release/incubator/pagespeed/1.14.36.1/x64/psol-1.14.36.1-apache-incubating-x64.tar.gz
+	source = brotli-v1.0.0rc.tar.gz::https://github.com/google/ngx_brotli/archive/refs/tags/v1.0.0rc.tar.gz
+	source = geoip2-v3.3.tar.gz::https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/3.3.tar.gz
 	sha256sums = 097684d83356fcdda8a6e949bca621126db751b37f6b23591cb3894a1f8a0108
 	sha256sums = c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb
 	sha256sums = 7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97
 	sha256sums = 43e6f0a14a2244ac4524e5ef6cf5c2db6145b785470575575f5bc7373179bebf
 	sha256sums = 01c1c0ce36adba494973efbd79437efcfa8a5b6029e487f604da60bddf18e77b
+	sha256sums = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
+	sha256sums = 41378438c833e313a18869d0c4a72704b4835c30acaf7fd68013ab6732ff78a7
 
 pkgname = tengine-extra
-
diff --git a/PKGBUILD b/PKGBUILD
index f938c884f4c6..906c6fd96a6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,12 +8,12 @@
 _tcp_module_gitname=nginx_tcp_proxy_module
 pkgname=tengine-extra
 pkgver=2.3.3
-pkgrel=2
+pkgrel=3
 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' 'luajit')
+depends=('pcre' 'zlib' 'openssl' 'gperftools' 'geoip' 'mailcap' 'luajit' 'libmaxminddb')
 backup=('etc/tengine/fastcgi.conf'
         'etc/tengine/fastcgi_params'
         'etc/tengine/koi-win'
@@ -28,26 +28,34 @@ conflicts=('tengine')
 provides=('nginx' 'tengine')
 _psol_ver=1.14.36.1
 _nps_ver=1.14.33.1-RC1
+_brotli_ver=1.0.0rc
+_geoip2_ver=3.3
 source=(tengine-$pkgver.tar.gz::https://github.com/alibaba/tengine/archive/$pkgver.tar.gz
         service
         logrotate
         pagespeed-v${_nps_ver}.zip::https://github.com/apache/incubator-pagespeed-ngx/archive/v${_nps_ver}.zip
         psol-v${_psol_ver}.tar.gz::https://dist.apache.org/repos/dist/release/incubator/pagespeed/${_psol_ver}/x64/psol-${_psol_ver}-apache-incubating-x64.tar.gz
+        brotli-v${_brotli_ver}.tar.gz::https://github.com/google/ngx_brotli/archive/refs/tags/v${_brotli_ver}.tar.gz
+        geoip2-v${_geoip2_ver}.tar.gz::https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/${_geoip2_ver}.tar.gz
         )
 sha256sums=('097684d83356fcdda8a6e949bca621126db751b37f6b23591cb3894a1f8a0108'
             'c066d39d2e945b74756a2422415b086eb26a9ce34788820c86c7e3dc7c6245eb'
             '7d4bd60b9210e1dfb46bc52c344b069d5639e1ba08cd9951c0563360af238f97'
             '43e6f0a14a2244ac4524e5ef6cf5c2db6145b785470575575f5bc7373179bebf'
-            '01c1c0ce36adba494973efbd79437efcfa8a5b6029e487f604da60bddf18e77b')
+            '01c1c0ce36adba494973efbd79437efcfa8a5b6029e487f604da60bddf18e77b'
+            'c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b'
+            '41378438c833e313a18869d0c4a72704b4835c30acaf7fd68013ab6732ff78a7')
 
 prepare() {
     mv psol incubator-pagespeed-ngx-${_nps_ver}/
-    cd tengine-$pkgver
+    #cd tengine-$pkgver
 }
 
 build() {
     cd tengine-$pkgver
 
+    export LUAJIT_LIB=/usr/lib
+    export LUAJIT_INC=/usr/include/luajit-2.1
     ./configure \
         --prefix=/etc/tengine \
         --conf-path=/etc/tengine/tengine.conf \
@@ -95,7 +103,9 @@ build() {
         --with-stream_ssl_module \
         --with-stream_ssl_preread_module \
         --with-threads \
-        --add-dynamic-module=$srcdir/incubator-pagespeed-ngx-${_nps_ver}
+        --add-dynamic-module=$srcdir/incubator-pagespeed-ngx-${_nps_ver} \
+        --add-dynamic-module=$srcdir/ngx_brotli-${_brotli_ver} \
+        --add-dynamic-module=$srcdir/ngx_http_geoip2_module-${_geoip2_ver}
 
     make
 }