Update to 150. Last version was 77, so ChangeLog would be too big to add

here -- lots of new features and bug fixes.
Distfile has version number now, so this should fix pkg/17588.

4 files changed, 22 insertions, 67 deletions

diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 25227bd6696..dffb33ba48b 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/03/15 17:17:45 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/07/13 21:35:15 wiz Exp $
 #
 
-DISTNAME=	pam_ldap
-PKGNAME=	${DISTNAME:S/_/-/}-${VERSION}
-WRKSRC=		${WRKDIR}/${DISTNAME}-${VERSION}
+DISTNAME=	pam_ldap-150
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	security
-MASTER_SITES=	http://www.padl.com/download/ \
-		ftp://ftp.padl.com/pub/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.padl.com/pub/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.padl.com/pam_ldap.html
@@ -17,13 +14,13 @@ DEPENDS+=	openldap-[0-9]*:../../databases/openldap
 DEPENDS+=	PAM-[0-9]*:../../security/PAM
 
 GNU_CONFIGURE=	YES
-CPPFLAGS+=	-I${WRKSRC}
-CONFIGURE_ARGS+=--with-ldap-lib=openldap
-CONFIGURE_ARGS+=--with-ldap-dir=${PREFIX}
+#CPPFLAGS+=	-I${WRKSRC}
+CONFIGURE_ARGS+=	--with-ldap-lib=openldap
+CONFIGURE_ARGS+=	--with-ldap-dir=${PREFIX}
+CONFIGURE_ARGS+=	--with-ldap-conf-file=${PREFIX}/etc/pam/pam.conf
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/pam
 INSTALL_TARGET=	install install-data
 
-VERSION=	77
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pam-ldap
 .for doc in COPYING COPYING.LIB INSTALL ChangeLog
diff --git a/security/pam-ldap/distinfo b/security/pam-ldap/distinfo
index 93d009a29f3..1ae3b60235a 100644
--- a/security/pam-ldap/distinfo
+++ b/security/pam-ldap/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/05/09 20:20:41 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/07/13 21:35:15 wiz Exp $
 
-SHA1 (pam_ldap.tgz) = 95687def83c7613c53a159309b6d6a82d1173397
-Size (pam_ldap.tgz) = 85035 bytes
-SHA1 (patch-aa) = 32dbe52f0a7e98948209fa351c897b34919650b7
-SHA1 (patch-ab) = 72942ca6e3c11ad682f39e4a5cb456e7e4b22aef
+SHA1 (pam_ldap-150.tar.gz) = a3b602eff6e345174d84d2eafa9b9aba3c7779f7
+Size (pam_ldap-150.tar.gz) = 107203 bytes
+SHA1 (patch-aa) = adb8529d100ad1c3fd0e71666a3631884b50cc9a
diff --git a/security/pam-ldap/patches/patch-aa b/security/pam-ldap/patches/patch-aa
index 5375ce59789..09ff21e92fa 100644
--- a/security/pam-ldap/patches/patch-aa
+++ b/security/pam-ldap/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/21 18:47:46 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/07/13 21:35:15 wiz Exp $
 
---- Makefile.in.orig	Thu Oct 12 23:25:50 2000
+--- Makefile.in.orig	Fri Jun 28 06:21:15 2002
 +++ Makefile.in
-@@ -83,7 +83,7 @@
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I.
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DETCPAMDIR=\"${PREFIX}/etc/pam\"
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- pam_ldap_so_OBJECTS =  pam_ldap.o md5.o
-@@ -380,17 +380,11 @@
+@@ -365,16 +365,13 @@
  install-exec-local: pam_ldap.so
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
@@ -19,15 +10,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/10/21 18:47:46 rh Exp $
 -@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
++	${BSD_INSTALL_PROGRAM} pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
  
  install-data-local:
  	@$(NORMAL_INSTALL)
--	@if test ! -f $(DESTDIR)$(etcdir)/ldap.conf; then \
--		$(mkinstalldirs) $(DESTDIR)$(etcdir); \
--		$(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(etcdir)/ldap.conf; \
--	fi
-+	${BSD_INSTALL_DATA} $(srcdir)/ldap.conf ${PREFIX}/etc/pam/ldap.conf;
+ 	@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; \
+ 	fi
  
  uninstall-local:
- 	@$(NORMAL_UNINSTALL)
diff --git a/security/pam-ldap/patches/patch-ab b/security/pam-ldap/patches/patch-ab
deleted file mode 100644
index 18d7f49ef16..00000000000
--- a/security/pam-ldap/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/21 18:47:46 rh Exp $
-
---- pam_ldap.c.orig	Sat Oct 21 18:19:15 2000
-+++ pam_ldap.c
-@@ -533,7 +533,7 @@
- 
-   result = *presult;
- 
--  fp = fopen ("/etc/ldap.conf", "r");
-+  fp = fopen (ETCPAMDIR "/ldap.conf", "r");
-   if (fp == NULL)
-     {
-       /* 
-@@ -722,7 +722,7 @@
- 
-   if (result->rootbinddn != NULL)
-     {
--      fp = fopen ("/etc/ldap.secret", "r");
-+      fp = fopen (ETCPAMDIR "/ldap.secret", "r");
-       if (fp != NULL)
- 	{
- 	  if (fgets (b, sizeof (b), fp) != NULL)
-@@ -741,7 +741,7 @@
- 	{
- 	  _pam_drop (result->rootbinddn);
- 	  syslog (LOG_WARNING,
--		  "pam_ldap: could not open secret file /etc/ldap.secret (%s)",
-+		  "pam_ldap: could not open secret file " ETCPAMDIR "/ldap.secret (%s)",
- 		  strerror (errno));
- 	}
-     }