wok 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 | eeb3f2dda9df |
| children | 2e9639a37ee1 |
| files | nginx-extras/receipt nginx/receipt |
line diff
1.1 --- a/nginx-extras/receipt Tue Mar 24 17:21:46 2020 +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
2.1 --- a/nginx/receipt Tue Mar 24 17:21:46 2020 +0100 2.2 +++ b/nginx/receipt Wed Mar 25 08:10:44 2020 +0100 2.3 @@ -1,21 +1,23 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="nginx" 2.7 -VERSION="1.9.4" 2.8 +VERSION="1.16.0" 2.9 CATEGORY="network" 2.10 -SHORT_DESC="Asynchronous HTTP server designed for heavy loads + mail proxy." 2.11 +SHORT_DESC="Asynchronous HTTP server designed for heavy loads and mail proxy." 2.12 MAINTAINER="pascal.bellard@slitaz.org" 2.13 LICENSE="BSD" 2.14 +WEB_SITE="https://nginx.org/" 2.15 + 2.16 +TARBALL="$PACKAGE-$VERSION.tar.gz" 2.17 +WGET_URL="${WEB_SITE}download//$TARBALL" 2.18 + 2.19 +PROVIDE="lighttpd" 2.20 SUGGESTED="php perl python" 2.21 -TARBALL="$PACKAGE-$VERSION.tar.gz" 2.22 -WEB_SITE="http://nginx.org/" 2.23 -WGET_URL="${WEB_SITE}download//$TARBALL" 2.24 -PROVIDE="lighttpd" 2.25 +DEPENDS="openssl pcre zlib" 2.26 +BUILD_DEPENDS="openssl-dev pcre-dev zlib-dev" 2.27 + 2.28 CONFIG_FILES="/etc/nginx" 2.29 2.30 -DEPENDS="pcre openssl zlib" 2.31 -BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev" 2.32 - 2.33 # Rules to configure and make the package. 2.34 compile_rules() 2.35 { 2.36 @@ -34,21 +36,23 @@ 2.37 # --with-http_perl_module enable ngx_http_perl_module 2.38 # --with-google_perftools_module enable ngx_google_perftools_module 2.39 2.40 - ./configure --prefix=/usr \ 2.41 - --conf-path=/etc/nginx/nginx.conf \ 2.42 - --pid-path=/var/run/nginx.pid \ 2.43 - --lock-path=/var/lock/nginx.lock \ 2.44 - --error-log-path=/var/log/nginx/error.log \ 2.45 - --http-log-path=/var/log/nginx/access.log \ 2.46 - --http-client-body-temp-path=/var/spool/nginx/body \ 2.47 - --http-proxy-temp-path=/var/spool/nginx/proxy \ 2.48 - --http-fastcgi-temp-path=/var/spool/nginx/fastcgi \ 2.49 - --with-http_stub_status_module \ 2.50 - --with-http_flv_module \ 2.51 - --with-http_ssl_module \ 2.52 - --with-http_dav_module \ 2.53 - --with-mail --with-mail_ssl_module \ 2.54 - --user=80 --group=80 && 2.55 + ./configure \ 2.56 + --prefix=/usr \ 2.57 + --conf-path=/etc/nginx/nginx.conf \ 2.58 + --pid-path=/var/run/nginx.pid \ 2.59 + --lock-path=/var/lock/nginx.lock \ 2.60 + --error-log-path=/var/log/nginx/error.log \ 2.61 + --http-log-path=/var/log/nginx/access.log \ 2.62 + --http-client-body-temp-path=/var/spool/nginx/body \ 2.63 + --http-proxy-temp-path=/var/spool/nginx/proxy \ 2.64 + --http-fastcgi-temp-path=/var/spool/nginx/fastcgi \ 2.65 + --with-http_stub_status_module \ 2.66 + --with-http_flv_module \ 2.67 + --with-http_ssl_module \ 2.68 + --with-http_dav_module \ 2.69 + --with-mail --with-mail_ssl_module \ 2.70 + --user=80 \ 2.71 + --group=80 && 2.72 make && 2.73 make DESTDIR=$DESTDIR install 2.74 } 2.75 @@ -57,21 +61,26 @@ 2.76 # On SliTaz Lighttpd runs as user/group : www/www or 80/80. 2.77 genpkg_rules() 2.78 { 2.79 - cp -a $install/* $fs/ 2.80 - rm -rf $fs/usr/html 2.81 - cp -a stuff/* $fs 2.82 - sed -i 's/#user nobody;/user www;/' $fs/etc/nginx/nginx.conf 2.83 + cp -a $install/* $fs/ 2.84 + rm -rf $fs/usr/html 2.85 + cp -a stuff/* $fs 2.86 + sed -i 's/#user nobody;/user www;/' \ 2.87 + $fs/etc/nginx/nginx.conf 2.88 } 2.89 2.90 # Pre and post install commands for Tazpkg. 2.91 # We stop the server by default in case of upgarde. 2.92 pre_install() 2.93 { 2.94 - [ -z "$1" ] && for i in httpd lighttpd apache cherokee $PACKAGE ; do 2.95 + [ -z "$1" ] && 2.96 + for i in httpd lighttpd apache cherokee $PACKAGE 2.97 + do 2.98 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 2.99 - done 2.100 - # Backup config file. 2.101 - if [ -d "$1/$CONFIG_FILES" ]; then 2.102 + done 2.103 + 2.104 + # Backup configuration file. 2.105 + if [ -d "$1/$CONFIG_FILES" ] 2.106 + then 2.107 cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak" 2.108 fi 2.109 } 2.110 @@ -79,17 +88,22 @@ 2.111 post_install() 2.112 { 2.113 mkdir -p /var/spool/nginx 2.114 - # Restore original config. 2.115 - if [ -d "$1/$CONFIG_FILES.bak" ]; then 2.116 + 2.117 + # Restore original configuration. 2.118 + if [ -d "$1/$CONFIG_FILES.bak" ] 2.119 + then 2.120 rm -rf "$1/$CONFIG_FILES" 2.121 mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES" 2.122 fi 2.123 + 2.124 # Just in case. 2.125 chown www.www "$1/var/log/$PACKAGE" 2.126 - if [ -z "$1" ]; then 2.127 - for i in apache lighttpd ; do 2.128 + if [ -z "$1" ] 2.129 + then 2.130 + for i in apache lighttpd 2.131 + do 2.132 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 2.133 - done 2.134 + done 2.135 /etc/init.d/$PACKAGE start 2.136 fi 2.137 true