Update app-eselect/eselect-php-0.9.2

4 files changed, 74 insertions, 2 deletions

diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 30909135..280250cc 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -4,6 +4,7 @@ AUX php-fpm-launcher 134 SHA256 d7e944a016a8a282b9a684de1820c8e5c00791c27471a528
 AUX php-fpm-r1.init 1207 SHA256 59ac0166b12eb454b6d0c92694b3d54cce3b3fb92cc0c9fbe0ac9f9ed9ca2cc5 SHA512 ec8f2d74e4c4c7f36bb9207386bbc4f705547829e2e0282f2799d224f42ebc6ee3a021b6be6e6597b16bf64316421687de80eb446134e42c6c7310d4027725af WHIRLPOOL 751cd97fe962ba7177f346a4280b619c98b622214df6d9a626519d29e2a3ae71e292e1ff5fb384b9ff570865087f877f61dee017b101c409e3d743e0ab228c76
 AUX php-fpm.conf 33 SHA256 99f2c030d6d37c8f846c9d06ac1953d82750725f2eaff65dded5e0e2a1e2556a SHA512 5c5bcc95343ffc31066276eca98a771082a27e3d015827a97d3d9d6cd837c41064a560cedd92df2388a4f2c139a0bfe5ead8e5e27f4b8149a1b6beb60a01a5a5 WHIRLPOOL bf9e56395425224c8f08680e12e5ba33d6c3ca7be036a2d93db473221e610440b191992ac1ab40185e944c2bbda288fde2cacf12905250ea895a6c48e0679312
 AUX php-fpm.init-r4 1912 SHA256 829550c8c4a0b34e4fc1cb178470edc5ff0b8b80aa29a695fed0064ab728d855 SHA512 17d2da0d5e74af8c063396a99e7e7370a1fda10ec96780aafc9cf900660d50ee2eceb3194d531431a8db8a529f68a8c688697b00c5ab3f0319464001590c8449 WHIRLPOOL cafb1f7aa2f953216b812f2e7f4d8b9f8ae18c64de9ccdfb3f1883b4b43197844b90c7c4bdda5ddc0f3469ce8470a5a7e607cd7b5704902d3e431a9c6a7facd2
+AUX php-fpm.init-r5 1962 SHA256 10035ae4fc6391b6f5052460c99a9ef966f91b09a6ff675ae0d262a8a2bf6719 SHA512 3fae1df17a93fac24ab14c4f27fa5ea2e8798f9c9d8c69c9abf310cc0ab2cd8725fc8788f43f3dbbc2680ef174ac8e37375a99b1657eeeba5bbdc96495bb2bdf WHIRLPOOL b0cb20c8f80dfac9a38afed9d387cc264fbc326fb969802d71a491b4abc4f5b615b9ed47f27a8a01eca978f060bc3b0d8e628288698facc12eeadcb4cdf6e305
 AUX php-fpm_at.service 321 SHA256 2bd9ae1dacba4db39c4dc39000c6450234dd6fce06be6fe32cbd6adb96d56b50 SHA512 298c05211748212b00ea9b1debb1cde04df0ca3bde6ee5e30634c510e4c4bdc5bf8dcb998f63a5a3bb232dabb53ebc105ab5bd10c4de21863b5744363d80cbe6 WHIRLPOOL 415686e54ac9da2b051ba5a1c9a65952d683f03f7e434c4a8f74f5176a5d591f570b5fb1314e4b793568ff3d6eac944d9e12e4b71dc31447f36a8e3d6845630d
 DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b
 DIST eselect-php-0.9.1.tar.xz 47548 SHA256 0c9768c9dd361dd3910f26e11956fc2121467ab56c52ba80d7620b1d757bc143 SHA512 bea84b4ae386d60cea2703d1b1c2a91bdc19188dfe151619750a1979dcfbdf2a2ada05d87faa7e0f371ab003e05be6fc7dd15f96459ae6e998c62e6d5caeb64a WHIRLPOOL 3d74edfa6962942836aa3823e9901b461433ce57f2fcb624eb1652b36245599a1bc076db5cb902b675747f2255f00ac887a5e35859dbcf62279944595ea02d6c
@@ -12,4 +13,4 @@ EBUILD eselect-php-0.7.1-r2.ebuild 1358 SHA256 e6b2bcea9ab338b8356d3df97370451da
 EBUILD eselect-php-0.7.1-r3.ebuild 1285 SHA256 e01dfaed85ae348cf88d3954753509b0021138d2d5e289edabb4608ca66062ba SHA512 cd1268b9dd6fb070d24cd0beaa06adeaf977cfdce379532c01b4a4a6301e02b08854ee10d5f23b753ca43a390f520027aba736bef82022de9e761a6c6b509501 WHIRLPOOL 4b5220c024fb1e41b82813983e98cf24c86bcea15f86f3959f0ddcecd88a875ca91234618e9365f92ae4f88169b0e8748dce8306ae889bdfd7ef422e51d540a5
 EBUILD eselect-php-0.7.1-r4.ebuild 1322 SHA256 2dd6f164e481eba402052bd5fab9fdd73e689df0e42ddd66955f8174cd3de959 SHA512 29a6dd0bca9c379587fe0203e5dbd4fc50b1bb1ab6ae940934ceead545b144291f622a79381df0e73ead17185c7fbf85ca1124b0e2fa6bd39fe284176ad9396a WHIRLPOOL 90c1d7de188905810b7505aa65ab809e0d50e9ff01863ebe062e14724c1af05060b3af0e58a46d29f31df6a240dd64f422e4d862b96c00be14fa77a1c10e554e
 EBUILD eselect-php-0.9.1.ebuild 2163 SHA256 584968ed9f54b39b002cf81a74e26d8bac0b16e393d4f6a65a8e79e391882eb8 SHA512 21820945f49dec26e972434ba21873fc20d02c22a076b4569913b189ad41b03f1a1dc34f30f1697bac7d8180e6ac47572f31ad4203a897df448382035d0e6ad9 WHIRLPOOL 00bb937fcbe2a5fd50a86b9a34f0a8c5e9e15f437efc46cde94acccac3a9875b671cdf29284596f0980e5ceaae5b85709336501c5b36ae3cea09342b19397ed6
-EBUILD eselect-php-0.9.2.ebuild 2061 SHA256 58820f694a5a506f21fa00dca829c8565ca2a9dab1afa8728292d7da40cc7fed SHA512 f058baeb4eeaf0bd015b35b2bd57f69f5e7fd5705602a050e8cf35a9db9e73ac703d0f5d4a1b3e6a6e79a0670c44c51ad29594d23b0d05cfbd0c7ee46d767d2c WHIRLPOOL 8e3aba24bf2350f8edbdfd52eac33f09079004acdc644472a8a534cfab3ee96827ac39528a8ad9bcee9a2aa08c81dd66a52928b8af2b2f70b23cbdc0ec6fe7c2
+EBUILD eselect-php-0.9.2.ebuild 2064 SHA256 50d5edc0aa13a3fb460f9ae68606822fde6a6d83aa9a65d288d516853bda0deb SHA512 02054b2ff3f193ccc28697f0ed292ac8d22006e82985628dd44ae5b9f742da6bfcd0b44f41636726643fcf2da49827331d2d2a4332795745ce175132935df073 WHIRLPOOL 7e66c937476d22ec498bc3b6e86e4b6e0771410dc334398667d21233686199a76b3d0b91493b6cb69dd9d217a8ffab020f9613aa2e3ac381ab46cfec6a9dbaa3
diff --git a/app-eselect/eselect-php/eselect-php-0.9.2.ebuild b/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
index e60b7822..be7c81d7 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
@@ -36,7 +36,7 @@ src_install() {
 	fi
 
 	if use fpm ; then
-		newinitd "doc/php-fpm.example.init" "php-fpm"
+		newinitd "${FILESDIR}/php-fpm.init-r5" "php-fpm"
 		newconfd "doc/php-fpm.example.conf" "php-fpm"
 		use systemd && systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
 		exeinto /usr/libexec
diff --git a/app-eselect/eselect-php/files/php-fpm.init-r4 b/app-eselect/eselect-php/files/php-fpm.init-r4
index cfcc258a..cfcc258a 100644..100755
--- a/app-eselect/eselect-php/files/php-fpm.init-r4
+++ b/app-eselect/eselect-php/files/php-fpm.init-r4
diff --git a/app-eselect/eselect-php/files/php-fpm.init-r5 b/app-eselect/eselect-php/files/php-fpm.init-r5
new file mode 100755
index 00000000..39e7939a
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm.init-r5
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+
+extra_started_commands="reload"
+extra_commands="configtest"
+
+set_phpvars() {
+	PHPSLOT="${SVCNAME#php-fpm-}"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+	if [ "${PHPSLOT}" = "php-fpm" ] ; then
+		PHPSLOT="$(eselect php show fpm)"
+		PHP_FPM_PID="/var/run/php-fpm.pid"
+	fi
+
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_BIN="/usr/lib/${PHPSLOT}/bin/php-fpm"
+}
+
+start() {
+        # If configtest fails, we don't have to sit around for five
+        # seconds waiting for a pid to show up.
+        configtest || return $?
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile "${PHP_FPM_PID}" \
+			  --exec "${PHP_FPM_BIN}" \
+			  ${PHP_FPM_UMASK:+--umask ${PHP_FPM_UMASK}} \
+			  -- \
+			  --fpm-config "${PHP_FPM_CONF}" \
+			  --pid "${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 "${PHP_FPM_BIN}" \
+			  --pidfile "${PHP_FPM_PID}"
+        eend $?
+}
+
+reload() {
+    configtest || return $?
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f "${PHP_FPM_PID}" ] && kill -USR2 $(cat "${PHP_FPM_PID}")
+    eend $?
+}
+
+configtest() {
+    ebegin "Testing PHP FastCGI Process Manager configuration"
+    set_phpvars
+    # Hide the "test is successful" message (which goes to stderr) if
+    # the test passed, but show the entire output if the test failed
+    # because it may contain hints about the problem.
+    OUTPUT=$( "${PHP_FPM_BIN}" --fpm-config "${PHP_FPM_CONF}" --test 2>&1 )
+
+    # Save this so `echo` doesn't clobber it.
+    local exit_code=$?
+    [ $exit_code -ne 0 ] && echo "${OUTPUT}" >&2
+    eend $exit_code
+}