prepare for 1.4.22 - copy mod_fastcgi.conf-1.4.13-r2 to mod_fastcgi.conf and lighttpd.initd-1.4.13-r2 to lighttpd.initd

Package-Manager: portage-2.2_rc26/cvs/Linux i686

4 files changed, 41 insertions, 25 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index c1362b99175f..4f7b5ecfe9a3 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.196 2009/04/03 18:58:12 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.197 2009/04/03 20:59:34 bangert Exp $
+
+  03 Apr 2009; Thilo Bangert <bangert@gentoo.org>
+  files/conf/mod_fastcgi.conf, files/lighttpd.initd:
+  prepare for 1.4.22 - copy mod_fastcgi.conf-1.4.13-r2 to mod_fastcgi.conf
+  and lighttpd.initd-1.4.13-r2 to lighttpd.initd
 
   03 Apr 2009; Thilo Bangert <bangert@gentoo.org>
   -files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff,
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a8563446c934..497ec19e678e 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -6,10 +6,10 @@ AUX 1.4.20/03_all_lighttpd-1.4.11-errorlog-pipe.diff 4931 RMD160 7653167b0cd3fde
 AUX conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 SHA1 16922786a79807fa3233d1af105a99582d3486a5 SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd
 AUX conf/mime-types.conf 3350 RMD160 ca82154e69af26b1d9de9757d5bcbe69eb428dcb SHA1 f7b7c19a90629b6598a1c4769592628fa582dd34 SHA256 8bbab2136c71878fbca5ad8d45838a99fd278037406049a3cca5f47d81309100
 AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
-AUX conf/mod_fastcgi.conf 661 RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b SHA1 853a54799e9cd42ab9ff92bf0c07a0515ebe2d2a SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06
+AUX conf/mod_fastcgi.conf 677 RMD160 4403ca232cfcfc51d1d71529be9903bf4123451e SHA1 2b4a3d35215ba8824b5eca943156b373479f1a45 SHA256 954bf2a030e268e7cd880d4cd7d6c13317c09e0ec4e87a8d7d887fb4e7dc83bd
 AUX conf/mod_fastcgi.conf-1.4.13-r2 687 RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 SHA1 ebb469944098a91772424a825fdd5a0464cef158 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e
 AUX lighttpd.confd 315 RMD160 c2d9c166a1209b853b400b5d21627f5d3f2d5216 SHA1 a09597a0d38d0b4d36a8f16f5d6fd5c4b7462b26 SHA256 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87
-AUX lighttpd.initd 1162 RMD160 9a1afa2777428a27857e9e587c1e94457b95c6eb SHA1 e1208f1906cf089e8bac00d0271b4691e9922f60 SHA256 8bbe703055f65742158ceeed7725a914d2fa4059e720b9983fa5e647626111aa
+AUX lighttpd.initd 1445 RMD160 0ebf75a57644912748a1c4173aa64c15981e5abc SHA1 0597c93d246639141ca8522f44f24b2431949e2e SHA256 72b08e97eae7de6a33160085bc46c0edd36f6924d6132239cd8191399998ec5a
 AUX lighttpd.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a
 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
 AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768
@@ -18,5 +18,5 @@ DIST lighttpd-1.4.19.tar.bz2 610347 RMD160 8731ba3efc95659a16dbb11b7298e3b539ab3
 DIST lighttpd-1.4.20.tar.bz2 618018 RMD160 0fcc71d6063574da86b610c9bdc16b7e44f9d2e7 SHA1 e5944a40579e0f37c6a0eeb0ad751344b2d6006c SHA256 3cda2ce779f24948062f765f2630b5865e483f5fab7149681a2a25422fd61176
 EBUILD lighttpd-1.4.19-r2.ebuild 5839 RMD160 0947b4c115cc5ecbc0ec67aa4b077b70c1714d09 SHA1 9ccbbb41364d162b09e52134cbc47c72f731ffdc SHA256 373f9b64c41abce5d09af55a16218ab34ac44bedc4cc6019d034d20865db4ac4
 EBUILD lighttpd-1.4.20.ebuild 5960 RMD160 19f74751b53e92f9876c0015b0fc850733c20021 SHA1 4de12f3cba5ef21bf55a16e4b5a9ca2ab64d1816 SHA256 45c275d895a00370c905b0aa37ebdba46872930034843bb0375fdfa1c0f78f72
-MISC ChangeLog 45547 RMD160 bed2169ad8e9f33023115216c4f84807ac2f528e SHA1 897be499799f718541a6543d0247f0c6e097bcd0 SHA256 012c702e889054ba97d5ba60527e10027a761e508f1552ec8f591a0e67406192
+MISC ChangeLog 45775 RMD160 debfb492054058ddfbc73250fa4fc14fb87b7174 SHA1 26252a2642ec0a319947f3b1dcf179ea8e290b2f SHA256 2b5960f02cbd823b8fcd271ca5e4e15b4495ef22c7be6d662c780cae50ff0c07
 MISC metadata.xml 927 RMD160 3d969f099d1bb8df70ec5f8ed78a83ad27d2b10d SHA1 1e564c4fc4edb8a4b2dc41f731071ec38e917027 SHA256 479db26201c5c934fd5fb5deccd8712a637114d5cde6e75da8ce9ad4872ec070
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
index 452e1749e1f7..b70aff1d1f0d 100644
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
@@ -1,15 +1,14 @@
 ###############################################################################
 # mod_fastcgi.conf
 # include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.2 2005/08/27 12:36:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.3 2009/04/03 20:59:34 bangert Exp $
 ###############################################################################
 
 server.modules += ("mod_fastcgi")
 fastcgi.server = ( ".php" =>
 		            ( "localhost" =>
 			            (
-				            "host"		=>		"127.0.0.1",
-				            "port"		=>		1026,
+				            "socket"		=>		"/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
 				            "bin-path"	=>		"/usr/bin/php-cgi"
 			            )
 		            )
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 1ce30659729d..71c72ba2ca8a 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,19 +1,19 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 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.12 2007/10/12 20:54:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.13 2009/04/03 20:59:34 bangert Exp $
 
-opts="depend checkconfig start stop reload"
+opts="reload graceful"
 
 depend() {
 	need net
-	use mysql logger spawn-fcgi ldap slapd
+	use mysql logger spawn-fcgi ldap slapd netmount dns
 	after famd
 	after sshd
 }
 
 checkconfig() {
-	if [[ ! -f ${LIGHTTPD_CONF} ]] ; then
+	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
 		ewarn "${LIGHTTPD_CONF} does not exist."
 		return 1
 	fi
@@ -25,31 +25,43 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet \
-		--background --pidfile ${LIGHTTPD_PID} \
-		--exec /usr/sbin/lighttpd -- -f ${LIGHTTPD_CONF}
+	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
+		--pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}"
 	eend $?
 }
 
 stop() {
 	local rv=0
 	ebegin "Stopping lighttpd"
-	if start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \
-			--signal 2 ; then
-		rm -f ${LIGHTTPD_PID} 
-	else
-		rv=1
-	fi
-	eend $rv
+	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
+	eend $?
 }
 
 reload() {
-	if [ ! -f ${LIGHTTPD_PID} ]; then
-		eerror "lighttpd isn't running"
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} isn't running"
 		return 1
 	fi
 	checkconfig || return 1
+
 	ebegin "Re-opening lighttpd log files"
-	kill -HUP `cat ${LIGHTTPD_PID}` &>/dev/null
+	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
+		--signal HUP
 	eend $?
 }
+
+graceful() {
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+
+	ebegin "Gracefully stopping lighttpd"
+	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
+		--signal INT
+	if eend $? ; then
+		rm -f "${LIGHTTPD_PID}"
+		start
+	fi
+}