summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMassimiliano Torromeo2020-12-28 19:41:22 +0100
committerMassimiliano Torromeo2020-12-28 19:41:22 +0100
commit65f5620861b6b5864a18bfa5e790125889aae06e (patch)
tree254f36298313032a2b79ae57a18f7887c50fa212
parentc5badff25e35b57e7da5373067b23a61fed9bc23 (diff)
downloadaur-65f5620861b6b5864a18bfa5e790125889aae06e.tar.gz
Updated to build against nginx-mainline-mod-src
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD33
2 files changed, 17 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fdec2de006c7..08d7ab9538c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
pkgbase = nginx-mainline-mod-ndk-set-misc
pkgdesc = Various set_xxx directives added to nginx's rewrite + ngx_devel_kit (module for mainline nginx)
pkgver = 0.32+0.3.1
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/openresty/set-misc-nginx-module
arch = i686
arch = x86_64
license = BSD
+ makedepends = nginx-mainline-src
depends = nginx-mainline
provides = nginx-mainline-mod-ndk
conflicts = nginx-mainline-mod-ndk
- source = https://nginx.org/download/nginx-1.19.3.tar.gz
- source = https://nginx.org/download/nginx-1.19.3.tar.gz.asc
source = https://github.com/openresty/set-misc-nginx-module/archive/v0.32/set-misc-0.32.tar.gz
source = https://github.com/simpl/ngx_devel_kit/archive/v0.3.1/ngx_devel_kit-0.3.1.tar.gz
- validpgpkeys = B0F4253373F8F6F510D42178520A9993A1C052F8
- sha256sums = 91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0
- sha256sums = SKIP
sha256sums = f1ad2459c4ee6a61771aa84f77871f4bfe42943a4aa4c30c62ba3f981f52c201
sha256sums = 0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85
diff --git a/PKGBUILD b/PKGBUILD
index 2e2b90b8cd95..8377c2504269 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,44 +5,41 @@ _ndkver=0.3.1
pkgname=nginx-mainline-mod-ndk-set-misc
pkgver=$_setmiscver+$_ndkver
-pkgrel=3
+pkgrel=4
_modname=set-misc
-_nginxver=1.19.3
pkgdesc="Various set_xxx directives added to nginx's rewrite + ngx_devel_kit (module for mainline nginx)"
arch=('i686' 'x86_64')
depends=('nginx-mainline')
+makedepends=('nginx-mainline-src')
conflicts=('nginx-mainline-mod-ndk')
provides=('nginx-mainline-mod-ndk')
url="https://github.com/openresty/set-misc-nginx-module"
license=('BSD')
-source=(
- https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
- https://github.com/openresty/$_modname-nginx-module/archive/v$_setmiscver/$_modname-$_setmiscver.tar.gz
- https://github.com/simpl/ngx_devel_kit/archive/v$_ndkver/ngx_devel_kit-$_ndkver.tar.gz
-)
-
-validpgpkeys=(
- 'B0F4253373F8F6F510D42178520A9993A1C052F8' # Maxim Dounin <mdounin@mdounin.ru>
-)
-
-sha256sums=('91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0'
- 'SKIP'
- 'f1ad2459c4ee6a61771aa84f77871f4bfe42943a4aa4c30c62ba3f981f52c201'
+source=(https://github.com/openresty/$_modname-nginx-module/archive/v$_setmiscver/$_modname-$_setmiscver.tar.gz
+ https://github.com/simpl/ngx_devel_kit/archive/v$_ndkver/ngx_devel_kit-$_ndkver.tar.gz)
+sha256sums=('f1ad2459c4ee6a61771aa84f77871f4bfe42943a4aa4c30c62ba3f981f52c201'
'0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85')
+prepare() {
+ mkdir -p build
+ cd build
+ ln -sf /usr/src/nginx/auto
+ ln -sf /usr/src/nginx/src
+}
+
build() {
- cd "$srcdir"/nginx-$_nginxver
- ./configure --with-compat \
+ cd build
+ /usr/src/nginx/configure --with-compat \
--add-dynamic-module=../ngx_devel_kit-$_ndkver \
--add-dynamic-module=../$_modname-nginx-module-$_setmiscver
make modules
}
package() {
- cd "$srcdir"/nginx-$_nginxver/objs
+ cd build/objs
for mod in *.so; do
install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
done