summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMassimiliano Torromeo2020-12-28 19:43:51 +0100
committerMassimiliano Torromeo2020-12-28 19:43:51 +0100
commitfdfc7928c80e34664c857ddd2b23656e1ce69ac7 (patch)
tree255d13eb7d32f283662ca18b8a812c364f2b4c22
parent7b88da7636c4733273fa6a41326fa1dacef42f8e (diff)
downloadaur-fdfc7928c80e34664c857ddd2b23656e1ce69ac7.tar.gz
Updated to build against nginx-mainline-mod-src
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD31
2 files changed, 19 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e107fe6e3870..63534837bcd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
pkgbase = nginx-mainline-mod-njs
pkgdesc = nginScript module for mainline nginx
- pkgver = 0.4.3
- pkgrel = 2
+ pkgver = 0.5.0
+ pkgrel = 1
url = https://nginx.org/en/docs/njs_about.html
arch = i686
arch = x86_64
license = CUSTOM
+ makedepends = nginx-mainline-src
depends = nginx-mainline
- source = https://nginx.org/download/nginx-1.19.3.tar.gz
- source = https://nginx.org/download/nginx-1.19.3.tar.gz.asc
- source = njs-0.4.3.tar.gz::http://hg.nginx.org/njs/archive/0.4.3.tar.gz
- validpgpkeys = B0F4253373F8F6F510D42178520A9993A1C052F8
- sha256sums = 91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0
- sha256sums = SKIP
- sha256sums = 74978d52de5212cbb36177a66b2e4223184ed7ed09218f4f42cefdd7893aecd8
+ source = njs-0.5.0.tar.gz::http://hg.nginx.org/njs/archive/0.5.0.tar.gz
+ sha256sums = ec874ac63c6e3357251ed373416520b27616da307a54fa2ba31b227c87cb4f39
pkgname = nginx-mainline-mod-njs
diff --git a/PKGBUILD b/PKGBUILD
index 2695b5eba8d9..08e5e8447692 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,31 @@
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=nginx-mainline-mod-njs
-pkgver=0.4.3 # http://hg.nginx.org/njs/tags
-pkgrel=2
+pkgver=0.5.0 # http://hg.nginx.org/njs/tags
+pkgrel=1
_modname="${pkgname#nginx-mainline-mod-}"
-_nginxver=1.19.3
pkgdesc='nginScript module for mainline nginx'
arch=('i686' 'x86_64')
depends=('nginx-mainline')
+makedepends=('nginx-mainline-src')
url="https://nginx.org/en/docs/njs_about.html"
license=('CUSTOM')
-source=(
- https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
- njs-$pkgver.tar.gz::http://hg.nginx.org/njs/archive/$pkgver.tar.gz
-)
+source=(njs-$pkgver.tar.gz::http://hg.nginx.org/njs/archive/$pkgver.tar.gz)
+sha256sums=('ec874ac63c6e3357251ed373416520b27616da307a54fa2ba31b227c87cb4f39')
-validpgpkeys=(
- 'B0F4253373F8F6F510D42178520A9993A1C052F8' # Maxim Dounin <mdounin@mdounin.ru>
-)
-
-sha256sums=('91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0'
- 'SKIP'
- '74978d52de5212cbb36177a66b2e4223184ed7ed09218f4f42cefdd7893aecd8')
+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 --with-stream --add-dynamic-module=../njs-$pkgver/nginx
+ cd build
+ /usr/src/nginx/configure --with-compat --with-stream --add-dynamic-module=../njs-$pkgver/nginx
make modules
}
@@ -36,7 +33,7 @@ package() {
install -Dm644 "$srcdir"/njs-$pkgver/LICENSE \
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- cd "$srcdir"/nginx-$_nginxver/objs
+ cd build/objs
for mod in *.so; do
install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
done