Another pre-release.

Package-Manager: portage-1.589-cvs

7 files changed, 18 insertions, 50 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 61787bb74cb1..adaf49e26937 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.30 2005/08/18 22:37:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.31 2005/08/19 14:57:12 ka0ttic Exp $
+
+*lighttpd-1.4.0.20050819.1044 (19 Aug 2005)
+
+  19 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff,
+  -files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff,
+  -lighttpd-1.4.0.20050817.1210-r1.ebuild,
+  +lighttpd-1.4.0.20050819.1044.ebuild:
+  Another pre-release.
 
 *lighttpd-1.4.0.20050817.1210-r1 (18 Aug 2005)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 5efbfa2a42a1..3a4332170bab 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bfc948ddcd1ac9f9beb814cd1aab3fc7 lighttpd-1.4.0.20050817.1210-r1.ebuild 2586
 MD5 c9b79dc823ba6f8f00e64d897e9e6e45 lighttpd-1.3.15.ebuild 2501
 MD5 d2d5a6c4339c60f164d75903c216d260 lighttpd-1.3.10-r1.ebuild 2173
 MD5 8a441a199d93bf8aa24ed38550e276ae lighttpd-1.3.16.ebuild 2413
 MD5 d9a2bd96d41a7d1bd55fd95497f84202 lighttpd-1.3.13-r3.ebuild 2470
-MD5 1112b0ac80e7effc6f93ca86f985e420 ChangeLog 8664
+MD5 8863369f204e81305febf74c924106f8 ChangeLog 8985
+MD5 91a35d2d8b7209d5bde943634c6485d8 lighttpd-1.4.0.20050819.1044.ebuild 2327
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -20,18 +20,16 @@ MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
 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 fa0335037cc965d9f94c177b7459d54b files/digest-lighttpd-1.4.0.20050819.1044 80
 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 04f029b7f99655581b3b69b5b480881d files/digest-lighttpd-1.4.0.20050817.1210-r1 80
-MD5 72738ce2746d9d805925873a6b077f53 files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff 734
 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)
 
-iD8DBQFDBQ2kEZCkKN40op4RAiOnAJ4xZEv0Y+7CqV0NkBvoEiYIDGu4NACeLHpt
-BG1RQeYBs+cm3XI74z1lDAY=
-=LA64
+iD8DBQFDBfNiEZCkKN40op4RAnF+AJ4p60xsN2Uvhq6jnGhFfnHz0nHrEQCZATkP
+Oz71k58CGN3LUV9nSNhd6gQ=
+=aOV2
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210-r1
deleted file mode 100644
index 74c69222cea5..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ac8753fc3803e3f4974794952d1cbb3 lighttpd-1.4.0-20050817-1210.tar.gz 744564
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050819.1044 b/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050819.1044
new file mode 100644
index 000000000000..91732da5a25b
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050819.1044
@@ -0,0 +1 @@
+MD5 c953ee5055065216a3453daf9f7b7755 lighttpd-1.4.0-20050819-1044.tar.gz 746946
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
deleted file mode 100644
index 3e9edcd70d9f..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-config-segv.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff b/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff
deleted file mode 100644
index 94faa64dfb36..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- branches/lighttpd-merge-1.4.x/src/mod_userdir.c	(revision 575)
-+++ branches/lighttpd-merge-1.4.x/src/mod_userdir.c	(revision 576)
-@@ -202,7 +202,8 @@
- 		
- 		if (!found_user) return HANDLER_GO_ON;
- 	}
--	 
-+	
-+	/* we build the physical path */	
- 	buffer_copy_string(con->physical.path, pwd->pw_dir);
- 	BUFFER_APPEND_SLASH(con->physical.path);
- 	buffer_append_string_buffer(con->physical.path, p->conf.path); /* skip the / */
-@@ -222,7 +223,7 @@
- 	p->name        = buffer_init_string("userdir");
- 	
- 	p->init           = mod_userdir_init;
--	p->handle_docroot = mod_userdir_docroot_handler;
-+	p->handle_physical = mod_userdir_docroot_handler;
- 	p->set_defaults   = mod_userdir_set_defaults;
- 	p->cleanup        = mod_userdir_free;
- 	
diff --git a/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.0.20050819.1044.ebuild
index 361919dbb8c0..dc8de6255fcd 100644
--- a/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.0.20050819.1044.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2005/08/18 22:37:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.0.20050819.1044.ebuild,v 1.1 2005/08/19 14:57:12 ka0ttic Exp $
 
 inherit eutils versionator
 
@@ -37,17 +37,10 @@ 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
-	epatch ${FILESDIR}/${P}-fix-mod_userdir.diff
 }
 
 src_compile() {
-#    einfo "Regenerating automake/autoconf files"
-#    autoreconf -f || die "autoreconf failed"
-
 	econf \
 		--libdir=/usr/$(get_libdir)/${PN} \
 		--enable-lfs \