Update security/pam-ldap to version 176. pkgsrc-related changes in this

update include:

	* The configuration file (shared with nss_ldap.so and sudo) has
	  been moved to ${PKG_SYSCONFDIR}/ldap.conf.  Any secrets file is
	  found in ${PKG_SYSCONFDIR}/ldap.secret.

	* Use the pkg.install framework to copy the config file from the
	  example directory to the real location.

	* Use libtool to build and install the PAM module.

Changes from version 150 include:

	* preliminary SASL bind support

	* include password policy schema file
	* preliminary support for
	  draft-behera-ldap-password-policy-07.txt

	* support for service-based authorization
	  (based on patch from Manon Goo)
	* add ignore_authinfo_unavail flag
	* pam_filter works again

	* fix from Thorsten Kukuk (SuSE) to handle scope-less
	  nss_base_passwd configuration

	* AD password change fix
	* fix from Thorsten Kukuk (SuSE) to handle aborted password changes
	* support for multiple service search descriptors from Symas

	* support non-experimental password change exop
	* patch from Howard Chu to use linker grouping on Solaris

5 files changed, 87 insertions, 44 deletions

diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 5d0c61688bd..eecea6f1543 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/11/19 15:32:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/19 19:08:43 jlam Exp $
 #
 
-DISTNAME=	pam_ldap-150
+DISTNAME=	pam_ldap-176
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.padl.com/pub/
 
@@ -12,20 +11,36 @@ HOMEPAGE=	http://www.padl.com/pam_ldap.html
 COMMENT=	Pluggable authentication module for LDAP directories
 
 USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ldap-lib=openldap
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
-CONFIGURE_ARGS+=	--with-ldap-conf-file=${BUILDLINK_PREFIX.pam}/etc/pam/ldap.conf
-CONFIGURE_ARGS+=	--sysconfdir=${BUILDLINK_PREFIX.pam}/etc/pam
+CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
+CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+MAKE_ENV+=		SHLIBTOOL=$(SHLIBTOOL)
+
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 INSTALL_TARGET=		install install-data
 
+DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
+EGDIR=		${PREFIX}/share/examples/${PKGBASE}
+
+USE_PKGINSTALL=	yes
+CONF_FILES=	${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf
+
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../security/PAM/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pam-ldap
-.for doc in COPYING COPYING.LIB INSTALL ChangeLog
-	cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${PREFIX}/share/doc/pam-ldap
+	${INSTALL_DATA_DIR} ${DOCDIR}
+.for file in COPYING COPYING.LIB
+	cd ${WRKSRC} && ${INSTALL_DATA} ${file} ${DOCDIR}
+.endfor
+.for file in ldapns.schema ns-pwd-policy.schema
+	cd ${WRKSRC} && ${INSTALL_DATA} ${file} ${EGDIR}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-ldap/PLIST b/security/pam-ldap/PLIST
index 04109b9a3a9..bc809c8a98f 100644
--- a/security/pam-ldap/PLIST
+++ b/security/pam-ldap/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:27 zuntum Exp $
-etc/pam/ldap.conf
-lib/security/pam_ldap.so
+@comment $NetBSD: PLIST,v 1.2 2004/11/19 19:08:43 jlam Exp $
+lib/security/pam_ldap.la
 share/doc/pam-ldap/COPYING
 share/doc/pam-ldap/COPYING.LIB
-share/doc/pam-ldap/ChangeLog
-share/doc/pam-ldap/INSTALL
+share/examples/pam-ldap/ldap.conf
+share/examples/pam-ldap/ldapns.schema
+share/examples/pam-ldap/ns-pwd-policy.schema
+@dirrm share/examples/pam-ldap
 @dirrm share/doc/pam-ldap
diff --git a/security/pam-ldap/distinfo b/security/pam-ldap/distinfo
index 5b86d36f315..ec6cc80d06e 100644
--- a/security/pam-ldap/distinfo
+++ b/security/pam-ldap/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/11/05 13:09:51 rtr Exp $
+$NetBSD: distinfo,v 1.5 2004/11/19 19:08:43 jlam Exp $
 
-SHA1 (pam_ldap-150.tar.gz) = a3b602eff6e345174d84d2eafa9b9aba3c7779f7
-Size (pam_ldap-150.tar.gz) = 107203 bytes
-SHA1 (patch-aa) = adb8529d100ad1c3fd0e71666a3631884b50cc9a
-SHA1 (patch-ab) = 7e7ece4753fbc3ed757cd7a4e237e6e9fe58421a
+SHA1 (pam_ldap-176.tar.gz) = 44dcbe0b8f0e458d1d86023e5722c2cb7359ef5a
+Size (pam_ldap-176.tar.gz) = 121531 bytes
+SHA1 (patch-aa) = 16c78741ddc11de08457fc19faec92a674550050
diff --git a/security/pam-ldap/patches/patch-aa b/security/pam-ldap/patches/patch-aa
index 09ff21e92fa..0639fb324eb 100644
--- a/security/pam-ldap/patches/patch-aa
+++ b/security/pam-ldap/patches/patch-aa
@@ -1,23 +1,65 @@
-$NetBSD: patch-aa,v 1.2 2002/07/13 21:35:15 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/19 19:08:43 jlam Exp $
 
---- Makefile.in.orig	Fri Jun 28 06:21:15 2002
+--- Makefile.in.orig	2004-09-30 22:33:14.000000000 -0400
 +++ Makefile.in
-@@ -365,16 +365,13 @@
- install-exec-local: pam_ldap.so
+@@ -70,7 +70,7 @@ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ pam_ldap_so_LD = @pam_ldap_so_LD@
+ 
+-noinst_PROGRAMS = pam_ldap.so
++noinst_PROGRAMS = pam_ldap.la
+ EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README 	     ldap.conf pam.conf pam_ldap.spec pam.d
+ 
+ 
+@@ -98,6 +98,7 @@ pam_ldap_so_OBJECTS =  pam_ldap.o md5.o
+ pam_ldap_so_LDADD = $(LDADD)
+ pam_ldap_so_DEPENDENCIES = 
+ CFLAGS = @CFLAGS@
++LTCOMPILE = $(SHLIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \
+@@ -116,7 +117,7 @@ OBJECTS = $(pam_ldap_so_OBJECTS)
+ 
+ all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .o .s
++.SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+ 
+@@ -185,6 +186,9 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
++pam_ldap.la: $(pam_ldap_so_OBJECTS:.o=.lo) $(pam_ldap_so_DEPENDENCIES)
++	$(SHLIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(pam_ldap_so_LDFLAGS) $(pam_ldap_so_OBJECTS:.o=.lo) -module -avoid-version -rpath $(libdir)/security -o $@ $(pam_ldap_so_LDADD) $(LIBS)
++
+ pam_ldap.so: $(pam_ldap_so_OBJECTS) $(pam_ldap_so_DEPENDENCIES)
+ 	@rm -f pam_ldap.so
+ 	$(LINK) $(pam_ldap_so_LDFLAGS) $(pam_ldap_so_OBJECTS) $(pam_ldap_so_LDADD) $(LIBS)
+@@ -385,7 +389,14 @@ mostlyclean-generic distclean-generic cl
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+-install-exec-local: pam_ldap.so
++install-exec-local: install-exec-local-libtool
++
++install-exec-local-libtool: pam_ldap.la
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
++	$(SHLIBTOOL) --mode=install $(INSTALL_PROGRAM) -c pam_ldap.la $(DESTDIR)$(libdir)/security
++
++install-exec-local-so: pam_ldap.so
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
--@EXTENSION_SO_TRUE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
--@EXTENSION_SO_FALSE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1
--@EXTENSION_SO_FALSE@	-rm -f $(DESTDIR)$(libdir)/security/pam_ldap.so
--@EXTENSION_SO_FALSE@	-ln -s $(DESTDIR)$(libdir)/security/pam_ldap.so.1 $(DESTDIR)$(libdir)/security/pam_ldap.so
-+	${BSD_INSTALL_PROGRAM} pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
- 
- install-data-local:
+ @EXTENSION_SO_TRUE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
+@@ -397,7 +408,7 @@ install-data-local:
  	@$(NORMAL_INSTALL)
  	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \
  		$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
 -		$(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
-+		$(BSD_INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
++		$(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
  	fi
  
  uninstall-local:
diff --git a/security/pam-ldap/patches/patch-ab b/security/pam-ldap/patches/patch-ab
deleted file mode 100644
index e6d7cb7f7c7..00000000000
--- a/security/pam-ldap/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/11/05 13:10:27 rtr Exp $
-
---- pam_ldap.h.orig	2002-06-08 14:49:15.000000000 +1000
-+++ pam_ldap.h
-@@ -19,6 +19,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+/* pam_ldap 164 defines LDAP_FILT_MAXSIZ 1024 */
-+#define LDAP_FILT_MAXSIZ 1024
-+
- #ifdef HAVE_SECURITY_PAM_APPL_H
- #include <security/pam_appl.h>
- #elif defined(HAVE_PAM_PAM_APPL_H)