Doh, my bad, make 1.4.15-r1 patches sepparate

(Portage version: 2.1.2.9)

6 files changed, 18 insertions, 278 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 2a9d888aab3b..019ee2397b6b 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.123 2007/07/20 13:46:14 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.124 2007/07/20 13:50:52 gustavoz Exp $
+
+  20 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff,
+  +files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff,
+  -files/1.4.15/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash
+  .diff,
+  +files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_cr
+  ash.diff, -files/1.4.15/08_all_lighttpd-1.4.15-mod_acces_bypass.diff,
+  +files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff,
+  -files/1.4.15/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff,
+  +files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff,
+  -files/1.4.15/10_all_lighttpd-1.4.15-mod_scgi_crash.diff,
+  +files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff,
+  lighttpd-1.4.15-r1.ebuild:
+  Doh, my bad, make 1.4.15-r1 patches sepparate
 
 *lighttpd-1.4.15-r1 (20 Jul 2007)
 
diff --git a/www-servers/lighttpd/files/1.4.15/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff b/www-servers/lighttpd/files/1.4.15/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff
deleted file mode 100644
index 6bb175a657b1..000000000000
--- a/www-servers/lighttpd/files/1.4.15/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff
+++ /dev/null
@@ -1,122 +0,0 @@
-Index: src/request.c
-===================================================================
---- src/request.c	(revision 1868)
-+++ src/request.c	(revision 1870)
-@@ -284,8 +284,6 @@
- 
- 	int done = 0;
- 
--	data_string *ds = NULL;
--
- 	/*
- 	 * Request: "^(GET|POST|HEAD) ([^ ]+(\\?[^ ]+|)) (HTTP/1\\.[01])$"
- 	 * Option : "^([-a-zA-Z]+): (.+)$"
-@@ -715,12 +713,24 @@
- 			switch(*cur) {
- 			case '\r':
- 				if (con->parse_request->ptr[i+1] == '\n') {
-+					data_string *ds = NULL;
-+
- 					/* End of Headerline */
- 					con->parse_request->ptr[i] = '\0';
- 					con->parse_request->ptr[i+1] = '\0';
- 
- 					if (in_folding) {
--						if (!ds) {
-+						buffer *key_b;
-+						/**
-+						 * we use a evil hack to handle the line-folding
-+						 * 
-+						 * As array_insert_unique() deletes 'ds' in the case of a duplicate
-+						 * ds points somewhere and we get a evil crash. As a solution we keep the old
-+						 * "key" and get the current value from the hash and append us
-+						 *
-+						 * */
-+
-+						if (!key || !key_len) {
- 							/* 400 */
- 
- 							if (srv->srvconf.log_request_header_on_error) {
-@@ -737,7 +747,15 @@
- 							con->response.keep_alive = 0;
- 							return 0;
- 						}
--						buffer_append_string(ds->value, value);
-+
-+						key_b = buffer_init();
-+						buffer_copy_string_len(key_b, key, key_len);
-+
-+						if (NULL != (ds = (data_string *)array_get_element(con->request.headers, key_b->ptr))) {
-+							buffer_append_string(ds->value, value);
-+						}
-+
-+						buffer_free(key_b);
- 					} else {
- 						int s_len;
- 						key = con->parse_request->ptr + first;
-@@ -969,7 +987,12 @@
- 					first = i+1;
- 					is_key = 1;
- 					value = 0;
--					key_len = 0;
-+#if 0
-+					/**
-+					 * for Bug 1230 keep the key_len a live
-+					 */
-+					key_len = 0; 
-+#endif
- 					in_folding = 0;
- 				} else {
- 					if (srv->srvconf.log_request_header_on_error) {
-Index: tests/core-request.t
-===================================================================
---- tests/core-request.t	(revision 1868)
-+++ tests/core-request.t	(revision 1870)
-@@ -8,7 +8,7 @@
- 
- use strict;
- use IO::Socket;
--use Test::More tests => 33;
-+use Test::More tests => 36;
- use LightyTest;
- 
- my $tf = LightyTest->new();
-@@ -273,6 +273,38 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
- ok($tf->handle_http($t) == 0, 'uppercase filenames');
- 
-+$t->{REQUEST}  = ( <<EOF
-+GET / HTTP/1.0
-+Location: foo
-+Location: foobar
-+  baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1232 - duplicate headers with line-wrapping');
- 
-+$t->{REQUEST}  = ( <<EOF
-+GET / HTTP/1.0
-+Location: 
-+Location: foobar
-+  baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1232 - duplicate headers with line-wrapping - test 2');
-+
-+$t->{REQUEST}  = ( <<EOF
-+GET / HTTP/1.0
-+A: 
-+Location: foobar
-+  baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1232 - duplicate headers with line-wrapping - test 3');
-+
-+
-+
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
- 
diff --git a/www-servers/lighttpd/files/1.4.15/08_all_lighttpd-1.4.15-mod_acces_bypass.diff b/www-servers/lighttpd/files/1.4.15/08_all_lighttpd-1.4.15-mod_acces_bypass.diff
deleted file mode 100644
index 3165cd7b7012..000000000000
--- a/www-servers/lighttpd/files/1.4.15/08_all_lighttpd-1.4.15-mod_acces_bypass.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: src/mod_access.c
-===================================================================
---- src/mod_access.c	(revision 1870)
-+++ src/mod_access.c	(revision 1871)
-@@ -111,6 +111,15 @@
- }
- #undef PATCH
- 
-+/**
-+ * URI handler
-+ *
-+ * we will get called twice:
-+ * - after the clean up of the URL and 
-+ * - after the pathinfo checks are done
-+ *
-+ * this handles the issue of trailing slashes
-+ */
- URIHANDLER_FUNC(mod_access_uri_handler) {
- 	plugin_data *p = p_d;
- 	int s_len;
-@@ -122,28 +131,41 @@
- 
- 	s_len = con->uri.path->used - 1;
- 
-+	if (con->conf.log_request_handling) {
-+ 		log_error_write(srv, __FILE__, __LINE__, "s", 
-+				"-- mod_access_uri_handler called");
-+	}
-+
- 	for (k = 0; k < p->conf.access_deny->used; k++) {
- 		data_string *ds = (data_string *)p->conf.access_deny->data[k];
- 		int ct_len = ds->value->used - 1;
-+		int denied = 0;
- 
-+
- 		if (ct_len > s_len) continue;
--
- 		if (ds->value->used == 0) continue;
- 
- 		/* if we have a case-insensitive FS we have to lower-case the URI here too */
- 
- 		if (con->conf.force_lowercase_filenames) {
- 			if (0 == strncasecmp(con->uri.path->ptr + s_len - ct_len, ds->value->ptr, ct_len)) {
--				con->http_status = 403;
--
--				return HANDLER_FINISHED;
-+				denied = 1;
- 			}
- 		} else {
- 			if (0 == strncmp(con->uri.path->ptr + s_len - ct_len, ds->value->ptr, ct_len)) {
--				con->http_status = 403;
-+				denied = 1;
-+			}
-+		}
- 
--				return HANDLER_FINISHED;
-+		if (denied) {
-+			con->http_status = 403;
-+
-+			if (con->conf.log_request_handling) {
-+	 			log_error_write(srv, __FILE__, __LINE__, "sb", 
-+					"url denied as we match:", ds->value);
- 			}
-+
-+			return HANDLER_FINISHED;
- 		}
- 	}
- 
-@@ -158,7 +180,8 @@
- 
- 	p->init        = mod_access_init;
- 	p->set_defaults = mod_access_set_defaults;
--	p->handle_uri_clean  = mod_access_uri_handler;
-+	p->handle_uri_clean = mod_access_uri_handler;
-+	p->handle_subrequest_start  = mod_access_uri_handler;
- 	p->cleanup     = mod_access_free;
- 
- 	p->data        = NULL;
-Index: tests/mod-access.t
-===================================================================
---- tests/mod-access.t	(revision 1870)
-+++ tests/mod-access.t	(revision 1871)
-@@ -8,7 +8,7 @@
- 
- use strict;
- use IO::Socket;
--use Test::More tests => 3;
-+use Test::More tests => 4;
- use LightyTest;
- 
- my $tf = LightyTest->new();
-@@ -23,5 +23,12 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
- ok($tf->handle_http($t) == 0, 'forbid access to ...~');
- 
-+$t->{REQUEST}  = ( <<EOF
-+GET /index.html~/ HTTP/1.0
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
-+ok($tf->handle_http($t) == 0, '#1230 - forbid access to ...~ - trailing slash');
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
- 
-Index: tests/prepare.sh
-===================================================================
---- tests/prepare.sh	(revision 1870)
-+++ tests/prepare.sh	(revision 1871)
-@@ -25,6 +25,7 @@
- # copy everything into the right places
- cp $srcdir/docroot/www/*.html \
-    $srcdir/docroot/www/*.php \
-+   $srcdir/docroot/www/*.html~ \
-    $srcdir/docroot/www/*.pl \
-    $srcdir/docroot/www/*.fcgi \
-    $srcdir/docroot/www/*.shtml \
-Index: tests/docroot/www/index.html~
-===================================================================
-Index: tests/docroot/www/Makefile.am
-===================================================================
---- tests/docroot/www/Makefile.am	(revision 1870)
-+++ tests/docroot/www/Makefile.am	(revision 1871)
-@@ -1,5 +1,5 @@
- EXTRA_DIST=cgi.php cgi.pl dummydir index.html index.txt phpinfo.php \
- 	   redirect.php cgi-pathinfo.pl get-env.php get-server-env.php \
- 	   nph-status.pl prefix.fcgi get-header.pl ssi.shtml get-post-len.pl \
--	   exec-date.shtml
-+	   exec-date.shtml index.html~
- SUBDIRS=go indexfile expire
diff --git a/www-servers/lighttpd/files/1.4.15/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff b/www-servers/lighttpd/files/1.4.15/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff
deleted file mode 100644
index 7c8f4e91c1e6..000000000000
--- a/www-servers/lighttpd/files/1.4.15/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/mod_fastcgi.c
-===================================================================
---- src/mod_fastcgi.c	(revision 1878)
-+++ src/mod_fastcgi.c	(revision 1879)
-@@ -2440,7 +2440,6 @@
- 		b->used = r + 1; /* one extra for the fake \0 */
- 		b->ptr[b->used - 1] = '\0';
- 	} else {
--		if (errno == EAGAIN) return 0;
- 		log_error_write(srv, __FILE__, __LINE__, "ssdsb",
- 				"unexpected end-of-file (perhaps the fastcgi process died):",
- 				"pid:", proc->pid,
diff --git a/www-servers/lighttpd/files/1.4.15/10_all_lighttpd-1.4.15-mod_scgi_crash.diff b/www-servers/lighttpd/files/1.4.15/10_all_lighttpd-1.4.15-mod_scgi_crash.diff
deleted file mode 100644
index f5bb6a128b1b..000000000000
--- a/www-servers/lighttpd/files/1.4.15/10_all_lighttpd-1.4.15-mod_scgi_crash.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura lighttpd-1.4.15/src/mod_scgi.c lighttpd-1.4.15-scgi/src/mod_scgi.c
---- lighttpd-1.4.15/src/mod_scgi.c	2007-02-08 13:34:45.000000000 -0300
-+++ lighttpd-1.4.15-scgi/src/mod_scgi.c	2007-07-20 10:35:41.000000000 -0300
-@@ -2536,7 +2536,7 @@
- 					return HANDLER_WAIT_FOR_FD;
- 				}
- 
--				log_error_write(srv, __FILE__, __LINE__, "sdsdsd",
-+				log_error_write(srv, __FILE__, __LINE__, "sosdsd",
- 						"response not sent, request sent:", hctx->wb->bytes_out,
- 						"connection-fd:", con->fd,
- 						"fcgi-fd:", hctx->fd);
diff --git a/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild
index c6c020a8ff75..d664a328ac52 100644
--- a/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild,v 1.1 2007/07/20 13:46:14 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild,v 1.2 2007/07/20 13:50:52 gustavoz Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -98,7 +98,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-l" epatch ${FILESDIR}/1.4.15 || die "Patching failed!"
+	EPATCH_SUFFIX="diff" EPATCH_OPTS="-l" epatch ${FILESDIR}/${PV} || die "Patching failed!"
 
 	eautoreconf || die