main/nginx: bump lua mod to 0.10.5, devkit to 0.3.0

Switch to $builddir, make use of default prepare(), add some new lines
and break too long ones for better readability. Sync configure
flags with these used by upstream in Dockerfile.

1 files changed, 45 insertions, 33 deletions

diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 3bea5b503d..14b52b29de 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=nginx
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="HTTP and reverse proxy server"
 url="http://www.nginx.org/en"
 arch="all"
@@ -19,7 +19,7 @@ depends="$pkgname-common !$pkgname-rtmp !$pkgname-lua"
 # Modules
 _lua_mod=lua-nginx-module
 _lua_dir=$_lua_mod
-_lua_ver=0.10.2
+_lua_ver=0.10.5
 
 _rtmp_mod=nginx-rtmp-module
 _rtmp_dir=$_rtmp_mod
@@ -27,7 +27,7 @@ _rtmp_ver=1.1.7
 
 _devkit_mod=nginx-devel-kit
 _devkit_dir=ngx_devel_kit
-_devkit_ver=0.2.19
+_devkit_ver=0.3.0
 
 makedepends="perl-dev pcre-dev openssl-dev zlib-dev luajit-dev paxmark linux-headers"
 subpackages="$pkgname-doc $pkgname-common $pkgname-vim $pkgname-rtmp $pkgname-lua"
@@ -41,15 +41,7 @@ source="http://nginx.org/download/$pkgname-$pkgver.tar.gz
 	ipv6.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/$pkgname-$pkgver
 
 _build() {
 	local binary=$1
@@ -67,24 +59,37 @@ _build() {
 		--http-scgi-temp-path=/var/lib/$pkgname/tmp/scgi \
 		--user=$pkgusers \
 		--group=$_grp_ngx \
-		--with-ipv6 \
-		--with-file-aio \
-		--with-pcre-jit \
-		--with-http_dav_module \
 		--with-http_ssl_module \
-		--with-http_stub_status_module \
+		--with-http_realip_module \
+		--with-http_addition_module \
+		--with-http_sub_module \
+		--with-http_dav_module \
+		--with-http_flv_module \
+		--with-http_mp4_module \
+		--with-http_gunzip_module \
 		--with-http_gzip_static_module \
-		--with-http_v2_module \
+		--with-http_random_index_module \
+		--with-http_secure_link_module \
+		--with-http_stub_status_module \
 		--with-http_auth_request_module \
+		--with-threads \
+		--with-stream \
+		--with-stream_ssl_module \
+		--with-http_slice_module \
 		--with-mail \
 		--with-mail_ssl_module \
+		--with-file-aio \
+		--with-http_v2_module \
+		--with-ipv6 \
 		$@ || return 1
+
 	make || return 1
+
 	mv objs/$pkgname objs/$binary
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 
 	_build $pkgname-lua --build="rtmp,lua" \
 		--add-module="$srcdir/$_devkit_dir-$_devkit_ver" \
@@ -100,23 +105,26 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 	install -Dm644 objs/$pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8
 
 	install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
-	cp -r "$srcdir"/$_lua_dir-$_lua_ver/doc "$pkgdir"/usr/share/doc/$pkgname/$_lua_mod || return 1
-	cp -r "$srcdir"/$_rtmp_dir-$_rtmp_ver/doc "$pkgdir"/usr/share/doc/$pkgname/$_rtmp_mod
-	cp -r "$srcdir"/$_devkit_dir-$_devkit_ver/docs "$pkgdir"/usr/share/doc/$pkgname/$_devkit_mod
+	cp -r "$srcdir"/$_lua_dir-$_lua_ver/doc \
+		"$pkgdir"/usr/share/doc/$pkgname/$_lua_mod || return 1
+	cp -r "$srcdir"/$_rtmp_dir-$_rtmp_ver/doc \
+		"$pkgdir"/usr/share/doc/$pkgname/$_rtmp_mod
+	cp -r "$srcdir"/$_devkit_dir-$_devkit_ver/docs \
+		"$pkgdir"/usr/share/doc/$pkgname/$_devkit_mod
 
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
 
 	install -dm755 "$pkgdir"/etc/$pkgname/conf.d
 	install -dm755 "$pkgdir"/etc/$pkgname/default.d
-	
+
 	install -dm750 -o $pkgusers -g $_grp_ngx "$pkgdir"/var/lib/$pkgname
 	install -dm700 -o $pkgusers -g $_grp_ngx "$pkgdir"/var/lib/$pkgname/tmp
 	install -dm755 -g $_grp_www "$pkgdir"/var/www/localhost/htdocs
@@ -136,6 +144,7 @@ common() {
 	depends=
 	replaces="nginx-initscripts"
 	arch="noarch"
+
 	mkdir -p "$subpkgdir"
 	mv "$pkgdir"/etc "$pkgdir"/var "$subpkgdir"/
 }
@@ -144,40 +153,43 @@ vim() {
 	pkgdesc="$pkgdesc (vim syntax)"
 	depends=
 	arch="noarch"
+
 	mkdir -p "$subpkgdir"/usr/share/vim
-	cp -r "$_builddir"/contrib/vim "$subpkgdir"/usr/share/vim/vimfiles
+	cp -r "$builddir"/contrib/vim "$subpkgdir"/usr/share/vim/vimfiles
 }
 
 rtmp() {
 	pkgdesc="$pkgdesc (rtmp support)"
 	depends="$pkgname-common !$pkgname !$pkgname-lua"
-	install -Dm755 "$_builddir"/objs/$pkgname-rtmp "$subpkgdir"/usr/sbin/$pkgname
+
+	install -Dm755 "$builddir"/objs/$pkgname-rtmp "$subpkgdir"/usr/sbin/$pkgname
 }
 
 lua() {
 	pkgdesc="$pkgdesc (rtmp & lua support)"
 	depends="$pkgname-common !$pkgname !$pkgname-rtmp"
-	install -Dm755 "$_builddir"/objs/$pkgname-lua "$subpkgdir"/usr/sbin/$pkgname
+
+	install -Dm755 "$builddir"/objs/$pkgname-lua "$subpkgdir"/usr/sbin/$pkgname
 }
 
 md5sums="088292d9caf6059ef328aa7dda332e44  nginx-1.10.1.tar.gz
-03d60e54151f0c578ef9bc8cd2880f3e  lua-nginx-module-0.10.2.tar.gz
+9824498b35e879e40d05b9c8348dc4ff  lua-nginx-module-0.10.5.tar.gz
 8006de2560db3e55bb15d110220076ac  nginx-rtmp-module-1.1.7.tar.gz
-09a18178adca7b5674129d8100ce4f68  nginx-devel-kit-0.2.19.tar.gz
+76c503918c003fcc55005b7688f47add  nginx-devel-kit-0.3.0.tar.gz
 db194cf3c6c4be12c70c757e0c9ad995  nginx.logrotate
 16dcac0d7a2b406807d3377841d9b480  nginx.initd
 801a87f7f9d27f8ad85b41a78b4c4461  ipv6.patch"
 sha256sums="1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801  nginx-1.10.1.tar.gz
-155feeff08a0b2efaf980705b9ef83d0b341e6d011adad8e2679ea4105668134  lua-nginx-module-0.10.2.tar.gz
+4f0292c37ab3d7cb980c994825040be1bda2c769cbd800e79c43eb37458347d4  lua-nginx-module-0.10.5.tar.gz
 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3  nginx-rtmp-module-1.1.7.tar.gz
-501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679  nginx-devel-kit-0.2.19.tar.gz
+88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619  nginx-devel-kit-0.3.0.tar.gz
 b063611c6cb2d33bd43c4b17bf4135dda25f209bb77e4e66d1b156cffc37fbe6  nginx.logrotate
 3d8a90d2f75b7f24c4d74722b5b3ac11d85f416c2d7641b4280d7c126bfe8395  nginx.initd
 a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b  ipv6.patch"
 sha512sums="fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1  nginx-1.10.1.tar.gz
-33ad538f0f63aae91b691ceda593899881b3ac0ea48da6814724d9bfe3d74b323ac5f3b8bc2fa03116c5cd1045e2a12db4e9bf96c8172a96ec1c6cd0b30199fa  lua-nginx-module-0.10.2.tar.gz
+a02b8614fdcd063b1087a3114f05402c707343ff3bceabaca1fb98531ba30edea1a525fc45e2f5a49ff155de8d6f9e1155e8870e463476da5703acfd5f8fc3fc  lua-nginx-module-0.10.5.tar.gz
 9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e  nginx-rtmp-module-1.1.7.tar.gz
-915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657  nginx-devel-kit-0.2.19.tar.gz
+558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614  nginx-devel-kit-0.3.0.tar.gz
 09b110693e3f4377349ccea3c43cb8199c8579ee351eae34283299be99fdf764b0c1bddd552e13e4d671b194501618b29c822e1ad53b34101a73a63954363dbb  nginx.logrotate
 1ea032cf88021ec8aa1401d284ea738364511cdb9f8c01670deb8e59aae570f5bbe17f0cbab73c0e08d6b342a621b6a9c014832168ed41f6028ecfa4211b60cf  nginx.initd
 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f  ipv6.patch"