Version bump for bug 82792; removed old patches that I forgot to remove last time.

Package-Manager: portage-2.0.51.16

10 files changed, 216 insertions, 134 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index fd172dcdd81e..f08a47a5e51e 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,16 @@
 # 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.12 2005/02/16 17:15:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.13 2005/02/23 11:37:25 ka0ttic Exp $
+
+*lighttpd-1.3.11 (23 Feb 2005)
+
+  23 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/lighttpd-1.1.8-gentoo.diff, -files/lighttpd-1.2.2-php.diff,
+  -files/lighttpd-1.2.2.initd, +files/lighttpd-1.3.11-gentoo.diff,
+  +files/lighttpd-1.3.11-php.diff, +files/lighttpd-1.3.11-upstream.diff,
+  +lighttpd-1.3.11.ebuild:
+  Version bump for bug 82792; removed old patches that I forgot to remove last
+  time.
 
   16 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> lighttpd-1.3.10-r1.ebuild,
   -lighttpd-1.3.5.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 3cdc2e29dcbe..2d3ee7fc1f69 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -2,22 +2,24 @@
 Hash: SHA1
 
 MD5 f244dad33f260b0794bec1f09288b2c2 lighttpd-1.3.10-r1.ebuild 2155
-MD5 ae344c9e3a508eb560b82bd8d7390d8e ChangeLog 4240
+MD5 1012bda0e37285755f02211ea2ebff71 lighttpd-1.3.11.ebuild 2161
+MD5 36d036c084926c6e8f4ad92d399a7ef7 ChangeLog 4645
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
-MD5 32569e20d3ecdd51ac0534cc85d52354 files/lighttpd-1.2.2-php.diff 1184
+MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
 MD5 7a09197e7483749e8963e177138c7622 files/lighttpd-1.3.10.initd 661
-MD5 dcfa5883c3433b49204b6b4de25a9a3c files/lighttpd-1.2.2.initd 800
 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
+MD5 19489693ecfbff88c20b9ef33fef1df6 files/digest-lighttpd-1.3.11 67
 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974
 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
-MD5 40dd57c102e7cefdabf25bff26e5124c files/lighttpd-1.1.8-gentoo.diff 1577
+MD5 353d4b620cc5f277554ac570d5e45b3c files/lighttpd-1.3.11-upstream.diff 786
+MD5 da762512b4ae8682e353873c4f9d31bd files/lighttpd-1.3.11-php.diff 1332
 MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCE3/NEZCkKN40op4RAi5CAJ98DZTDLVw5AYnS5LT8LpBeucXmwgCghN3h
-HBT0UHhlvTccB07hmbGRiaY=
-=IXf7
+iD8DBQFCHGuAEZCkKN40op4RAswpAJsEPf3ZWzvXmwEh6+Je7YwzX0+rewCgq5oO
+cX7RZoAbrTPo6bQ61TdiUwE=
+=SO+i
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.11 b/www-servers/lighttpd/files/digest-lighttpd-1.3.11
new file mode 100644
index 000000000000..177f1b482eb0
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.11
@@ -0,0 +1 @@
+MD5 730c9b9d743360d23e523968ab4fe7c5 lighttpd-1.3.11.tar.gz 670438
diff --git a/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff
deleted file mode 100644
index 8df2fb291728..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- doc/lighttpd.1.orig	2005-02-06 23:58:57.661234800 -0500
-+++ doc/lighttpd.1	2005-02-06 23:59:30.758203296 -0500
-@@ -5,7 +5,7 @@
- lighttpd -D -f <configfile>
- .SH DESCRIPTION
- .SH FILES
--/etc/lighttpd/lighttpd.conf
-+/etc/lighttpd.conf
- .SH CONFORMING TO
- HTTP/1.0
- HTTP/1.0
---- doc/lighttpd.conf.orig	2004-04-23 18:31:13.985795352 +0100
-+++ doc/lighttpd.conf	2004-04-23 18:34:00.191528240 +0100
-@@ -25,10 +25,10 @@
- 
- ## a static document-root, for virtual-hosting take look at the 
- ## server.virtual-* options
--server.document-root             = "/www/pages/"
-+server.document-root             = "/var/www/localhost/htdocs/"
- 
- ## where to send error-messages to
--server.errorlog            = "/www/logs/lighttpd.error.log"
-+server.errorlog            = "/var/log/lighttpd/error.log"
- 
- # files to check for if .../ is requested
- server.indexfiles          = ( "index.php", "index.html", 
-@@ -52,7 +52,7 @@
- 				".conf" => "text/plain" )
- 
- #### accesslog module
--accesslog.filename          = "/www/logs/access.log"
-+accesslog.filename          = "/var/log/lighttpd/access.log"
- 
- ## deny access the file-extensions
- #
-@@ -81,9 +81,9 @@
- ##   virtual-server-root + virtual-server-default-host + virtual-server-docroot or
- ##   virtual-server-root + http-host + virtual-server-docroot
- ##
--#simple-vhost.server-root         = "/home/weigon/wwwroot/servers/"
-+#simple-vhost.server-root         = "/var/www/"
- #simple-vhost.default-host        = "grisu.home.kneschke.de"
--#simple-vhost.document-root       = "/pages/"
-+#simple-vhost.document-root       = "/htdocs/"
- 
- 
- ## 
diff --git a/www-servers/lighttpd/files/lighttpd-1.2.2-php.diff b/www-servers/lighttpd/files/lighttpd-1.2.2-php.diff
deleted file mode 100644
index 7ace09086270..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.2.2-php.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -u olddoc/lighttpd.1 doc/lighttpd.1
---- olddoc/lighttpd.1	2004-06-24 10:26:54.888331272 +0200
-+++ doc/lighttpd.1	2004-06-24 10:27:48.352203528 +0200
-@@ -5,7 +5,7 @@
- lighttpd -D -f <configfile>
- .SH DESCRIPTION
- .SH FILES
--/etc/lighttpd/lighttpd.conf
-+/etc/lighttpd.conf
- .SH CONFORMING TO
- HTTP/1.0
- HTTP/1.0
-diff -u olddoc/lighttpd.conf doc/lighttpd.conf
---- olddoc/lighttpd.conf	2004-06-24 10:26:54.900329448 +0200
-+++ doc/lighttpd.conf	2004-06-24 10:26:35.252316400 +0200
-@@ -16,7 +16,7 @@
- 			        "mod_access", 
- #				"mod_auth", 
- #                               "mod_status", 
--#				"mod_fastcgi",
-+				"mod_fastcgi",
- #				"mod_simple_vhost",
- #				"mod_evhost",
- #				"mod_cgi",
-@@ -114,14 +114,14 @@
- 
- #### fastcgi module
- ## read fastcgi.txt for more info
--#fastcgi.server              = ( ".php" =>
--#				( "grisu" => 
--#				  ( 
--#				    "host" => "192.168.2.10",
--#				    "port" => 1026
--#				  )
--#				)
--#			      )
-+fastcgi.server              = ( ".php" =>
-+				( "localhost" => 
-+				  ( 
-+				    "host" => "127.0.0.1",
-+				    "port" => 1026
-+				  )
-+				)
-+			      )
- 
- #### CGI module
- #cgi.assign                  = ( ".pl"  => "/usr/bin/perl",
diff --git a/www-servers/lighttpd/files/lighttpd-1.2.2.initd b/www-servers/lighttpd/files/lighttpd-1.2.2.initd
deleted file mode 100644
index e1bcfd476d35..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.2.2.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd-1.2.2.initd,v 1.2 2004/09/28 02:01:03 swegener Exp $
-
-LIGHTTPD_PID="/var/run/lighttpd.pid"
-LIGHTTPD_BIN="/usr/sbin/lighttpd"
-LIGHTTPD_CONF="/etc/lighttpd.conf"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi
-	after spawn-fcgi
-}
-			
-start() {
-	ebegin "Starting lighttpd"
-	${LIGHTTPD_BIN} -f ${LIGHTTPD_CONF}
-	eend ${?}
-	pidof lighttpd >${LIGHTTPD_PID}
-}
-
-stop() {
-	if [ -r ${LIGHTTPD_PID} ]; then
-	        ebegin "Stopping lighttpd"
-		kill `cat ${LIGHTTPD_PID}`
-		eend $?
-		if [ -w ${LIGHTTPD_PID} ]; then  rm ${LIGHTTPD_PID}; fi;
-	else
-		eerror "lighttpd: no PID-file found. no process killed!"
-	fi
-}
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff
new file mode 100644
index 000000000000..9138690f58aa
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff
@@ -0,0 +1,50 @@
+diff --exclude='*~' -urN lighttpd-1.3.11.orig/doc/lighttpd.1 lighttpd-1.3.11/doc/lighttpd.1
+--- lighttpd-1.3.11.orig/doc/lighttpd.1	2005-02-22 22:13:45.421019568 -0500
++++ lighttpd-1.3.11/doc/lighttpd.1	2005-02-22 22:18:13.278299072 -0500
+@@ -5,7 +5,7 @@
+ lighttpd -D -f <configfile>
+ .SH DESCRIPTION
+ .SH FILES
+-/etc/lighttpd/lighttpd.conf
++/etc/lighttpd.conf
+ .SH CONFORMING TO
+ HTTP/1.0
+ HTTP/1.0
+diff --exclude='*~' -urN lighttpd-1.3.11.orig/doc/lighttpd.conf lighttpd-1.3.11/doc/lighttpd.conf
+--- lighttpd-1.3.11.orig/doc/lighttpd.conf	2005-02-22 22:13:45.421019568 -0500
++++ lighttpd-1.3.11/doc/lighttpd.conf	2005-02-22 22:20:39.417082600 -0500
+@@ -35,10 +35,10 @@
+ 
+ ## a static document-root, for virtual-hosting take look at the
+ ## server.virtual-* options
+-server.document-root        = "/www/pages/"
++server.document-root        = "/var/www/localhost/htdocs/"
+ 
+ ## where to send error-messages to
+-server.errorlog             = "/www/logs/lighttpd.error.log"
++server.errorlog             = "/var/log/lighttpd/error.log"
+ 
+ # files to check for if .../ is requested
+ server.indexfiles           = ( "index.php", "index.html",
+@@ -103,7 +103,7 @@
+ #server.tag                 = "lighttpd"
+ 
+ #### accesslog module
+-accesslog.filename          = "/www/logs/access.log"
++accesslog.filename          = "/var/log/lighttpd/access.log"
+ 
+ ## deny access the file-extensions
+ #
+@@ -165,10 +165,10 @@
+ #server.chroot              = "/"
+ 
+ ## change uid to <uid> (default: don't care)
+-#server.username            = "wwwrun"
++server.username            = "lighttpd"
+ 
+ ## change uid to <uid> (default: don't care)
+-#server.groupname           = "wwwrun"
++server.groupname           = "lighttpd"
+ 
+ #### compress module
+ #compress.cache-dir         = "/tmp/lighttpd/cache/compress/"
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.11-php.diff b/www-servers/lighttpd/files/lighttpd-1.3.11-php.diff
new file mode 100644
index 000000000000..961722716ff5
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.11-php.diff
@@ -0,0 +1,35 @@
+diff --exclude='*~' -urN lighttpd-1.3.11.orig/doc/lighttpd.conf lighttpd-1.3.11/doc/lighttpd.conf
+--- lighttpd-1.3.11.orig/doc/lighttpd.conf	2005-02-22 22:22:46.836711872 -0500
++++ lighttpd-1.3.11/doc/lighttpd.conf	2005-02-22 22:24:26.732525400 -0500
+@@ -19,7 +19,7 @@
+ #                               "mod_auth",
+ #                               "mod_status",
+ #                               "mod_setenv",
+-#                               "mod_fastcgi",
++			       "mod_fastcgi",
+ #                               "mod_proxy",
+ #                               "mod_simple_vhost",
+ #                               "mod_evhost",
+@@ -187,14 +187,14 @@
+ 
+ #### fastcgi module
+ ## read fastcgi.txt for more info
+-#fastcgi.server             = ( ".php" =>
+-#                               ( "localhost" =>
+-#                                 (
+-#                                   "socket" => "/tmp/php-fastcgi.socket",
+-#                                   "bin-path" => "/usr/local/bin/php"
+-#                                 )
+-#                               )
+-#                            )
++fastcgi.server             = ( ".php" =>
++			       ( "localhost" =>
++				 (
++				   "host" => "127.0.0.1",
++				   "port" => 1026
++				 )
++			       )
++			    )
+ 
+ #### CGI module
+ #cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff b/www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff
new file mode 100644
index 000000000000..35d4f1408f85
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff
@@ -0,0 +1,24 @@
+diff --exclude='*~' -urN lighttpd-1.3.11.orig/src/mod_cgi.c lighttpd-1.3.11/src/mod_cgi.c
+--- lighttpd-1.3.11.orig/src/mod_cgi.c	2005-02-22 22:22:46.000000000 -0500
++++ lighttpd-1.3.11/src/mod_cgi.c	2005-02-23 06:24:09.490319288 -0500
+@@ -690,12 +690,14 @@
+ 	
+ #ifndef __WIN32	
+ 	
+-	/* stat the exec file */
+-	if (-1 == (stat(cgi_handler->ptr, &st))) {
+-		log_error_write(srv, __FILE__, __LINE__, "sbss", 
+-				"stat for cgi-handler", cgi_handler,
+-				"failed:", strerror(errno));
+-		return -1;
++	if (cgi_handler->used > 1) {
++		/* stat the exec file */
++		if (-1 == (stat(cgi_handler->ptr, &st))) {
++			log_error_write(srv, __FILE__, __LINE__, "sbss", 
++					"stat for cgi-handler", cgi_handler,
++					"failed:", strerror(errno));
++			return -1;
++		}
+ 	}
+ 	
+ 	if (pipe(to_cgi_fds)) {
diff --git a/www-servers/lighttpd/lighttpd-1.3.11.ebuild b/www-servers/lighttpd/lighttpd-1.3.11.ebuild
new file mode 100644
index 000000000000..ce0f559420c2
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.3.11.ebuild
@@ -0,0 +1,86 @@
+# 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.11.ebuild,v 1.1 2005/02/23 11:37:25 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}/${P}-upstream.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	use php && epatch ${FILESDIR}/${P}-php.diff
+}
+
+src_compile() {
+	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
+
+	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
+}