Revbump. Major changes

Logdir no longer world readable - bug 458888
varnishd, varnishncsa and varnishlog have been split into separate init scripts, also fixes bug 480252
Run Varnish as user (varnish/varnish)
Check the VCL for errors before stopping varnishd when doing a restart

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

10 files changed, 257 insertions, 26 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index b10c4ecce7d2..f17288d45aaa 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,17 @@
 # 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.76 2014/04/12 22:45:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.77 2014/05/22 20:23:48 idl0r Exp $
+
+*varnish-4.0.0-r1 (22 May 2014)
+
+  22 May 2014; Christian Ruppert <idl0r@gentoo.org> +files/varnishd.confd-r3,
+  +files/varnishd.initd-r3, +files/varnishd.logrotate-r2,
+  +files/varnishlog.confd, +files/varnishlog.initd, +files/varnishncsa.confd,
+  +files/varnishncsa.initd, +varnish-4.0.0-r1.ebuild, -varnish-4.0.0.ebuild:
+  Revbump. Major changes  Logdir no longer world readable - bug 458888 varnishd,
+  varnishncsa and varnishlog have been split into separate init scripts, also
+  fixes bug 480252 Run Varnish as user (varnish/varnish) Check the VCL for
+  errors before stopping varnishd when doing a restart
 
 *varnish-4.0.0 (12 Apr 2014)
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index fad14f6b6e69..d4a33a515f61 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -9,32 +9,33 @@ AUX varnish-3.0.5-path-to-vmod_vcc.patch 440 SHA256 0d58f66edab6de91154b72c32e8d
 AUX varnish-4.0.0-fix-man-Makefile_am.patch 688 SHA256 e33cf14de518b8d96bc0b03d024a66ec3e5ef67fc3137e020cf070bfad1627e5 SHA512 4dc8786bf8bb3137f99f9ff7e063bd80bccb7b35fec4dc1488256406fa291521f55c01f9942700fa84dccce82285e727d20f17a14b715360b289fa5bd224e465 WHIRLPOOL 0a4b7c6b8b724388ec73f96b9810812c08265eb3f7041c03c7944d9520bda80236db81576aac5f8b82d0459458464e4aeed229e2ab609747613ad02c730dce80
 AUX varnishd.confd-r1 706 SHA256 4d1b2498c78ce8ae4bfccafb2847598f9aad68fb6fbd521770dd198b7619a647 SHA512 053e61b72978028f4899d1da207a0ca69050bb48a07112186e6415f7a92fbacf4d55ca80d963ca35fac99b9440eefb4e9d252cd623bda49ea3f1b7e5b6520b9c WHIRLPOOL 4c3b0273b2ee4943bf662bcbec62176eebc2756ffcbf6cd3f7bf646e917402679085e43af383aa6d9633a5730f7d755fb68f0e7d45b3438d5f9a4b1e7d920c69
 AUX varnishd.confd-r2 866 SHA256 462f29edb715f547839ecadd8402b6cf05a33faca08c3899ca0e56b750028415 SHA512 3650ff80a4f0d36d4c6e7874ae43ece5bfde1ae2404118656e3c0f679698a033c2002c74a81b082fe4712cc5444c8da6ac5ef65cbe6aa9c11ea5c48c9bc8890e WHIRLPOOL e2ece98465d2aea09dad94c6587513b46f8f84e436a7646942e07137d36c25093d2f674e09124e7af4dcca33f782f4420d02ee6576caa97d126d33a1557b2d61
+AUX varnishd.confd-r3 589 SHA256 09e039be32bc0fb616925dd5bed8b9d76553f34549034425265afa59da5e861b SHA512 dad4bf5ddcc84a9267ee00ed8b3e36c136674b0b87e686fa5ab1f854cb1a111b3f8943439a3b7a1b20b81f3dfe57879e126434673c6520ccfc6b900e8edc6d9e WHIRLPOOL f17b8d043a6a2439730fead3d527ffa1ce0d8643e7674dfa1562f80368b60cbcfd044fe16b8fe0306bc871cff65d983d8b67b96201579b30882e30322e7b6d7d
 AUX varnishd.initd-r1 2046 SHA256 484b9e53523f1509d48fc6253d99e0ae5e7fed61d112274ef0957449e248ac94 SHA512 ff5c3a2eab71ac6800e9ff0d49045fd7c7404242f2e64a36fc5f72475868baeb92a2e8d6cf26e6eb2d08d01e6eae98dd4c2484f99cf8979d0c1e76bd172513d5 WHIRLPOOL 0a9a2fe5857df26c2e3d49696e86570afb9048889072ee65de6112b8ac7a7e6736757cef0098343007bd58fae2055bc438043c2780f47f33f2494864a3b91930
 AUX varnishd.initd-r2 2106 SHA256 71d571c9d631218deff6c46670d54e7a8447bbe8c7f20187a7680a2cf93293f1 SHA512 416b2e4345cc997b89857ec54e6b099ce0ca76295bd1003eba35e3955d0d18a1ccebfa9528ce00493d4bcf0eeb20b0c7efbf4533074f729cb7f30560e40b65df WHIRLPOOL e3f518bc921e8121a350549662e07db4f219d971445f2644d6e2a8eab598787b1452a4305d6c3883dd9b87910ac02ec7f7b26cdcc534ea5400b4f3ec2966a636
+AUX varnishd.initd-r3 1668 SHA256 7f0f9356f7dd2881c285bc3370f419cc2360cd93cd900a4fa816fc7458931e4c SHA512 47d2489da008d217392f57ad89145b6a699f3040cef53c66eee4523fb4762b1ae307bc0822c7072660b272eba90fc284d4d4df43f1ac673b5720f0d7b3bd6975 WHIRLPOOL 0aa0d88856229f20c746b2a3bf3c7e1a5cbce73921e152268d64a6ff25403027dbe9b48356f6a94ce75ea97c694a1d729bebb6e06a9577b6bc2d7f9c523557fa
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
+AUX varnishd.logrotate-r2 470 SHA256 4c1b7abf23bfc32a65f65633c0be0d065fb9fee72e4b533feca35c596d9c5a2c SHA512 51cc6d46ff7439de93977ab87dfb0af399458c1e446475696f73342ae7a0c1a8ca8fc6e79e593659f1af30716a5f8a1ee5e3b1f5e7b35df40b45d47e7b0f2ffd WHIRLPOOL f6fa4d5b6e53934d79c83cb2ec683f0aad9ee4ba473c13fe9fa4c4e4105e40397f8677d25103804ea4da60dfca3bf6b9a1f88f75efb8546a1dd87a802d5666b1
 AUX varnishd.service 455 SHA256 2cdb47ce8bc90f94df5b06b2468e8c7f1f20a32910d19fea00b7ccbfbf0f9bc5 SHA512 aa1671e1a0c374c30df31a1bb41248fc28d10ee3e7f062737e13502c8f5282ee4fb2c20255bf943016809b5f3f31d3f16b3c453b8663abf6ad3ce23d6fcaf57a WHIRLPOOL 4f78e9aa471723b3226f78228426cf1edea86e4a2ddfe10f7cbd86518fdac8a41cac9a50b3857cb7e6fbd7f44be347cb527834dcc9f57f2e6bcd3405d4646059
+AUX varnishlog.confd 82 SHA256 e285fe31434addbeee40c6fae7745536574750a0fe658788318acb33943e38d3 SHA512 88fe9b545a2b25d6e6e45f1cfecbeca5f503bc1fbe95856386e568edee41b487b162cddceba8cb152b0a37d8d96635a76c0715fc69d87d6c667ac403ebae0bb7 WHIRLPOOL 4214c022296126d73bcdc98c8c75f8a1c62a31862e521338afdb36d48e5b209889b05bcc949ec2544897193f4e1bd44faeab28627c3407977203dd901b86710e
+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
 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
 EBUILD varnish-3.0.5-r3.ebuild 2404 SHA256 f563aaa34c8795ac9a444b31b09e6a9bbfc136e3e15f68aebb7a94178316cc6b SHA512 c98f3e1365cb0a5f552f35f48a75e641104ade8ddc0e853ce1f669815e984b19763cd3986ca81431868a4e1970587b71c9d1b6403f83073e722bd8e063ea40b7 WHIRLPOOL def91f69d96a04f44e4aaaab70ac58dcdd840e142023603196b815dca49f3d6025bfd7757456becd1d1f3356bf148dcb7bed2e06d472fa1fd1edbd237ff6d1f9
 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.ebuild 2047 SHA256 9e69645723168ee1d56aeddd8d6664951826e75d998fd5db3d0c3d1e4c9bdd35 SHA512 2ea398f004b4f5e3f51a59406b3dfc8350606f45ec4e7f2777e8934c12d602e292d37c628b0d947f944c31c3aab7d905a9ca62800e9ffbf9309f790571cc7dc5 WHIRLPOOL 476298206a6b93a652a1de41847f09cf292fe71be2e6773cb24afd21fc423b6964564a56422f9abbd6ac2cb7b455412f2a284154eea458fa74251c63c2617cef
-MISC ChangeLog 11889 SHA256 2612890003432d3e78465308e1ade13490a91f2f0989364aab2c3a6d79a79776 SHA512 5a2d432019189e000f3697e1d8dcff1bf94703fbedd6d2290292be3f09f1b63a7b4190a015e743dde14f34028871015466d544b6e3b24cb8c534233db5894886 WHIRLPOOL b8d1e010f38b7980f9e3a3c8d51921bb8c2065e55ce6cdeecfe17454b350ac698f25862b415fe8bf2ef6a5501dd4fe590eaf146d68fffad3f71925c48e9767e2
+EBUILD varnish-4.0.0-r1.ebuild 2581 SHA256 e5d9b1162025afaafe2bd67957bdca3d19d9b202f86820c86763db2c05b55957 SHA512 284309ed550d798513c877aa2f23533717502ce9bc0ba8c044c7e1ad0ecc40cd39e3fa40e6bcf706f22a7dd6577f711b366ec3e9ce23c5aedc7776066dd76c35 WHIRLPOOL 4c0957059bbfc2914202343679309d7f6d28d20061c2eaa26182bb4aebc64bb2e19bcb021a5168a26e920461f898ed6f63dd0f00c8ba70009823d17130f67c8c
+MISC ChangeLog 12500 SHA256 691c2a3708ff7e531d45ca0e84890855e52e5c0bb22ad0b6be240fd7d7556867 SHA512 481e7d2b05a1bd2f9b724d324f350a0d58e791cfde8ddc29f61786ea39b6f1c16997c9e998d4adc908fb7bca1016e89eefc78b8b6373dbf3c20ce65e636b2c51 WHIRLPOOL cdd9b54456d8ca6e153fb1c01172be1c13a45e7883b59159af61562477745fe5f0e543f397c0303026230f191e961481c24c92e8e774bfca9a686a4179bbf0d9
 MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d SHA512 df155931660201fa2e392cb10ecc150b2782520528e6534ee9ce538f9feb37c78fca9a33d0bdedc8c97831389b5d9313327b5564d7684749423da7c5856e12f6 WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTScI3AAoJEJOE+m71LUu6o8MP/3vuZFhsvHd2zHraDNnhUvyG
-YG/EdykJqWYQKmdnwzHUtlGWcj9No5ZVjO2n5ELgwIei62Orj31v1dpUs6CillU2
-BJ5TecKPnKjRaamHxThiWWVU6rCwtTYnZVr+RBSBYfiz3+yup00kZBjSfIXC5Jj5
-2Vt2HimkSD+LILFMX8X1O16b0rnDSFTQLDb+CnFwP9nxO8VUTLx2qEztI3GNnHU0
-7zAY+j1kNJA6nDQ55fUA+LOK7XVcJt5yT58v+6CCLMt6d+GdquHMH8wc5xwfiuqW
-PbzpaZ+qHSTYllx56ROdY+NcZVygy//LuBPjtRHzTr498FRIFbfjG7PQAzgOjcAD
-cTOK/bw9efpiALZyJLupPmaaVvFEWrTDO3cmlNQtPcdFPuf9y/CdrpPXz81crb9t
-h5PTpMtv0qmuz46KbkFDM+YtGxTKV7sDxR+UkwKNqt0Hzz9WGxH2nFOdH9VaXNfa
-qLtCUtOan5OH4eH75qVlyKstTNHJj09p4RfHcwfhzXd9L2spL+z9UBz7VHnlFd+T
-UKP+h4wQSMG+tTzu06/7bNrQRwItS/J8P9A2IPGxcOPRTVrZnMxPt+NOJqH66Es1
-071RvulQqyUZNEgF+TBoIZhvkAANsntF/9XHTNk1P75MCzXWDwMpyrwGgEIaf6E9
-8m8dRzjrJLRr5/f0NRvc
-=BOCR
+iQEcBAEBCAAGBQJTflzdAAoJEMOx0zmdw4Z1T1cH/ifWSa2VT36gs1vrcPb4l4sn
+mU0axAxMb39jCDL7SEqGKbuzpt0ydCh3oCT4SiZ6FP4L5un1Y/PEdbZnIWUCzfVD
+L35B5/A6JnIJY74sWyzbxfzemB9LN4PMm/OApfjJTBbvUIwI+Edu/DsM7IsXgpdt
+WrQIJlptrRUDCBF/zQ0Idxjkm8j3ECyf5U1Pvhwif1V8zzgEqaJTEftlPS/PjDLh
+gZJoSgFtx75vdXlgRKmfABDnhf3bgst94VBAGWd5LjjNKQVrgrWyWJg8+IqY/eeQ
+gLYCK+bnBZ+cFmICRdqKdG9/st0S45JGCqEdJvw/W1zwOr8pGTRMcpqi2keIfec=
+=9IRc
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnishd.confd-r3 b/www-servers/varnish/files/varnishd.confd-r3
new file mode 100644
index 000000000000..c05b8fb7521c
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.confd-r3
@@ -0,0 +1,22 @@
+# /etc/conf.d/varnishd
+
+VARNISHD="/usr/sbin/varnishd"
+VARNISHADM="/usr/bin/varnishadm"
+
+#CONFIGFILES="/etc/varnish/${SVCNAME}.vcl"
+CONFIGFILE="/etc/varnish/default.vcl"
+
+# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
+#VARNISHD_OPTS="-a 127.0.0.1:8080 -a 127.0.0.1:8080"
+
+# Alternatively, don't listen to a backend
+VARNISHD_OPTS="-a 127.0.0.1:8080"
+
+
+# User/Group
+VARNISHD_OPTS="${VARNISHD_OPTS} -u varnish -g varnish"
+
+# You may need to increase the number of open files (-n)
+# and the maximum amount off locked memory (-l)
+# See bug #459142
+#rc_ulimit="-n 32786 -l 82000"
diff --git a/www-servers/varnish/files/varnishd.initd-r3 b/www-servers/varnish/files/varnishd.initd-r3
new file mode 100644
index 000000000000..d98120fec280
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.initd-r3
@@ -0,0 +1,78 @@
+#!/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/varnishd.initd-r3,v 1.1 2014/05/22 20:23:48 idl0r Exp $
+
+VARNISHD_PID=${VARNISHD_PID:-/run/${SVCNAME}.pid}
+CONFIGFILES="${CONFIGFILE:-/etc/varnish/default.vcl}"
+
+command="${VARNISHD:-/usr/sbin/varnishd}"
+command_args="-P ${VARNISHD_PID} -f ${CONFIGFILE} ${VARNISHD_OPTS}"
+pidfile="${VARNISHD_PID}"
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description_configtest="Run syntax tests for configuration files."
+description_reload="Reloads the configuration."
+
+depend() {
+	need net
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+checkconfig() {
+	${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected an error in your setup:"
+		${VARNISHD} -C -f ${CONFIGFILE}
+	fi
+
+	return $ret
+}
+
+start_pre() {
+	checkconfig || return 1
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading varnish"
+
+	$VARNISHADM vcl.list >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} cannot list configuration"
+		return 1
+	fi
+
+	new_config="reload_$(date +%FT%H:%M:%S)"
+	$VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} cannot load configuration"
+		return 1
+	fi
+
+	$VARNISHADM vcl.use $new_config >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} cannot switch configuration"
+		return 1
+	fi
+
+	eend 0
+}
diff --git a/www-servers/varnish/files/varnishd.logrotate-r2 b/www-servers/varnish/files/varnishd.logrotate-r2
new file mode 100644
index 000000000000..e697e428f3dd
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.logrotate-r2
@@ -0,0 +1,31 @@
+/var/log/varnish/varnishncsa.log {
+	daily
+	rotate 31
+	copytruncate
+	dateext
+	dateyesterday
+	delaycompress
+	compress
+	notifempty
+	missingok
+
+	prerotate
+		/etc/init.d/varnishncsa -q status && /etc/init.d/varnishncsa -q flush
+	endscript
+}
+
+/var/log/varnish/varnishlog.log {
+	daily
+	rotate 31
+	copytruncate
+	dateext
+	dateyesterday
+	delaycompress
+	compress
+	notifempty
+	missingok
+
+	prerotate
+		/etc/init.d/varnishlog -q status && /etc/init.d/varnishlog -q flush
+	endscript
+}
diff --git a/www-servers/varnish/files/varnishlog.confd b/www-servers/varnish/files/varnishlog.confd
new file mode 100644
index 000000000000..d7358b1dc898
--- /dev/null
+++ b/www-servers/varnish/files/varnishlog.confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/varnishlog
+
+VARNISHLOG_OPTS="-a -w /var/log/varnish/varnishlog.log"
diff --git a/www-servers/varnish/files/varnishlog.initd b/www-servers/varnish/files/varnishlog.initd
new file mode 100644
index 000000000000..a87b6d83081e
--- /dev/null
+++ b/www-servers/varnish/files/varnishlog.initd
@@ -0,0 +1,32 @@
+#!/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/varnishlog.initd,v 1.1 2014/05/22 20:23:48 idl0r Exp $
+
+VARNISHLOG_PID=${VARNISHLOG_PID:-/run/${SVCNAME}.pid}
+
+command="${VARNISHLOG:-/usr/bin/varnishlog}"
+command_args="-D -P ${VARNISHLOG_PID} ${VARNISHLOG_OPTS}"
+pidfile="${VARNISHLOG_PID}"
+
+extra_started_commands="reload rotate flush"
+
+description_rotate="Rotate the log file"
+description_flush="Flush any outstanding transactions"
+
+rotate() {
+	ebegin "Rotating log file"
+	start-stop-daemon -p ${VARNISHLOG_PID} -s SIGHUP
+	eend $?
+}
+
+flush() {
+	ebegin "Flushing any outstanding transactions"
+	start-stop-daemon -p ${VARNISHLOG_PID} -s SIGUSR1
+	eend $?
+}
+
+reload() {
+	flush
+	rotate
+}
diff --git a/www-servers/varnish/files/varnishncsa.confd b/www-servers/varnish/files/varnishncsa.confd
new file mode 100644
index 000000000000..f3112fdd532a
--- /dev/null
+++ b/www-servers/varnish/files/varnishncsa.confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/varnishncsa
+
+VARNISHNCSA_OPTS="-a -w /var/log/varnish/${SVCNAME}.log"
diff --git a/www-servers/varnish/files/varnishncsa.initd b/www-servers/varnish/files/varnishncsa.initd
new file mode 100644
index 000000000000..1b97b0b6785d
--- /dev/null
+++ b/www-servers/varnish/files/varnishncsa.initd
@@ -0,0 +1,32 @@
+#!/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,v 1.1 2014/05/22 20:23:48 idl0r 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"
+
+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.0.ebuild b/www-servers/varnish/varnish-4.0.0-r1.ebuild
index d21d9c823dc0..704dcd928996 100644
--- a/www-servers/varnish/varnish-4.0.0.ebuild
+++ b/www-servers/varnish/varnish-4.0.0-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.0.ebuild,v 1.1 2014/04/12 22:45:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-4.0.0-r1.ebuild,v 1.1 2014/05/22 20:23:48 idl0r Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
 
-inherit autotools-utils eutils systemd python-single-r1
+inherit user autotools-utils eutils systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
 HOMEPAGE="http://www.varnish-cache.org/"
@@ -20,7 +20,8 @@ IUSE="jemalloc jit static-libs"
 CDEPEND="
 	|| ( dev-libs/libedit sys-libs/readline )
 	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )"
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses"
 
 #varnish compiles stuff at run time
 RDEPEND="
@@ -46,7 +47,10 @@ PATCHES=(
 AUTOTOOLS_AUTORECONF="yes"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	ebegin "Creating varnish user and group"
+	enewgroup varnish 40
+	enewuser varnish 40 -1 /var/lib/varnish varnish
+	eend $?
 }
 
 src_prepare() {
@@ -69,18 +73,32 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 
-	newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
 
-	dodir /var/log/varnish
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	dodir /var/log/varnish/
 
 	systemd_dounit "${FILESDIR}/${PN}d.service"
 
-	insinto /etc/varnish
+	insinto /etc/varnish/
 	doins  lib/libvmod_std/vmod.vcc
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
 }
 
 pkg_postinst () {