Fix varnishncsa initd script, bug #524284

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 73 insertions, 20 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 54bdfa189499..863467c6c1d9 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.79 2014/06/25 12:46:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.80 2014/10/03 18:15:09 blueness Exp $
+
+*varnish-4.0.1-r1 (03 Oct 2014)
+
+  03 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnishncsa.initd-r1, +varnish-4.0.1-r1.ebuild, -varnish-4.0.1.ebuild:
+  Fix varnishncsa initd script, bug #524284
 
 *varnish-4.0.1 (25 Jun 2014)
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 80b9ddc18150..3d65d972742e 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -23,6 +23,7 @@ AUX varnishlog.confd 82 SHA256 e285fe31434addbeee40c6fae7745536574750a0fe6587883
 AUX varnishlog.initd 822 SHA256 534dd41dd09a345eeb81652b99dbea3f0874a9df6b1423ed409fc8b07efe2249 SHA512 cbd8ea04aefa6d6a638157f1c8848bce4ea877ab14618e1680ff1648adaa9383b45e959bb75cef663ef6dc72e935c96c7330fe254466f7f3aa4f07ae4993e351 WHIRLPOOL 227aaa04bb90ea560f2476c9df9b0ef3215f5e0111158289b1d13f18c091881da9fa3517211178fba6ed6f26792281ed517b71dd167a49de048b0e6a7c920bd7
 AUX varnishncsa.confd 84 SHA256 60e03274b8d786abf7769be26a4ee6c671a155a761b16ee92d5c8b183491870e SHA512 a5426ff66b89d2afb6273f05e4117b3eec5ce0162a624d52c92b418960f72e58bd01224165613221af76ec241bd98e1eb985b2ef7b83a5b615e9ece67234dcc8 WHIRLPOOL cc83c4093d17e8d80a917486012ddc3946fd644a4d09648c8c6749fa476e7e5080c6d013d5be21418d7c36fcf6e76f8c648bdeb56908f856816fffde70998f6a
 AUX varnishncsa.initd 832 SHA256 cb81f89a151513823e9af3163c4ab1c3a9b9b05f786c691d3c8a7dc42f31b412 SHA512 725d81db0aa39a7fd7e50cceeaec4e0977719748624ab213585a8927088856ac4f7df4991d5ab7d11af2df6e90bdae1bb0a90037031fd7c3180086a42c4b9f74 WHIRLPOOL d5a3a9545231587a07f79bc05711c2023ee4d9585824b756f6869e2975c1c8bc4002e5301bdde1e471a238a95c20e044411317a8c3a9d16f23318ff2af4931c3
+AUX varnishncsa.initd-r1 1123 SHA256 25ddbcb2f2c426950c616356c2bca144856315dc95c27424e7d242d897db79a4 SHA512 0f79bef898a7bce41d2b644bb405acd5bd3ed7a380f25ace2b436530698d3aaa84d805f062fa197edd5ce790d47d0b368f7784f1304ed56ae5cbb99e81d83412 WHIRLPOOL 071f06a67457b292cf23a0ee40f031b1b2052cae9c45161317823ed3de9104c4267505000149119064bd6621702195024b57695ce72c6b1060fbde3ab02353d7
 DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 SHA512 0fe8a0f45ebe3b159fde811ac374ef8fb5be7712d8a61474778c57ddf4e7fb0404c7b28abeb614a16255a1c9ef0c780db44d03b1c8fbfee54adc49d92cbf733d WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
 DIST varnish-4.0.0.tar.gz 2372630 SHA256 4bbf73656be11687cbb8c7d4a7315786081687664b40a8ccbe67b36f8c0b1c17 SHA512 5eb3806f6c7c46438b6ebbe30c42f5a6afc53a9fa9e8f4b809c7d18b465712640950601be9873810a0f408865fba6ae9d18e46e4f22c89cc3a2e0c351753ac71 WHIRLPOOL 431dad47430a7b2a2eba3dd635eb487cb4d112a9ebdf6a3cb946b0bd8476653bded2d29128bcac1f98c6b3dfc3d7bc9c32f25ea76bccc9f427519f8dc36e2eb6
 DIST varnish-4.0.1.tar.gz 1877657 SHA256 49c3cebc89cb08fbc89d6680c1c8b42efc9313888172f3cdbdae7324b5c8f35b SHA512 e1ae846ff5b5e6ac0b694e8b197f9f7ec8c47677cbaaab6c0c490b6d5fa52f58f84fa3001bee8fe57451328cb809be0b5be55ddb41bd9c2444f23e0af582116b WHIRLPOOL 3013ae885a1eb6d44600b7c5513109a526cbed8f6bf687a81fa31111088713d68a9a059a67912966d7bed3b6404988c5fc785f02c91a63ea1f2a5037caf21e7b
@@ -30,23 +31,23 @@ EBUILD varnish-3.0.5-r3.ebuild 2404 SHA256 f563aaa34c8795ac9a444b31b09e6a9bbfc13
 EBUILD varnish-3.0.5-r4.ebuild 2406 SHA256 9f6aacee63083720cf258cac002e068ff49079d9697675c121d69ca1bc150cad SHA512 2b759343b58a7bbcb4533839a75c05e5e303f692fc1b640527a6246f8fca7b3be5c533cb11f44a9ae89c73285468ce762268406ddeac19c374d906f0e44a8c34 WHIRLPOOL 46aecb7600935c99c2512ff0f4260ee604a103782d69e107350758146eb3f188ed727fe5fa4b96e52301e4c8bd405a77ea8e987c8a42feb8b5225af2ad125b99
 EBUILD varnish-3.0.5.ebuild 1975 SHA256 3b76c80bc0c5aedde002a2dd41a90a7519b190db8f98f0bc05e6a15a50d627ec SHA512 3fba7c6b93490bb013809d52b3ae81d0bfea61fc783495c74fad689f9561645c50749533569529106be8c5afddf05b994b01611017f6581533e0763b72f36827 WHIRLPOOL 437337047d3d0719cdb4729d00f296aad0c8db5dc6d244c56c70306ac60a86e407220cbc42872c4e0fa1e9c8e3c5cd5f81cb42ad2a924f4d0e1bb3c8bd5df8c6
 EBUILD varnish-4.0.0-r1.ebuild 2581 SHA256 e5d9b1162025afaafe2bd67957bdca3d19d9b202f86820c86763db2c05b55957 SHA512 284309ed550d798513c877aa2f23533717502ce9bc0ba8c044c7e1ad0ecc40cd39e3fa40e6bcf706f22a7dd6577f711b366ec3e9ce23c5aedc7776066dd76c35 WHIRLPOOL 4c0957059bbfc2914202343679309d7f6d28d20061c2eaa26182bb4aebc64bb2e19bcb021a5168a26e920461f898ed6f63dd0f00c8ba70009823d17130f67c8c
-EBUILD varnish-4.0.1.ebuild 2679 SHA256 63153d75e856a3fc60c9984c8fd8a4e24b2009ebf8a84c96bfc4a31a72d37024 SHA512 024213c45fe8d4f3f4c05678bcdaca61d39bcbe1fab0bbd4e51b2e42d5dd78ee62af4c04ae3be4e564f2277306e6474f5818ff054b101c7a9974adb84c5205e3 WHIRLPOOL c9c077207e40d0ad663acfe5425abab190224b17fd18ad5190d2d90fdd895fab34ec52615f9695203ebb710363530ca84a66ae250ffd40210ce5fe105f0ba69e
-MISC ChangeLog 12873 SHA256 1c7fceb440fb8156a6246b3eca5d391e3614279ff3d1863c276cf26ed7a570d0 SHA512 184ed05bcfc16afc11bb54aebfb3760b6f957c34b20506abf9e503727f2a5b4376c8f00647917d2d53c9659c6ca64303c4aaca45dec06cec7974b53b56eec532 WHIRLPOOL 72535907931f162fa743ccabb3ca4541ea45fc277f3d26766902555f30d6822da1e3b3d2014a807f4a4982f376113f6527cf0c77bc548c1cd373dcff62a662cd
+EBUILD varnish-4.0.1-r1.ebuild 2707 SHA256 4ffd4cb8021edf70667512cafcd743842ce542905adea073be7939e31dcee781 SHA512 4e285fecd45f4aede2cac5f175bc752ccd07d604f63c24b406119b851138919123045e496126122e351a627a815f803c4c79b11fb5788d8330d2f7fd7fff5292 WHIRLPOOL f6eca026a7c3fa774de159222cfed0a4f0697314272a1ac2ffc2b2255496f369234358cf60b244e16d49356b3db2ed65432fc243b7ecc9132453ae44924008a8
+MISC ChangeLog 13086 SHA256 0e0ac77582755b4f8513b3f0e9070885e224cb920d1236398723349f85b739b1 SHA512 ebd3a3d1c6ca425033f92e9b651a2ec33808340d4e3114f721c7b3b354c002b92cce96d3c110a2389b262d3c2ac7280ff4a228febb156ac6b6306db717a4b3b8 WHIRLPOOL 6e4be42abaaaffa70864aa34ade1bc86a9050c7ead58482bfda8e99c3e3d6d2b5a2c40e15299cf24afc8e139ef52adc84199a184e1345c2ea7f9c556f8b97bee
 MISC metadata.xml 1383 SHA256 1cc0d8fc9765ed02a4c1a2a153309612e089ae7e87d732b9794231fba76cee92 SHA512 0a15da3879bb0f3320dc59a81b5772fb7dc810b9096f5ac073493fa052f98a0cdb97f3a610ce433c0b34e3961cfe2195bae2d4f8072961665398083b8bba6552 WHIRLPOOL cf50f3fa2f2f92de6be52f4cbcd02fc84de9661f672e7152cc5fd8081a925e0608b073809cca28ebc29931a842bbdae5989270f3d8838d13f7f220234e2ad19a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTqsTrAAoJEJOE+m71LUu69okP/RHoxAx8GY8OJMOn6pYaa8Rn
-RYWH75UdX8GJuZ7MW7DXFpoREr/ZIcd6rmkUUt4EUXptsrtFZCffYasJLDr/0KuQ
-68ugV0Er/ZFAikBZd4yf70ualrJw94qIjIag2SzH5FvX5YjISghGSt2RPnaRhHPg
-Y7SJBdhpdnk8FDtET5JdeDGIpvQqK+O5kSFLu+buVzQ8ftdUyBdbGYG79DsVW+LN
-SH70fm8Rg+bsOiTcmGpL0QOz0unF6PR39l1IejCo3CP9O6GPNshEhdKUUguFJNgE
-Uf2hQUf1V+Hl5IdHrwgHOBu6bnfbr3hjp7wMoWqE0Ises1O5yXh1QaaVjA6Zu/7O
-ylN7PwSubF1C/hsrkmhIxi2wiAO2vW/mT213G6efmu8Uj0zgpOc85m/By37ykrEC
-YxMjXPzxDminyL556doFeyqsp0fitA1dFFJT/zl5mMFXh17a1fcidsxHUU17qi9E
-dFZ1k82EUqKSoCCj1D29w4fecoP/Ej1PmxzIIowFMJIb+MuuaZKeYzNxG+THN/Eq
-on0GoMrSndvNhU4NeV+MkH3VQxzSVfcmTV5WzUWi5T+Q/sloqE74OHBr2KM794QR
-0mssv2qcRTcchpnYUmmK3ue1PcWDRKvtKdnmvb6c6ntHIjeGIro8RBVr+SJ8FAYP
-dJttuAMrYuV+7HJCXAL7
-=xaHh
+iQIcBAEBCAAGBQJULufTAAoJEJOE+m71LUu6qqEP/Rztv7HO8ZjC2GkWMXc1wkt5
+f4I6ryQUCY6U4JuW797Gfrj0wE6NR8xGHnHRG/+HO/nT+27yxEUdL8+xAOy3mZxn
+lCiClCQM0c0UPAwBxjet+APt5z2bhcSKW3HgEvjKxKNL2UTp52VVB/jaxEOwrn0M
+OBXb37XgmAD4Qds6NuLtZaXh728EABz+czs3DxZ6ecsfwW9QbLFvjTXUtSas10Be
+V0xnZqda0VR+ini0BHSuDCmd8AHiJPvzd8yDy0542LpZW6vBdMKekQ63m5J/T251
+YDh3t+hyxlgaQYVvzLwqr+Of2IqahmItV0t1ZbBeSabg+P56S984WpeWauI4FVOu
+JWsjRXlyVVW7xHkBAGckQvWcYu3rj8pv7+qgkeZqEzsYofH7JL4YpSqAF/hWGPPH
+ojRgnJuM9ZLmu0x31r3OQR4Gw9pCTNfThCoGcuY+wTzbzK6/mjqHAZ2p51GPo9eR
+HDHEMp5LVH91Nd0vEXZsMpxpC4OxI/zESbUrFBOGU+EhyQ1i6ToxQwk7TCtRIhaq
+fObGDzQqVl0kJlQFq4obccuZlXvCKNWTD3F9B7w/APdvIMZFqLJGE+TBH5s4DTUx
+LExODROQyGLu6qVK6TaWtncjjroOLi5cNmvnccTazBhuxgO21fQY8xWH6JSS/x/U
+H6Ygf9cScWy9xwKZ2xr5
+=X20G
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnishncsa.initd-r1 b/www-servers/varnish/files/varnishncsa.initd-r1
new file mode 100644
index 000000000000..a13f087a60b1
--- /dev/null
+++ b/www-servers/varnish/files/varnishncsa.initd-r1
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishncsa.initd-r1,v 1.1 2014/10/03 18:15:09 blueness Exp $
+
+VARNISHNCSA_PID=${VARNISHNCSA_PID:-/run/${SVCNAME}.pid}
+
+command="${VARNISHNCSA:-/usr/bin/varnishncsa}"
+command_args="-D -P ${VARNISHNCSA_PID} ${VARNISHNCSA_OPTS}"
+pidfile="${VARNISHNCSA_PID}"
+
+extra_started_commands="reload rotate flush"
+
+description_rotate="Rotate the log file"
+description_flush="Flush any outstanding transactions"
+
+# We need to make sure varnishd has started first, bug #524284
+start_pre() {
+	TIMEOUT=${TIMEOUT:-5}
+
+	local i=0
+	while [ $i -lt ${TIMEOUT} ]; do
+		echo status | varnishadm 2>/dev/null | grep -q "Child in state running"
+		test $? -eq 0  && break
+
+		sleep 1 && i=$(expr $i + 1)
+	done
+}
+
+rotate() {
+	ebegin "Rotating log file"
+	start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGHUP
+	eend $?
+}
+
+flush() {
+	ebegin "Flushing any outstanding transactions"
+	start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGUSR1
+	eend $?
+}
+
+reload() {
+	flush
+	rotate
+}
diff --git a/www-servers/varnish/varnish-4.0.1.ebuild b/www-servers/varnish/varnish-4.0.1-r1.ebuild
index 6a25ea65783d..66dedd3618ed 100644
--- a/www-servers/varnish/varnish-4.0.1.ebuild
+++ b/www-servers/varnish/varnish-4.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-4.0.1.ebuild,v 1.1 2014/06/25 12:46:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-4.0.1-r1.ebuild,v 1.1 2014/10/03 18:15:09 blueness Exp $
 
 EAPI="5"
 
@@ -80,7 +80,7 @@ src_install() {
 	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
 	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
 
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
 	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
 
 	newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
@@ -96,7 +96,8 @@ src_install() {
 	systemd_dounit "${FILESDIR}/${PN}d.service"
 
 	insinto /etc/varnish/
-	doins  lib/libvmod_std/vmod.vcc
+	doins lib/libvmod_std/vmod.vcc
+	doins etc/example.vcl
 
 	fowners root:varnish /etc/varnish/
 	fowners varnish:varnish /var/lib/varnish/