Update files which haven't been tracking upstream

9 files changed, 30 insertions, 25 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index dda7039f..a60a7dc0 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,15 +1,15 @@
 AUX conf/lighttpd.conf 8311 SHA256 cac1fe4567d5a7bc9007b3d533396865da4a126b076870c972ea73c10337f223 SHA512 125f7fdfcd16f8138d3ce6bf8bdca43f79bdcc0cada1bae7d688c533898374374effb3cfa7b8b3a675849ca45120158fcf22de5105738074a63cb7bada5815f7 WHIRLPOOL b125a007233d599f41f626ecdfab1666927e86564dd616461c4f0fdef598679c9729c471101d3f4422386da465f109787014eced4f15431cdd38e3fe9bfdb2d1
-AUX conf/mime-types.conf 3436 SHA256 75a6fce072250ebccde2320996fdace0ebfeb525b03322f0b454f8f4e0e29a85 SHA512 a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf WHIRLPOOL 4302b7ea4d95d35c52f3a4f4d70b7501d5d84ab38a159f1e13a546b072fa051ed99eeac5e234e5788c788d18d1a60e31cca5af0c56a4a6bfd4e468ecbd1550ff
-AUX conf/mod_cgi.conf 869 SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf SHA512 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 WHIRLPOOL 6384804166120172603e92dd1642666b995fe1987fa8033518d0395b7e0b9e029a06edb989515f405dd5a5e4c5e5c0706d98e24a72ca4f1ff6c35c9607200c73
-AUX conf/mod_fastcgi.conf 677 SHA256 954bf2a030e268e7cd880d4cd7d6c13317c09e0ec4e87a8d7d887fb4e7dc83bd SHA512 0e9ba1403c44bcca6740803f8932caf2d787641d139db3ff1d3d3234234368774875493b8dd82e5e5337791de945d9ddeb578f665cec5503747e5bdf2c5318ba WHIRLPOOL b7378d44772216076ca9bba05104c03a256035a1a604f0366d76e6b5d0709212a1f3e222f8cbb9e0daabd28e513d4322eeb39e6b2e2950ffff9d3602c960bce9
-AUX conf/mod_fastcgi.conf-1.4.13-r2 687 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e SHA512 1f7ca06b3501326f204bfa4de2694b1552fddfac5af52357a5cea5861c20204069adf6f92ea0c267968e5e2dc02804e34a61eb710026c213e3523a490254b3aa WHIRLPOOL 8e125710abe0467170a83f17a2b6cbe79d7a17ad9dde9b158a1be1dca2cc14ecfa2db6a4856371f1240f528caf22f0809523f1b13c81bab9e6ec70fd4f0abe59
+AUX conf/mime-types.conf 3363 SHA256 56a053c83c1c60b5efd1a25a629ff44daf0170e80b1304d896ba795162a932cb SHA512 ca51096fbfe0e3166919fc80aac830801371f553e0b6d7ac9378cc6d3977748f37a578413e772ced16844e09a73c058795de95015c91eb6b731f588fa852516a WHIRLPOOL 16590795c8e011c5345975720d7e31d00048bd978ce332efd23bf4247ab970bb68a3432b2150b7d0dd4bc2b917b349c22a844a7201ac22743d3d038fe544147c
+AUX conf/mod_cgi.conf 799 SHA256 48a94d480d0dc6c92a13e5f85c905d771b9273aad0b86019a1503f63c563fa8e SHA512 00ac3296f8f0dd2afe91b09ec54fb2fd3490f3a7a9d9f177a0d4b42f490651c0b4401c3ace78393c280def9836605cfd8c8df664a5be4a68adb1e5df66a13859 WHIRLPOOL b254ae4d9ea679b7ae16a073fd85fa48a942b97e11f5a36e6dddeae18c19b7c655c1c1a54d7f7dfb8a83e56e844cd5896f51a1eaf4476214c8b4ba24f4d34228
+AUX conf/mod_fastcgi.conf 603 SHA256 b2bbc7002060fcee344f80299814abbc80ad129cf20ae57bf1db29a66738a1dc SHA512 7fa35af51069fa3e65b664ebc4086b59e2b4c15ae936d82b8710a1bff82825c78645e300ed124c09c7d314031633a2c10b6a53f521627f9dd3f7459ca2f62a88 WHIRLPOOL 0d6ac40d9f92ae58424ebfbf661e12021eaf764bccc061efbfd74c4ed336ab55884032f5e9d76c5396a9a014d2ca2f40fb60a9c565026108b3876ce309123817
+AUX conf/mod_fastcgi.conf-1.4.13-r2 603 SHA256 b2bbc7002060fcee344f80299814abbc80ad129cf20ae57bf1db29a66738a1dc SHA512 7fa35af51069fa3e65b664ebc4086b59e2b4c15ae936d82b8710a1bff82825c78645e300ed124c09c7d314031633a2c10b6a53f521627f9dd3f7459ca2f62a88 WHIRLPOOL 0d6ac40d9f92ae58424ebfbf661e12021eaf764bccc061efbfd74c4ed336ab55884032f5e9d76c5396a9a014d2ca2f40fb60a9c565026108b3876ce309123817
 AUX lighttpd-1.4.29-mod_uploadprogress.patch 22472 SHA256 b7b13ae1de4bbe2cf2687686ae4921d4ae2f66fc524703b3c63924b6d888934f SHA512 b790e36f803765c922da970ca69a851afa7f03aa8aedb9ecaf21d326794fa8622959b953705d0d9ff4125504478da7b384fa969d1c70e35623b3a3d4bb4b90bc WHIRLPOOL 837792c531c7522a11618f99574716c2b4a1eb43f906cf6e50fcd6bf10fe85ab451ad160d072830cd0d813e69a1b15fa5eb3808db75b2516244b55418e20a92e
 AUX lighttpd-1.4.31-automake-1.12.patch 346 SHA256 035ba86aec4dea7e7fdfb499e8105332f1df04d41b382f14bdd8f105f0baaa60 SHA512 080085d8ec3760fea8affd423150c9f37cb9767ba494d43d7b2e900ddb73efe03bb684f2b2cf274f9e94e2c2d7803719687128333c32cde44e0da997a407cbba WHIRLPOOL 859e86d9689f4365492af0a4b9b665719172c284ab29bbc3910280ecb861d64044bf64511dfadb70c9d8b3f2d8f6472d36c0c7a02e0f84593474f070c42e8745
 AUX lighttpd-1.4.33-fix-ipv6-build.patch 661 SHA256 28d892b34d60151dbb8ccbd3d57c8f1c84747126210556ad51b1c3bb06880e5f SHA512 7e55bf1d175081b1dc764040a8cf05c74db1e2062a690a343553c12065f668db5f47c65d63f856170d213bce063227e9fb031bd5636af49b34e0d16a621276de WHIRLPOOL 2f88bc5943b1081d84c7d6dc858e1e929359051ce4ca67f2e200134c0bfbc4e2ce566912360d5996a9ee5e25c7ce33436250dfc5e9af449e14fba7e40e7f76c3
-AUX lighttpd.confd 383 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0 SHA512 a28bf860ed23836063c37c14ca33dcd70f4b1234326442f8c0bc23b44efb53f5752292a98cf5f4a6c6cfc0f9e06b3c8a2f9d3b9512b0146e680af021570ad16d WHIRLPOOL cea38f5edf0e0d30c46e815adbb03579816979215789944564f1b1bdb53a97f566857bb8bd72954bc91ae641a3a898ed87033980f7f69466ae33fbad5df88b35
-AUX lighttpd.initd 1682 SHA256 4e7741cf9f702c981f14852357e7e1dcac7bb26b32dd5e872af01fce6026ffc8 SHA512 fe4e755c95355bb9c81f2a13b30df37e282238b3e5288335ca7ac66d6a2b6353ae3187446d0e2537f5094b37de884ef207859cc3ac7fd9f69df58c711dab405a WHIRLPOOL 764ceb47fa89eb81e930bedbf1401a04d0dbdf3c02e115bd5da991a77d35c7bd402d1753b8bd37df9206220874b8d1ae735f2ac0c176a4a7a15b70f497fe6b78
-AUX lighttpd.logrotate 487 SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c SHA512 e1284fe9ab4b9a53c21b40a5ac3e77e66343e187321b8a2f7464db64747f3a99f7e17a9e7c0e298db84a24fa1286cfe344dbff182eddd9de5c0605f5397a6972 WHIRLPOOL 96538a7fb86d6cb19dbc8eb6034e305fbc574edeb29e45d7fd8e58234fb8f1812daf7c1d845f9dfa052ebf9bfdc84b801a8aa68dfbad08aa88f32b0838a5bf5c
-AUX lighttpd.logrotate-r1 715 SHA256 3e84b3ae253c0310b751537691939b532f79208049cb0471d40b3b08b13f1595 SHA512 dfb9e2be3d3553e442daf4d9fa693793842eeaa2a12e5aeb4d7fc74846926447b706cc12d31151316f9f2856277a654134c3dd2836decb8966824f94aab6935a WHIRLPOOL f1e857c8c7c4993ecebe40ab055820ea31c2b04d1650225f237fb865e10584f4c8a302220640e3d1f08ffae000e333b754d95bd63ad8301081ab9fcdf4159607
+AUX lighttpd.confd 240 SHA256 0be7c9c04ce508cbefb3e913951d83c5ed7f0e01fe5aebcf3a5071f30ef3dbc2 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416 WHIRLPOOL 9ffa7ee9fa1620520a282da15c5b68ee43e2bf5bfe47bd889a39d294ec48c6a254eb6d4af4fc842755f6939dc41276d25e253e088d09cd788c2495f557d15912
+AUX lighttpd.initd 2237 SHA256 75e168ee9adc193d06af5f509b29595a3778982c4bd1206fd82363b58fdecb8a SHA512 fa7e70a00715786801d914af72afb0555583fe8ae2528ca17e698937d10d21908dd727d7bb7215363c84763dcde4336a4bfecf85a476a28b0b93bcb8be9b51b6 WHIRLPOOL bff3c51be88fd12c9feefdf8c9f31054f34bcd1c864f2b0599b928fc65c170bd93e184167f4914bf35b8d059650a46a5f7699c4eb475bd6539bfa78528939671
+AUX lighttpd.logrotate 416 SHA256 a5c47508d7ed2035838ec0b141f4167ff697420b5dd6f857c7bfe0a1c3994a85 SHA512 de8bb07f40c3bde614f40b5da972a1f9dc9a6d1827c367bbba610c8f65cfa45eae7bd80b3c04c5470ccaff36a6ae778fec7cde1adc4bcba7943aaa19fa56aa9b WHIRLPOOL 4a9daa78bbd34b29679821e7049f0d7dd384c0b290130cf64da7f076edeefc73b9fcbfc8d3601089af2e7b13c100932a9a303290d7e173daac325f2d56108dfd
+AUX lighttpd.logrotate-r1 640 SHA256 d35f7bf15a27aacd6fa726ce190bea464e3ed75a9f22d4c704b0397a9a1b4edd SHA512 0c1fa255469c498a946ab9b2482ae32a89445c7b0167d9ee49c2b6608d05215f15bc7204581addff94625b2d37bfe53e6e6d0019c451a9b96cc5cd6399364e5c WHIRLPOOL d65df5dc5a327833cfcc34b2c556e495f394e643f2ae79f8c58b12d2860063fe6842e705df33196cea15df928feee12a49a6fad6bf938ac4c99a6f287b7c65c1
 AUX lighttpd.service 257 SHA256 3e8c6615b46f35e0e585fa6e788d4fc5725c656404d3c47081ceca77f8873c6b SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f WHIRLPOOL f6078f3b676d753fd130e46367043bc498617d19564c8e78874629f82f2df817e2398774aa41382d6a38826d7bdaf5b2190fa6e298ae83d6819d4aacf758a979
 AUX lighttpd.tmpfiles.conf 44 SHA256 a31237336ad02b22579b5e2168485d43d350f78ed010d39a2dbc554dd574bbcb SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936 WHIRLPOOL 5774c609ead3af3758766cd69111af5e080dc230cb7632ae54ade74313a20f5680d83117a2a369230e2d7c5328e1703ecc315fa1555f79a688e8728a7a209b4a
 DIST lighttpd-1.4.32.tar.bz2 681065 SHA256 60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f SHA512 ffd5488a2ed57daa26b6d16223f422a94e88f2488cdc50bbb354c45daa535fbf9231fbbe73c23327a0adb708cc2b67fbdc60c34195a2a46a171dcc0f30bb3efb WHIRLPOOL 0f537296ae2a321962a4e4bc9a45631d334cf180a5aee1a182e6d95ebdcabfec6df4d229e888ce9170f526ab716c323cc66947413747ee91e6f73e2a4a0d4526
diff --git a/www-servers/lighttpd/files/conf/mime-types.conf b/www-servers/lighttpd/files/conf/mime-types.conf
index f24d4d85..72bac5fe 100644
--- a/www-servers/lighttpd/files/conf/mime-types.conf
+++ b/www-servers/lighttpd/files/conf/mime-types.conf
@@ -1,7 +1,7 @@
 ###############################################################################
 # Default mime-types.conf for Gentoo.
 # include'd from lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $
+# $Id: 4d083e3abec705f1a08890611e797eaf45f3fce2 $
 ###############################################################################
 
 # {{{ mime types
diff --git a/www-servers/lighttpd/files/conf/mod_cgi.conf b/www-servers/lighttpd/files/conf/mod_cgi.conf
index 1cb3770f..a3a048e9 100644
--- a/www-servers/lighttpd/files/conf/mod_cgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_cgi.conf
@@ -1,7 +1,7 @@
 ###############################################################################
 # mod_cgi.conf
 # include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_cgi.conf,v 1.1 2005/08/27 12:36:13 ka0ttic Exp $
+# $Id: 306f927f07917181f50dc9cfb0a5e61678b93482 $
 ###############################################################################
 
 #
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
index b70aff1d..9bf82941 100644
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
@@ -1,7 +1,7 @@
 ###############################################################################
 # mod_fastcgi.conf
 # include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.3 2009/04/03 20:59:34 bangert Exp $
+# $Id: fe1c84fece6bd22845336541cedf6442e8e0312b $
 ###############################################################################
 
 server.modules += ("mod_fastcgi")
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 b/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
index ca1369af..9bf82941 100644
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
@@ -1,7 +1,7 @@
 ###############################################################################
 # mod_fastcgi.conf
 # include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2,v 1.1 2007/04/01 23:22:00 robbat2 Exp $
+# $Id: fe1c84fece6bd22845336541cedf6442e8e0312b $
 ###############################################################################
 
 server.modules += ("mod_fastcgi")
diff --git a/www-servers/lighttpd/files/lighttpd.confd b/www-servers/lighttpd/files/lighttpd.confd
index f3afb07a..c7733de7 100644
--- a/www-servers/lighttpd/files/lighttpd.confd
+++ b/www-servers/lighttpd/files/lighttpd.confd
@@ -6,7 +6,3 @@
 
 # Location of the lighttpd configuration file
 LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
-
-# Location of the lighttpd pid file
-LIGHTTPD_PID="$(/usr/bin/awk '/^server.pid-file/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
-
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index dadbed56..fe31f1b0 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,10 +1,13 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.22 2013/02/06 19:36:51 hwoarang Exp $
+# $Id: 1a4fa561e16b480a269e548bd1f839ae09efd50b $
 
 extra_started_commands="reload graceful"
 
+LIGHTTPD_PID="$(awk '/^server.pid-file/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF} 2>/dev/null)"
+LIGHTTPD_PID="${LIGHTTPD_PID:-/var/run/lighttpd.pid}"
+
 depend() {
 	need net
 	use mysql logger spawn-fcgi ldap slapd netmount dns
@@ -18,17 +21,23 @@ checkconfig() {
 		return 1
 	fi
 
-	if [ -z "${LIGHTTPD_PID}" ] ; then
-		ewarn "server.pid-file variable in ${LIGHTTPD_CONF}"
-		ewarn "is not set. Falling back to lighttpd.pid"
+	LIGHTTPD_PID="$(awk '/^server.pid-file/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF} 2>/dev/null)"
+	if [ -z "${LIGHTTPD_PID:-}" ] ; then
 		LIGHTTPD_PID="/var/run/lighttpd.pid"
+		ewarn "server.pid-file variable in ${LIGHTTPD_CONF}"
+		ewarn "is not set. Falling back to '${LIGHTTPD_PID}'"
 	fi
 	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
 }
 
 start() {
 	checkconfig || return 1
-	checkpath -d -q -m 0750 -o lighttpd:lighttpd /var/run/lighttpd/
+
+	# Glean lighttpd's credentials from the configuration file
+	# Fixes bug 454366
+	LIGHTTPD_USER="$(awk '/^server.username/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF} 2>/dev/null)"
+	LIGHTTPD_GROUP="$(awk '/^server.groupname/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF} 2>/dev/null)"
+	checkpath -q -d -m 0750 -o "${LIGHTTPD_USER:-lighttpd}":"${LIGHTTPD_GROUP:-lighttpd}" /var/run/lighttpd/
 
 	ebegin "Starting lighttpd"
 	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
diff --git a/www-servers/lighttpd/files/lighttpd.logrotate b/www-servers/lighttpd/files/lighttpd.logrotate
index 76f0ef3f..0cffe09d 100644
--- a/www-servers/lighttpd/files/lighttpd.logrotate
+++ b/www-servers/lighttpd/files/lighttpd.logrotate
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.logrotate,v 1.2 2006/05/30 19:49:29 bangert Exp $
+# $Id: ef9dcc082e06642e1a87442616224b48488c4983 $
 # lighttpd logrotate script for Gentoo
 
 /var/log/lighttpd/*.log {
diff --git a/www-servers/lighttpd/files/lighttpd.logrotate-r1 b/www-servers/lighttpd/files/lighttpd.logrotate-r1
index 543214b1..8f66cbe1 100644
--- a/www-servers/lighttpd/files/lighttpd.logrotate-r1
+++ b/www-servers/lighttpd/files/lighttpd.logrotate-r1
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.logrotate-r1,v 1.2 2015/02/21 21:11:57 hwoarang Exp $
+# $Id: 724ff049d3c9360f579680a3fa32a873117c5f21 $
 # lighttpd logrotate script for Gentoo
 
 /var/log/lighttpd/*.log {