summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancoism902020-12-24 13:45:43 +0100
committerfrancoism902020-12-24 13:45:43 +0100
commit4fbd59c5577819fb016d578404d809b7ea54ad81 (patch)
treeafd9612943baefa7fbf68c7aaa87b27318e8f87f
parentd88454c5dfc4c9190138f7c15eb5bd4277da5342 (diff)
downloadaur-4fbd59c5577819fb016d578404d809b7ea54ad81.tar.gz
Use nginx-mainline-src
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD41
2 files changed, 24 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a7a2594f290..e4e66e9d2877 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
pkgbase = nginx-mainline-mod-brotli-git
pkgdesc = Brotli compression filter module for mainline nginx
- pkgver = r53.25f86f0
- pkgrel = 3
+ pkgver = r54.9aec15e
+ pkgrel = 1
url = https://github.com/google/ngx_brotli
- arch = any
+ arch = i686
+ arch = x86_64
license = CUSTOM
makedepends = git
- depends = nginx-mainline=1.19.3
+ makedepends = nginx-mainline-src
+ depends = nginx-mainline
depends = brotli
provides = nginx-mainline-mod-brotli
conflicts = nginx-mainline-mod-brotli
- source = https://nginx.org/download/nginx-1.19.3.tar.gz
- source = https://nginx.org/download/nginx-1.19.3.tar.gz.asc
source = ngx_brotli::git+https://github.com/google/ngx_brotli.git
validpgpkeys = B0F4253373F8F6F510D42178520A9993A1C052F8
- sha256sums = 91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0
- sha256sums = SKIP
sha256sums = SKIP
pkgname = nginx-mainline-mod-brotli-git
diff --git a/PKGBUILD b/PKGBUILD
index 008a76a5eb77..902fe305aedd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,23 @@
# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
_modname="ngx_brotli"
-_nginxver=1.19.3
pkgname=nginx-mainline-mod-brotli-git
-pkgver=r53.25f86f0
-pkgrel=3
+pkgver=r54.9aec15e
+pkgrel=1
pkgdesc="Brotli compression filter module for mainline nginx"
-arch=('any')
-depends=("nginx-mainline=$_nginxver" 'brotli')
-makedepends=('git')
+arch=('i686' 'x86_64')
+depends=('nginx-mainline' 'brotli')
+makedepends=('git' 'nginx-mainline-src')
provides=('nginx-mainline-mod-brotli')
conflicts=('nginx-mainline-mod-brotli')
url="https://github.com/google/ngx_brotli"
license=('CUSTOM')
-
-source=(
- https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
- "$_modname::git+https://github.com/google/ngx_brotli.git"
-)
-
+source=("$_modname::git+https://github.com/google/ngx_brotli.git")
validpgpkeys=(
'B0F4253373F8F6F510D42178520A9993A1C052F8' # Maxim Dounin <mdounin@mdounin.ru>
)
-
-sha256sums=('91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0'
- 'SKIP'
- 'SKIP')
+sha256sums=('SKIP')
pkgver() {
cd "$_modname"
@@ -35,13 +26,17 @@ pkgver() {
}
prepare() {
- cd "$srcdir"/$_modname
- sed 's@/usr/local@/usr@' -i config
+ cp -r /usr/src/nginx .
+
+ cd "$srcdir"/$_modname
+ sed 's@/usr/local@/usr@' -i config
}
build() {
- cd "$srcdir"/nginx-$_nginxver
+ cd "$srcdir"/nginx
+
./configure --with-compat --add-dynamic-module=../$_modname
+
make modules
}
@@ -49,8 +44,8 @@ package() {
install -Dm644 "$srcdir"/$_modname/LICENSE \
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- cd "$srcdir"/nginx-$_nginxver/objs
- for mod in ngx_*.so; do
- install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
- done
+ cd "$srcdir"/nginx/objs
+ for mod in ngx_*.so; do
+ install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
+ done
}