Apache herd package refresh. closes #77063

(Portage version: 2.0.51-r15)

12 files changed, 80 insertions, 161 deletions

diff --git a/net-www/mod_auth_ldap/ChangeLog b/net-www/mod_auth_ldap/ChangeLog
index ce0e11a43adc..07ed21159714 100644
--- a/net-www/mod_auth_ldap/ChangeLog
+++ b/net-www/mod_auth_ldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/mod_auth_ldap
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/ChangeLog,v 1.10 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/ChangeLog,v 1.11 2005/01/30 07:58:01 hollow Exp $
+
+*mod_auth_ldap-2.4.2-r1 (30 Jan 2005)
+
+  30 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/55_mod_auth_ldap.conf, -files/mod_auth_ldap-2.4.1-register.patch,
+  -mod_auth_ldap-2.4.1-r1.ebuild, -mod_auth_ldap-2.4.1.ebuild,
+  +mod_auth_ldap-2.4.2-r1.ebuild:
+  Apache herd package refresh. Closes #77063
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_auth_ldap-2.4.1-r1.ebuild, mod_auth_ldap-2.4.1.ebuild,
diff --git a/net-www/mod_auth_ldap/Manifest b/net-www/mod_auth_ldap/Manifest
index c7328568f9d0..8c9b12a9e88b 100644
--- a/net-www/mod_auth_ldap/Manifest
+++ b/net-www/mod_auth_ldap/Manifest
@@ -1,11 +1,9 @@
-MD5 d3b3c53a235c6b0b40d7b52bee670e4e ChangeLog 2244
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 7eeb1157b9dff1d31d72285c487354bf mod_auth_ldap-2.4.1-r1.ebuild 1686
-MD5 5cbcdd1cc86fea3efba03f5999ad80c8 mod_auth_ldap-2.4.1.ebuild 1561
-MD5 29cd8e0e000511831f4997748a163539 mod_auth_ldap-2.4.2.ebuild 1661
-MD5 8e27cb64926af0962345b6ee75f7744d files/digest-mod_auth_ldap-2.4.1 64
-MD5 8e27cb64926af0962345b6ee75f7744d files/digest-mod_auth_ldap-2.4.1-r1 64
+MD5 9d26c24c95165c01902cef4ea506bb24 ChangeLog 2565
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 f03d43b0956d6195ac8fb0c04f25692e mod_auth_ldap-2.4.2.ebuild 1661
+MD5 7ee1cfe7dadbb714a2191ca8cadf990b mod_auth_ldap-2.4.2-r1.ebuild 875
 MD5 70f2900c0af4686603926e27feb6b46d files/digest-mod_auth_ldap-2.4.2 71
-MD5 065e832893289b1878b7e3b89a2cef0d files/mod_auth_ldap-2.4.1-register.patch 746
 MD5 62b3324855a538cd461599aa25998233 files/mod_auth_ldap-2.4.2-register.patch 1038
 MD5 7c887a1226ef0c99f4068014a05b2135 files/mod_auth_ldap.conf 667
+MD5 70f2900c0af4686603926e27feb6b46d files/digest-mod_auth_ldap-2.4.2-r1 71
+MD5 d6e8db2a8f272dd55fe74800f0935c25 files/55_mod_auth_ldap.conf 669
diff --git a/net-www/mod_auth_ldap/files/55_mod_auth_ldap.conf b/net-www/mod_auth_ldap/files/55_mod_auth_ldap.conf
new file mode 100644
index 000000000000..7d062f6c3b41
--- /dev/null
+++ b/net-www/mod_auth_ldap/files/55_mod_auth_ldap.conf
@@ -0,0 +1,26 @@
+<IfDefin AUTH_LDAP>
+	LoadModule ldap_auth_module modules/mod_auth_ldap.so
+
+	<Directory "/var/www/localhost/htdocs/foo">
+		Options Indexes FollowSymLinks
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+		
+		AuthName "RCS Staff only"
+		AuthType Basic
+		
+		LDAP_Server ldap.fccc.edu
+		LDAP_Port 389
+		Base_DN "o=Fox Chase Cancer Center,c=US"
+		#Bind_DN "uid=admin,o=Fox Chase Cancer Center,c=US"
+		#Bind_Pass "secret"
+		UID_Attr uid
+
+		#require valid-user
+		require user muquit foo bar "john doe"
+		#require roomnumber "123 Center Building"
+		#require filter "(&(telephonenumber=1234)(roomnumber=123))"
+		#require group cn=rcs,ou=Groups
+	</Directory>
+</IfDefine>
diff --git a/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.1 b/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.1
deleted file mode 100644
index d3ee574626c6..000000000000
--- a/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c78fc7e99b285c13de4821c54358bb2 mod_auth_ldap.tar.gz 20644
diff --git a/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.1-r1 b/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.1-r1
deleted file mode 100644
index d3ee574626c6..000000000000
--- a/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c78fc7e99b285c13de4821c54358bb2 mod_auth_ldap.tar.gz 20644
diff --git a/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.2-r1 b/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.2-r1
new file mode 100644
index 000000000000..395e3a7d61a1
--- /dev/null
+++ b/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.2-r1
@@ -0,0 +1 @@
+MD5 c2bd6b02a441aa90d0afb702297b9e9f mod_auth_ldap-2.4.2.tar.bz2 19272
diff --git a/net-www/mod_auth_ldap/files/mod_auth_ldap-2.4.1-register.patch b/net-www/mod_auth_ldap/files/mod_auth_ldap-2.4.1-register.patch
deleted file mode 100644
index 7cc1eb1c42f4..000000000000
--- a/net-www/mod_auth_ldap/files/mod_auth_ldap-2.4.1-register.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mod_auth_ldap.c.orig	2003-01-18 19:28:40.000000000 -0500
-+++ mod_auth_ldap.c	2003-01-18 19:30:01.000000000 -0500
-@@ -168,6 +168,10 @@
-         *dummy;
- } ldap_auth_config_rec;
- 
-+void ldap_module_init(void)
-+{
-+    ap_add_version_component("mod_auth_ldap/" MOD_AUTH_LDAP_VERSION_S);
-+}
- 
- static void *create_ldap_auth_dir_config(pool *p,char *d)
- {
-@@ -1230,7 +1234,7 @@
- module ldap_auth_module =
- {
-     STANDARD_MODULE_STUFF,
--    NULL,                         /* module initializer */
-+    ldap_module_init,             /* module initializer */
-     create_ldap_auth_dir_config,  /* per-directory config creator */
-     NULL,                         /* dir config merger */
-     NULL,                         /* server config creator */
diff --git a/net-www/mod_auth_ldap/metadata.xml b/net-www/mod_auth_ldap/metadata.xml
index c054a8cd9b61..10510cb8be95 100644
--- a/net-www/mod_auth_ldap/metadata.xml
+++ b/net-www/mod_auth_ldap/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1-r1.ebuild b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1-r1.ebuild
deleted file mode 100644
index 52481f209661..000000000000
--- a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1-r1.ebuild,v 1.6 2004/09/03 23:24:08 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache module for LDAP authorization"
-HOMEPAGE="http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.html"
-KEYWORDS="x86 ppc ~sparc"
-
-#watch out for this thing; no version number ...
-SRC_URI="http://www.muquit.com/muquit/software/mod_auth_ldap/${PN}.tar.gz"
-DEPEND="=net-www/apache-1*
-		>=net-nds/openldap-2.0.25
-		ssl? ( dev-libs/openssl )"
-RDEPEND=""
-LICENSE="as-is"
-SLOT="0"
-
-IUSE=""
-
-S=${WORKDIR}/modauthldap
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/${P}-register.patch
-}
-
-src_compile() {
-	if use ssl;
-	then
-		apxs -lresolv -lldap -llber -lssl -c mod_auth_ldap.c || die
-	else
-		apxs -lresolv -lldap -llber -c mod_auth_ldap.c || die
-	fi
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe mod_auth_ldap.so
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_auth_ldap.conf
-
-	dodoc README
-	dohtml mod_auth_ldap.html
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Execute the command:"
-	einfo " \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
-	einfo " to auto-update apache.conf with supporting statements."
-	einfo " Then edit /etc/conf.d/apache accordingly."
-	einfo " You can find config examples here: ${HOMEPAGE}."
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/mod_auth_ldap.so mod_auth_ldap.c ldap_auth_module \
-		define=AUTH_LDAP addconf=conf/addon-modules/mod_auth_ldap.conf
-	:;
-}
diff --git a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1.ebuild b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1.ebuild
deleted file mode 100644
index b4aeca8920bd..000000000000
--- a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/mod_auth_ldap-2.4.1.ebuild,v 1.8 2004/09/03 23:24:08 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache module for LDAP authorization"
-HOMEPAGE="http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.html"
-KEYWORDS="x86 ppc ~sparc"
-
-#watch out for this thing; no version number ...
-SRC_URI="http://www.muquit.com/muquit/software/mod_auth_ldap/${PN}.tar.gz"
-DEPEND="=net-www/apache-1* >=net-nds/openldap-2.0.25"
-RDEPEND=""
-LICENSE="as-is"
-SLOT="0"
-
-IUSE=""
-
-S=${WORKDIR}/modauthldap
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/${P}-register.patch
-}
-
-src_compile() {
-	apxs -lresolv -lldap -llber -c mod_auth_ldap.c || die
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe mod_auth_ldap.so
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_auth_ldap.conf
-
-	dodoc README
-	dohtml mod_auth_ldap.html
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Execute the command:"
-	einfo " \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
-	einfo " to auto-update apache.conf with supporting statements."
-	einfo " Then edit /etc/conf.d/apache accordingly."
-	einfo " You can find config examples here: ${HOMEPAGE}."
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/mod_auth_ldap.so mod_auth_ldap.c ldap_auth_module \
-		define=AUTH_LDAP addconf=conf/addon-modules/mod_auth_ldap.conf
-	:;
-}
diff --git a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2-r1.ebuild b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..8036ba66f872
--- /dev/null
+++ b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2-r1.ebuild,v 1.1 2005/01/30 07:58:01 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Apache module for LDAP authorization"
+HOMEPAGE="http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.html"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=net-nds/openldap-2.0.25"
+RDEPEND=""
+
+APXS1_ARGS="-lresolv -lldap -llber -c ${PN}.c"
+APACHE1_MOD_FILE="${PN}.so"
+APACHE1_MOD_CONF="55_${PN}"
+APACHE1_MOD_DEFINE="AUTH_LDAP"
+
+DOCFILES="README mod_auth_ldap.html"
+
+need_apache1
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+	epatch ${FILESDIR}/${P}-register.patch || die "patch failed"
+}
diff --git a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild
index b41d6b694af4..edc5b7205097 100644
--- a/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild
+++ b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild,v 1.8 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild,v 1.9 2005/01/30 07:58:01 hollow Exp $
 
 DESCRIPTION="Apache module for LDAP authorization"
 HOMEPAGE="http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.html"