From: Ole Markus With <olemarkus@gentoo.org>
Date: Tue, 6 Dec 2011 12:27:26 +0000 (+0000)
Subject: Migrated changes from issue 390307
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b85e8f8fd192c91d12b5fe4769a1af587943109b;p=gentoo.git

Migrated changes from issue 390307

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64
---

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index c795de7d203f..abf2aba4ee80 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.523 2011/11/25 09:10:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.524 2011/12/06 12:27:26 olemarkus Exp $
+
+  06 Dec 2011; Ole Markus With <olemarkus@gentoo.org> -files/php-fpm.init,
+  files/php-fpm-r4.init:
+  Migrated changes from issue 390307
 
 *php-5.4.0_rc2 (25 Nov 2011)
 *php-5.3.9_rc2 (25 Nov 2011)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 480093bdf44b..0e9a05aa0c71 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -20,8 +20,7 @@ AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1f
 AUX eblits/src_prepare-v4.eblit 2317 RMD160 22833c1caa6f7530230b0809e119eeb2dbba7b27 SHA1 2f7a5fdd113cdf026de5b565fb073e3968db946b SHA256 7c18252a49a6d8e071471d14624f284d7b3ad8b95cad4a001e10e6e521f4c9b1
 AUX eblits/src_test-v1.eblit 1530 RMD160 10031a5128dab729106c6fbfe4e899b1583818cb SHA1 0f1abf995913c2c381e2496b8670ea4f6e97964b SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c
 AUX php-fpm-r1.conf 12966 RMD160 2710840ccbd847f74af0486929b6b9af87bf2c51 SHA1 4f0cca8cf24936012c9ee5cb2eaa1a0b391e77b3 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c
-AUX php-fpm-r4.init 954 RMD160 19a097406bd82fec0a75175fa000c1f6c7757b0d SHA1 cfa42214e35e9abe8bfe099b5aec35ca2230b6ad SHA256 aba14f04126f474d5809b9a7976aca65c6ec895896de736b606c798c4aa04366
-AUX php-fpm.init 1157 RMD160 19b129c9254efcbba39d4bf3f77745681497a34d SHA1 0b4b5ba0f10ca1dedc2ea6143781b3bc6fa5915c SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7
+AUX php-fpm-r4.init 1157 RMD160 19b129c9254efcbba39d4bf3f77745681497a34d SHA1 0b4b5ba0f10ca1dedc2ea6143781b3bc6fa5915c SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
 DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2
@@ -43,16 +42,16 @@ EBUILD php-5.3.9_rc1.ebuild 11665 RMD160 bd460ad19d1b84e6cc630c1e1410fb0dd925f78
 EBUILD php-5.3.9_rc2.ebuild 11665 RMD160 563d90227f056c652cf253d9e27871f5d8d31848 SHA1 c4d35d26b093eb755eea718f5ef8f1a7c0d57b51 SHA256 46161ffab07a39f26b4e7aa889a755ad4b2e3c5b17ff9dc2588f67358df77bf9
 EBUILD php-5.4.0_rc1.ebuild 8579 RMD160 35d43804cf6af0af3b14c47824b08b98b25a4118 SHA1 3f32b99e456ef6577079f0b57d923dbf9de4481c SHA256 4ae41e327bc363abd7b9ffb4c869256b661fc4a21a8beb18015bec9150609267
 EBUILD php-5.4.0_rc2.ebuild 8579 RMD160 8a1b5ca093cdf2ead9c4b38dc77ccf5257dfe17f SHA1 5b7de2434874f855149fae69aff0c238257c6a7c SHA256 3a7415d6255b02f4d46e90f5a9e14d16da3b25b3d159df92e3b419b99931554b
-MISC ChangeLog 89299 RMD160 1c0bd8eeea710f49d1e6502d81f3cf26cb99169c SHA1 309085ce7368ee1b713498f954e9b58ee5245225 SHA256 5a6b03fa983fb2ccebcdbf7a07604f078b5b999f6a15bfb67e49e7d1adc44e6e
+MISC ChangeLog 89437 RMD160 5945de075de9043d71a0337bfd91434c2b170dc3 SHA1 68df7c9ba7a24991a55d13f5ad3efb83b5bf85ed SHA256 ab28e2a9207efe3155fc4f373567fef8cea240a36aea87c609ebb2d297c1c11e
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOz1yOAAoJEGurSuXEqSv1bvMIAI7sNXpy5ddOiBEiGZmP0AWW
-nlEEae+WNZm6Xgw0nUK4gRp0PZ5kFekrm1F2N9nz82OUs3/PJxBpNqi0PnOx3TFU
-DZWaPnOH+W7M/FGjlIgqzjraS5wo1kdEXHPHnjVMlMp/8K1xGorxkPwJnHGXDp+c
-cfaMaT1UGk6qjHVC+wvGDWfdcHYOik5J37CFXSId6w1khSCHmVpAF/GJq16avzmO
-r/+nd1ICU45hUD7XngcDrbsvDHaFWdZGEzA8WzpBSlqxLRIGqb1YWqy9SKRns6n2
-awaZNbjlfFkWIbCIGB2uu2khLW4xFAWnVcj8EXY7h/kcmc6zyXsDU6RMQePQazU=
-=dZPo
+iQEcBAEBAgAGBQJO3go5AAoJEGurSuXEqSv1PAQH/AzjIzpB8Vpa3mhWALFnqYwb
+ez4wH5DvBCvhVtWdV8Mu3yHIlSsiDpMX5qmIsO3grrxk7A6M3uRGzBlDE/tZdCsp
+kQ/HqW3w/CkgfWpB1FyD31t7PA7n7gVE4CqM2Tb0kNX4eT1GEwwLwGMCIBG1BKdK
+HTqhEA2xKRzs3KG/2gZOnpiTxP5DXcvccK/LtYsF/XNekXHn3GKB/WR3iAx3UWpP
+8YzxEEP/8eo36HR8LPz+GWBriAHU0IqpUMwV7cmGsLYg899TdEE3G/zEnGRAhafc
+75jjoSr3pR+2Z91o4S6lCF48guQ5RwxCK5AWsKY2KbPDfOJZAZOGfNgmApVtwIk=
+=q6bL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init
index 249df0f880a4..a186d83478c5 100755
--- a/dev-lang/php/files/php-fpm-r4.init
+++ b/dev-lang/php/files/php-fpm-r4.init
@@ -1,12 +1,15 @@
 #!/sbin/runscript
 
-PHPSLOT="php5.3"
+set_phpvars() {
+	PHPSLOT=${SVCNAME#php-fpm-}
+	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
 
-PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-
-PHP_FPM_PID="/var/run/php-fpm.pid"
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+}
 
-opts="depend start stop reload"
+extra_commands="depend"
+extra_started_commands="reload"
 
 depend() {
 	need net
@@ -15,8 +18,9 @@ depend() {
 
 start() {
         ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
         start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
-            /usr/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
         local i=0
         local timeout=5
         while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
@@ -30,12 +34,14 @@ start() {
 
 stop() {
         ebegin "Stopping PHP FastCGI Process Manager"
-        start-stop-daemon --signal QUIT --stop --exec /usr/bin/php-fpm --pidfile ${PHP_FPM_PID}
+	set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
         eend $?
 }
 
 reload() {
     ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
     [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
     eend $?
 }
diff --git a/dev-lang/php/files/php-fpm.init b/dev-lang/php/files/php-fpm.init
deleted file mode 100755
index a186d83478c5..000000000000
--- a/dev-lang/php/files/php-fpm.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-
-set_phpvars() {
-	PHPSLOT=${SVCNAME#php-fpm-}
-	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
-
-	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
-}
-
-extra_commands="depend"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use apache2 lighttpd nginx
-}
-
-start() {
-        ebegin "Starting PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
-            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
-        local i=0
-        local timeout=5
-        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
-            sleep 1
-            i=$(($i + 1))
-        done
-        
-        [ $timeout -gt $i ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
-        eend $?
-}
-
-reload() {
-    ebegin "Reloading PHP FastCGI Process Manager"
-    set_phpvars
-    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
-    eend $?
-}