diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-04-09 19:48:39 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-04-09 19:48:39 +0000 |
| commit | 36c0460cd141557ed00a3161ea758e32db4323df (patch) | |
| tree | fcc0ac7486ffaf19d19aa1a3f22326354dfb948b /www-servers/spawn-fcgi | |
| parent | Version bump. (diff) | |
| download | historical-36c0460cd141557ed00a3161ea758e32db4323df.tar.gz historical-36c0460cd141557ed00a3161ea758e32db4323df.tar.bz2 historical-36c0460cd141557ed00a3161ea758e32db4323df.zip | |
make multiple environment variables work with stable start-stop-daemon
Package-Manager: portage-2.2_rc26/cvs/Linux i686
Diffstat (limited to 'www-servers/spawn-fcgi')
| -rw-r--r-- | www-servers/spawn-fcgi/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.initd | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog index 3aa5a88d3cb9..b34f8e6e2b91 100644 --- a/www-servers/spawn-fcgi/ChangeLog +++ b/www-servers/spawn-fcgi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/spawn-fcgi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.5 2009/04/09 18:56:03 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.6 2009/04/09 19:48:39 bangert Exp $ + + 09 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.initd: + make multiple environment variables work with stable start-stop-daemon 09 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd, files/spawn-fcgi.initd, spawn-fcgi-1.6.1: diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest index b8330c185830..5f9107c181f2 100644 --- a/www-servers/spawn-fcgi/Manifest +++ b/www-servers/spawn-fcgi/Manifest @@ -1,6 +1,6 @@ AUX spawn-fcgi.confd 2139 RMD160 db0e89fc9602f864cbd21b20b0235d1a4cb48610 SHA1 d0e87700f2387699f598b29a1338990de10193bc SHA256 d2e8246fdbbb6961d4286cf43a1a0e60110a14b215435fc25087a94ef06ad6e3 -AUX spawn-fcgi.initd 2690 RMD160 92a97c46a29a68c08a3ff6843bedd17d2c289688 SHA1 ba51e6cdaa437cfd3e5f7f6dc3348177cd831f50 SHA256 8ba3e5fc9e3b16a764ed880e3cdbbf97e7c385bdf78302ed9b92e213337232d0 +AUX spawn-fcgi.initd 2691 RMD160 2b6eeb90151c877d3d0ad3fdcc1b02ea56e31d9c SHA1 f9d4c8fb6b85fe618ed03840569f94921ae3733a SHA256 ccd01ba42f3698767e025638a1a22fcdfffad5cd7342d26885efa4b3bbe549c0 DIST spawn-fcgi-1.6.1.tar.bz2 71975 RMD160 d906031b3ce40c4a7d682da8acd556f12e8f3fcb SHA1 e18db1367ac1e186972d02e4d9e67a3a34212fc2 SHA256 81301b74d66b8083f23e9c1e39d42fe71995cdf3d06d3beecf3a81a1782f523c EBUILD spawn-fcgi-1.6.1.ebuild 836 RMD160 eaadba7af88122d0ff35394b8d473f068a16ac03 SHA1 d14e466d82fec0688a32af19a2af01b9a25f2830 SHA256 e44cbd0d9022a82a9de12268de13a1a16510d69e48937263a826ee8d4c1eb3fe -MISC ChangeLog 1051 RMD160 7c2f221ead29bade4d9f88013b5df7535ca42334 SHA1 2122c80430369eb3b5ed93cb7beb74bd2d56ae14 SHA256 7a8419748d57beb981a404aced097899c96bff235412d235cdc8abb6077938c9 +MISC ChangeLog 1199 RMD160 9b57d49578c85a6638d89e4ed1c5bd064d02f802 SHA1 117b1e7824ea7421ed4efc19ad006c453ffce15d SHA256 d4719273e564bdf78efa14eef6984f5876e26cd39240ee8f1fa8a1afa5087dea MISC metadata.xml 454 RMD160 6d518892201f5edddc6a83e119384f5c57661d42 SHA1 37c722d45f2473c24620d92f5bc2b31e92f6385c SHA256 dad5c3b31bdf5cffbec7a56402ecc46a9ed1db288f9e27302ca3d53da5b0fe0c diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd index 38cbc2b57f39..d36d1fec651f 100644 --- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd +++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.5 2009/04/09 18:56:04 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.6 2009/04/09 19:48:39 bangert Exp $ PROGNAME=${SVCNAME#*.} SPAWNFCGI=/usr/bin/spawn-fcgi @@ -65,7 +65,7 @@ start() { for i in ${ALLOWED_ENV}; do local j eval j=$(echo \$"$i") - [ -n "${j}" ] && E="${E} -e ${i}=${j}" + [ -n "${j}" ] && E="${E} ${i}=${j}" done ebegin "Starting FastCGI application ${PROGNAME}" @@ -77,7 +77,7 @@ start() { [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" - start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} --name ${FCGI_PROGRAM} -- \ + env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} --name ${FCGI_PROGRAM} -- \ ${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} RETVAL=$? |