wok diff nginx-extras/receipt @ rev 23237

updated nginx and nginx-extras (1.9.4 -> 1.16.0)
author Hans-G?nter Theisgen
date Wed Mar 25 08:10:44 2020 +0100 (2020-03-25)
parents c83afd3687bf
children 2e9639a37ee1
line diff
     1.1 --- a/nginx-extras/receipt	Mon Feb 27 10:15:04 2017 +0100
     1.2 +++ b/nginx-extras/receipt	Wed Mar 25 08:10:44 2020 +0100
     1.3 @@ -1,62 +1,65 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nginx-extras"
     1.7 -VERSION="1.9.4"
     1.8 +VERSION="1.16.0"
     1.9  CATEGORY="network"
    1.10 -SHORT_DESC="Asynchronous HTTP server designed for heavy loads + mail proxy."
    1.11 +SHORT_DESC="Asynchronous HTTP server designed for heavy loads and mail proxy."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="BSD"
    1.14 +WEB_SITE="http://nginx.org/"
    1.15 +
    1.16 +TARBALL="nginx-$VERSION.tar.gz"
    1.17 +WGET_URL="${WEB_SITE}download//$TARBALL"
    1.18 +
    1.19 +PROVIDE="lighttpd"
    1.20 +CONFLICT="nginx"
    1.21  SUGGESTED="php perl python"
    1.22 -TARBALL="nginx-$VERSION.tar.gz"
    1.23 -WEB_SITE="http://nginx.org/"
    1.24 -WGET_URL="${WEB_SITE}download//$TARBALL"
    1.25 -PROVIDE="lighttpd"
    1.26 +DEPENDS="geoip libgd libxslt openssl pcre zlib"
    1.27 +BUILD_DEPENDS="geoip-dev libgd-dev libxslt-dev openssl-dev pcre-dev 
    1.28 +	tiff zlib-dev"
    1.29 +
    1.30  CONFIG_FILES="/etc/nginx"
    1.31 -CONFLICT="nginx"
    1.32 -
    1.33 -DEPENDS="pcre openssl zlib libgd geoip libxslt"
    1.34 -BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev libgd-dev geoip-dev libxslt-dev \
    1.35 -tiff"
    1.36  
    1.37  # Rules to configure and make the package.
    1.38  compile_rules()
    1.39  {
    1.40 -	./configure \
    1.41 -		--prefix=/usr \
    1.42 -		--conf-path=/etc/nginx/nginx.conf \
    1.43 -		--pid-path=/var/run/nginx.pid \
    1.44 -		--lock-path=/var/lock/nginx.lock \
    1.45 -		--error-log-path=/var/log/nginx/error.log \
    1.46 -		--http-log-path=/var/log/nginx/access.log \
    1.47 -		--http-client-body-temp-path=/var/spool/nginx/body \
    1.48 -		--http-proxy-temp-path=/var/spool/nginx/proxy \
    1.49 -		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi \
    1.50 -		--with-http_ssl_module \
    1.51 -		--with-http_spdy_module \
    1.52 -		--with-http_realip_module \
    1.53 -		--with-http_addition_module \
    1.54 -		--with-http_xslt_module \
    1.55 -		--with-http_image_filter_module \
    1.56 -		--with-http_geoip_module \
    1.57 -		--with-http_sub_module \
    1.58 -		--with-http_dav_module \
    1.59 -		--with-http_flv_module \
    1.60 -		--with-http_mp4_module \
    1.61 -		--with-http_gunzip_module \
    1.62 -		--with-http_gzip_static_module \
    1.63 -		--with-http_auth_request_module \
    1.64 -		--with-http_random_index_module \
    1.65 -		--with-http_secure_link_module \
    1.66 -		--with-http_degradation_module \
    1.67 -		--with-http_stub_status_module \
    1.68 -		--with-mail \
    1.69 -		--with-mail_ssl_module \
    1.70 -		--with-stream \
    1.71 -		--with-stream_ssl_module \
    1.72 -		--with-pcre \
    1.73 -		--with-pcre-jit \
    1.74 -		--with-http_perl_module \
    1.75 -		--user=80 --group=80 &&
    1.76 +	./configure							\
    1.77 +		--prefix=/usr						\
    1.78 +		--conf-path=/etc/nginx/nginx.conf			\
    1.79 +		--pid-path=/var/run/nginx.pid				\
    1.80 +		--lock-path=/var/lock/nginx.lock			\
    1.81 +		--error-log-path=/var/log/nginx/error.log		\
    1.82 +		--http-log-path=/var/log/nginx/access.log		\
    1.83 +		--http-client-body-temp-path=/var/spool/nginx/body	\
    1.84 +		--http-proxy-temp-path=/var/spool/nginx/proxy		\
    1.85 +		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi	\
    1.86 +		--with-http_ssl_module					\
    1.87 +		--with-http_spdy_module					\
    1.88 +		--with-http_realip_module				\
    1.89 +		--with-http_addition_module				\
    1.90 +		--with-http_xslt_module					\
    1.91 +		--with-http_image_filter_module				\
    1.92 +		--with-http_geoip_module				\
    1.93 +		--with-http_sub_module					\
    1.94 +		--with-http_dav_module					\
    1.95 +		--with-http_flv_module					\
    1.96 +		--with-http_mp4_module					\
    1.97 +		--with-http_gunzip_module				\
    1.98 +		--with-http_gzip_static_module				\
    1.99 +		--with-http_auth_request_module				\
   1.100 +		--with-http_random_index_module				\
   1.101 +		--with-http_secure_link_module				\
   1.102 +		--with-http_degradation_module				\
   1.103 +		--with-http_stub_status_module				\
   1.104 +		--with-mail						\
   1.105 +		--with-mail_ssl_module					\
   1.106 +		--with-stream						\
   1.107 +		--with-stream_ssl_module				\
   1.108 +		--with-pcre						\
   1.109 +		--with-pcre-jit						\
   1.110 +		--with-http_perl_module					\
   1.111 +		--user=80						\
   1.112 +		--group=80 &&
   1.113  	make &&
   1.114  	make DESTDIR=$DESTDIR install
   1.115  
   1.116 @@ -68,19 +71,23 @@
   1.117  # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
   1.118  genpkg_rules()
   1.119  {
   1.120 -	cp -a $install/* $fs/
   1.121 -	rm -rf $fs/usr/html
   1.122 -	cp -a stuff/* $fs
   1.123 -	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
   1.124 +	cp -a $install/*	$fs
   1.125 +	rm -rf			$fs/usr/html
   1.126 +	cp -a stuff/*		$fs
   1.127 +	sed -i 's/#user  nobody;/user  www;/' \
   1.128 +				$fs/etc/nginx/nginx.conf
   1.129  }
   1.130  
   1.131  # Pre and post install commands for Tazpkg.
   1.132  # We stop the server by default in case of upgarde.
   1.133  pre_install()
   1.134  {
   1.135 -	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
   1.136 -	# Backup config file.
   1.137 -	if [ -d "$1/$CONFIG_FILES" ]; then
   1.138 +	[ -f /etc/init.d/$PACKAGE ] &&
   1.139 +	/etc/init.d/$PACKAGE stop
   1.140 +
   1.141 +	# Backup configuration file.
   1.142 +	if [ -d "$1/$CONFIG_FILES" ]
   1.143 +	  then
   1.144  		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
   1.145  	fi
   1.146  }
   1.147 @@ -89,18 +96,21 @@
   1.148  {
   1.149  	mkdir -p /var/spool/nginx
   1.150  
   1.151 -	# Restore original config.
   1.152 -	if [ -d "$1/$CONFIG_FILES.bak" ]; then
   1.153 +	# Restore original configuration.
   1.154 +	if [ -d "$1/$CONFIG_FILES.bak" ]
   1.155 +	  then
   1.156  		rm -rf "$1/$CONFIG_FILES"
   1.157  		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
   1.158  	fi
   1.159  
   1.160  	# Just in case.
   1.161  	chown www.www "$1/var/log/$PACKAGE"
   1.162 -	if [ -z "$1" ]; then
   1.163 -		for i in apache lighttpd; do
   1.164 +	if [ -z "$1" ]
   1.165 +	  then
   1.166 +		for i in apache lighttpd
   1.167 +		  do
   1.168  			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   1.169 -		done
   1.170 +		  done
   1.171  		/etc/init.d/$PACKAGE start
   1.172  	fi
   1.173