From ae6b33cae60aa1e5a1c49dd698274ccaa3fc8d0d Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Wed, 30 Jul 2008 15:21:16 +0000 Subject: [PATCH] Update from 0.7.6 to 0.7.7. Remove useless function from rc script. Cleanup whitespaces. *) Change: now the EAGAIN error returned by connect() is not considered as temporary error. *) Change: now the $ssl_client_cert variable value is a certificate with TAB character intended before each line except first one; an unchanged certificate is available in the $ssl_client_raw_cert variable. *) Feature: the "ask" parameter in the "ssl_verify_client" directive. *) Feature: byte-range processing improvements. Thanks to Maxim Dounin. *) Feature: the "directio" directive. *) Feature: MacOSX 1.5 sendfile() support. *) Bugfix: now in MacOSX and Cygwin locations are tested in case insensitive mode; however, the compare is provided by single-byte locales only. *) Bugfix: mail proxy SSL connections hanged, if select, poll, or /dev/poll methods were used. *) Bugfix: UTF-8 encoding usage in the ngx_http_autoindex_module. --- www/nginx-devel/Makefile | 3 +-- www/nginx-devel/distinfo | 6 +++--- www/nginx-devel/files/nginx.sh.in | 20 ++++++-------------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 352b86a77dc1..259f135965a4 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 0.7.6 -PORTREVISION= 2 +PORTVERSION= 0.7.7 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ MASTER_SITES+= ${MASTER_SITE_LOCAL} diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index ef7b4044ede2..658c1c87935a 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (nginx-0.7.6.tar.gz) = ae7ce6f66a2cf5a5970d9a9a0da0cf7d -SHA256 (nginx-0.7.6.tar.gz) = 1abbff9910ae7f518cbe65e3e47f70278eb5db26018aca839c4934018f0effec -SIZE (nginx-0.7.6.tar.gz) = 528488 +MD5 (nginx-0.7.7.tar.gz) = 42a5b70651e5421ec53cba930f613c8d +SHA256 (nginx-0.7.7.tar.gz) = 11b5d6267d5e19ce6051b6d72c7df90b0ef8aa903b7370d484ed113e428d3270 +SIZE (nginx-0.7.7.tar.gz) = 534497 diff --git a/www/nginx-devel/files/nginx.sh.in b/www/nginx-devel/files/nginx.sh.in index 80d1f1f724b6..b87ef0a8b295 100644 --- a/www/nginx-devel/files/nginx.sh.in +++ b/www/nginx-devel/files/nginx.sh.in @@ -35,11 +35,11 @@ _pidprefix="/var/run/nginx" pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/nginx/nginx.conf -[ -z "$nginx_enable" ] && nginx_enable="NO" -[ -z "$nginx_profiles" ] && nginx_profiles="" -[ -z "$nginx_flags" ] && nginx_flags="" -[ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" -[ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" +[ -z "$nginx_enable" ] && nginx_enable="NO" +[ -z "$nginx_profiles" ] && nginx_profiles="" +[ -z "$nginx_flags" ] && nginx_flags="" +[ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" +[ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" load_rc_config $name @@ -77,14 +77,6 @@ else fi fi -nginx_requirepidfile() -{ - if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then - echo "${name} not running? (check $pidfile)." - exit 1 - fi -} - nginx_checkconfig() { echo "Performing sanity check on nginx configuration:" @@ -117,7 +109,7 @@ nginx_precmd() eval `/usr/bin/limits ${nginxlimits_args}` 2>/dev/null else return 0 - fi + fi } extra_commands="reload configtest upgrade"