Just noticed I forgot the revbump when it was committed...

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 240 insertions, 8 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 4c644618e479..b5c55fdd2fb4 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.309 2013/09/22 09:33:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.310 2013/09/22 09:36:05 pacho Exp $
+
+*lighttpd-1.4.32-r3 (22 Sep 2013)
+
+  22 Sep 2013; Pacho Ramos <pacho@gentoo.org> +files/lighttpd.tmpfiles.conf,
+  +lighttpd-1.4.32-r3.ebuild, lighttpd-1.4.32-r2.ebuild:
+  Just noticed I forgot the revbump when it was committed...
 
   22 Sep 2013; Pacho Ramos <pacho@gentoo.org> lighttpd-1.4.32-r2.ebuild:
   Install tmpfiles.d conf (#476882 by Francisco Vazquez)
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 4788a48a08b7..ea30ced78eb2 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -12,15 +12,17 @@ AUX lighttpd.confd 383 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e93940
 AUX lighttpd.initd 1674 SHA256 b1515472c32927039b38f6c3a797cbc54a5a300b5d6fa54df9550174afa2b7f8 SHA512 6d945f9f02cba85d0ab6c67508c6853dd4372fc44e16ad1276dce890b5929a175c55286cc95ea974997690fae89d565684897d78f88466e261642d7d83223aad WHIRLPOOL 0474e19680d20b205975b7392929641388f7dfef10524f8aa99580d6213cf04f220842e26c479d3aac880c27838f5e7245f33d49a67fa71b892c13b0e08454a8
 AUX lighttpd.logrotate 487 SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c SHA512 e1284fe9ab4b9a53c21b40a5ac3e77e66343e187321b8a2f7464db64747f3a99f7e17a9e7c0e298db84a24fa1286cfe344dbff182eddd9de5c0605f5397a6972 WHIRLPOOL 96538a7fb86d6cb19dbc8eb6034e305fbc574edeb29e45d7fd8e58234fb8f1812daf7c1d845f9dfa052ebf9bfdc84b801a8aa68dfbad08aa88f32b0838a5bf5c
 AUX lighttpd.service 252 SHA256 bcd5a17df1bf5fe1cd2af9393e18c33a23eca5fb706de44472b214dd0cfb82fc SHA512 0a890005a8eb7d813c687bca8611018cf158152d04eb8355abf963cb74c06d712060bb66cb96d8d6d48ac71839b89bfec74e32b8f143b411c8570ec9c38ae5be WHIRLPOOL 811c4cfe203e261493da5d42dac541001982faffc0335e1a0359cb5d0b174aae136d825d4c63d89d90b3ed33d5d47fb6ce39dce6792443486b3d113ba99fecfb
+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
-EBUILD lighttpd-1.4.32-r2.ebuild 6683 SHA256 a41feb9bb7c42594f378f3e73496f7356a4f9941657e9ee59b8bca0661210a1b SHA512 9b1376cef6f627d4bcc3fff565419c1924c059db5f554b0ee1a7cda07dee42b47b52a3760d81d243737468c3c879020b512e00cee1b4d217f61f72c88fe29c79 WHIRLPOOL 84c846af1ab3ab70ab8ef052aea0028e9abf86cce28cf6c5daa08214b82c2bf2ed7cdecaf8b37610323832c3f882d74d238946d0af44f112a0892c3af702cb38
+EBUILD lighttpd-1.4.32-r2.ebuild 6628 SHA256 0ac6fa299552dc3306d61965f7a1c4bff55c705080605a8d40c6861f61efacd7 SHA512 64615224e9c4314897848eafaca2c0501bf5023c01bd39f5a694cfc8ff6ecd3d1857830f0bbf16155008dddefd16d6f83b57ed30a403ea90b88ff2a2f8f09aa9 WHIRLPOOL 9a4a376beca26ddd5f0914c3b1ba65cd770f1e367821ef49788d8d7571e1448246a37c23a1197f41f67b9a1aa0a0ad06cc3902754c7e5eaa614e6cffca0ca308
+EBUILD lighttpd-1.4.32-r3.ebuild 6691 SHA256 99736197c997c1fcc8f611792e6a82e6157ec076d0744a3eb6858bf8ed92df0b SHA512 628738f6c8c4985a9459d6583aad23fa82eff6a5aa742c346e08d687d192b853de061639a9ce5b6109ee22f5e87a1f9039e6c77dcec1370592530b3d8279d162 WHIRLPOOL efd9c738f9d7fc9c06c45bf5d322899cc210865069e1a9cb87491d59a93a219947cfccd3adbd5f3d3becf65b0d6a2ad80060370d7ca529eedd1cb49f81b66eba
 EBUILD lighttpd-1.4.32.ebuild 6647 SHA256 6d618327ba9b945cf1f0f9fc52ad40e32fd9804e93d0129802d46bba586c7477 SHA512 33069ef5915441223451a5071895092a348f8afc0f84b7bc2641e1e3458d90aeac5b4c90507fa9be60a2aa30cb8874407ff59822ed0997f4e42ad4414403dab9 WHIRLPOOL 32803a9b66dc3b2986679da0d1cc979f46d164e3e7c2357522b5bf71354b7fe7f03548520b1f728c50bcffe306d306acbc044336c18701c065f29cfd58aa4de1
-MISC ChangeLog 63441 SHA256 98efb81898faef8a8979ebb32ca77a1c68ce3be889159912f05eea4259a7e114 SHA512 22cc1fe388e2659473e347d324302eb95ffbcd2b43f84011d59eaaf36689ae510867ad26393e4ecc5b42a4a5fcc9051a664934411348fea07f9960088d64914a WHIRLPOOL 1f4b9ae272a6f1b7ded4473672b6499dac9c62458429b71d71fe37da936fc2e0e79cae374728b7df6c885eafdd4f4cfcc87b67294a5b850d9dbcf3e7ecac2918
+MISC ChangeLog 63672 SHA256 e4a62fdb8d8beed0735300721c0d936ca00e46483dad2274f7f50ec0433547bf SHA512 71e2a0ff48f4b1965e8cf3ae810d79c7967765a35b958b5128a0c96a885f84ad340532990119e4c8d1ca6b7325dd11037f547c3886d880f3038b9fa4916e5649 WHIRLPOOL c81c8439be741bc7e7f1c171dd0748329dc1f9e874dba82cf0f2426a20359fc6ea585efc199a603a7c5a77e5fab01725515a61aa42bf60a3174fdc8ab24c293e
 MISC metadata.xml 1315 SHA256 4a5b911cadfb5f48332d4c252cabdae052af96232321f0171e5ed1fa7194abce SHA512 4ff65b32d294a5ff288eafb81561e4160db69bbea3fab90dc7e80135901ce7c6aded4743b88d3e52e936c73d71b2ddef7d65523e6f737fd76994776bb9a6ea77 WHIRLPOOL 83a654aa9c34b778cded6acad83aaa891d57b3effc220a4a006123beef73d69e075eeb580d9b5c3021535da8a8ec64a933d0d62bd1e8ab639ccff4f3592b92f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlI+uXUACgkQCaWpQKGI+9RG9gCeO19xeIomgMdbH7LH1U2kq5b/
-6jYAnRwe4J5S+j86BdoU5yoCHS+lA07V
-=f0wZ
+iEYEAREIAAYFAlI+ugYACgkQCaWpQKGI+9SMTgCePribX26p7yVhjbmNEhX55c6h
+PYwAniZ2Hxc4oky4YXHzpi+IPlnedxQe
+=nDrN
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd.tmpfiles.conf b/www-servers/lighttpd/files/lighttpd.tmpfiles.conf
new file mode 100644
index 000000000000..325ab13d839c
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/lighttpd 0750 lighttpd lighttpd -
\ No newline at end of file
diff --git a/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild
index b31dc519b89a..e6095d97c19b 100644
--- a/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.11 2013/09/22 09:33:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild,v 1.12 2013/09/22 09:36:05 pacho Exp $
 
 EAPI="4"
 inherit base autotools eutils depend.php readme.gentoo user systemd
@@ -195,7 +195,6 @@ src_install() {
 	use minimal && remove_non_essential
 
 	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
 }
 
 pkg_postinst () {
diff --git a/www-servers/lighttpd/lighttpd-1.4.32-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.32-r3.ebuild
new file mode 100644
index 000000000000..4896b5754305
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.32-r3.ebuild
@@ -0,0 +1,224 @@
+# 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-r3.ebuild,v 1.1 2013/09/22 09:36:05 pacho Exp $
+
+EAPI="4"
+inherit base autotools eutils depend.php readme.gentoo user systemd
+
+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
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+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 ipv6 && readme.gentoo_create_doc
+
+	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
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+	use ipv6 && readme.gentoo_print_elog
+
+	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
+}