allow extra options to be passed to spawn-fcgi - bug #284698 - thanks dev-zero

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

4 files changed, 18 insertions, 6 deletions

diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog
index 6946046e587b..52b637a2abea 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.20 2009/09/28 08:29:11 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.21 2009/09/28 08:38:02 bangert Exp $
+
+  28 Sep 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd,
+  files/spawn-fcgi.initd:
+  allow for additional spawn-fcgi options - bug #284698
 
 *spawn-fcgi-1.6.3 (28 Sep 2009)
 
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index 91609866d428..65bec4eeeb58 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,10 +1,10 @@
-AUX spawn-fcgi.confd 2277 RMD160 6a8df37d29d84902de4b2acc13cf4cff05b330d8 SHA1 2ef6f39bb1a66f2d13b317932be6b9d7b14e5106 SHA256 e4acdf6918fb350f7de93e594e281f0080cca825afe4c69c135efab89dc1942f
-AUX spawn-fcgi.initd 3050 RMD160 fac623187bad2652685ef8aaf7cd8a76450c4044 SHA1 744cceeb287bf9e8d33daa16748c156371f4b10c SHA256 a6c52f5690f7c0ab1aca01485bf52a98cba652f30d7cf39809e23c827adb9693
+AUX spawn-fcgi.confd 2359 RMD160 1e849334edabec40a2c491cdcf7b9a6fa1aa5c11 SHA1 a0517732944bab1c13abe454a9cc8fbf0f3b6f78 SHA256 562d5f9da68a3f8be53fe4432e8bcde8e2b3297e25b848c46485dfba2b8168ca
+AUX spawn-fcgi.initd 3141 RMD160 9adfd77f7c8750e3cff2506a636ef160e32fb0ab SHA1 739dfe5b0cc4eea57e0946eb8d2f1dd0d3a4b128 SHA256 0ecb6318444b7a203e526033d6755d608718dab2a3c483608680fd178ca5e5b7
 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
 DIST spawn-fcgi-1.6.3.tar.bz2 77607 RMD160 6f3720a5958a503b5c1dc654eaaf23f052a6e4c9 SHA1 95e668079fa9ec144e3d014a50cc978a2d93eb9f SHA256 e6721dc0fa59bb00e05f160406815d53c95e81ac28f7e52fbd36497584f846cd
 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
 EBUILD spawn-fcgi-1.6.3.ebuild 1014 RMD160 d564b85d3fbd462a5553805b2b00aba3350d1809 SHA1 d20c0b90b1db4dfb77b6ddea726ae4a64ca8d91b SHA256 f7fc476fe1637bd147cc1046131a3e8d5cab85073e47f2f10101b55a864225b6
-MISC ChangeLog 3066 RMD160 d6ec684073f501ca779bdae6da8034fccbbd39b5 SHA1 e87c8733d7450e18529ec4963bb3e9e919c4f684 SHA256 aa70832cb1fdb3ddc9e1eb0e56ef447849da300e1ff8a96253d679290cb5d121
+MISC ChangeLog 3223 RMD160 42a25af481e143fd9ba47dcd9f8283c5db42e9ef SHA1 fa717fb149e5b9727c6e1a52ea956eb1b372048b SHA256 2e0373e299ad72387673ce523a5fb1713831a843a89eab71c10cf02489c87281
 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 8f7901234710..c2d3dd3ed82a 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.5 2009/07/03 21:17:11 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.6 2009/09/28 08:38:02 bangert Exp $
 
 # DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
 
@@ -54,6 +54,10 @@ FCGI_CHDIR=
 FCGI_USER=
 FCGI_GROUP=
 
+# Additional options you might want to pass to spawn-fcgi
+#
+#FCGI_EXTRA_OPTIONS=
+
 # If your application requires additional environment variables, you may
 # specify them here. See PHP example below.
 #
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd
index 0d6abd0e784d..0b138cecca7e 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.10 2009/07/03 21:17:10 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.11 2009/09/28 08:38:02 bangert Exp $
 
 PROGNAME=${SVCNAME#*.}
 SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -73,6 +73,10 @@ start() {
 		OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
 	fi
 
+	if [ -n "${FCGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${FCGI_EXTRA_OPTIONS}"
+	fi
+
 	unset E
 	for i in ${ALLOWED_ENV}; do
 		local j