Revbump to fix init script per bug #366811

Package-Manager: portage-2.1.9.47/cvs/Linux x86_64

5 files changed, 237 insertions, 13 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 8eaacb1fabea..9d118f9a626b 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.244 2011/03/16 19:52:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.245 2011/05/12 18:15:56 hwoarang Exp $
+
+*lighttpd-1.4.28-r2 (12 May 2011)
+
+  12 May 2011; Markos Chandras <hwoarang@gentoo.org>
+  +lighttpd-1.4.28-r2.ebuild, files/lighttpd.confd, files/lighttpd.initd:
+  Revbump to fix init script per bug #366811
 
   16 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> lighttpd-1.4.28.ebuild:
   ppc/ppc64 stable wrt #349213
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index f6b6a91972d1..6c87c77b0985 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.4.25-fix-CVE-2010-0295.patch 6237 RMD160 cd9ce4410ed805d28899b0207bbc670e04491315 SHA1 2ba33d94f5628d97cb606ad97ef9630eef5191c4 SHA256 d4d269d993396cfd9146de621e0a3d5e9203ac7f6b2b6f351f9013dbbe956a4e
 AUX 1.4.25-fix-unknown-AM_SILENT_RULES.patch 744 RMD160 5da8bdca1728f2de730e90de4fb7e93a274406e8 SHA1 8ae6849a88aaaca76c1b8c13a62cc266dbebc2a7 SHA256 a1cf7c77b7ee1cbe9bf3efbb7704b8582c480ae69fd70934597d24ff3fddf663
@@ -10,8 +10,8 @@ AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 3
 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-1.4.28-detect-libev.patch 441 RMD160 e65051bd918d784d3333dd0f6cde2ce4c5fe6c2e SHA1 0e7e6de46a80564c800674d19dcc05da7d97fc9d SHA256 223756902928f0f5de0100115b1e1def9e312363d16bedbc998b5d983d04ecbe
-AUX lighttpd.confd 315 RMD160 c2d9c166a1209b853b400b5d21627f5d3f2d5216 SHA1 a09597a0d38d0b4d36a8f16f5d6fd5c4b7462b26 SHA256 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87
-AUX lighttpd.initd 1445 RMD160 0ebf75a57644912748a1c4173aa64c15981e5abc SHA1 0597c93d246639141ca8522f44f24b2431949e2e SHA256 72b08e97eae7de6a33160085bc46c0edd36f6924d6132239cd8191399998ec5a
+AUX lighttpd.confd 383 RMD160 e7b5d446dcbb55c7855706aa566bf87ab0bad911 SHA1 c300230745dd060dc2b16000270dd33def6df6a7 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0
+AUX lighttpd.initd 1622 RMD160 17da181ec3bac4c0b80d1ba47a65ae53aa30f874 SHA1 3aabf1736cdea7dbc0906dfdeedc1dd8df370349 SHA256 b65275e24a02c31a876c92f3e888c330c18f74da9d6812f6c6bd6dac8d85b67b
 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
@@ -26,15 +26,24 @@ EBUILD lighttpd-1.4.25.ebuild 5829 RMD160 365b1ea4415d2667fcef3a7af08fec29edcf59
 EBUILD lighttpd-1.4.26-r1.ebuild 5825 RMD160 16be303cda3100f66640258f7e9e454536de3e0a SHA1 fde7db27fe91f3f5288fb77239ccc45c5b3fbbdd SHA256 040d20f3c6051a35d0ec075b545be236c3e05091bf7c8c3487e89ff2cde1effa
 EBUILD lighttpd-1.4.26.ebuild 5770 RMD160 163db40627952a781db876216682589e7e493789 SHA1 c3c430d49799fa2644dbdd07833d0a42f8065efd SHA256 0a990bb6fa0cbb78ef493807d59badafb9d7e83cb54fc7d31b65ad3748ec371d
 EBUILD lighttpd-1.4.28-r1.ebuild 5739 RMD160 39f13a4f941e4f54f2ce1e15972c7df3327af6f0 SHA1 61b83b7f7f38a7868f552ab8c48905ffdc9dc022 SHA256 9a905d74a2367e00c00708efb099755a9614c6e6b5896726f05f9e405195e50f
+EBUILD lighttpd-1.4.28-r2.ebuild 5739 RMD160 8710965e748aea55c9bc837d78215300d647e912 SHA1 467b297fa64abcbfc573f8c01c1486235b581719 SHA256 6b5daa005e901165d47f4a558d55c2dd0bdd858f1a672b9023941be9ec62b7e1
 EBUILD lighttpd-1.4.28.ebuild 5676 RMD160 551c7b19158096b60f350f8db80ac6e61312af42 SHA1 005e0a5ed111b6cda8eb22c9cff9280e4542d3eb SHA256 8fb37b0afc97e260ffda15acc288f8e75418b84cfab9de0a9d62fc1a91f83bac
-MISC ChangeLog 52932 RMD160 6c199556ce743a0a23b4b28784a68bc4d9709fb3 SHA1 95b43c92bd413263bfbb16ebdcd7405ef3e180ad SHA256 0660041ba615c13b5e7afd6989d412f4547259038733084d85f16b22e2abbf1e
+MISC ChangeLog 53138 RMD160 1108d3a3f1eb52f3792447881c2fdba324774984 SHA1 d7796a1674ab770711e9ef7110c9dc6a32717c83 SHA256 074edc33ce78e471cbe9d6da0b46801875ca291cbf38f5cb4a430e5b587d000a
 MISC metadata.xml 1104 RMD160 445c36561695b89266cb1bb0b052167473e1568d SHA1 821390063f6a1d798fc036b14af8cb56c8e62492 SHA256 7b633eaadf23540735206a1ce6af010b7757affb753fc496c7b15de8c9cf78c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2BFR4ACgkQIiMqcbOVdxQjmgP/Q/fFYNNpE8bDY3t/DrSlnaTi
-WHexPL68/CEUejbUJC3aGKIaPIOiu4mrrZE13p++ZqLhyefhWE70pktx1a2r4Hwm
-CjV8ziWT0UCbUpT6d2OYeBRBPUoNs62/mVAGrg2zNFKWj35hFzWbxIbFcdv2XiaT
-XdLbKCxztPDOx2O57eg=
-=8vUZ
+iQIcBAEBCgAGBQJNzCQHAAoJEPqDWhW0r/LCRHYP/1FqsdodEmbQi+hxvQhKrAi/
+ua6Nte8d0f4TKxq/Bh6A+M1QgDEuk4r+mC8rb9kS7hd0e+Y8awW4b8WK5djRUuMz
+DWGyNKke+vxYaAHZ8uGyx8TM7fmKUb/nSK2ljOZltaYYsdeiD54KXGx1I2IVFlmx
+5W9vv0FjRb/6iKPeYASeRyM6zBnJC9aNgUZE2QmKe1paJhDQqax4SN59AbF9ccuh
+Of2Zb6eKuVe5zJw9sG1oGQmZkuePbqpdjZhHKxZxQ2BuzHJ670JdfhlNHztCGI0c
+DszEkr2EugDbXi+2wwRTYn/kMpzG6WPsyWb5sEOdSRcYZdvQbGtI9rUjMAo70IG4
+NHPjCFAqGxYc7EF67ogdQV0ke1dAU75JhIr+wnN2HCuP0PXAJlnI+NWaHn6Xz+Va
+6cYaf7dPeTCs7KtodLEZN6oAtRsMhmXK/FTIhBgpXMDsCEnEbTFC+N8V0y2nVBcL
+YgiTh50lepA/1TTSFnToLaLNOxad2dhpmeKeiVwU8A8jn5a4gjzTFnOOzdCqZ7z6
+tDqsHmO8To3WpU0oXYxglKQwQI7zpwvBa9hg34XEbT3kY4xaJQ0uPxT25LLrBj/d
+61jCx6dDY87nVOfzwBnt/mswda7rffhks5nzN0M3HydQIz8UhytK2+Ys+vKNli5X
+CEdPvDToqCylqGukSDLL
+=ay3b
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd.confd b/www-servers/lighttpd/files/lighttpd.confd
index 70d4170555b6..f3afb07a58e1 100644
--- a/www-servers/lighttpd/files/lighttpd.confd
+++ b/www-servers/lighttpd/files/lighttpd.confd
@@ -8,5 +8,5 @@
 LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
 
 # Location of the lighttpd pid file
-LIGHTTPD_PID="/var/run/lighttpd.pid"
+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 71c72ba2ca8a..d087f1b7f64e 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.13 2009/04/03 20:59:34 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.14 2011/05/12 18:15:56 hwoarang Exp $
 
 opts="reload graceful"
 
@@ -18,6 +18,11 @@ checkconfig() {
 		return 1
 	fi
 
+	if [ -z "${LIGHTTPD_PID}" ] ; then
+		ewarn "servber.pid-file variable in ${LIHTTPD_CONF}"
+		ewarn "is not set. Falling back to lighttpd.pid"
+		LIGHTTPD_PID="lighttpd.pid"
+	fi
 	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
 }
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild
new file mode 100644
index 000000000000..62cc9e10f1a3
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r2.ebuild,v 1.1 2011/05/12 18:15:56 hwoarang Exp $
+
+EAPI="2"
+
+inherit base eutils autotools depend.php
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1
+	bzip2?    ( app-arch/bzip2 )
+	fam?      ( virtual/fam )
+	gdbm?     ( sys-libs/gdbm )
+	ldap?     ( >=net-nds/openldap-2.1.26 )
+	libev?    ( >=dev-libs/libev-4.01 )
+	lua?      ( >=dev-lang/lua-5.1 )
+	memcache? ( dev-libs/libmemcache )
+	mysql?    ( >=virtual/mysql-4.0 )
+	pcre?     ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php[cgi] )
+	rrdtool?  ( net-analyzer/rrdtool )
+	ssl?    ( >=dev-libs/openssl-0.9.7 )
+	webdav? (
+		dev-libs/libxml2
+		>=dev-db/sqlite-3
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && \
+		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
+
+	# enable stat() caching
+	use fam && \
+		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && \
+		dosed 's|# server.use-ipv6|server.use-ipv6|' ${config}
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+}
+
+pkg_setup() {
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+
+	enewgroup lighttpd
+	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+}
+
+src_prepare() {
+	base_src_prepare
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	epatch "${FILESDIR}"/${P}-detect-libev.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_with bzip2) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
+		$(use_with memcache) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with ssl openssl) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr)
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc
+		emake html || die "failed to build HTML documentation"
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
+	use fam && has_version app-admin/fam && \
+		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+	# Secure directory for fastcgi sockets
+	keepdir /var/run/lighttpd/
+	fperms 0750 /var/run/lighttpd/
+	fowners lighttpd:lighttpd /var/run/lighttpd/
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+
+	use doc && dohtml -r doc/*
+
+	docinto txt
+	dodoc doc/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+
+	use minimal && remove_non_essential
+}
+
+pkg_postinst () {
+	if use ipv6; then
+		elog "IPv6 migration guide:"
+		elog "http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+	fi
+	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}