wok diff nginx/receipt @ rev 23623

Update some bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Apr 14 16:56:01 2020 +0000 (2020-04-14)
parents 3630f18392bd
children 3ae2d1f7b186
line diff
     1.1 --- a/nginx/receipt	Mon May 23 11:34:06 2016 +0200
     1.2 +++ b/nginx/receipt	Tue Apr 14 16:56:01 2020 +0000
     1.3 @@ -1,21 +1,23 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nginx"
     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="https://nginx.org/"
    1.15 +
    1.16 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.17 +WGET_URL="${WEB_SITE}download//$TARBALL"
    1.18 +
    1.19 +PROVIDE="lighttpd"
    1.20  SUGGESTED="php perl python"
    1.21 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.22 -WEB_SITE="http://nginx.org/"
    1.23 -WGET_URL="${WEB_SITE}download//$TARBALL"
    1.24 -PROVIDE="lighttpd"
    1.25 +DEPENDS="openssl pcre zlib"
    1.26 +BUILD_DEPENDS="openssl-dev pcre-dev zlib-dev"
    1.27 +
    1.28  CONFIG_FILES="/etc/nginx"
    1.29  
    1.30 -DEPENDS="pcre openssl zlib"
    1.31 -BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev"
    1.32 -
    1.33  # Rules to configure and make the package.
    1.34  compile_rules()
    1.35  {
    1.36 @@ -34,21 +36,23 @@
    1.37  #  --with-http_perl_module            enable ngx_http_perl_module
    1.38  #  --with-google_perftools_module     enable ngx_google_perftools_module
    1.39  
    1.40 -	./configure --prefix=/usr \
    1.41 -		--conf-path=/etc/nginx/nginx.conf \
    1.42 -		--pid-path=/var/run/nginx.pid \
    1.43 -		--lock-path=/var/lock/nginx.lock \
    1.44 -		--error-log-path=/var/log/nginx/error.log \
    1.45 -		--http-log-path=/var/log/nginx/access.log \
    1.46 -		--http-client-body-temp-path=/var/spool/nginx/body \
    1.47 -		--http-proxy-temp-path=/var/spool/nginx/proxy \
    1.48 -		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi \
    1.49 -		--with-http_stub_status_module \
    1.50 -		--with-http_flv_module \
    1.51 -		--with-http_ssl_module \
    1.52 -		--with-http_dav_module \
    1.53 -		--with-mail --with-mail_ssl_module \
    1.54 -		--user=80 --group=80 &&
    1.55 +	./configure							\
    1.56 +		--prefix=/usr						\
    1.57 +		--conf-path=/etc/nginx/nginx.conf			\
    1.58 +		--pid-path=/var/run/nginx.pid				\
    1.59 +		--lock-path=/var/lock/nginx.lock			\
    1.60 +		--error-log-path=/var/log/nginx/error.log		\
    1.61 +		--http-log-path=/var/log/nginx/access.log		\
    1.62 +		--http-client-body-temp-path=/var/spool/nginx/body	\
    1.63 +		--http-proxy-temp-path=/var/spool/nginx/proxy		\
    1.64 +		--http-fastcgi-temp-path=/var/spool/nginx/fastcgi	\
    1.65 +		--with-http_stub_status_module				\
    1.66 +		--with-http_flv_module					\
    1.67 +		--with-http_ssl_module					\
    1.68 +		--with-http_dav_module					\
    1.69 +		--with-mail --with-mail_ssl_module			\
    1.70 +		--user=80						\
    1.71 +		--group=80 &&
    1.72  	make &&
    1.73  	make DESTDIR=$DESTDIR install
    1.74  }
    1.75 @@ -57,21 +61,26 @@
    1.76  # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
    1.77  genpkg_rules()
    1.78  {
    1.79 -	cp -a $install/* $fs/
    1.80 -	rm -rf $fs/usr/html
    1.81 -	cp -a stuff/* $fs
    1.82 -	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
    1.83 +	cp -a $install/*	$fs/
    1.84 +	rm -rf			$fs/usr/html
    1.85 +	cp -a stuff/*		$fs
    1.86 +	sed -i 's/#user  nobody;/user  www;/' \
    1.87 +				$fs/etc/nginx/nginx.conf
    1.88  }
    1.89  
    1.90  # Pre and post install commands for Tazpkg.
    1.91  # We stop the server by default in case of upgarde.
    1.92  pre_install()
    1.93  {
    1.94 -	[ -z "$1" ] && for i in httpd lighttpd apache cherokee $PACKAGE ; do
    1.95 +	[ -z "$1" ] &&
    1.96 +	for i in httpd lighttpd apache cherokee $PACKAGE
    1.97 +	  do
    1.98  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
    1.99 -	done
   1.100 -	# Backup config file.
   1.101 -	if [ -d "$1/$CONFIG_FILES" ]; then
   1.102 +	  done
   1.103 +
   1.104 +	# Backup configuration file.
   1.105 +	if [ -d "$1/$CONFIG_FILES" ]
   1.106 +	  then
   1.107  		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
   1.108  	fi
   1.109  }
   1.110 @@ -79,17 +88,22 @@
   1.111  post_install()
   1.112  {
   1.113  	mkdir -p /var/spool/nginx
   1.114 -	# Restore original config.
   1.115 -	if [ -d "$1/$CONFIG_FILES.bak" ]; then
   1.116 +
   1.117 +	# Restore original configuration.
   1.118 +	if [ -d "$1/$CONFIG_FILES.bak" ]
   1.119 +	  then
   1.120  		rm -rf "$1/$CONFIG_FILES"
   1.121  		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
   1.122  	fi
   1.123 +
   1.124  	# Just in case.
   1.125  	chown www.www "$1/var/log/$PACKAGE"
   1.126 -	if [ -z "$1" ]; then
   1.127 -		for i in apache lighttpd ; do
   1.128 +	if [ -z "$1" ]
   1.129 +	  then
   1.130 +		for i in apache lighttpd
   1.131 +		  do
   1.132  			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   1.133 -		done
   1.134 +		  done
   1.135  		/etc/init.d/$PACKAGE start
   1.136  	fi
   1.137  	true