strip env (bug #271425)

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 13 insertions, 9 deletions

diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog
index 15132a49b8cc..ccaa82142e2a 100644
--- a/www-servers/spawn-fcgi/ChangeLog
+++ b/www-servers/spawn-fcgi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2009/07/03 21:00:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.19 2009/07/03 21:17:10 bangert Exp $
+
+  03 Jul 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd,
+  files/spawn-fcgi.initd:
+  strip env (bug #271425)
 
   03 Jul 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd,
   files/spawn-fcgi.initd:
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index e7a26d761b4f..32d592142055 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,8 +1,8 @@
-AUX spawn-fcgi.confd 2266 RMD160 01d9bd8d339310244e296b1e3e9304403c96b2ff SHA1 8823d3087b2ef09e479e07b39acdbc6347c6922d SHA256 ea151325fe76d92b2c5cf0ba21c3ae7805bba188a208d227b8a8032475c9710b
-AUX spawn-fcgi.initd 3040 RMD160 383bc8961685938bd347ff1862c5aa231cbdf67c SHA1 5951545f95d3fdcbd3591a2d95c95242a9c938c1 SHA256 2be7940e519b00981e6f07642f2256f874f47a53de324efcb00278956d0a5a6d
+AUX spawn-fcgi.confd 2277 RMD160 6a8df37d29d84902de4b2acc13cf4cff05b330d8 SHA1 2ef6f39bb1a66f2d13b317932be6b9d7b14e5106 SHA256 e4acdf6918fb350f7de93e594e281f0080cca825afe4c69c135efab89dc1942f
+AUX spawn-fcgi.initd 3050 RMD160 fac623187bad2652685ef8aaf7cd8a76450c4044 SHA1 744cceeb287bf9e8d33daa16748c156371f4b10c SHA256 a6c52f5690f7c0ab1aca01485bf52a98cba652f30d7cf39809e23c827adb9693
 DIST spawn-fcgi-1.6.1.tar.bz2 71975 RMD160 d906031b3ce40c4a7d682da8acd556f12e8f3fcb SHA1 e18db1367ac1e186972d02e4d9e67a3a34212fc2 SHA256 81301b74d66b8083f23e9c1e39d42fe71995cdf3d06d3beecf3a81a1782f523c
 DIST spawn-fcgi-1.6.2.tar.bz2 73169 RMD160 7a0986a9254646e7c635c086ef055b0f9a00a458 SHA1 475e9d9bff7ab31c29d082cc214cea66e04da690 SHA256 fd9b790dc7692985fcf552e4b6349b0d6872b822450169719192d7a73f6565c0
 EBUILD spawn-fcgi-1.6.1-r1.ebuild 887 RMD160 acc68e27978e34c258086f352c91235ccadf216e SHA1 837201708713c51d2bf467683aa02ec09fbbb170 SHA256 56a9a3ff3bd1f697cdb2606de15e082fbc028b0eee6e2f767bc279553711d663
 EBUILD spawn-fcgi-1.6.2.ebuild 942 RMD160 350a6215eb218918c5589a2a83567344e4c1305b SHA1 effa2d055f7f74e5944a6c8c70d5049e9a4346e7 SHA256 739025585dbb2743d4f1e5a6383fc30241ee6e29d7f3b5ef2b4b56cac737ccd0
-MISC ChangeLog 2814 RMD160 5a57eb6e7e4623fa3c0c176a0ced6c6118063cfb SHA1 f45292e62ee4cc089b891f8a6ea9058e57ff8fc7 SHA256 bd6e13ea942939807b3640acc0a2a0cf98cbecd0429bcd6c345ed1ffaf634014
+MISC ChangeLog 2941 RMD160 bbb6415a28f5e731a919edae7d0fb08500a9a0fb SHA1 b620e50afd9ae7a5ce0e6e2f3b30b3e8ff7fa1f5 SHA256 2adb8c38138a5ab74ae288e7b54bf3700aee0223cb51759d64ed5ded11d30078
 MISC metadata.xml 454 RMD160 6d518892201f5edddc6a83e119384f5c57661d42 SHA1 37c722d45f2473c24620d92f5bc2b31e92f6385c SHA256 dad5c3b31bdf5cffbec7a56402ecc46a9ed1db288f9e27302ca3d53da5b0fe0c
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.confd b/www-servers/spawn-fcgi/files/spawn-fcgi.confd
index 6605d8610827..8f7901234710 100644
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.confd
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.confd
@@ -1,6 +1,6 @@
 # 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.confd,v 1.4 2009/07/03 21:00:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.5 2009/07/03 21:17:11 bangert Exp $
 
 # DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
 
@@ -57,7 +57,7 @@ FCGI_GROUP=
 # If your application requires additional environment variables, you may
 # specify them here. See PHP example below.
 #
-ALLOWED_ENV=
+ALLOWED_ENV="PATH"
 
 # PHP ONLY :: These two options are specific to PHP. The first is the number
 # of child processes to spawn. The second is the number of requests to be
@@ -67,4 +67,4 @@ ALLOWED_ENV=
 #PHP_FCGI_MAX_REQUESTS=500
 #
 # For this to work you would set
-# ALLOWED_ENV="PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS"
+# ALLOWED_ENV="PATH PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS"
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd
index 7e6c0e263445..0d6abd0e784d 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.9 2009/07/03 21:00:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.10 2009/07/03 21:17:10 bangert Exp $
 
 PROGNAME=${SVCNAME#*.}
 SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -89,7 +89,7 @@ start() {
 		[ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
 		[ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
 
-		env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
+		env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
 			--name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
 			-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
 		RETVAL=$?