Backport upstream patch to detect libev >4.0 correctly. Thanks to Stefan Bühler <lighttpd@stbuehler.de>. Bug #351371

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 250 insertions, 2 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 158b831853ad..5a230f8cc39f 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.242 2011/01/25 17:01:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.243 2011/02/23 12:16:13 hwoarang Exp $
+
+*lighttpd-1.4.28-r1 (23 Feb 2011)
+
+  23 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  +lighttpd-1.4.28-r1.ebuild, +files/lighttpd-1.4.28-detect-libev.patch:
+  Backport upstream patch to detect libev >4.0 correctly. Thanks to Stefan
+  Bühler <lighttpd@stbuehler.de>. Bug #351371. Upstream
+  commit:http://cgit.lighttpd.net/lighttpd/lighttpd2/commit/?id=eea9b56d16c705c
+  31110e522540febc5cd0282c9
 
   25 Jan 2011; Jeroen Roovers <jer@gentoo.org> lighttpd-1.4.28.ebuild:
   Stable for HPPA (bug #349213).
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 6a52e8d8c441..bae82a4b4934 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX 1.4.26-fix-ssl-return-check-r2716.patch 562 RMD160 81b5fc8f13e3fbca8a48fd1f954ae7e165b261b1 SHA1 60c3665d0a4f46df1da80338970c7ce6efab64fe SHA256 28391235c48d4dc686d060bbafd711e028a07b68065f40346dc40ca242f4285c
@@ -6,6 +9,7 @@ AUX conf/mime-types.conf 3436 RMD160 e4b6024ac6cd48253d4be0abb171ad54e7fbc121 SH
 AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
 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.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a
@@ -21,6 +25,24 @@ EBUILD lighttpd-1.4.25-r1.ebuild 5876 RMD160 5634e49a7eef011d5ae68a9c804df24e36b
 EBUILD lighttpd-1.4.25.ebuild 5829 RMD160 365b1ea4415d2667fcef3a7af08fec29edcf596f SHA1 002a05ab99b4f3c15c8da95fa764fbfb8d84757c SHA256 cc5b0e4170cf4ef91b8043504c4b28e677c5d0d92039cbbe897c00d1a61bcce5
 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.ebuild 5670 RMD160 aedfe6e1cf94da57e76ce67df2ffa09447537b0b SHA1 97beacb535fc9c711802a080aaf839a3d0e98bdc SHA256 e10e960fa3b95d398b6b6159da168c351002e257e272b09480571e33ebf200ec
-MISC ChangeLog 52413 RMD160 f3c03ddd05654d4d33ef6224969925b82d7dc5fe SHA1 43a3d6bd5dcc422f3daa140fc9a5d750c63dfc57 SHA256 c9228d48623b12f65d73cb492eb4e18b2501a6c6d561591c455e7d5537cbbad3
+MISC ChangeLog 52820 RMD160 2cc65d37d55e800b5f196c589b398bc56c94de2d SHA1 f2233351e7f4b23df4282f6dbcc7ff15728a4c72 SHA256 f15c51ecfeb2966be465ada240ff0a2a42d85003aa6fcb512a5e4e895fa83ce9
 MISC metadata.xml 1104 RMD160 445c36561695b89266cb1bb0b052167473e1568d SHA1 821390063f6a1d798fc036b14af8cb56c8e62492 SHA256 7b633eaadf23540735206a1ce6af010b7757affb753fc496c7b15de8c9cf78c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNZPqOAAoJEPqDWhW0r/LC05oP/17bwu88wiDSGLCfwhOmHLlN
+rVyP/NetYnxXZkWM5OOaN819/ecCiiBPeMzATvtmrtdQIWonBfrhZQVZb8uMpPfI
+5l/e/jYEpbwsJK1dgzQiyLy5PKSJ14hHBmiFQRvRF5yXNLLYwZQWLZfKGYEoVzpZ
+P/l055T8Ebzu4LYYp/CJqBuIrsdR4bv9rwLr8nCghsyYHKZgam43EIkhukBKFfNh
+/8VZEtWGUc/ZKa3/EWv2paxTAdBDQyMxrbzIB2+sHxCiLjDTnsP2Xl4OyoPEuybz
+0ogawRTQvDWEAFrWG4U7dcHyWf4q3ZbKdcOEwuodAWQ0+Iqs1bd+Obs2AbpSMptw
+kUCqG2ojgB3Yx1EUGz/4pyxl12JZBwO4cSmn45ne/mSI9MvKLdm/1buCt40iPspo
+0v9ZcTa4kZGYz9Ycr58mATDgAIz3h2wjWdfhM6SdP2UFbKw4VjteXnV5io20wTtl
+ESnTu17bEqYxVTDi90gfZJdsV+22UMTZoyYh0Z8q4lavmB2dGR2G/hkK9vEStVjZ
+QiDjUwDtQbGil/eAVp/2V2CJ79+bgkzsZEQaK0plPSFVt9k7t3zL3iGtAGd1IWwq
+oq47CZitfYXHZwh873C1TlyL/l4pR0ezfZ2T/Q2WyV9fNz//9X1wbwUV4Puf/h2a
+xRc599wX1lP8AoqYwf3J
+=/NhO
+-----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.28-detect-libev.patch b/www-servers/lighttpd/files/lighttpd-1.4.28-detect-libev.patch
new file mode 100644
index 000000000000..c1934eacb4f4
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.28-detect-libev.patch
@@ -0,0 +1,13 @@
+Index: lighttpd-1.4.28/configure.ac
+===================================================================
+--- lighttpd-1.4.28.orig/configure.ac
++++ lighttpd-1.4.28/configure.ac
+@@ -105,7 +105,7 @@ if test "$WITH_LIBEV" != "no"; then
+ 			LIBEV_LIBS="-L$WITH_LIBEV/lib -lev"
+ 		else
+ 			AC_CHECK_HEADERS([ev.h],[
+-				AC_CHECK_LIB([ev], [ev_loop], [
++				AC_CHECK_LIB([ev], [ev_time], [
+ 						LIBEV_CFLAGS=""
+ 						LIBEV_LIBS="-lev"
+ 					],[
diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r1.ebuild
new file mode 100644
index 000000000000..44445a4a856f
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.28-r1.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-r1.ebuild,v 1.1 2011/02/23 12:16:13 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
+}