Fixed startup of apache when pidfile exists (bug #492222)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 29 insertions, 24 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index a6ebc4edfc11..e361f7791cc0 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.249 2013/11/20 17:50:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.250 2013/11/22 08:45:22 polynomial-c Exp $
+
+  22 Nov 2013; Lars Wendler <polynomial-c@gentoo.org>
+  files/gentoo-apache-2.2.23-initd_fixups.patch:
+  Fixed startup of apache when pidfile exists. Thanks to Roman Barczyński who
+  reported this in bug #492222.
 
 *apache-2.2.26 (20 Nov 2013)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index fa870824cff8..adef010c12ef 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -6,7 +6,7 @@ AUX 2.2.22-envvars-std.in 1071 SHA256 1721b424f2335640e49d71e671a4be15424d29fe90
 AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0
 AUX apache2.2.service 716 SHA256 e850ad73585fbba52ade58a39ca91adbfd52f56a0bbd426ebcadb340a7dcb62b SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c WHIRLPOOL 776a928422b8f37a12099111a1503674ca901934b60dca8596dc8bc287390be9a0e912d7ba6226dcb22eb7c669fa298ddc20fd7bf5c275b0cf019bae0d594839
 AUX apache2.4.service 728 SHA256 4420af10d1237f90ae519e56e75f1cc84e9f7c7b63aca9decf91a77f88ae0390 SHA512 6b43e5638d5da68a5408d45befd10a9e42197c1a393764e945ba22d47d0736e2b28bad36a96f4f4ad4ff928db6f2c1377bd22ce401056b2f21fb38933a3cd972 WHIRLPOOL 5526995c5f4772353fcccbd83ed93c8186cb47f80f5d1244dc454ca886189ac92539572c43978d2868b77002a2397ff4794b3c8f6c655fecb432b8013afaf38e
-AUX gentoo-apache-2.2.23-initd_fixups.patch 1023 SHA256 d071f2fe815e2488d256b97a293e9ba986cea11ebc012138c3f078ac69fd6e7f SHA512 1ba6f4cd8fab70f6ff9b4bd907b59776235fe30458cc20eb262ed7aab24e47dd37bb5a3c485a77c63e6db2f86b788f45f3a0481d12452308175a8fbf8209de74 WHIRLPOOL ea04708879062a111d8a9b2b09a60f760fd481fa893dfabfb4e72072608f7708aca3f7b9c7164bbe332c37af3f7e387e14799222c13912da6d3d7777f0f07ad7
+AUX gentoo-apache-2.2.23-initd_fixups.patch 963 SHA256 ea8cdb5ad98416fcc3daf496bc996d23c09212f325980e0328da5e76deb8ad5d SHA512 3250d94e9fc5c3f921c756d3d5cfc670b0221a06dab376ef162cc8ecec8d1300cb95266b2a96d5a608a710326de2144662d450c8a2142a12200b1210fbc9cdb0 WHIRLPOOL 314e1d2c6d156cbf1a0330ab822f64a32d2b6b52adf46e1db4d8f148eb1e471712ebd65948056e4e2e85585499cbc1f9a0d0616f2a6c1ec9b382af35bdf8f194
 AUX httpd-2.4.3-mod_systemd.patch 5396 SHA256 d8f5c76dd5eb0edc9759ea300d3b320ee96b6e6f9fabb8a4043f8d1b77b646a2 SHA512 0db785fac6034aa431e9d816bd06020a5b287dbdae794f8b94eb267805981a1d2a97fdb92bd13e32d35329e6db3f799a03e98456329f6a80c5863e72a26e5c59 WHIRLPOOL 4016b9626af1a8ca001518e8a45262ca4dd27a998727db988a8f1234aa7c5d56d439f4ecfdc6219510f57c97991884a7f57eaa83535988cb72e9fd8ffdee7b6e
 DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff411366cd768f9450101da050438a2f77abeab7333 SHA512 92a49f954b82d4427862f41977625a60641731cc25ab3efdd666be8db839038e7b1c2ef2f878d5efed243eaa63237e88ee4993cd25cca1dfbb0f56a6b2093d57 WHIRLPOOL 221d9c0cf999430afc11a8e48ae67019c7f31daca827a5db7615aca24859788743e5da00e4c99b7b7b375e58fafd6c148339e5671be939dbc30735031e12c49f
 DIST gentoo-apache-2.4.4-20130725.tar.bz2 24525 SHA256 c155dae39d87acc43ef34b385a2eaf2a45ff9c11d31b1c1791a74f9946335c39 SHA512 95489af418e3674b9d20dc988f4473d5d088d892bb2e6660a46a225667b0427c904d883a19fa3a847778fa00eb8ac0f27e1a5f76f0d65a28eaf0a39747353bbb WHIRLPOOL 1fd36df2db6814d01846cb40be9443aa963a0df9b45647859e901981872f64a8b4ba95aff9a14a8985feb74d51c551ab10c6734a63d5e9d001c53ab3c4383c42
@@ -20,23 +20,23 @@ EBUILD apache-2.2.25.ebuild 3288 SHA256 b0a9162f6d2dbf57bc312fd52cc495844a70376d
 EBUILD apache-2.2.26.ebuild 3295 SHA256 e0e3689fab59f9e189b48a18755a18987dc2e6602ffb7a324de026a354264a26 SHA512 69d68e0a4c9117583bb4d4eb935e67b487ae0347399f7a59e3c0a0f7043776f8854e02d556ee423bec285c17bc9305322b417e7536e67d10596e5f26292e98e0 WHIRLPOOL 73b55f2e8c28f105d6fe59b9c957c3e3183ba701f27d5e663921f7b123168bbd1cceaa7e1afee990ec7bd8958d130391b49b54f0bb896f58663ed46754be7f26
 EBUILD apache-2.4.6-r1.ebuild 7457 SHA256 2440b94f37d21a4caf7ffd43b8a662515df98aebd4efa373eca5f90e774730e7 SHA512 088ebd904cff8d88160f628255c9e40b3ba6abf25818464769a029246d2f74d9132a8a8f5235083f052ebb8fb44acb0ffae939a09dadd83dc80449b0032d1272 WHIRLPOOL 991f357cd3b6221a56184808247fba881901b4115cea128cf87e2d6b98eb25abcb27ea1452160513d4786fe8688c13fddd52ae9dc192d1fad51b1ee08252fce5
 EBUILD apache-2.4.6-r2.ebuild 7457 SHA256 b7de783e8e1ddd59b2fa05bd8169d727e3a70d129ce4fffb886ca862de142645 SHA512 cd6844573d40f2508bc5b16d762df5869d5ba363733f07beb600fe148937166b1556de7b57cac9663c93545e820f0cf4af2bc6adb072d054778dbbb50f441465 WHIRLPOOL 7cb32151f2df8a05c03962ccf4876f5a9c0303c3caad06c960011b836d7f0243e691618ba75a7c2493242a65ef3e8b3eb75b430371846ef97d6890cd1facceb7
-MISC ChangeLog 22061 SHA256 ed3cadcf6ae7a379007dabdb233a2597a667c990cff476a333ee96cea6451e1d SHA512 324b3a727c91e8e06a728e9cbcba6e4d874307f3a43c66793a274159f315cb3b75d92d0dd280e498cf3b33f6ca2c42e29aba4f39e8fe1d1820842c3214de7536 WHIRLPOOL d5d6334e09aa4f084e6b844d1c49025ae46f20c7f766f023a47647e8fea102610196ff5dcd1bc84c2bec1254d5095bd89e23d82c9d6c62d4d2dbad28884fb0de
+MISC ChangeLog 22276 SHA256 f6f9064ef64097ad88ee6cf2c09dbf863bb0d2869033a6a0f461338b22ece20a SHA512 0f2225953e512c52b60a077905ca3ee20bf7e05810323d06c329348a1091f59d631e2c974e6cbd34eab61ae251a9a1af2915eb016c8774ac4b2a65b49135d4a3 WHIRLPOOL 431760c04011c39ac4e9762c5adbedca58080c5a374041cfc16dae9de6bb4b648e5b2bb3e139a0cc42842533a72df535dedb12523c194187f5ba69df1dec7612
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2492 SHA256 f132bc37567605f338e23ed6ec22c553e1443d2b6cf407ab0bcff359fc9b3f90 SHA512 0582259bc2d615f1f640d375aab4452613a4006dca03c8bcf9757c376599bc2c7789df44003db914e2e3a5cd5a3ce725b0bf76d92488f65c67f4859927c83d11 WHIRLPOOL 6e826e0847788527dc2499e10c8c4ec59b78e2e4859b23127c26f103fc679c1516720be587ee25753c52d04f0544e634f553a769bed2d24db8442d57be22d26f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSjPZxAAoJEPiazRVxLXTFekEP/2pTtTk+uObe/XVTgTLaeCZi
-un0eta9xDrlYNmv9bCWMuJ89ksb7gW5gVrgGOyB9Y4xtdJwnRw86CT0g8aw7eMaL
-ZzK7sKsZB9ST8z8a2gOmy8qK7W2xwBBfpCzMScoKq/upTBBpu5IKJQyCeVWUW0mr
-+j77oZV4kxeYfnonxIctAIaKhBNABKyMx4zY9bskuv/EZfAKnqHU9HUodCy1L7G4
-IghmDB+LiluCVSvN9FoVq4s3UO5i/RK3t+b5djHr3VwR7CK/2iwxRTA+bYzw141k
-lRGlERD7eH3te1iu2Xn/XFrOc6Cxhp9XY0K2gBbhypEikX6oFHtG2mZ2NJNmPPpR
-X1ASGF5Xw1TON7XszK7J3LgGZ8suYTcUYpLdsCBh8fo6fY0l6J2s2IHoxtXFO6db
-qv1UIlfXm08bYe+kjTjYPbtT54+70IiuOO3RqJfwEWY4D/LbGV2221H+SPMfsPKI
-qpnbwyxTrk3Ato/C75CKwHkaKU+cZ/KimXeLwbEVk236oBerz+v6lIY1vKxY4/fp
-pjGEq/chinPo5PbiXQSWwNea9oDGH3/BLcniZUO+ioAxyR6d6B7zc5wwrK4AtqpD
-EteJsiFZhj3GuLUidnsgAdmAKWFGmGUM+Sc6NC3M/nYwpyCvN8fw0Yv4TWsI8fLZ
-eVgZwANBME5WzRS8ssZF
-=lTYv
+iQIcBAEBCAAGBQJSjxmkAAoJEPiazRVxLXTF5FwP/38SUM6ngEfhaAQiGkFFJTZc
+9fx0drNFUiW1KZvWb734RmgqktWGykpiObRiMiFW9+nXN2qsLOLPQoKwb9pg9wtp
+6etzpzCnqNtimc4Z7VitzOuqdZYkBf44EGJqvrTs4tGAiX1a6b+vbJ7r4hiWtyaS
+E+sfcA8IZ/ZL/PZbYLmF3lTcNNEMqWbJAI8CVhIFLFob0PtobG5EIcVpOuDB6sES
+Lx6qQ8RKhq+D83QqTmjeWhig9z4Ycbo0rtOQvvKjZFI1k4DO3xU+6auUNlclYrCn
+HpYDmOQzrcq39gvYwDsL8vke4EMjgFnmgluE1JK1RKXUFIgbI5FUiMsOfBiS9biC
+eNK2Wcr2f0VwSz+h7t8bIHZ5F3ldhX+hc9OusLcSMmV0Sy61IioQgLz+lJpJYOuP
+jyxPZclm0IYhzcWzsvgLUahNyXppFr6NVUnz3Qo1EANyPFTIemzJrcKSvy5KlSJs
+uYScNQsrNYmfo1cpki21JitGVXo9HZGeOccKrQ0om6vh+asUB1+tBHOYHk13pAO4
+XxNDhz7qTfyjJaQ/IGIEwSvYRyBLulTzO70Ui94mpyUJkLNmi7MuphF36nz/OUjV
+qJPZhJ7G5CTzNKNsL0Sa2MtImXKhLKDoP6WFKdLLm2RkB8wlC3szNiYrOg13uZA6
+vN4cj4IH22QzZkzCOEf3
+=h0Ik
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch b/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch
index cc57c854ca82..92a073117a11 100644
--- a/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch
+++ b/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch
@@ -1,18 +1,18 @@
-Make the init script recognize failed start and stop more reliably.
-
-2013-11-07 - Lars Wendler <polynomial-c@gentoo.org>
-
 --- gentoo-apache-2.2.23/init/apache2.initd
 +++ gentoo-apache-2.2.23/init/apache2.initd
-@@ -77,12 +77,13 @@
+@@ -77,12 +77,16 @@
  	# Use start stop daemon to apply system limits #347301 
  	start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start
  
 -	i=0
+-	while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
 +	local i=0 retval=1
- 	while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
++	while [ $i -lt ${TIMEOUT} ] ; do
++		if [ -e "${PIDFILE}" ] ; then
++			retval=0
++			break
++		fi
  		sleep 1 && i=$(expr $i + 1)
-+		[ -e "${PIDFILE}" ] && retval=0
  	done
  
 -	eend $(test $i -lt ${TIMEOUT})
@@ -20,7 +20,7 @@ Make the init script recognize failed start and stop more reliably.
  }
  
  stop() {
-@@ -101,13 +102,14 @@
+@@ -101,13 +105,14 @@
  	ebegin "Stopping ${SVCNAME}"
  	${APACHE2} ${APACHE2_OPTS} -k stop