Added 1.4.0 pre-release for folks to test/play with.

(Portage version: 2.0.51.22-r2)

5 files changed, 121 insertions, 12 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 759fde602a9d..b14aea6c99ac 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.27 2005/08/16 14:34:54 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.28 2005/08/17 15:45:28 ka0ttic Exp $
+
+*lighttpd-1.4.0.20050817.1210 (17 Aug 2005)
+
+  17 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff,
+  +lighttpd-1.4.0.20050817.1210.ebuild:
+  Added 1.4.0 pre-release for folks to test/play with.
 
   16 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
   -files/lighttpd-1.3.16-zope-deserves-lovins-too.diff,
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 40766a6b1bc3..61d44bbd7863 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5591549cf1ec8f04c2d25a687367467b lighttpd-1.3.15.ebuild 2504
 MD5 d2d5a6c4339c60f164d75903c216d260 lighttpd-1.3.10-r1.ebuild 2173
 MD5 93e7824d3138516fc7fa9678dde32db5 lighttpd-1.3.16.ebuild 2416
 MD5 d4dab79caea1684c7996dd38fc8afa8d lighttpd-1.3.13-r3.ebuild 2473
-MD5 63f7bd98c4a4c7139f013b9dc50dbc15 ChangeLog 7897
+MD5 2d3213a760cc0c11c60651d9f5f5e2e0 lighttpd-1.4.0.20050817.1210.ebuild 2516
+MD5 93f2a367d0aeffdcc33125462aeb03d3 ChangeLog 8147
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -16,18 +14,13 @@ MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
+MD5 04f029b7f99655581b3b69b5b480881d files/digest-lighttpd-1.4.0.20050817.1210 80
 MD5 2299a6229d7b298b7b0f66d611c041d9 files/digest-lighttpd-1.3.15 67
 MD5 c54a6d92e91493bbb27e8f346f6ac342 files/digest-lighttpd-1.3.16 67
 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974
+MD5 0fe3018cf00058379faadf5b4ff92234 files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff 370
 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
 MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
 MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDAfmrEZCkKN40op4RArkkAJ4lH3Bme1/RCaZUGvJZLr1SAJ7J0wCfRG7I
-a5+oI8hfx1XunMmIUXz2K30=
-=jiPU
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210 b/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210
new file mode 100644
index 000000000000..74c69222cea5
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210
@@ -0,0 +1 @@
+MD5 7ac8753fc3803e3f4974794952d1cbb3 lighttpd-1.4.0-20050817-1210.tar.gz 744564
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff b/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff
new file mode 100644
index 000000000000..3e9edcd70d9f
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff
@@ -0,0 +1,11 @@
+--- branches/lighttpd-merge-1.4.x/src/configfile.c	(revision 562)
++++ branches/lighttpd-merge-1.4.x/src/configfile.c	(revision 563)
+@@ -186,7 +186,7 @@
+ 		
+ 		cv[35].destination = &(s->allow_http11);
+ 		cv[38].destination = s->ssl_ca_file;
+-		cv[39].destination = &(s->range_requests);
++		cv[40].destination = &(s->range_requests);
+ 		
+ 		srv->config_storage[i] = s;
+ 	
diff --git a/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210.ebuild b/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210.ebuild
new file mode 100644
index 000000000000..58972eeb7176
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210.ebuild,v 1.1 2005/08/17 15:45:28 ka0ttic Exp $
+
+inherit eutils versionator
+
+RESTRICT="test"
+
+MY_PV="$(get_version_component_range 1-2).$(replace_all_version_separators '-' "$(get_version_component_range '3-5')")"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${MY_PV%%-*}"
+DESCRIPTION="lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://www.lighttpd.net/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="mysql ssl php xattr ldap ipv6"
+
+RDEPEND="virtual/libc
+		app-arch/bzip2
+		>=dev-libs/libpcre-3.1
+		>=sys-libs/zlib-1.1
+		ldap? ( >=net-nds/openldap-2.1.26 )
+		mysql? ( >=dev-db/mysql-4.0.0 )
+		ssl? ( >=dev-libs/openssl-0.9.7 )
+		php? (
+			>=dev-php/php-cgi-4.3.0
+			!net-www/spawn-fcgi
+		)"
+
+LIGHTTPD_DIR="/var/www/localhost/htdocs/"
+LOG_DIR="/var/log/lighttpd/"
+
+pkg_setup() {
+	enewgroup lighttpd
+	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
+#    epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff
+	use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff
+
+	epatch ${FILESDIR}/${P}-fix-config-segv.diff
+}
+
+src_compile() {
+#    einfo "Regenerating automake/autoconf files"
+#    autoreconf -f -i || die "autoreconf failed"
+
+	econf \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_with mysql) \
+		$(use_with ldap) \
+		$(use_with xattr attr) \
+		$(use_with ssl openssl) || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc
+	doins doc/lighttpd.conf || die "doins failed"
+
+	newinitd ${FILESDIR}/${PN}-1.3.10.initd ${PN}
+
+	if use php ; then
+		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi
+		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi
+	fi
+
+	keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed"
+	fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed"
+
+	dodoc README COPYING
+	cd doc
+	dodoc *.txt *.sh
+	newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed"
+}
+
+pkg_postinst () {
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo
+		einfo "spawn-fcgi is now included with lighttpd"
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+		einfo
+	fi
+}