Revert previous -i flag removal as it's still necessary on certain systems bug #103108; added patch for undefined reference in 1.4.0 when USE=xattr, thanks to J <j-spam@starline.ee> in bug #103074.

Package-Manager: portage-1.589-cvs

7 files changed, 48 insertions, 16 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index c5d858c975ab..6b720e8c2088 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.32 2005/08/19 15:53:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.33 2005/08/20 14:12:43 ka0ttic Exp $
+
+  20 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/lighttpd-1.4.0-stat-cache.diff, lighttpd-1.3.13-r3.ebuild,
+  lighttpd-1.3.15.ebuild, lighttpd-1.3.16.ebuild, lighttpd-1.4.0.ebuild:
+  Revert previous -i flag removal as it's still necessary on certain systems
+  bug #103108; added patch for undefined reference in 1.4.0 when USE=xattr,
+  thanks to J <j-spam@starline.ee> in bug #103074.
 
 *lighttpd-1.4.0 (19 Aug 2005)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 1bac19c0af31..8c6c97944488 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c9b79dc823ba6f8f00e64d897e9e6e45 lighttpd-1.3.15.ebuild 2501
-MD5 4292891e69af2eccfbdfe0d8034034ea lighttpd-1.4.0.ebuild 2122
+MD5 5073c18436b7e145e1e708ffe723bb2a lighttpd-1.3.15.ebuild 2625
+MD5 1e26e54d3b9c9cbf43047aacd1bec080 lighttpd-1.4.0.ebuild 2163
 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 8bbf1879ebfbe40368f3be066fca40cb ChangeLog 9145
+MD5 4e49b7039097eb7ff44bafe6513dd0ba lighttpd-1.3.16.ebuild 2537
+MD5 c95b0f48a86e45d7f20163a175cca033 lighttpd-1.3.13-r3.ebuild 2594
+MD5 262dbad800086006abb14d6924fc9684 ChangeLog 9540
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -14,6 +14,7 @@ MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
 MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762
 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
+MD5 d0e3dbe62af1ef54922055287f40c59d files/lighttpd-1.4.0-stat-cache.diff 341
 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
@@ -29,7 +30,7 @@ MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDBgBxEZCkKN40op4RAmc2AJ92vBvlBT9eQyEI2G9Gc3mZC1/pGQCgtvp7
-3yg4seoov8fKFORrZgormSg=
-=j+g8
+iD8DBQFDBzp1EZCkKN40op4RAqOWAJ9W1XIkpoY9DLBaY9dorymBKcb4agCeNtK4
+wIilFFKz0IHCYPU99ujkMHs=
+=SNtb
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.0-stat-cache.diff b/www-servers/lighttpd/files/lighttpd-1.4.0-stat-cache.diff
new file mode 100644
index 000000000000..73451a021c50
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.0-stat-cache.diff
@@ -0,0 +1,11 @@
+--- lighttpd-1.4.0/src/stat_cache.c	2005-08-11 01:26:16.000000000 +0300
++++ lighttpd-1.4.0/src/stat_cache.c	2005-08-19 21:22:20.000000000 +0300
+@@ -181,7 +181,7 @@
+ }
+ 
+ #ifdef HAVE_XATTR
+-static int stat_cache_entry_attr_get(buffer *buf, char *name) {
++static int stat_cache_attr_get(buffer *buf, char *name) {
+ 	int attrlen;
+ 	int ret;
+ 	
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
index 7aa3c5c89409..c20386a4d196 100644
--- a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.13-r3.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.3.13-r3.ebuild,v 1.7 2005/08/18 16:54:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.8 2005/08/20 14:12:43 ka0ttic Exp $
 
 inherit eutils
 
@@ -50,8 +50,12 @@ src_unpack() {
 src_compile() {
 	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
 
+	# somehow during the process the BSD COPYING gets
+	# overwritten with a GPL one
+	mv COPYING{,.orig}
 	einfo "Regenerating automake/autoconf files"
-	autoreconf -f || die "autoreconf failed"
+	autoreconf -f -i || die "autoreconf failed"
+	mv COPYING{.orig,}
 
 	econf ${my_conf} \
 		$(use_with mysql) \
diff --git a/www-servers/lighttpd/lighttpd-1.3.15.ebuild b/www-servers/lighttpd/lighttpd-1.3.15.ebuild
index ab2821e3ee8a..968e5b4d224d 100644
--- a/www-servers/lighttpd/lighttpd-1.3.15.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.15.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.3.15.ebuild,v 1.5 2005/08/18 16:54:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.15.ebuild,v 1.6 2005/08/20 14:12:43 ka0ttic Exp $
 
 inherit eutils
 
@@ -49,8 +49,12 @@ src_unpack() {
 src_compile() {
 	local myconf="--libdir=/usr/$(get_libdir)/${PN}"
 
+	# somehow during the process the BSD COPYING gets
+	# overwritten with a GPL one
+	mv COPYING{,.orig}
 	einfo "Regenerating automake/autoconf files"
-	autoreconf -f || die "autoreconf failed"
+	autoreconf -f -i || die "autoreconf failed"
+	mv COPYING{.orig,}
 
 	econf ${myconf} \
 		$(use_enable ipv6) \
diff --git a/www-servers/lighttpd/lighttpd-1.3.16.ebuild b/www-servers/lighttpd/lighttpd-1.3.16.ebuild
index d799d5e42f4b..7f4719ab7632 100644
--- a/www-servers/lighttpd/lighttpd-1.3.16.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.16.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.3.16.ebuild,v 1.5 2005/08/18 16:54:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.16.ebuild,v 1.6 2005/08/20 14:12:43 ka0ttic Exp $
 
 inherit eutils
 
@@ -47,8 +47,12 @@ src_unpack() {
 src_compile() {
 	local myconf="--libdir=/usr/$(get_libdir)/${PN}"
 
+	# somehow during the process the BSD COPYING gets
+	# overwritten with a GPL one
+	mv COPYING{,.orig}
 	einfo "Regenerating automake/autoconf files"
-	autoreconf -f || die "autoreconf failed"
+	autoreconf -f -i || die "autoreconf failed"
+	mv COPYING{.orig,}
 
 	econf --libdir=/usr/$(get_libdir)/${PN} \
 		$(use_enable ipv6) \
diff --git a/www-servers/lighttpd/lighttpd-1.4.0.ebuild b/www-servers/lighttpd/lighttpd-1.4.0.ebuild
index 3b44077205a5..eb197033df9f 100644
--- a/www-servers/lighttpd/lighttpd-1.4.0.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.0.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.ebuild,v 1.1 2005/08/19 15:53:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.0.ebuild,v 1.2 2005/08/20 14:12:44 ka0ttic Exp $
 
 inherit eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
 	use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff
+	epatch ${FILESDIR}/${P}-stat-cache.diff
 }
 
 src_compile() {