Date: Mon, 13 Apr 2009 19:20:03 GMT From: "Dmitry V. Reshetnikov" <genserg@hotmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/133711: [maintainer update] www/spawn-fcgi Message-ID: <200904131920.n3DJK3xk001023@www.freebsd.org> Resent-Message-ID: <200904131930.n3DJU3WY066869@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133711 >Category: ports >Synopsis: [maintainer update] www/spawn-fcgi >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 13 19:30:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dmitry V. Reshetnikov >Release: 7.2-BETA1 >Organization: >Environment: FreeBSD epsilon.home.local 7.2-BETA1 FreeBSD 7.2-BETA1 #0: Tue Mar 31 21:01:09 UTC 2009 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN spawn-fcgi.bak/Makefile spawn-fcgi/Makefile --- spawn-fcgi.bak/Makefile 2009-04-13 11:15:00.000000000 +0400 +++ spawn-fcgi/Makefile 2009-04-13 22:51:39.000000000 +0400 @@ -6,7 +6,7 @@ # PORTNAME= spawn-fcgi -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 CATEGORIES= www MASTER_SITES= http://www.lighttpd.net/download/ \ http://mirrors.cat.pdx.edu/lighttpd/ diff -ruN spawn-fcgi.bak/distinfo spawn-fcgi/distinfo --- spawn-fcgi.bak/distinfo 2009-04-13 11:15:00.000000000 +0400 +++ spawn-fcgi/distinfo 2009-04-13 21:48:07.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (spawn-fcgi-1.6.0.tar.bz2) = 06fcafdb87aeb5dc9b8f0f91632ae748 -SHA256 (spawn-fcgi-1.6.0.tar.bz2) = 8321de784b3c4d3108d49795029aae2acdc6b2eee8fce7c2837989762f9e04f3 -SIZE (spawn-fcgi-1.6.0.tar.bz2) = 69691 +MD5 (spawn-fcgi-1.6.1.tar.bz2) = ae893d12943fd4cd38a0a38835263c80 +SHA256 (spawn-fcgi-1.6.1.tar.bz2) = 81301b74d66b8083f23e9c1e39d42fe71995cdf3d06d3beecf3a81a1782f523c +SIZE (spawn-fcgi-1.6.1.tar.bz2) = 71975 diff -ruN spawn-fcgi.bak/files/spawn-fcgi.sh.in spawn-fcgi/files/spawn-fcgi.sh.in --- spawn-fcgi.bak/files/spawn-fcgi.sh.in 2009-04-13 11:15:00.000000000 +0400 +++ spawn-fcgi/files/spawn-fcgi.sh.in 2009-04-13 22:39:00.000000000 +0400 @@ -14,7 +14,7 @@ load_rc_config $name : ${spawn_fcgi_enable="NO"} -: ${spawn_fcgi_app=""} +: ${spawn_fcgi_app="%%LOCALBASE%%/bin/php-cgi"} : ${spawn_fcgi_pidfile="/var/run/spawn-fcgi.pid"} : ${spawn_fcgi_user="www"} : ${spawn_fcgi_group="www"} @@ -23,27 +23,27 @@ : ${spawn_fcgi_children="5"} : ${spawn_fcgi_max_requests="1000"} : ${spawn_fcgi_allowed_env=""} - +: ${spawn_fcgi_path_env="/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin"} command="/usr/local/bin/spawn-fcgi" command_args="-u ${spawn_fcgi_user} -g ${spawn_fcgi_group} -a ${spawn_fcgi_bindaddr} -p ${spawn_fcgi_bindport} -P ${spawn_fcgi_pidfile} -- ${spawn_fcgi_app}" pidfile=${spawn_fcgi_pidfile} +procname=${spawn_fcgi_app} _allowed_env="PATH USER PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS" _allowed_env="${_allowed_env} ${spawn_fcgi_allowed_env}" start_precmd="${name}_start_precmd" -stop_cmd="${name}_stop_cmd" stop_postcmd="${name}_stop_postcmd" spawn_fcgi_start_precmd() { touch ${pidfile} chown ${spawn_fcgi_user}:${spawn_fcgi_group} ${pidfile} - export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin + export PATH=${spawn_fcgi_path_env} + export USER=${spawn_fcgi_user} export PHP_FCGI_CHILDREN=${spawn_fcgi_children} export PHP_FCGI_MAX_REQUESTS=${spawn_fastcgi_max_requests} - export USER=${spawn_fcgi_user} E= for i in ${_allowed_env}; do eval _val="\$$i" @@ -55,12 +55,6 @@ command="env - ${E} ${command}" } -spawn_fcgi_stop_cmd() -{ - read rc_pid < ${pidfile} - kill ${sig_stop} ${rc_pid} -} - spawn_fcgi_stop_postcmd() { rm -f ${pidfile} >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904131920.n3DJK3xk001023>