remove insecure version - bug #189786

(Portage version: 2.1.3.19)

7 files changed, 8 insertions, 356 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 05d1c072af0d..9de8d723968c 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.150 2008/01/26 14:46:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.151 2008/02/12 23:18:40 bangert Exp $
+
+  12 Feb 2008; Thilo Bangert <bangert@gentoo.org>
+  -files/lighttpd-1.3.10.initd, -files/lighttpd-1.3.11-gentoo.diff,
+  -files/lighttpd-1.3.13-ldap-binddn.diff,
+  -files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff,
+  -files/lighttpd-1.3.13-php.diff, -lighttpd-1.3.16.ebuild:
+  remove insecure version - bug #189786
 
   26 Jan 2008; Thilo Bangert <bangert@gentoo.org> lighttpd-1.4.16.ebuild,
   lighttpd-1.4.18.ebuild:
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10.initd b/www-servers/lighttpd/files/lighttpd-1.3.10.initd
deleted file mode 100644
index 451d236516b2..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.10.initd
+++ /dev/null
@@ -1,27 +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.3.10.initd,v 1.3 2007/10/12 20:54:46 swegener Exp $
-
-PID_FILE="/var/run/lighttpd.pid"
-LIGHTTPD_BIN="/usr/sbin/lighttpd"
-LIGHTTPD_CONF="/etc/lighttpd.conf"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi ldap
-	after sshd
-}
-
-start() {
-	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet --exec ${LIGHTTPD_BIN} -- \
-		-f ${LIGHTTPD_CONF}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lighttpd"
-	start-stop-daemon --stop --quiet --exec ${LIGHTTPD_BIN}
-	eend $?
-}
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff
deleted file mode 100644
index 9138690f58aa..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-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.13-ldap-binddn.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-ldap-binddn.diff
deleted file mode 100644
index 936813a0aebd..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-ldap-binddn.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -urN lighttpd-1.3.13.orig/src/http_auth.h lighttpd-1.3.13/src/http_auth.h
---- lighttpd-1.3.13.orig/src/http_auth.h	2005-05-06 21:20:21.000000000 +0000
-+++ lighttpd-1.3.13/src/http_auth.h	2005-05-06 21:19:24.000000000 +0000
-@@ -27,6 +27,8 @@
- 	
- 	buffer *auth_ldap_hostname;
- 	buffer *auth_ldap_basedn;
-+	buffer *auth_ldap_binddn;
-+	buffer *auth_ldap_bindpw;
- 	buffer *auth_ldap_filter;
- 	
- 	unsigned short auth_debug;
-diff -urN lighttpd-1.3.13.orig/src/mod_auth.c lighttpd-1.3.13/src/mod_auth.c
---- lighttpd-1.3.13.orig/src/mod_auth.c	2005-05-06 21:20:21.000000000 +0000
-+++ lighttpd-1.3.13/src/mod_auth.c	2005-05-06 21:21:24.000000000 +0000
-@@ -67,6 +67,8 @@
- 			
- 			buffer_free(s->auth_ldap_hostname);
- 			buffer_free(s->auth_ldap_basedn);
-+			buffer_free(s->auth_ldap_binddn);
-+			buffer_free(s->auth_ldap_bindpw);
- 			buffer_free(s->auth_ldap_filter);
- 			
- #ifdef USE_LDAP
-@@ -152,6 +154,8 @@
- 	PATCH(auth_debug);
- 	PATCH(auth_ldap_hostname);
- 	PATCH(auth_ldap_basedn);
-+	PATCH(auth_ldap_binddn);
-+	PATCH(auth_ldap_bindpw);
- 	PATCH(auth_ldap_filter);
- #ifdef USE_LDAP
- 	PATCH(ldap);
-@@ -296,10 +300,12 @@
- 		{ "auth.require",                   NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION },
- 		{ "auth.backend.ldap.hostname",     NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- 		{ "auth.backend.ldap.base-dn",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+		{ "auth.backend.ldap.bind-dn",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+		{ "auth.backend.ldap.bind-pw",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- 		{ "auth.backend.ldap.filter",       NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- 		{ "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- 		{ "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
--		{ "auth.debug",                     NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 9 */
-+		{ "auth.debug",                     NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
- 		{ NULL,                             NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
- 	};
- 	
-@@ -320,6 +326,8 @@
- 		
- 		s->auth_ldap_hostname = buffer_init();
- 		s->auth_ldap_basedn = buffer_init();
-+		s->auth_ldap_binddn = buffer_init();
-+		s->auth_ldap_bindpw = buffer_init();
- 		s->auth_ldap_filter = buffer_init();
- 		s->auth_debug = 0;
- 		
-@@ -337,10 +345,12 @@
- 		cv[3].destination = s->auth_require;
- 		cv[4].destination = s->auth_ldap_hostname;
- 		cv[5].destination = s->auth_ldap_basedn;
--		cv[6].destination = s->auth_ldap_filter;
--		cv[7].destination = s->auth_htdigest_userfile;
--		cv[8].destination = s->auth_htpasswd_userfile;
--		cv[9].destination = &(s->auth_debug);
-+		cv[6].destination = s->auth_ldap_binddn;
-+		cv[7].destination = s->auth_ldap_bindpw;
-+		cv[8].destination = s->auth_ldap_filter;
-+		cv[9].destination = s->auth_htdigest_userfile;
-+		cv[10].destination = s->auth_htpasswd_userfile;
-+		cv[11].destination = &(s->auth_debug);
- 		
- 		p->config_storage[i] = s;
- 		ca = ((data_config *)srv->config_context->data[i])->value;
-@@ -532,10 +542,18 @@
- 				
- 				
- 				/* 1. */
--				if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) {
--					log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
--					
--					return HANDLER_ERROR;
-+				if (s->auth_ldap_binddn->used) {
-+					if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, s->auth_ldap_binddn->ptr, s->auth_ldap_bindpw->ptr))) {
-+						log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
-+						
-+						return HANDLER_ERROR;
-+					}
-+				} else {
-+					if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) {
-+						log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
-+						
-+						return HANDLER_ERROR;
-+					}
- 				}
- 			}
- #else
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
deleted file mode 100644
index cb8e39c84e22..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-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-php.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-php.diff
deleted file mode 100644
index fec462e657ad..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-php.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/doc/lighttpd.conf lighttpd-1.3.13/doc/lighttpd.conf
---- lighttpd-1.3.13.orig/doc/lighttpd.conf	2005-07-12 09:35:12.000000000 -0400
-+++ lighttpd-1.3.13/doc/lighttpd.conf	2005-07-12 09:36:19.000000000 -0400
-@@ -19,7 +19,7 @@
- #                               "mod_auth",
- #                               "mod_status",
- #                               "mod_setenv",
--#                               "mod_fastcgi",
-+			       "mod_fastcgi",
- #                               "mod_proxy",
- #                               "mod_simple_vhost",
- #                               "mod_evhost",
-@@ -190,14 +190,15 @@
- 
- #### 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,
-+				   "bin-path" => "/usr/bin/php-cgi"
-+				 )
-+			       )
-+			    )
- 
- #### CGI module
- #cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
diff --git a/www-servers/lighttpd/lighttpd-1.3.16.ebuild b/www-servers/lighttpd/lighttpd-1.3.16.ebuild
deleted file mode 100644
index 37e707542d8c..000000000000
--- a/www-servers/lighttpd/lighttpd-1.3.16.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.16.ebuild,v 1.12 2006/11/23 20:43:03 vivo Exp $
-
-inherit eutils depend.php
-
-RESTRICT="test"
-
-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="amd64 mips ~ppc x86"
-IUSE="mysql ssl php xattr ldap ipv6"
-
-RDEPEND="app-arch/bzip2
-		>=dev-libs/libpcre-3.1
-		>=sys-libs/zlib-1.1
-		xattr? ( sys-apps/attr )
-		ldap? ( >=net-nds/openldap-2.1.26 )
-		mysql? ( >=virtual/mysql-4.0 )
-		ssl? ( >=dev-libs/openssl-0.9.7 )
-		php? (
-			virtual/httpd-php
-			!net-www/spawn-fcgi
-		)"
-
-LIGHTTPD_DIR="/var/www/localhost/htdocs/"
-LOG_DIR="/var/log/lighttpd/"
-
-pkg_setup() {
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
-
-	use php && require_php_with_use cgi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
-	epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff
-	epatch ${FILESDIR}/${PN}-1.3.13-ldap-binddn.diff
-	use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff
-}
-
-src_compile() {
-	local myconf="--libdir=/usr/$(get_libdir)/${PN}"
-
-	# somehow during the process the BSD COPYING gets
-	# overwritten with a GPL one
-	mv COPYING{,.orig}
-	einfo "Regenerating automake/autoconf files"
-	autoreconf -f -i || die "autoreconf failed"
-	mv COPYING{.orig,}
-
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		$(use_enable ipv6) \
-		$(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
-}