# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1585120244 -3600
# Node ID d25a28bf6b6c3acf3dde86a76aa80a3f054b0221
# Parent  eeb3f2dda9dff135078bc92e0c2c6f8f7b5443ae
updated nginx and nginx-extras (1.9.4 -> 1.16.0)

diff -r eeb3f2dda9df -r d25a28bf6b6c nginx-extras/receipt
--- a/nginx-extras/receipt	Tue Mar 24 17:21:46 2020 +0100
+++ b/nginx-extras/receipt	Wed Mar 25 08:10:44 2020 +0100
@@ -1,62 +1,65 @@
 # SliTaz package receipt.
 
 PACKAGE="nginx-extras"
-VERSION="1.9.4"
+VERSION="1.16.0"
 CATEGORY="network"
-SHORT_DESC="Asynchronous HTTP server designed for heavy loads + mail proxy."
+SHORT_DESC="Asynchronous HTTP server designed for heavy loads and mail proxy."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://nginx.org/"
+
+TARBALL="nginx-$VERSION.tar.gz"
+WGET_URL="${WEB_SITE}download//$TARBALL"
+
+PROVIDE="lighttpd"
+CONFLICT="nginx"
 SUGGESTED="php perl python"
-TARBALL="nginx-$VERSION.tar.gz"
-WEB_SITE="http://nginx.org/"
-WGET_URL="${WEB_SITE}download//$TARBALL"
-PROVIDE="lighttpd"
+DEPENDS="geoip libgd libxslt openssl pcre zlib"
+BUILD_DEPENDS="geoip-dev libgd-dev libxslt-dev openssl-dev pcre-dev 
+	tiff zlib-dev"
+
 CONFIG_FILES="/etc/nginx"
-CONFLICT="nginx"
-
-DEPENDS="pcre openssl zlib libgd geoip libxslt"
-BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev libgd-dev geoip-dev libxslt-dev \
-tiff"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/nginx/nginx.conf \
-		--pid-path=/var/run/nginx.pid \
-		--lock-path=/var/lock/nginx.lock \
-		--error-log-path=/var/log/nginx/error.log \
-		--http-log-path=/var/log/nginx/access.log \
-		--http-client-body-temp-path=/var/spool/nginx/body \
-		--http-proxy-temp-path=/var/spool/nginx/proxy \
-		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi \
-		--with-http_ssl_module \
-		--with-http_spdy_module \
-		--with-http_realip_module \
-		--with-http_addition_module \
-		--with-http_xslt_module \
-		--with-http_image_filter_module \
-		--with-http_geoip_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_auth_request_module \
-		--with-http_random_index_module \
-		--with-http_secure_link_module \
-		--with-http_degradation_module \
-		--with-http_stub_status_module \
-		--with-mail \
-		--with-mail_ssl_module \
-		--with-stream \
-		--with-stream_ssl_module \
-		--with-pcre \
-		--with-pcre-jit \
-		--with-http_perl_module \
-		--user=80 --group=80 &&
+	./configure							\
+		--prefix=/usr						\
+		--conf-path=/etc/nginx/nginx.conf			\
+		--pid-path=/var/run/nginx.pid				\
+		--lock-path=/var/lock/nginx.lock			\
+		--error-log-path=/var/log/nginx/error.log		\
+		--http-log-path=/var/log/nginx/access.log		\
+		--http-client-body-temp-path=/var/spool/nginx/body	\
+		--http-proxy-temp-path=/var/spool/nginx/proxy		\
+		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi	\
+		--with-http_ssl_module					\
+		--with-http_spdy_module					\
+		--with-http_realip_module				\
+		--with-http_addition_module				\
+		--with-http_xslt_module					\
+		--with-http_image_filter_module				\
+		--with-http_geoip_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_auth_request_module				\
+		--with-http_random_index_module				\
+		--with-http_secure_link_module				\
+		--with-http_degradation_module				\
+		--with-http_stub_status_module				\
+		--with-mail						\
+		--with-mail_ssl_module					\
+		--with-stream						\
+		--with-stream_ssl_module				\
+		--with-pcre						\
+		--with-pcre-jit						\
+		--with-http_perl_module					\
+		--user=80						\
+		--group=80 &&
 	make &&
 	make DESTDIR=$DESTDIR install
 
@@ -68,19 +71,23 @@
 # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
 genpkg_rules()
 {
-	cp -a $install/* $fs/
-	rm -rf $fs/usr/html
-	cp -a stuff/* $fs
-	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
+	cp -a $install/*	$fs
+	rm -rf			$fs/usr/html
+	cp -a stuff/*		$fs
+	sed -i 's/#user  nobody;/user  www;/' \
+				$fs/etc/nginx/nginx.conf
 }
 
 # Pre and post install commands for Tazpkg.
 # We stop the server by default in case of upgarde.
 pre_install()
 {
-	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
-	# Backup config file.
-	if [ -d "$1/$CONFIG_FILES" ]; then
+	[ -f /etc/init.d/$PACKAGE ] &&
+	/etc/init.d/$PACKAGE stop
+
+	# Backup configuration file.
+	if [ -d "$1/$CONFIG_FILES" ]
+	  then
 		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
 	fi
 }
@@ -89,18 +96,21 @@
 {
 	mkdir -p /var/spool/nginx
 
-	# Restore original config.
-	if [ -d "$1/$CONFIG_FILES.bak" ]; then
+	# Restore original configuration.
+	if [ -d "$1/$CONFIG_FILES.bak" ]
+	  then
 		rm -rf "$1/$CONFIG_FILES"
 		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
 	fi
 
 	# Just in case.
 	chown www.www "$1/var/log/$PACKAGE"
-	if [ -z "$1" ]; then
-		for i in apache lighttpd; do
+	if [ -z "$1" ]
+	  then
+		for i in apache lighttpd
+		  do
 			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
-		done
+		  done
 		/etc/init.d/$PACKAGE start
 	fi
 
diff -r eeb3f2dda9df -r d25a28bf6b6c nginx/receipt
--- a/nginx/receipt	Tue Mar 24 17:21:46 2020 +0100
+++ b/nginx/receipt	Wed Mar 25 08:10:44 2020 +0100
@@ -1,21 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="nginx"
-VERSION="1.9.4"
+VERSION="1.16.0"
 CATEGORY="network"
-SHORT_DESC="Asynchronous HTTP server designed for heavy loads + mail proxy."
+SHORT_DESC="Asynchronous HTTP server designed for heavy loads and mail proxy."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://nginx.org/"
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="${WEB_SITE}download//$TARBALL"
+
+PROVIDE="lighttpd"
 SUGGESTED="php perl python"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://nginx.org/"
-WGET_URL="${WEB_SITE}download//$TARBALL"
-PROVIDE="lighttpd"
+DEPENDS="openssl pcre zlib"
+BUILD_DEPENDS="openssl-dev pcre-dev zlib-dev"
+
 CONFIG_FILES="/etc/nginx"
 
-DEPENDS="pcre openssl zlib"
-BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev"
-
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -34,21 +36,23 @@
 #  --with-http_perl_module            enable ngx_http_perl_module
 #  --with-google_perftools_module     enable ngx_google_perftools_module
 
-	./configure --prefix=/usr \
-		--conf-path=/etc/nginx/nginx.conf \
-		--pid-path=/var/run/nginx.pid \
-		--lock-path=/var/lock/nginx.lock \
-		--error-log-path=/var/log/nginx/error.log \
-		--http-log-path=/var/log/nginx/access.log \
-		--http-client-body-temp-path=/var/spool/nginx/body \
-		--http-proxy-temp-path=/var/spool/nginx/proxy \
-		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi \
-		--with-http_stub_status_module \
-		--with-http_flv_module \
-		--with-http_ssl_module \
-		--with-http_dav_module \
-		--with-mail --with-mail_ssl_module \
-		--user=80 --group=80 &&
+	./configure							\
+		--prefix=/usr						\
+		--conf-path=/etc/nginx/nginx.conf			\
+		--pid-path=/var/run/nginx.pid				\
+		--lock-path=/var/lock/nginx.lock			\
+		--error-log-path=/var/log/nginx/error.log		\
+		--http-log-path=/var/log/nginx/access.log		\
+		--http-client-body-temp-path=/var/spool/nginx/body	\
+		--http-proxy-temp-path=/var/spool/nginx/proxy		\
+		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi	\
+		--with-http_stub_status_module				\
+		--with-http_flv_module					\
+		--with-http_ssl_module					\
+		--with-http_dav_module					\
+		--with-mail --with-mail_ssl_module			\
+		--user=80						\
+		--group=80 &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
@@ -57,21 +61,26 @@
 # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
 genpkg_rules()
 {
-	cp -a $install/* $fs/
-	rm -rf $fs/usr/html
-	cp -a stuff/* $fs
-	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
+	cp -a $install/*	$fs/
+	rm -rf			$fs/usr/html
+	cp -a stuff/*		$fs
+	sed -i 's/#user  nobody;/user  www;/' \
+				$fs/etc/nginx/nginx.conf
 }
 
 # Pre and post install commands for Tazpkg.
 # We stop the server by default in case of upgarde.
 pre_install()
 {
-	[ -z "$1" ] && for i in httpd lighttpd apache cherokee $PACKAGE ; do
+	[ -z "$1" ] &&
+	for i in httpd lighttpd apache cherokee $PACKAGE
+	  do
 		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
-	done
-	# Backup config file.
-	if [ -d "$1/$CONFIG_FILES" ]; then
+	  done
+
+	# Backup configuration file.
+	if [ -d "$1/$CONFIG_FILES" ]
+	  then
 		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
 	fi
 }
@@ -79,17 +88,22 @@
 post_install()
 {
 	mkdir -p /var/spool/nginx
-	# Restore original config.
-	if [ -d "$1/$CONFIG_FILES.bak" ]; then
+
+	# Restore original configuration.
+	if [ -d "$1/$CONFIG_FILES.bak" ]
+	  then
 		rm -rf "$1/$CONFIG_FILES"
 		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
 	fi
+
 	# Just in case.
 	chown www.www "$1/var/log/$PACKAGE"
-	if [ -z "$1" ]; then
-		for i in apache lighttpd ; do
+	if [ -z "$1" ]
+	  then
+		for i in apache lighttpd
+		  do
 			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
-		done
+		  done
 		/etc/init.d/$PACKAGE start
 	fi
 	true