Revision bump; added patch by tigger^ to make lighttpd+zope happy. added patch by me to not install mod_mysql_vhost if USE=-mysql.

(Portage version: 2.0.51.21-r1)

6 files changed, 328 insertions, 10 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index b492b99fc781..3bf2f59f6a71 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.15 2005/03/22 16:36:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.16 2005/05/13 13:49:34 ka0ttic Exp $
+
+*lighttpd-1.3.13-r1 (13 May 2005)
+
+  13 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff,
+  +files/lighttpd-1.3.13-zope-deserves-lovins-too.diff,
+  +lighttpd-1.3.13-r1.ebuild:
+  Revision bump; added patch by tigger^ to make lighttpd+zope happy. added
+  patch by me to not install mod_mysql_vhost if USE=-mysql.
 
   22 Mar 2005; <blubb@gentoo.org> lighttpd-1.3.10-r1.ebuild:
   added ~amd64
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 04a52f7083f4..545fa523a2c6 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,17 +1,21 @@
-MD5 ed23624abff2b8500071d95ef19d4efe ChangeLog 4843
+MD5 cd23797541ff4bbc3da62538ae699dd1 lighttpd-1.3.13.ebuild 2138
 MD5 2ee7defa9578776786620b0864ca3bbc lighttpd-1.3.10-r1.ebuild 2160
+MD5 32909ef616ea1985ad66b7367e664df2 lighttpd-1.3.13-r1.ebuild 2339
 MD5 1012bda0e37285755f02211ea2ebff71 lighttpd-1.3.11.ebuild 2161
-MD5 cd23797541ff4bbc3da62538ae699dd1 lighttpd-1.3.13.ebuild 2138
+MD5 4af784510a30c89ea103958ac20048fa ChangeLog 5204
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
+MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
+MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
+MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
+MD5 7a09197e7483749e8963e177138c7622 files/lighttpd-1.3.10.initd 661
 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
+MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r1 67
 MD5 19489693ecfbff88c20b9ef33fef1df6 files/digest-lighttpd-1.3.11 67
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13 67
-MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
-MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974
-MD5 7a09197e7483749e8963e177138c7622 files/lighttpd-1.3.10.initd 661
-MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
-MD5 da762512b4ae8682e353873c4f9d31bd files/lighttpd-1.3.11-php.diff 1332
+MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
 MD5 353d4b620cc5f277554ac570d5e45b3c files/lighttpd-1.3.11-upstream.diff 786
-MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
-MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
+MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
+MD5 da762512b4ae8682e353873c4f9d31bd files/lighttpd-1.3.11-php.diff 1332
+MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
+MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1
new file mode 100644
index 000000000000..d17be2479447
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1
@@ -0,0 +1 @@
+MD5 2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz 680068
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff
new file mode 100644
index 000000000000..cb8e39c84e22
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff
@@ -0,0 +1,45 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/configure.in lighttpd-1.3.13/configure.in
+--- lighttpd-1.3.13.orig/configure.in	2005-05-13 04:00:39.000000000 -0400
++++ lighttpd-1.3.13/configure.in	2005-05-13 04:26:00.000000000 -0400
+@@ -82,7 +82,7 @@
+ 
+ dnl Checks for database.
+ MYSQL_INCLUDE=""
+-
++USE_MYSQL=no
+ AC_PATH_PROG(MYSQLCONFIG, mysql_config)
+ AC_MSG_CHECKING(for MySQL support)
+ AC_ARG_WITH(mysql,
+@@ -113,6 +113,7 @@
+     CPPFLAGS="$old_CPPFLAGS"
+ 
+     AC_DEFINE([HAVE_MYSQL], [1], [mysql support])
++    USE_MYSQL=yes
+   else
+     AC_MSG_RESULT(no)
+   fi
+@@ -120,7 +121,7 @@
+ 
+ AC_SUBST(MYSQL_LIBS)
+ AC_SUBST(MYSQL_INCLUDE)
+-
++AM_CONDITIONAL(USE_MYSQL, test x$USE_MYSQL = xyes)
+ 
+ AC_MSG_CHECKING(for LDAP support)
+ AC_ARG_WITH(ldap, AC_HELP_STRING([--with-ldap],[enable LDAP support]),
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/src/Makefile.am lighttpd-1.3.13/src/Makefile.am
+--- lighttpd-1.3.13.orig/src/Makefile.am	2005-05-13 04:00:39.000000000 -0400
++++ lighttpd-1.3.13/src/Makefile.am	2005-05-13 04:25:29.000000000 -0400
+@@ -68,10 +68,12 @@
+ common_libadd = 
+ endif
+ 
++if USE_MYSQL
+ lib_LTLIBRARIES += mod_mysql_vhost.la
+ mod_mysql_vhost_la_SOURCES = mod_mysql_vhost.c
+ mod_mysql_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+ mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
++endif
+ 
+ lib_LTLIBRARIES += mod_cgi.la
+ mod_cgi_la_SOURCES = mod_cgi.c 
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-zope-deserves-lovins-too.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-zope-deserves-lovins-too.diff
new file mode 100644
index 000000000000..d09b4e5dad3e
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.13-zope-deserves-lovins-too.diff
@@ -0,0 +1,169 @@
+--- src/mod_fastcgi.c	(revision 102)
++++ src/mod_fastcgi.c	(working copy)
+@@ -329,10 +329,10 @@
+ 	int       fd;        /* fd to the fastcgi process */
+ 	int       fde_ndx;   /* index into the fd-event buffer */
+
+-	size_t    path_info_offset; /* start of path_info in uri.path */
+-	
+ 	pid_t     pid;
+ 	int       got_proc;
++
++	buffer   *extension; /* used extension, used for SCRIPT_NAME/PATH_INFO of check-local=0 */
+ 	
+ 	plugin_config conf;
+ 	
+@@ -359,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;
+@@ -379,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);
+@@ -1650,22 +1652,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));
++			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 */
+ 			
+-			/* 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(""));
+ 		}
+ 	}
+
+@@ -2923,7 +2977,6 @@
+ 	size_t k, i;
+ 	buffer *fn;
+ 	fcgi_extension *extension = NULL;
+-	size_t path_info_offset;
+ 	
+ 	/* Possibly, we processed already this request */
+ 	if (con->file_started == 1) return HANDLER_GO_ON;
+@@ -2944,8 +2997,6 @@
+ 		fcgi_patch_connection(srv, con, p, CONST_BUF_LEN(patch));
+ 	}
+ 	
+-	path_info_offset = 0;
+-	
+ 	/* check if extension matches */
+ 	for (k = 0; k < p->conf.exts->used; k++) {
+ 		size_t ct_len;
+@@ -2958,15 +3009,8 @@
+ 		
+ 		if (s_len < ct_len) continue;
+ 		
+-		/* check extension in the form "/fcgi_pattern" */
+ 		if (*(extension->key->ptr) == '/' && strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) {
+-			if (s_len > ct_len + 1) {
+-				char *pi_offset;
+-				
+-				if (0 != (pi_offset = strchr(fn->ptr + ct_len + 1, '/'))) {
+-					path_info_offset = pi_offset - fn->ptr;
+-				}
+-			}
++			/* check extension in the form "/fcgi_pattern" */
+ 			break;
+ 		} else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
+ 			/* check extension in the form ".fcg" */
+@@ -3008,7 +3052,7 @@
+ 				handler_ctx *hctx;
+ 				hctx = handler_ctx_init();
+ 				
+-				hctx->path_info_offset = path_info_offset;
++				buffer_copy_string_buffer(hctx->extension, extension->key);
+ 				hctx->remote_conn      = con;
+ 				hctx->plugin_data      = p;
+ 				hctx->host             = host;
+@@ -3028,7 +3072,6 @@
+ 			handler_ctx *hctx;
+ 			hctx = handler_ctx_init();
+ 			
+-			hctx->path_info_offset = path_info_offset;
+ 			hctx->remote_conn      = con;
+ 			hctx->plugin_data      = p;
+ 			hctx->host             = host;
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild
new file mode 100644
index 000000000000..5e28f9284b9d
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild
@@ -0,0 +1,90 @@
+# 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-r1.ebuild,v 1.1 2005/05/13 13:49:34 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="mysql ssl php xattr ldap"
+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 /bin/false "${LIGHTTPD_DIR}" lighttpd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
+	epatch ${FILESDIR}/${P}-no-mysql-means-no-mysql.diff
+	epatch ${FILESDIR}/${P}-zope-deserves-lovins-too.diff
+	use php && epatch ${FILESDIR}/${PN}-1.3.11-php.diff
+}
+
+src_compile() {
+	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
+
+	einfo "Regenerating automake/autoconf files"
+	autoreconf -f -i || die "autoreconf failed"
+
+	econf ${my_conf} \
+		$(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 *.ps.gz
+	newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed"
+}
+
+pkg_postinst () {
+	echo
+	einfo "lighttpd.conf has moved from /etc/conf.d to /etc"
+	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."
+	fi
+	echo
+}