Revision bump; added patch from upstream to fix mod_userdir.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 47 insertions, 16 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index b22b74464e44..61787bb74cb1 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2005/08/18 16:54:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.30 2005/08/18 22:37:09 ka0ttic Exp $
+
+*lighttpd-1.4.0.20050817.1210-r1 (18 Aug 2005)
+
+  18 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff,
+  -lighttpd-1.4.0.20050817.1210.ebuild,
+  +lighttpd-1.4.0.20050817.1210-r1.ebuild:
+  Revision bump; added patch from upstream to fix mod_userdir.
 
   18 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> lighttpd-1.3.13-r3.ebuild,
   lighttpd-1.3.15.ebuild, lighttpd-1.3.16.ebuild,
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index d516977f553d..5efbfa2a42a1 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 a4ff9cf58034fbd0e0b520070023994f lighttpd-1.4.0.20050817.1210.ebuild 2526
-MD5 bdc8553ea6d3673efefa1f84b2682951 ChangeLog 8360
+MD5 1112b0ac80e7effc6f93ca86f985e420 ChangeLog 8664
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -17,7 +17,6 @@ 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
@@ -25,12 +24,14 @@ MD5 0fe3018cf00058379faadf5b4ff92234 files/lighttpd-1.4.0.20050817.1210-fix-conf
 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)
 
-iD8DBQFDBL1bEZCkKN40op4RAgCNAKDAwq1H+LVUZCT4Wj2St3euhfdAewCeItX3
-TbRs7WVl5R1z3M0W3nfcSIY=
-=Is6t
+iD8DBQFDBQ2kEZCkKN40op4RAiOnAJ4xZEv0Y+7CqV0NkBvoEiYIDGu4NACeLHpt
+BG1RQeYBs+cm3XI74z1lDAY=
+=LA64
 -----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-r1
index 74c69222cea5..74c69222cea5 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.0.20050817.1210-r1
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
new file mode 100644
index 000000000000..94faa64dfb36
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.0.20050817.1210-fix-mod_userdir.diff
@@ -0,0 +1,21 @@
+--- 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.ebuild b/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210-r1.ebuild
index 7ca2f7453079..361919dbb8c0 100644
--- a/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.0.20050817.1210-r1.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.ebuild,v 1.2 2005/08/18 16:54:24 ka0ttic Exp $
+# $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 $
 
 inherit eutils versionator
 
@@ -33,11 +33,6 @@ RDEPEND="virtual/libc
 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}
@@ -46,6 +41,7 @@ src_unpack() {
 	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() {
@@ -65,6 +61,8 @@ src_compile() {
 }
 
 src_install() {
+	keepdir ${LIGHTTPD_DIR} ${LOG_DIR}
+
 	make DESTDIR="${D}" install || die "make install failed"
 
 	insinto /etc
@@ -77,15 +75,18 @@ src_install() {
 		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_preinst() {
+	enewgroup lighttpd || die "enewgroup failed"
+	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd || die "enewuser failed"
+	chown lighttpd:lighttpd ${IMAGE}${LOG_DIR}
+}
+
 pkg_postinst () {
 	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
 		einfo