Update to nginx-mainline-1.19.3, new maintainer

3 files changed, 29 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1391040288e..4366b3a47946 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
 pkgbase = nginx-mainline-mod-fancyindex
 	pkgdesc = Fancy indexes module for the Nginx web server
 	pkgver = 0.4.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/aperezdc/ngx-fancyindex
-	arch = i686
 	arch = x86_64
-	arch = armv7h
 	license = BSD
-	makedepends = nginx-mainline
 	depends = nginx-mainline
-	source = https://nginx.org/download/nginx-1.19.0.tar.gz
-	source = https://nginx.org/download/nginx-1.19.0.tar.gz.asc
-	source = https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz
+	source = https://nginx.org/download/nginx-1.19.3.tar.gz
+	source = https://nginx.org/download/nginx-1.19.3.tar.gz.asc
+	source = nginx-mainline-mod-fancyindex-0.4.4.tar.gz::https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz
 	validpgpkeys = B0F4253373F8F6F510D42178520A9993A1C052F8
-	sha256sums = 44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8
+	sha256sums = 91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0
 	sha256sums = SKIP
 	sha256sums = 34e2bf332b9fa930914220c0187ca18d6f7a6abb88b81fdc9eb4779a1584f83a
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 040df18b9f2a..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*z
-*.asc
-pkg
-src
diff --git a/PKGBUILD b/PKGBUILD
index 8f82ecd75602..1451ba34959e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,37 @@
-# Maintainer: jkl
+# Maintainer: Morgenstern <charles [at] charlesbwise [dot] com>
+# Contributor: jkl <jkl@johnluebs.com>
 # Contributor: hdhoang <arch@hdhoang.space>
 
 pkgname=nginx-mainline-mod-fancyindex
 pkgver=0.4.4
-pkgrel=1
-
+pkgrel=2
 _modname="${pkgname#nginx-mainline-mod-}"
-_nginxver=1.19.0
-
-pkgdesc='Fancy indexes module for the Nginx web server'
-arch=('i686' 'x86_64' 'armv7h')
-makedepends=('nginx-mainline')
-depends=('nginx-mainline')
+_nginxver=1.19.3
+pkgdesc="Fancy indexes module for the Nginx web server"
+arch=('x86_64')
 url="https://github.com/aperezdc/ngx-fancyindex"
 license=('BSD')
-
-source=(
-	https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
-	https://github.com/aperezdc/ngx-$_modname/archive/v$pkgver.tar.gz
-)
-sha256sums=('44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8'
-			'SKIP'
-			'34e2bf332b9fa930914220c0187ca18d6f7a6abb88b81fdc9eb4779a1584f83a')
+depends=('nginx-mainline')
+source=(https://nginx.org/download/nginx-$_nginxver.tar.gz{,.asc}
+	"${pkgname}-${pkgver}.tar.gz::https://github.com/aperezdc/ngx-$_modname/archive/v$pkgver.tar.gz")
 validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8') # Maxim Dounin <mdounin@mdounin.ru>
-
-prepare() {
-	cd ngx-$_modname-$pkgver
-}
+sha256sums=('91e5b74fa17879d2463294e93ad8f6ffc066696ae32ad0478ffe15ba0e9e8df0'
+            'SKIP'
+            '34e2bf332b9fa930914220c0187ca18d6f7a6abb88b81fdc9eb4779a1584f83a')
 
 build() {
-	cd "$srcdir"/nginx-$_nginxver
-	opts=$(nginx -V 2>&1 | grep 'configure arguments' | sed -r 's@^[^:]+: @@')
-	IFS=$'\n' opts=( $(xargs -n1 <<< "$opts") )
-	./configure "${opts[@]}" \
-		--add-dynamic-module=../ngx-$_modname-$pkgver
-	make modules
+  cd "$srcdir/nginx-$_nginxver"
+  _opts=$(nginx -V 2>&1 | grep 'configure arguments' | sed -r 's/^[^:]+: //')
+  IFS=$'\n' _opts=( $(xargs -n1 <<< "$_opts") )
+  ./configure "${_opts[@]}" \
+	--add-dynamic-module=../ngx-"$_modname-$pkgver"
+  make modules
 }
 
-package() {
-	install -Dm644 "$srcdir/"ngx-$_modname-$pkgver/LICENSE \
-	  "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-	cd "$srcdir"/nginx-$_nginxver/objs
-	for mod in *.so; do
-		install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
-	done
+package() {  
+  for _mod in "$srcdir"/nginx-"$_nginxver"/objs/*.so; do
+	install -D $_mod "$pkgdir/usr/lib/nginx/modules/$_mod"
+  done
+  install -Dm644 "$srcdir/ngx-$_modname-$pkgver/LICENSE" \
+	"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }