remove obsolete ebuilds/files

Package-Manager: portage-2.2_rc26/cvs/Linux i686

23 files changed, 0 insertions, 1550 deletions

diff --git a/www-servers/lighttpd/files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.16/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.16/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.16/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.18-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.18-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.18-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.18-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.18-r1/05_all_lighttpd-fix-DoS.diff b/www-servers/lighttpd/files/1.4.18-r1/05_all_lighttpd-fix-DoS.diff
deleted file mode 100644
index 4f63be3bc04c..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r1/05_all_lighttpd-fix-DoS.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c lighttpd-1.4.18/src/fdevent_solaris_devpoll.c
---- lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c	2006-10-04 14:26:23.000000000 +0100
-+++ lighttpd-1.4.18/src/fdevent_solaris_devpoll.c	2008-02-24 15:41:13.000000000 +0000
-@@ -67,7 +67,7 @@
- 	int ret;
- 
- 	dopoll.dp_timeout = timeout_ms;
--	dopoll.dp_nfds = ev->maxfds;
-+	dopoll.dp_nfds = ev->maxfds - 1;
- 	dopoll.dp_fds = ev->devpollfds;
- 
- 	ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll);
-diff -ur lighttpd-1.4.18.orig/src/server.c lighttpd-1.4.18/src/server.c
---- lighttpd-1.4.18.orig/src/server.c	2007-09-05 11:39:56.000000000 +0100
-+++ lighttpd-1.4.18/src/server.c	2008-02-24 15:40:38.000000000 +0000
-@@ -697,9 +697,6 @@
- 			}
- 		}
- 
--		/* #372: solaris need some fds extra for devpoll */
--		if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10;
--
- 		if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
- 			srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
- 		} else {
diff --git a/www-servers/lighttpd/files/1.4.18-r2/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.18-r2/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r2/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.18-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.18-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.18-r2/05_all_lighttpd-fix-DoS.diff b/www-servers/lighttpd/files/1.4.18-r2/05_all_lighttpd-fix-DoS.diff
deleted file mode 100644
index 4f63be3bc04c..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r2/05_all_lighttpd-fix-DoS.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c lighttpd-1.4.18/src/fdevent_solaris_devpoll.c
---- lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c	2006-10-04 14:26:23.000000000 +0100
-+++ lighttpd-1.4.18/src/fdevent_solaris_devpoll.c	2008-02-24 15:41:13.000000000 +0000
-@@ -67,7 +67,7 @@
- 	int ret;
- 
- 	dopoll.dp_timeout = timeout_ms;
--	dopoll.dp_nfds = ev->maxfds;
-+	dopoll.dp_nfds = ev->maxfds - 1;
- 	dopoll.dp_fds = ev->devpollfds;
- 
- 	ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll);
-diff -ur lighttpd-1.4.18.orig/src/server.c lighttpd-1.4.18/src/server.c
---- lighttpd-1.4.18.orig/src/server.c	2007-09-05 11:39:56.000000000 +0100
-+++ lighttpd-1.4.18/src/server.c	2008-02-24 15:40:38.000000000 +0000
-@@ -697,9 +697,6 @@
- 			}
- 		}
- 
--		/* #372: solaris need some fds extra for devpoll */
--		if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10;
--
- 		if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
- 			srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
- 		} else {
diff --git a/www-servers/lighttpd/files/1.4.18-r2/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff b/www-servers/lighttpd/files/1.4.18-r2/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff
deleted file mode 100644
index 45a66e179222..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r2/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: /branches/lighttpd-1.4.x/src/mod_cgi.c

-===================================================================

---- /branches/lighttpd-1.4.x/src/mod_cgi.c (revision 2065)

-+++ /branches/lighttpd-1.4.x/src/mod_cgi.c (revision 2107)

-@@ -1005,4 +1005,5 @@

- 		/* error */

- 		log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));

-+		return -1;

- 		break;

- 	default: {

-Index: /branches/lighttpd-1.4.x/NEWS

-===================================================================

---- /branches/lighttpd-1.4.x/NEWS (revision 2106)

-+++ /branches/lighttpd-1.4.x/NEWS (revision 2107)

-@@ -46,4 +46,5 @@

-   * fixed body handling of status 300 requests 

-   * spawn-fcgi: only try to connect to unix socket (not tcp) before spawning (#1575)

-+  * fix sending source of cgi script instead of 500 error if fork fails

- 

- - 1.4.18 - 2007-09-09

diff --git a/www-servers/lighttpd/files/1.4.18-r3/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.18-r3/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r3/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.18-r3/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.18-r3/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r3/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.18-r3/05_all_lighttpd-fix-DoS.diff b/www-servers/lighttpd/files/1.4.18-r3/05_all_lighttpd-fix-DoS.diff
deleted file mode 100644
index 4f63be3bc04c..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r3/05_all_lighttpd-fix-DoS.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c lighttpd-1.4.18/src/fdevent_solaris_devpoll.c
---- lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c	2006-10-04 14:26:23.000000000 +0100
-+++ lighttpd-1.4.18/src/fdevent_solaris_devpoll.c	2008-02-24 15:41:13.000000000 +0000
-@@ -67,7 +67,7 @@
- 	int ret;
- 
- 	dopoll.dp_timeout = timeout_ms;
--	dopoll.dp_nfds = ev->maxfds;
-+	dopoll.dp_nfds = ev->maxfds - 1;
- 	dopoll.dp_fds = ev->devpollfds;
- 
- 	ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll);
-diff -ur lighttpd-1.4.18.orig/src/server.c lighttpd-1.4.18/src/server.c
---- lighttpd-1.4.18.orig/src/server.c	2007-09-05 11:39:56.000000000 +0100
-+++ lighttpd-1.4.18/src/server.c	2008-02-24 15:40:38.000000000 +0000
-@@ -697,9 +697,6 @@
- 			}
- 		}
- 
--		/* #372: solaris need some fds extra for devpoll */
--		if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10;
--
- 		if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
- 			srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
- 		} else {
diff --git a/www-servers/lighttpd/files/1.4.18-r3/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff b/www-servers/lighttpd/files/1.4.18-r3/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff
deleted file mode 100644
index 45a66e179222..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r3/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: /branches/lighttpd-1.4.x/src/mod_cgi.c

-===================================================================

---- /branches/lighttpd-1.4.x/src/mod_cgi.c (revision 2065)

-+++ /branches/lighttpd-1.4.x/src/mod_cgi.c (revision 2107)

-@@ -1005,4 +1005,5 @@

- 		/* error */

- 		log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));

-+		return -1;

- 		break;

- 	default: {

-Index: /branches/lighttpd-1.4.x/NEWS

-===================================================================

---- /branches/lighttpd-1.4.x/NEWS (revision 2106)

-+++ /branches/lighttpd-1.4.x/NEWS (revision 2107)

-@@ -46,4 +46,5 @@

-   * fixed body handling of status 300 requests 

-   * spawn-fcgi: only try to connect to unix socket (not tcp) before spawning (#1575)

-+  * fix sending source of cgi script instead of 500 error if fork fails

- 

- - 1.4.18 - 2007-09-09

diff --git a/www-servers/lighttpd/files/1.4.18-r3/07_all_lighttpd-1.4.18-mod_userdir-information_disclosure.diff b/www-servers/lighttpd/files/1.4.18-r3/07_all_lighttpd-1.4.18-mod_userdir-information_disclosure.diff
deleted file mode 100644
index df20d3f4ad48..000000000000
--- a/www-servers/lighttpd/files/1.4.18-r3/07_all_lighttpd-1.4.18-mod_userdir-information_disclosure.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: /branches/lighttpd-1.4.x/src/mod_userdir.c

-===================================================================

---- /branches/lighttpd-1.4.x/src/mod_userdir.c (revision 2058)

-+++ /branches/lighttpd-1.4.x/src/mod_userdir.c (revision 2120)

-@@ -178,4 +178,9 @@

- 	mod_userdir_patch_connection(srv, con, p);

- 

-+	/* enforce the userdir.path to be set in the config, ugly fix for #1587;

-+	 * should be replaced with a clean .enabled option in 1.5

-+	 */

-+	if (p->conf.path->used == 0) return HANDLER_GO_ON;

-+

- 	uri_len = con->uri.path->used - 1;

- 

-Index: /branches/lighttpd-1.4.x/NEWS

-===================================================================

---- /branches/lighttpd-1.4.x/NEWS (revision 2111)

-+++ /branches/lighttpd-1.4.x/NEWS (revision 2120)

-@@ -49,4 +49,5 @@

-   * fix min-procs handling in mod_scgi.c, just set to max-procs (patch from #623)

-   * fix sending "408 - Timeout" instead of "410 - Gone" for timedout urls in mod_secdownload (#1440)

-+  * workaround #1587: require userdir.path to be set to enable mod_userdir (empty string allowed)

- 

- - 1.4.18 - 2007-09-09

diff --git a/www-servers/lighttpd/files/1.4.18/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.18/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.18/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.18/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.18/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.18/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.19-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.19-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.19-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.19-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.19-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.19-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.19-r1/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff b/www-servers/lighttpd/files/1.4.19-r1/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff
deleted file mode 100644
index 9d67afd049ed..000000000000
--- a/www-servers/lighttpd/files/1.4.19-r1/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- lighttpd-1.4.19/src/mod_userdir.c	2008-03-10 22:45:29.000000000 +1100
-+++ lighty-dev/src/mod_userdir.c	2008-03-12 17:44:43.000000000 +1100
-@@ -286,6 +286,11 @@
- 
- 	BUFFER_APPEND_SLASH(p->temp_path);
- 	buffer_append_string(p->temp_path, rel_url + 1); /* skip the / */
-+
-+    if (con->conf.force_lowercase_filenames) {
-+        buffer_to_lower(p->temp_path);
-+    }
-+
- 	buffer_copy_string_buffer(con->physical.path, p->temp_path);
- 
- 	buffer_reset(p->temp_path);
diff --git a/www-servers/lighttpd/files/1.4.19-r1/06_all_lighttpd-1.4.19-closing_foreign_ssl_connections-dos.diff b/www-servers/lighttpd/files/1.4.19-r1/06_all_lighttpd-1.4.19-closing_foreign_ssl_connections-dos.diff
deleted file mode 100644
index 7a904e999e1d..000000000000
--- a/www-servers/lighttpd/files/1.4.19-r1/06_all_lighttpd-1.4.19-closing_foreign_ssl_connections-dos.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur lighttpd-1.4.19.orig/NEWS lighttpd-1.4.19/NEWS
---- lighttpd-1.4.19.orig/NEWS	2008-03-10 22:28:30.000000000 +0100
-+++ lighttpd-1.4.19/NEWS	2008-03-26 20:45:16.000000000 +0100
-@@ -8,6 +8,7 @@
-   * added support for If-Range: <date> (#1346)
-   * added support for matching $HTTP["scheme"] in configs
-   * fixed initgroups() called after chroot (#1384)
-+  * Fix #285 again: read error after SSL_shutdown (thx marton.illes@balabit.com) and clear the error queue before some other calls
-   * fixed case-sensitive check for Auth-Method (#1456)
-   * execute fcgi app without /bin/sh if used as argument to spawn-fcgi (#1428)
-   * fixed a bug that made /-prefixed extensions being handled also when
-diff -Naur lighttpd-1.4.19.orig/src/connections.c lighttpd-1.4.19/src/connections.c
---- lighttpd-1.4.19.orig/src/connections.c	2008-02-28 00:41:35.000000000 +0100
-+++ lighttpd-1.4.19/src/connections.c	2008-03-26 20:45:16.000000000 +0100
-@@ -199,6 +199,7 @@
- 
- 	/* don't resize the buffer if we were in SSL_ERROR_WANT_* */
- 
-+	ERR_clear_error();
- 	do {
- 		if (!con->ssl_error_want_reuse_buffer) {
- 			b = buffer_init();
-@@ -1669,13 +1670,16 @@
- #ifdef USE_OPENSSL
- 			if (srv_sock->is_ssl) {
- 				int ret;
-+				ERR_clear_error();
- 				switch ((ret = SSL_shutdown(con->ssl))) {
- 				case 1:
- 					/* ok */
- 					break;
- 				case 0:
--					SSL_shutdown(con->ssl);
--					break;
-+					ERR_clear_error();
-+					if ((ret = SSL_shutdown(con->ssl)) == 1) break;
-+
-+					// fall through
- 				default:
- 					log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:",
- 							SSL_get_error(con->ssl, ret),
-diff -Naur lighttpd-1.4.19.orig/src/network_openssl.c lighttpd-1.4.19/src/network_openssl.c
---- lighttpd-1.4.19.orig/src/network_openssl.c	2008-02-26 17:20:26.000000000 +0100
-+++ lighttpd-1.4.19/src/network_openssl.c	2008-03-26 20:45:16.000000000 +0100
-@@ -85,6 +85,7 @@
- 			 *
- 			 */
- 
-+			ERR_clear_error();
- 			if ((r = SSL_write(ssl, offset, toSend)) <= 0) {
- 				unsigned long err;
- 
-@@ -187,6 +188,7 @@
- 
- 				close(ifd);
- 
-+				ERR_clear_error();
- 				if ((r = SSL_write(ssl, s, toSend)) <= 0) {
- 					unsigned long err;
- 
diff --git a/www-servers/lighttpd/files/1.4.19/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.19/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.19/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.19/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.19/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.19/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.19/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff b/www-servers/lighttpd/files/1.4.19/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff
deleted file mode 100644
index 9d67afd049ed..000000000000
--- a/www-servers/lighttpd/files/1.4.19/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- lighttpd-1.4.19/src/mod_userdir.c	2008-03-10 22:45:29.000000000 +1100
-+++ lighty-dev/src/mod_userdir.c	2008-03-12 17:44:43.000000000 +1100
-@@ -286,6 +286,11 @@
- 
- 	BUFFER_APPEND_SLASH(p->temp_path);
- 	buffer_append_string(p->temp_path, rel_url + 1); /* skip the / */
-+
-+    if (con->conf.force_lowercase_filenames) {
-+        buffer_to_lower(p->temp_path);
-+    }
-+
- 	buffer_copy_string_buffer(con->physical.path, p->temp_path);
- 
- 	buffer_reset(p->temp_path);