summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nginx-mod-ipscrub-git/.gitignore1
-rw-r--r--nginx-mod-ipscrub/PKGBUILD (renamed from nginx-mod-ipscrub-git/PKGBUILD)27
2 files changed, 5 insertions, 23 deletions
diff --git a/nginx-mod-ipscrub-git/.gitignore b/nginx-mod-ipscrub-git/.gitignore
deleted file mode 100644
index 8ccd8f634..000000000
--- a/nginx-mod-ipscrub-git/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ipscrub
diff --git a/nginx-mod-ipscrub-git/PKGBUILD b/nginx-mod-ipscrub/PKGBUILD
index 9a57513ad..5e04c39d3 100644
--- a/nginx-mod-ipscrub-git/PKGBUILD
+++ b/nginx-mod-ipscrub/PKGBUILD
@@ -2,8 +2,8 @@
_nginxver=1.14.0
-pkgname=nginx-mod-ipscrub-git
-pkgver=0.r9.99230f6
+pkgname=nginx-mod-ipscrub
+pkgver=1.0.0
pkgrel=1
pkgdesc='IP address anonymizer for nginx log files'
@@ -14,36 +14,19 @@ license=('custom')
source=(
https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
- ipscrub::git+https://github.com/masonicboom/ipscrub.git#commit=${pkgver##*.}
+ ${pkgname}-${pkgver}.tar.gz::https://github.com/masonicboom/ipscrub/archive/v${pkgver}.tar.gz
)
validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
sha256sums=(
'5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5'
'SKIP'
- 'SKIP'
+ '6fcfa7d04e98691aff72171c369e6d325df6a68efadddb5013aeecfc7da5287f'
)
-pkgver() {
-
- git -C "${srcdir}/ipscrub" fetch >/dev/null 2>&1
-
- _commit=$(
- git -C "${srcdir}/ipscrub" rev-parse --short HEAD
- )
-
- printf '%s.r%s.%s\n' \
- "${pkgver%%.*}" \
- "$(
- git -C "${srcdir}/ipscrub" rev-list --count "${_commit}"
- )" \
- "${_commit}"
-
-}
-
build() {
cd "$srcdir"/nginx-$_nginxver
./configure --with-compat \
- --add-dynamic-module=../ipscrub/ipscrub
+ --add-dynamic-module=../ipscrub-${pkgver}/ipscrub
make modules
}