[patch] diff of 1.4.28 over 1.4.26-r1

lighttpd.diff (text/plain), 4.13 KB, created by Andrii Yurchuk on 2010-11-03 09:31:24 UTC

--- /usr/portage/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild	2010-05-13 19:37:17.000000000 +0300
+++ lighttpd-1.4.28.ebuild	2010-11-03 11:25:29.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild,v 1.7 2010/05/13 16:18:03 josejx Exp $
+# $Header: $
 
 EAPI="2"
 
@@ -12,8 +12,8 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap libev lua memcache minimal mysql pcre php rrdtool ssl test webdav xattr"
 
 RDEPEND="
 	>=sys-libs/zlib-1.1
@@ -21,6 +21,7 @@
 	fam?      ( virtual/fam )
 	gdbm?     ( sys-libs/gdbm )
 	ldap?     ( >=net-nds/openldap-2.1.26 )
+	libev?    ( dev-libs/libev )
 	lua?      ( >=dev-lang/lua-5.1 )
 	memcache? ( dev-libs/libmemcache )
 	mysql?    ( >=virtual/mysql-4.0 )
@@ -43,19 +44,6 @@
 		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}
-}
-
 # remove non-essential stuff (for USE=minimal)
 remove_non_essential() {
 	local libdir="${D}/usr/$(get_libdir)/${PN}"
@@ -100,7 +88,6 @@
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
 		die "sed doc/Makefile.am failed"
 
-	epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch"
 	eautoreconf
 }
 
@@ -119,7 +106,8 @@
 		$(use_with ssl openssl) \
 		$(use_with webdav webdav-props) \
 		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
+		$(use_with xattr attr) \
+		$(use_with libev libev)
 }
 
 src_compile() {
@@ -150,22 +138,22 @@
 		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
 
 	# configs
+	epatch "${FILESDIR}/lighttpd_configs.patch"
 	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
+	doins "${WORKDIR}"/${P}/doc/config/lighttpd.conf
+	doins "${WORKDIR}"/${P}/doc/config/modules.conf
+	insinto /etc/lighttpd/conf.d
+	doins "${WORKDIR}"/${P}/doc/config/conf.d/*.conf
+	insinto /etc/lighttpd/vhosts.d
+	doins "${WORKDIR}"/${P}/doc/config/vhosts.d/vhosts.template
 	# 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/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
 
 	use doc && dohtml -r doc/*
 
@@ -180,33 +168,6 @@
 	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.*
-
+	# remove non-essential stuff
 	use minimal && remove_non_essential
 }
-
-pkg_postinst () {
-	echo
-	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."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fastcgi; then
-		ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
-		ewarn "www-servers/spawn-fcgi package. Please install it manually, if"
-		ewarn "you use spawn-fcgi."
-		ewarn "It features a new, more featurefull init script - please migrate"
-		ewarn "your configuration!"
-	fi
-}