8 files changed, 22 insertions, 17 deletions
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 {