Removed zope patch for 1.3.16 since it should be fixed (in a different way) in that version. Also updated all ebuilds to use -1 instead of /bin/false when calling enewuser.

(Portage version: 2.0.51.22-r2)

7 files changed, 23 insertions, 150 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index d81deea4b1e4..759fde602a9d 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.26 2005/08/12 18:05:28 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.27 2005/08/16 14:34:54 ka0ttic Exp $
+
+  16 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/lighttpd-1.3.16-zope-deserves-lovins-too.diff,
+  lighttpd-1.3.10-r1.ebuild, lighttpd-1.3.13-r3.ebuild,
+  lighttpd-1.3.15.ebuild, lighttpd-1.3.16.ebuild:
+  Removed zope patch for 1.3.16 since it should be fixed (in a different way)
+  in that version. Also updated all ebuilds to use -1 instead of /bin/false
+  when calling enewuser.
 
   12 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> lighttpd-1.3.15.ebuild,
   lighttpd-1.3.16.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 0f962b2005a1..e9e70c29b07e 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6b0196789bf945c28f845ec4f52293a6 lighttpd-1.3.15.ebuild 2512
-MD5 4f68ff1ad2dd0b01e11474dede6e62f0 lighttpd-1.3.10-r1.ebuild 2181
-MD5 3dbc9eac17ec54d9965e41fe3b073d91 lighttpd-1.3.16.ebuild 2455
-MD5 b8935dbb5e02292fdf75347124e29c38 lighttpd-1.3.13-r3.ebuild 2481
-MD5 7b3625874cd9a7d6eeb2011598c07091 ChangeLog 7506
+MD5 f033e31da90e3c000e4c0a2607eaf9db lighttpd-1.3.15.ebuild 2504
+MD5 de87f4cd8bed8fcd40b8efd5e4f52333 lighttpd-1.3.10-r1.ebuild 2173
+MD5 bc67b44560327d509a8ae8019da9aa60 lighttpd-1.3.16.ebuild 2416
+MD5 72827ab41a3ad2fdfa96a17ee24ee0d8 lighttpd-1.3.13-r3.ebuild 2473
+MD5 0fe0d6c93fbb1d1a7d6e9d828afd6f78 ChangeLog 7897
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -14,7 +11,6 @@ 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 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
-MD5 dd1691d04eda1cb0ff916c08f8907db8 files/lighttpd-1.3.16-zope-deserves-lovins-too.diff 4669
 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
 MD5 2299a6229d7b298b7b0f66d611c041d9 files/digest-lighttpd-1.3.15 67
@@ -25,10 +21,3 @@ MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-
 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)
-
-iD8DBQFC/OUFEZCkKN40op4RAuskAJ9mpH+5TgEckZHoAkoRB4QBaSTQ+wCffkFt
-rC7pL+/b6ygs4zsgmfzcBgs=
-=3X+K
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff b/www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff
deleted file mode 100644
index cd9c5e0ae241..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff
+++ /dev/null
@@ -1,123 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.16.orig/src/mod_fastcgi.c lighttpd-1.3.16/src/mod_fastcgi.c
---- lighttpd-1.3.16.orig/src/mod_fastcgi.c	2005-08-01 23:15:30.000000000 -0400
-+++ lighttpd-1.3.16/src/mod_fastcgi.c	2005-08-01 23:30:01.000000000 -0400
-@@ -331,6 +331,8 @@
- 
- 	pid_t     pid;
- 	int       got_proc;
-+
-+	buffer   *extension; /* used extension, used for SCRIPT_NAME/PATH_INFO of check-local=0 */
- 	
- 	plugin_config conf;
- 	
-@@ -357,6 +359,7 @@
- 	hctx->response = buffer_init();
- 	hctx->response_header = buffer_init();
- 	hctx->write_buffer = buffer_init();
-+	hctx->extension = buffer_init();
- 	
- 	hctx->request_id = 0;
- 	hctx->state = FCGI_STATE_INIT;
-@@ -377,6 +380,7 @@
- 	buffer_free(hctx->response);
- 	buffer_free(hctx->response_header);
- 	buffer_free(hctx->write_buffer);
-+	buffer_free(hctx->extension);
- 	
- 	if (hctx->rb) {
- 		if (hctx->rb->ptr) free(hctx->rb->ptr);
-@@ -1654,22 +1658,74 @@
- 		 * For AUTHORIZER mode these headers should be omitted.
- 		 */
- 
--		fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
-+		if (host->check_local == 0 && 
-+		    !buffer_is_empty(hctx->extension) &&
-+		    hctx->extension->ptr[0] == '/') {
-+			char *sl;
-+			/* no local check and path-prefix /fcgi_pattern 
-+			 *
-+			 * zope needs this 
-+			 *
-+			 * SCRIPT_NAME => /fcgi_pattern
-+			 * PATH_INFO => uri.path - /fcgi_pattern
-+			 * 
-+			 */
-+
-+			/* search for / in uri.path after /fcgi_pattern
-+			 * 
-+			 * uri.path = /zope/abc
-+			 * 
-+			 * pattern    SCRIPT_NAME     PATH_INFO
-+			 * /zop       /zope           /abc
-+			 * /zope/     /zope           /abc
-+			 * /zope/abc  /zope/abc       (empty)
-+			 * /          /zope/abc       (empty)
-+			 * 
-+			 */
-+			if (hctx->extension->used == 2) {
-+				/* ext is / only */
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_STR_LEN(""));
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->uri.path));
-+
-+			} else if (hctx->extension->ptr[hctx->extension->used - 2] == '/') {
-+				/* last character is a / */
-+
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), con->uri.path->ptr, hctx->extension->used - 2);
-+				if (con->uri.path->used > hctx->extension->used) {
-+					fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), 
-+							con->uri.path->ptr + hctx->extension->used - 2, 
-+							con->uri.path->used - hctx->extension->used + 1);
-+				} else {
-+					fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
-+				}
-+
-+			} else if (NULL != (sl = strchr(con->uri.path->ptr + hctx->extension->used - 1, '/'))) {
-+				/* a trailing slash was found */
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), con->uri.path->ptr, sl - con->uri.path->ptr - 1);
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), sl, strlen(sl));
-+			} else {
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
-+			}
-+
-+		} else {
-+			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
- 		
--		if (!buffer_is_empty(con->request.pathinfo)) {
--			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
--			
--			/* PATH_TRANSLATED is only defined if PATH_INFO is set */
-+			if (!buffer_is_empty(con->request.pathinfo)) {
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
-+				
-+				/* PATH_TRANSLATED is only defined if PATH_INFO is set */
- 			
--			if (!buffer_is_empty(host->docroot)) {
--				buffer_copy_string_buffer(p->path, host->docroot);
-+				if (!buffer_is_empty(host->docroot)) {
-+					buffer_copy_string_buffer(p->path, host->docroot);
-+				} else {
-+					buffer_copy_string_buffer(p->path, con->physical.doc_root);
-+				}
-+				buffer_append_string_buffer(p->path, con->request.pathinfo);
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path));
- 			} else {
--				buffer_copy_string_buffer(p->path, con->physical.doc_root);
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
- 			}
--			buffer_append_string_buffer(p->path, con->request.pathinfo);
--			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path));
--		} else {
--			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
- 		}
- 	}
- 
-@@ -3044,6 +3100,7 @@
- 				
- 				hctx = handler_ctx_init();
- 				
-+				buffer_copy_string_buffer(hctx->extension, extension->key);
- 				hctx->remote_conn      = con;
- 				hctx->plugin_data      = p;
- 				hctx->host             = host;
diff --git a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
index 631dc393d4d9..64dec49136bd 100644
--- a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.10-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.3.10-r1.ebuild,v 1.5 2005/07/17 11:57:52 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild,v 1.6 2005/08/16 14:34:54 ka0ttic Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ LOG_DIR="/var/log/lighttpd/"
 
 pkg_setup() {
 	enewgroup lighttpd
-	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd
+	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
 }
 
 src_unpack() {
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
index 52312b841f1a..ae6eb0f35613 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.5 2005/08/02 13:17:59 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.6 2005/08/16 14:34:54 ka0ttic Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ LOG_DIR="/var/log/lighttpd/"
 
 pkg_setup() {
 	enewgroup lighttpd
-	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd
+	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
 }
 
 src_unpack() {
diff --git a/www-servers/lighttpd/lighttpd-1.3.15.ebuild b/www-servers/lighttpd/lighttpd-1.3.15.ebuild
index 454bc207de9f..e0aded98e4cf 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.3 2005/08/12 18:05:28 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.15.ebuild,v 1.4 2005/08/16 14:34:54 ka0ttic Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ LOG_DIR="/var/log/lighttpd/"
 
 pkg_setup() {
 	enewgroup lighttpd
-	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd
+	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
 }
 
 src_unpack() {
diff --git a/www-servers/lighttpd/lighttpd-1.3.16.ebuild b/www-servers/lighttpd/lighttpd-1.3.16.ebuild
index 1151eb206c2a..9b8410f5ea99 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.3 2005/08/12 18:05:28 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.16.ebuild,v 1.4 2005/08/16 14:34:54 ka0ttic Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ LOG_DIR="/var/log/lighttpd/"
 
 pkg_setup() {
 	enewgroup lighttpd
-	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd
+	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
 }
 
 src_unpack() {
@@ -42,7 +42,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff
 	epatch ${FILESDIR}/${PN}-1.3.13-ldap-binddn.diff
 	use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff
-	epatch ${FILESDIR}/${P}-zope-deserves-lovins-too.diff
 }
 
 src_compile() {
@@ -51,7 +50,7 @@ src_compile() {
 	einfo "Regenerating automake/autoconf files"
 	autoreconf -f -i || die "autoreconf failed"
 
-	econf ${myconf} \
+	econf --libdir=/usr/$(get_libdir)/${PN} \
 		$(use_enable ipv6) \
 		$(use_with mysql) \
 		$(use_with ldap) \