removed keepdir for /var/run/lighttpd/, this is already handled by the init.d script. bug #450836

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

3 files changed, 249 insertions, 3 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 7eff34803d44..f4c6f7bf27e3 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/lighttpd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.295 2012/12/29 15:12:38 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.296 2013/02/02 03:47:28 wired Exp $
+
+*lighttpd-1.4.32-r1 (02 Feb 2013)
+
+  02 Feb 2013; Alex Alexander <wired@gentoo.org> +lighttpd-1.4.32-r1.ebuild:
+  removed keepdir for /var/run/lighttpd/, this is already handled by the init.d
+  script. bug #450836
 
   29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> -lighttpd-1.4.30-r1.ebuild,
   -lighttpd-1.4.31.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a725a0461096..b60520565af1 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX conf/lighttpd.conf 8383 SHA256 52598c3428ede27e2784861df16cc1f7b811feee4f4273b26515aba4a79431b6 SHA512 8befa83dd2ccc1df0187c31c233a3bffd7d059ccc1ce4aa96fbd9a6fd0c402d8ddf0f6b9bd8dc7ff2279103ee92ddd53ecf6aac509deb3ffc17d62ed1cad413e WHIRLPOOL 685806f9e770c803f7a0498b4b9f8f4d1aaad510ec93f61979c3ab8e9ed4e34893bccf03b6e33c9d7798943c1110b3409782d863c345a6e6f1f9312c1106b1fb
 AUX conf/mime-types.conf 3436 SHA256 75a6fce072250ebccde2320996fdace0ebfeb525b03322f0b454f8f4e0e29a85 SHA512 a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf WHIRLPOOL 4302b7ea4d95d35c52f3a4f4d70b7501d5d84ab38a159f1e13a546b072fa051ed99eeac5e234e5788c788d18d1a60e31cca5af0c56a4a6bfd4e468ecbd1550ff
 AUX conf/mod_cgi.conf 869 SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf SHA512 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 WHIRLPOOL 6384804166120172603e92dd1642666b995fe1987fa8033518d0395b7e0b9e029a06edb989515f405dd5a5e4c5e5c0706d98e24a72ca4f1ff6c35c9607200c73
@@ -9,6 +12,24 @@ AUX lighttpd.confd 383 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e93940
 AUX lighttpd.initd 1682 SHA256 7886dab8764fca471ae0152af823accfe8ffea45049f49236ef0566ef98b6cb3 SHA512 165e960c4c6a0dcc455ea4513d64695191a6b43a5537d50fbf24e96a2aefd613f62aa72a47ae462b31b90e22abd511fce501745e634a4a6102e478700e3e4aa4 WHIRLPOOL 8fa3fa36d85982b45fba515fb218e7a81d1069f94521d97db728895c5341374e43433019f9af5f15cf2d18695f2dee08d4a754691b7c5849ac17f3a5455c1877
 AUX lighttpd.logrotate 487 SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c SHA512 e1284fe9ab4b9a53c21b40a5ac3e77e66343e187321b8a2f7464db64747f3a99f7e17a9e7c0e298db84a24fa1286cfe344dbff182eddd9de5c0605f5397a6972 WHIRLPOOL 96538a7fb86d6cb19dbc8eb6034e305fbc574edeb29e45d7fd8e58234fb8f1812daf7c1d845f9dfa052ebf9bfdc84b801a8aa68dfbad08aa88f32b0838a5bf5c
 DIST lighttpd-1.4.32.tar.bz2 681065 SHA256 60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f SHA512 ffd5488a2ed57daa26b6d16223f422a94e88f2488cdc50bbb354c45daa535fbf9231fbbe73c23327a0adb708cc2b67fbdc60c34195a2a46a171dcc0f30bb3efb WHIRLPOOL 0f537296ae2a321962a4e4bc9a45631d334cf180a5aee1a182e6d95ebdcabfec6df4d229e888ce9170f526ab716c323cc66947413747ee91e6f73e2a4a0d4526
+EBUILD lighttpd-1.4.32-r1.ebuild 6512 SHA256 764af918fe36520a6dc968e1682681123012eca7c0fe7eeb7b4e4d9945bc6724 SHA512 a3e61c41568ed756042d6f3c41574547582a4a120b62a401563a46a29075f96b6f09d1804dd4f0856c2844e2214d2b99b51c1ae88e4cd374bccf02eba87b9750 WHIRLPOOL a8f3315546a20818ee2a129ed0e9e38e47e9602e0a5e08b1903f1c3e9d6c656ffb811b7af0370ba0bfbebee0ec7579eb70fc8e477e5bb0ce94f6b6799bc0646e
 EBUILD lighttpd-1.4.32.ebuild 6647 SHA256 6d618327ba9b945cf1f0f9fc52ad40e32fd9804e93d0129802d46bba586c7477 SHA512 33069ef5915441223451a5071895092a348f8afc0f84b7bc2641e1e3458d90aeac5b4c90507fa9be60a2aa30cb8874407ff59822ed0997f4e42ad4414403dab9 WHIRLPOOL 32803a9b66dc3b2986679da0d1cc979f46d164e3e7c2357522b5bf71354b7fe7f03548520b1f728c50bcffe306d306acbc044336c18701c065f29cfd58aa4de1
-MISC ChangeLog 61654 SHA256 6d9ecb126ee0cff049833f8935b9e4414cc41906b784f4e48e8eb395e1c5e00e SHA512 9ee41dd67ce36ef74ce9a22ad0c7254171559f86d4c83edce6277ca1c2d800ef3364de3dadd8334969db4b8c6897641bcf58e26a13838ab0b0d08cc4d4a0ee7f WHIRLPOOL ed5125f99502c0841044f4ae7a1dfa5aabbdb390c70516683085a3416dfadff230fb34a5a462411516ce72903ed13d8731796ef350ed2e69966186f4a2d88f17
+MISC ChangeLog 61871 SHA256 5c0b1e82295bfb2308784439f7f8c57389e9452762e55fa276c2084c47f5255b SHA512 854383c82bea9eb181efbc2cf5f5b1292b1dd1838fff8d53681f84dcdf548d949a500f1d2f3ed06931292bda2c3baa0b13309e5718e8a6fcd1804e885fcbeac8 WHIRLPOOL a768977663217592496e9ee1e143553757ced46cdae6b93054323e16cd9cdc6a8f0cb7520dab00225d60418291782b410d0ad112f6feeabbdf34d23544294b61
 MISC metadata.xml 1315 SHA256 4a5b911cadfb5f48332d4c252cabdae052af96232321f0171e5ed1fa7194abce SHA512 4ff65b32d294a5ff288eafb81561e4160db69bbea3fab90dc7e80135901ce7c6aded4743b88d3e52e936c73d71b2ddef7d65523e6f737fd76994776bb9a6ea77 WHIRLPOOL 83a654aa9c34b778cded6acad83aaa891d57b3effc220a4a006123beef73d69e075eeb580d9b5c3021535da8a8ec64a933d0d62bd1e8ab639ccff4f3592b92f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRDIxnAAoJEDZF8K7rm0r6tZ4QALKTPOxenEjNOJrn/a96BVib
+nkj0f7b8cu3gfOsuGmZBrhX9/lQ41zHeLBz3zm7eftO588N/O8p9DBy1qxr9UfFG
+eJr6BAO/0/urg+/MwQZewUH9uP8IEwUcJqEq1/tzktqSFWqb8ZtqfusAZadZP8bk
+pco05uTOFzre3izZobBCtb7+22gZ5kpdP5u/6JVVA572Imp/7Sb8aDH6N9JLysm4
+4pc4Oy7SuxF0esVTtMfMm76iOL+/ZO1SjynH2Z4c3Wa+6QcoccP8BDvnDFoKf/Nk
+6nuELFVhtlNZPrR/WkvbJz4uJPm6dBzkKO5KTLybGIo5y+bbWSh5P7XOnG3uxSpT
+61inmVAiOKSJrtug4PNysZrY49Vt4u59xHtPR1seSMoq4cCzp0VTWntwlJQBdvmh
+Ia769Rc5fC2exnnDWyC18NrRo5F6txGQ25cyDnxJn4PXpHJxR5C2ArLTQC5Wp2vS
+3djsznqwJyImNz4AnFRYkSKmD7mlvmxpXXdysWhGRb+Cw06nFD8f6jWfHdIwywVo
+ShMCS41izeys0io2xZTmwZ9bXZNtUZZ7Ov4OrwE1NO6x9o/lY2v1NYE36+rTMfYT
+c2mHJrjwNGScJgAT48ZRO4eOP4S6nxU4XxBViGsOquJ6Rk6fnkLEfZHGZjgBijAC
+KPpk4Wx8kSqarBwssIf7
+=FIxB
+-----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/lighttpd-1.4.32-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.32-r1.ebuild
new file mode 100644
index 000000000000..d15c533e380e
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.32-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.32-r1.ebuild,v 1.1 2013/02/02 03:47:28 wired Exp $
+
+EAPI="4"
+
+inherit base autotools eutils depend.php user
+
+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 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl )"
+
+RDEPEND="
+	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 )
+	selinux? ( sec-policy/selinux-apache )
+	ssl?    ( >=dev-libs/openssl-0.9.7[kerberos?] )
+	webdav? (
+		dev-libs/libxml2
+		>=dev-db/sqlite-3
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? (	>=sys-libs/zlib-1.1 )"
+
+DEPEND="${RDEPEND}
+	virtual/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="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# 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.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+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
+	if use mmap; then
+		ewarn "You have enabled the mmap option. This option may allow"
+		ewarn "local users to trigger SIGBUG crashes. Use this option"
+		ewarn "with EXTRA care."
+	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/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	# Experimental patch for progress bar. Bug #380093
+	if use uploadprogress; then
+	    epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch
+	fi
+	eautoreconf
+}
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with kerberos kerberos5) \
+		$(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) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	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() {
+	emake DESTDIR="${D}" install
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# 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
+
+	# 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/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate lighttpd
+
+	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
+
+	if use uploadprogress; then
+		elog "WARNING! mod_uploadprogress is a backported module from the"
+		elog "1.5x-branch, which is not considered stable yet. Please go to"
+		elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress"
+		elog "for more information. This configuration also is NOT supported"
+		elog "by upstream, so please refrain from reporting bugs. You have"
+		elog "been warned!"
+	fi
+}