- Update to 3.3

> v3.2 (Dec-29-2004)
>     * Some options were missing in apache 1.3x part of the code.
>
>     * There was a syntax error in TLS related code. Thanks for many of you
>       who pointed it out.
>
>     * Don't try to re-initialize TLS. Thanks to Volker for pointing it out.
>
>     * if the ldap header files and libaries are no in ldap base directory,
>       they can be specified with --with-ldap-includes and
>       --with-ldap-libraries respectively.
>
> v 3.3 (Dec-30-2004)
>     * some tls code was outside

6 files changed, 50 insertions, 24 deletions

diff --git a/www/ap2-auth-ldap/MESSAGE b/www/ap2-auth-ldap/MESSAGE
index 7b5b9fb497b..5d89a318d6d 100644
--- a/www/ap2-auth-ldap/MESSAGE
+++ b/www/ap2-auth-ldap/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/02/21 21:55:25 adrianp Exp $
+$NetBSD: MESSAGE,v 1.2 2005/02/26 01:06:08 adrianp Exp $
 
 In order to use this module in your Apache installation, you need to
 add the following to your httpd.conf file:
 
-  LoadModule auth_ldap_module lib/httpd/mod_auth_ldap.so
+  LoadModule mm_auth_ldap_module lib/httpd/mod_auth_ldap.so
 
 ===========================================================================
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 20a2e739866..062fd3f28f7 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/02/21 22:48:22 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/26 01:06:08 adrianp Exp $
 
-DISTNAME=	mod_auth_ldap2.16
-PKGNAME=	ap2-auth-ldap-2.16
+DISTNAME=	mod_auth_ldap3.3
+PKGNAME=	ap2-auth-ldap-3.3
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
 
@@ -12,22 +12,27 @@ COMMENT=	Module to allow apache2 authentication against an LDAP directory
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 APACHE_MODULE=		YES
-APACHE_MODULE_NAME=	mod_auth_ldap
+APACHE_MODULE_NAME=	mm_auth_ldap_module
 USE_LIBTOOL=		YES
 CPPFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
 
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.47
+BUILDLINK_DEPENDS.apache?=      apache>=2.0.47
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
 CONFIGURE_ARGS+=	--with-apache-dir=${PREFIX}
+CONFIGURE_ARGS+=	--with-apache-ver=2
+
+SUBST_CLASSES=		paths
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	configure
+SUBST_SED.paths=	-e "s|@@HASHLIB@@|${PREFIX}/include|g" \
+			-e "s|@@HASHINC@@|${PREFIX}/lib|g"
+SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
 
 do-install:
 	cd ${WRKSRC} && ${APXS} -i \
-		-n ${APACHE_MODULE_NAME} ${APACHE_MODULE_NAME}.la
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${APACHE_MODULE_NAME}
-	${INSTALL_DATA} ${WRKSRC}/${APACHE_MODULE_NAME}_apache2.html \
-		${PREFIX}/share/doc/${APACHE_MODULE_NAME}
+		-n ${APACHE_MODULE_NAME} mod_auth_ldap.la
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/www/ap2-auth-ldap/PLIST b/www/ap2-auth-ldap/PLIST
index 219aac674cb..bd9ad30e511 100644
--- a/www/ap2-auth-ldap/PLIST
+++ b/www/ap2-auth-ldap/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/21 21:55:25 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/26 01:06:08 adrianp Exp $
 lib/httpd/mod_auth_ldap.so
-share/doc/mod_auth_ldap/mod_auth_ldap_apache2.html
-@dirrm share/doc/mod_auth_ldap
diff --git a/www/ap2-auth-ldap/distinfo b/www/ap2-auth-ldap/distinfo
index 844270af395..6a338d9be9d 100644
--- a/www/ap2-auth-ldap/distinfo
+++ b/www/ap2-auth-ldap/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:08:28 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/02/26 01:06:08 adrianp Exp $
 
-SHA1 (mod_auth_ldap2.16.tar.gz) = dbb9c5a20dbe9a252f40c2dad708360b126554b3
-RMD160 (mod_auth_ldap2.16.tar.gz) = 777030aea0b83d29739dd8116326174394c34194
-Size (mod_auth_ldap2.16.tar.gz) = 548912 bytes
-SHA1 (patch-aa) = 1a1d75be98b8c91a8ddf31145373aaabb3a685a7
+SHA1 (mod_auth_ldap3.3.tar.gz) = fcd217fcd7dd792af23d137f5ca543fcfd48bbe0
+RMD160 (mod_auth_ldap3.3.tar.gz) = 10c714d39fd9935f5929da3413d9e205ae45c0b0
+Size (mod_auth_ldap3.3.tar.gz) = 530801 bytes
+SHA1 (patch-aa) = cbb9cd3424dfec05a8c10af6ba6c62b4eaafc414
+SHA1 (patch-ab) = f7b2c59c26aaf8345e89fa61000da979c0e9b523
diff --git a/www/ap2-auth-ldap/patches/patch-aa b/www/ap2-auth-ldap/patches/patch-aa
index 4a58fb7cf40..c722ce3af15 100644
--- a/www/ap2-auth-ldap/patches/patch-aa
+++ b/www/ap2-auth-ldap/patches/patch-aa
@@ -1,11 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/21 21:55:25 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/26 01:06:08 adrianp Exp $
 
---- Makefile.in.orig	2005-02-18 21:27:01.000000000 +0000
-+++ Makefile.in	2005-02-18 21:27:47.000000000 +0000
-@@ -45,7 +45,7 @@
+--- Makefile.in.orig	2005-02-26 00:15:01.000000000 +0000
++++ Makefile.in	2005-02-26 00:16:15.000000000 +0000
+@@ -41,13 +41,13 @@
+ .c.o:
+ 	$(APXS) -c $(CPPFLAGS) $*.c
+ 
+-all: $(HASH_LIB_NAME) $(LDBM_LIB_NAME) $(MODULE)
++all: $(MODULE)
  
  $(MODULE): $(OBJS)
- 	@echo "*******"
+ 	@echo ""
+ 	@echo ""
+ 	@echo "***Creating module** mod_auth_ldap v$(MOD_VER) for Apache $(AV) *******"
 -	$(APXS) -c $(OBJS) $(LDFLAGS) $(LIBS)
 +	#$(APXS) -c $(OBJS) $(LDFLAGS) $(LIBS)
  
diff --git a/www/ap2-auth-ldap/patches/patch-ab b/www/ap2-auth-ldap/patches/patch-ab
new file mode 100644
index 00000000000..d2a33e0a63f
--- /dev/null
+++ b/www/ap2-auth-ldap/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2005/02/26 01:06:08 adrianp Exp $
+
+--- configure.orig	2005-02-26 00:17:39.000000000 +0000
++++ configure	2005-02-26 00:18:15.000000000 +0000
+@@ -3830,8 +3830,8 @@
+     if test ."$withval" = ."yes"; then
+         HASHLIB_NAME="hash routines from ght hash library"
+         HASHLIB_TYPE="-DUSE_MEM_CACHE -DMM_ADD"
+-        HASHINC="-I./libs/libghthash/src"
+-        HASHLIB="./libs/libghthash/src/.libs/libghthash.a"
++        HASHINC="-I@@HASHINC@@"
++        HASHLIB="@@HASHLIB@@/libghthash.a"
+         HASH_LIB_NAME="libghthash.a"
+         use_mem_cache=1
+     fi