diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2007-06-18 07:08:46 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2007-06-18 07:08:46 +0000 |
| commit | b2dd0344b27c38469bca51690ab58ca5dd7f703b (patch) | |
| tree | ed0c74b5ccc594ce01edde82226ca2edfd4c9480 | |
| parent | - Update to 3.0 (diff) | |
Update to 0.5.26.
Fix rc script functionality for extra configtest_cmd command. (*)
<ChangeLog>
*) Bugfix: in SSI parsing.
</ChangeLog>
Spotted by: Andrey Y. Ostanovsky < andrey at ostanovsky dot spb dot ru > (*)
Notes
Notes:
svn path=/head/; revision=193757
| -rw-r--r-- | www/nginx/Makefile | 3 | ||||
| -rw-r--r-- | www/nginx/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx/files/nginx.sh.in | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 6af874e6a5a8..de7ba32cdc59 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 0.5.25 -PORTREVISION= 2 +PORTVERSION= 0.5.26 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ MASTER_SITES+= ${MASTER_SITE_LOCAL} diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 810b62065654..22463ed2f915 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,3 +1,3 @@ -MD5 (nginx-0.5.25.tar.gz) = de49b8521d79e7774c89a9268ae5a89a -SHA256 (nginx-0.5.25.tar.gz) = 21aa716b0ed5d60ab7baa1475eda1f236d02b2cdac363f595b45cdf15a636c37 -SIZE (nginx-0.5.25.tar.gz) = 471439 +MD5 (nginx-0.5.26.tar.gz) = 6fa28b4e752208a47257982731e23983 +SHA256 (nginx-0.5.26.tar.gz) = 90f143b1e07af27cdceb60ed69b88cb6720d622ddc2ee93fd30c8a831441bb1d +SIZE (nginx-0.5.26.tar.gz) = 471489 diff --git a/www/nginx/files/nginx.sh.in b/www/nginx/files/nginx.sh.in index dcbd00d0213c..69e3405162b0 100644 --- a/www/nginx/files/nginx.sh.in +++ b/www/nginx/files/nginx.sh.in @@ -23,22 +23,22 @@ name="nginx" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/nginx" +load_rc_config $name + +pidfile="${nginx_pidfile}" + extra_commands="configtest reload" configtest_cmd="configtest_cmd" configtest_cmd() { echo "Configuration syntax test for ${name}." - if ${command} -t; then + if ${command} ${nginx_flags} -t; then : else err 8 "FATAL: bad config for ${name}" fi } -load_rc_config $name - -pidfile="${nginx_pidfile}" - start_cmd="echo \"Starting ${name}.\"; /usr/bin/limits -U www ${command} ${nginx_flags}" run_rc_command "$1" |