Revision bump; added two more patches from tigger^. See http://trac.lighttpd.net/trac/ticket/4 and http://trac.lighttpd.net/trac/ticket/149 respectively.

(Portage version: 2.0.51.22-r1)

6 files changed, 141 insertions, 15 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 51b638c6b8a4..e9a2f97e0e3b 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.18 2005/06/06 12:11:08 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.19 2005/06/06 17:09:51 ka0ttic Exp $
+
+*lighttpd-1.3.13-r3 (06 Jun 2005)
+
+  06 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/lighttpd-1.3.13-ldap-binddn.diff,
+  +files/lighttpd-1.3.13-valid-user.diff, -lighttpd-1.3.13-r2.ebuild,
+  +lighttpd-1.3.13-r3.ebuild:
+  Revision bump; added two more patches from tigger^. See
+  http://trac.lighttpd.net/trac/ticket/4 and
+  http://trac.lighttpd.net/trac/ticket/149 respectively.
 
   06 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
   files/lighttpd-1.3.10.initd:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 689968cc808a..c79c293bf191 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,18 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 378ffce2346d85a3d3c04e769e725480 lighttpd-1.3.13-r2.ebuild 2381
 MD5 2ee7defa9578776786620b0864ca3bbc lighttpd-1.3.10-r1.ebuild 2160
 MD5 3e5bb5d47d1b107f11b702af81b85451 lighttpd-1.3.13-r1.ebuild 2342
-MD5 71ea80bfaf5e2fbaf6d83cd1eea7c42e ChangeLog 5609
+MD5 837ed3e480bd9575046ce96db94c96ec lighttpd-1.3.13-r3.ebuild 2464
+MD5 32aefc84d435a3f773c514b3a5c1491e ChangeLog 5997
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
+MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
+MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762
 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r1 67
-MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r2 67
+MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974
 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
@@ -20,10 +19,3 @@ MD5 da762512b4ae8682e353873c4f9d31bd files/lighttpd-1.3.11-php.diff 1332
 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
 MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
 MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCpD1zEZCkKN40op4RAtygAJ9KwUllRct0ekMy00bdGdlX4GZGCACgsosR
-YVdD8f1SuXfhe5fOoK9N7gI=
-=DKT9
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r2 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
index d17be2479447..d17be2479447 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r2
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
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
new file mode 100644
index 000000000000..936813a0aebd
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.13-ldap-binddn.diff
@@ -0,0 +1,96 @@
+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-valid-user.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-valid-user.diff
new file mode 100644
index 000000000000..48ba54535de9
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.13-valid-user.diff
@@ -0,0 +1,26 @@
+--- lighttpd-1.3.13.orig/src/http_auth.c	2005-06-06 14:10:02.000000000 +0100
++++ lighttpd-1.3.13/src/http_auth.c	2005-06-06 14:12:52.000000000 +0100
+@@ -313,6 +313,11 @@
+ 	req = ((data_array *)(p->conf.auth_require->data[i]))->value;
+ 
+ 	require = (data_string *)array_get_element(req, "require");
++
++	/* valid-user */
++
++	if (0 == strcmp(require->value->ptr, "valid-user"))
++		return 0;
+ 	
+ 	/* user=name1|group=name3|host=name4 */
+ 	
+@@ -339,6 +344,11 @@
+ 		}
+ 		
+ 		/* from r to r + r_len is a rule */
++
++		if (0 == strncmp(r, "valid-user", r_len)) {
++			log_error_write(srv, __FILE__, __LINE__, "s", "valid-user cannot be combined with other require rules");
++			return -1;
++		}
+ 		
+ 		/* search for = in the rules */
+ 		if (NULL == (eq = strchr(r, '='))) {
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
index 00c6b6c415f9..04443d0adc00 100644
--- a/www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild,v 1.1 2005/06/05 17:59:47 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.1 2005/06/06 17:09:51 ka0ttic Exp $
 
 inherit eutils
 
@@ -38,6 +38,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-no-mysql-means-no-mysql.diff
 	epatch ${FILESDIR}/${P}-zope-deserves-lovins-too.diff
 	epatch ${FILESDIR}/${P}-pam-name.diff
+	epatch ${FILESDIR}/${P}-valid-user.diff
+	epatch ${FILESDIR}/${P}-ldap-binddn.diff
 	use php && epatch ${FILESDIR}/${PN}-1.3.11-php.diff
 }