#23492

5 files changed, 92 insertions, 3 deletions

diff --git a/net-www/mod_auth_ldap/ChangeLog b/net-www/mod_auth_ldap/ChangeLog
index 94f0b6b0b71c..b7dd27ec149e 100644
--- a/net-www/mod_auth_ldap/ChangeLog
+++ b/net-www/mod_auth_ldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mod_auth_ldap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/ChangeLog,v 1.2 2003/02/12 15:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_ldap/ChangeLog,v 1.3 2003/07/13 03:42:15 woodchip Exp $
+
+*mod_auth_ldap-2.4.2 (12 Jul 2003)
+
+  12 Jul 2003; Donny Davies <woodchip@gentoo.org> mod_auth_ldap-2.4.2.ebuild,
+  files/mod_auth_ldap-2.4.2-register.patch:
+  Close #23492.  I added a version component to the tarball and placed it on
+  the Gentoo mirrors as there still is none from upstream.
 
 *mod_auth_ldap-2.4.1 (18 Jan 2003)
 
diff --git a/net-www/mod_auth_ldap/Manifest b/net-www/mod_auth_ldap/Manifest
index 07b68b43a4bf..0602ac63d069 100644
--- a/net-www/mod_auth_ldap/Manifest
+++ b/net-www/mod_auth_ldap/Manifest
@@ -1,6 +1,6 @@
-MD5 cd043414654ead71c2a5a0faeb324519 ChangeLog 521
+MD5 0991e85e496e80da1de02685f01f900b ChangeLog 818
 MD5 8b8d90f1d66f9824bc1994931f86be45 mod_auth_ldap-2.4.1.ebuild 1555
-MD5 20b7e0511318128d313c6a7333b85752 mod_auth_ldap-2.4.2.ebuild 1656
+MD5 2df039e5a880e351f78bfd13bc00c7c2 mod_auth_ldap-2.4.2.ebuild 1656
 MD5 8e27cb64926af0962345b6ee75f7744d files/digest-mod_auth_ldap-2.4.1 64
 MD5 065e832893289b1878b7e3b89a2cef0d files/mod_auth_ldap-2.4.1-register.patch 746
 MD5 7c887a1226ef0c99f4068014a05b2135 files/mod_auth_ldap.conf 667
diff --git a/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.2 b/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.2
new file mode 100644
index 000000000000..395e3a7d61a1
--- /dev/null
+++ b/net-www/mod_auth_ldap/files/digest-mod_auth_ldap-2.4.2
@@ -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.2-register.patch b/net-www/mod_auth_ldap/files/mod_auth_ldap-2.4.2-register.patch
new file mode 100644
index 000000000000..aedda16ca72d
--- /dev/null
+++ b/net-www/mod_auth_ldap/files/mod_auth_ldap-2.4.2-register.patch
@@ -0,0 +1,24 @@
+diff -uNr mod_auth_ldap-2.4.2.orig/mod_auth_ldap.c mod_auth_ldap-2.4.2/mod_auth_ldap.c
+--- mod_auth_ldap-2.4.2.orig/mod_auth_ldap.c	2003-06-08 01:10:33.000000000 -0400
++++ mod_auth_ldap-2.4.2/mod_auth_ldap.c	2003-07-12 23:00:18.000000000 -0400
+@@ -1249,6 +1249,11 @@
+     return (DECLINED);
+ }
+ 
++void ldap_module_init(void)
++{
++    ap_add_version_component("mod_auth_ldap/" MOD_AUTH_LDAP_VERSION_S);
++}
++
+ /*--------------------------------------------------------------------------*/
+ /* Finally, the list of callback routines and data structures that          */
+ /* provide the hooks into our module from the other parts of the server.    */
+@@ -1256,7 +1261,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/mod_auth_ldap-2.4.2.ebuild b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild
new file mode 100644
index 000000000000..a170369a25e6
--- /dev/null
+++ b/net-www/mod_auth_ldap/mod_auth_ldap-2.4.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/07/13 03:42:15 woodchip Exp $
+
+DESCRIPTION="Apache module for LDAP authorizaion"
+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"
+#---> as of 2.4.2 still no version number, doing it the hard way, sigh.
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+DEPEND="=net-www/apache-1* >=net-nds/openldap-2.0.25"
+LICENSE="as-is"
+SLOT="0"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	patch -p1 <${FILESDIR}/${P}-register.patch || die
+}
+
+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/${CATEGORY}/${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
+	:;
+}