>Number:         36698
>Category:       pkg
>Synopsis:       update of ap2-auth-ldap and added support for apache22
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 28 17:10:00 +0000 2007
>Originator:     Daniel Horecki
>Release:        4.0_BETA2
>Organization:
>Environment:
NetBSD tatooine.stars 4.0_BETA2 NetBSD 4.0_BETA2 (TATOOINE) #0: Wed Jul 25 22:25:02 CEST 2007  root@tatooine.stars:/usr/obj/sys/arch/i386/compile/TATOOINE i386

>Description:
Current version of ap2-auth-ldap doesn't not build with apache22 (it tries to build apache2). ap2-auth-ldap supports apache22 with version 3.11.
>How-To-Repeat:
Try to build ap2-auth-ldap with apache22.
>Fix:
Attached patch should work:

Index: MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/MESSAGE,v
retrieving revision 1.2
diff -u -r1.2 MESSAGE
--- MESSAGE	26 Feb 2005 01:06:08 -0000	1.2
+++ MESSAGE	10 Jul 2007 21:57:17 -0000
@@ -4,6 +4,6 @@
 In order to use this module in your Apache installation, you need to
 add the following to your httpd.conf file:
 
-  LoadModule mm_auth_ldap_module lib/httpd/mod_auth_ldap.so
+  LoadModule mm_auth_ldap_module lib/httpd/mm_mod_auth_ldap.so
 
 ===========================================================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	30 Jun 2007 14:35:11 -0000	1.16
+++ Makefile	10 Jul 2007 21:57:17 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.16 2007/06/30 14:35:11 joerg Exp $
 
-DISTNAME=	mod_auth_ldap3.05
-PKGNAME=	ap2-auth-ldap-3.05
-PKGREVISION=	4
+DISTNAME=	mm_mod_auth_ldap3.11
+PKGNAME=	${APACHE_PKG_PREFIX}-auth-ldap-3.11
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
 
@@ -16,15 +15,19 @@
 USE_LIBTOOL=		YES
 CPPFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
 
-PKG_APACHE_ACCEPTED=	apache2
+PKG_APACHE_ACCEPTED=	apache2 apache22
 
 .include "../../mk/apache.mk"
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
-CONFIGURE_ARGS+=	--with-apache-dir=${PREFIX:Q}
+CONFIGURE_ARGS+=	--with-apache-dir=${BUILDLINK_PREFIX.apache}
+.if ${PKG_APACHE} == "apache2"
 CONFIGURE_ARGS+=	--with-apache-ver=2
+.else ${PKG_APACHE} == "apache22"
+CONFIGURE_ARGS+=	--with-apache-ver=2.2
+.endif
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
@@ -34,7 +37,7 @@
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 
 do-install:
-	cd ${WRKSRC} && ${APXS} -i -n ${APACHE_MODULE_NAME} mod_auth_ldap.la
+	cd ${WRKSRC} && ${APXS} -i -n ${APACHE_MODULE_NAME} mm_mod_auth_ldap.la
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	26 Feb 2005 01:06:08 -0000	1.2
+++ PLIST	10 Jul 2007 21:57:17 -0000
@@ -1,2 +1,2 @@
 @comment $NetBSD: PLIST,v 1.2 2005/02/26 01:06:08 adrianp Exp $
-lib/httpd/mod_auth_ldap.so
+lib/httpd/mm_mod_auth_ldap.so
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	14 Oct 2005 10:47:43 -0000	1.4
+++ distinfo	10 Jul 2007 21:57:17 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.4 2005/10/14 10:47:43 adrianp Exp $
 
-SHA1 (mod_auth_ldap3.05.tar.gz) = bbdd0e3615408d629a02c170e9853da7262fad29
-RMD160 (mod_auth_ldap3.05.tar.gz) = 211e2911f711a6f39bc4c2a9497a97c80f4295b9
-Size (mod_auth_ldap3.05.tar.gz) = 532894 bytes
-SHA1 (patch-aa) = cbb9cd3424dfec05a8c10af6ba6c62b4eaafc414
-SHA1 (patch-ab) = f7b2c59c26aaf8345e89fa61000da979c0e9b523
+SHA1 (mm_mod_auth_ldap3.11.tar.gz) = 47f25ff947b05ac3c3563e8e2152daddafc1b04e
+RMD160 (mm_mod_auth_ldap3.11.tar.gz) = 0f3f30beae099e596ef4311066a09909e99dd960
+Size (mm_mod_auth_ldap3.11.tar.gz) = 700572 bytes
+SHA1 (patch-aa) = d54b8968679c13ae5f53ab6648677148a56b2d54
+SHA1 (patch-ab) = 6ba34059f2f9e96acca5f955b63c7d0407644d92
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	26 Feb 2005 01:06:08 -0000	1.2
+++ patches/patch-aa	10 Jul 2007 21:57:17 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2005/02/26 01:06:08 adrianp Exp $
-
---- 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 @@
+--- Makefile.in.orig	2007-07-10 23:42:38.000000000 +0200
++++ Makefile.in	2007-07-10 23:42:58.000000000 +0200
+@@ -47,13 +47,13 @@
  .c.o:
  	$(APXS) -c $(CPPFLAGS) $*.c
  
@@ -16,5 +14,5 @@
 -	$(APXS) -c $(OBJS) $(LDFLAGS) $(LIBS)
 +	#$(APXS) -c $(OBJS) $(LDFLAGS) $(LIBS)
  
- install:
- 	@echo ""
+ # changing $(APXS) -i -a -c $(OBJS) $(LDFLAGS) $(LIBS) to
+ #  $(APXS) -i -a $(MODULE_NAME)
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- patches/patch-ab	26 Feb 2005 01:06:08 -0000	1.1
+++ patches/patch-ab	10 Jul 2007 21:57:17 -0000
@@ -1,8 +1,6 @@
-$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 @@
+--- configure.orig	2007-07-10 23:32:22.000000000 +0200
++++ configure	2007-07-10 23:33:12.000000000 +0200
+@@ -7702,8 +7702,8 @@
      if test ."$withval" = ."yes"; then
          HASHLIB_NAME="hash routines from ght hash library"
          HASHLIB_TYPE="-DUSE_MEM_CACHE -DMM_ADD"
@@ -10,6 +8,6 @@
 -        HASHLIB="./libs/libghthash/src/.libs/libghthash.a"
 +        HASHINC="-I@@HASHINC@@"
 +        HASHLIB="@@HASHLIB@@/libghthash.a"
-         HASH_LIB_NAME="libghthash.a"
+         HASH_LIB_NAME="libghthash"
          use_mem_cache=1
      fi