Pullup ticket 1994 - requested by taca

security update for pam-ldap

Revisions pulled up:
- pkgsrc/security/pam-ldap/Makefile			1.27
- pkgsrc/security/pam-ldap/distinfo			1.9
- pkgsrc/security/pam-ldap/patches/patch-ab		1.6

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Mon Jan 15 03:24:03 UTC 2007

   Modified Files:
   	pkgsrc/security/pam-ldap: Makefile distinfo
   	pkgsrc/security/pam-ldap/patches: patch-ab

   Log Message:
   Update pam-ldap to 183.

   - Fix miscellaneous pkglint warnings.
   - Fix security problem; CAN-2006-5170.

   $Id: ChangeLog,v 1.212 2006/10/05 23:23:52 lukeh Exp $
   ===============================================================

   183	Luke Howard <lukeh@padl.com>

   	* fix for BUG#291: don't suppress password policy
   	  errors which should not be suppressed

   182	Luke Howard <lukeh@padl.com>

   	* fix for BUG#269: compile time error in call to
   	  ldap_sasl_interactive_bind_s()

   181	Luke Howard <lukeh@padl.com>

   	* fix for BUG#256: don't send password policy request
   	  control if pam_lookup_policy no specified
   	* fix for BUG#254: check gethostbyname() result
   	* fix for BUG#237: typo in ldap_get_lderrno()
   	  implementation
   	* fix for BUG#207: if ldap_start_tls_s() fails
   	  return PAM_AUTHINFO_UNAVAIL
   	* fix for BUG#261: sslpath example wrong
   	* fix for BUG#268: POLICY_ERROR_CHANGE_AFTER_RESET
   	  should be handled as POLICY_ERROR_PASSWORD_EXPIRED,
   	  other password policy errors to be treated as fatal

3 files changed, 9 insertions, 11 deletions

diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 9990c70da12..12cfeb74046 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/05/31 18:22:26 ghen Exp $
+# $NetBSD: Makefile,v 1.26.6.1 2007/01/17 17:10:31 salo Exp $
 #
 
-DISTNAME=	pam_ldap-180
+DISTNAME=	pam_ldap-183
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.padl.com/pub/
 MASTER_SITES+=	http://www.padl.com/download/
@@ -21,7 +20,7 @@ CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/pam_ldap.conf
 CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/pam_ldap.secret
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-MAKE_ENV+=		SHLIBTOOL=$(SHLIBTOOL)
+MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 INSTALL_TARGET=		install install-data
diff --git a/security/pam-ldap/distinfo b/security/pam-ldap/distinfo
index 7e10f0a2bd0..0af9881d562 100644
--- a/security/pam-ldap/distinfo
+++ b/security/pam-ldap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/08/29 09:49:07 drochner Exp $
+$NetBSD: distinfo,v 1.8.12.1 2007/01/17 17:10:31 salo Exp $
 
-SHA1 (pam_ldap-180.tar.gz) = 1a526af35446f26b7c19f277274143fa98ffea48
-RMD160 (pam_ldap-180.tar.gz) = e5a59d7a49cd958ce9e4e34ef2652614d8512a3f
-Size (pam_ldap-180.tar.gz) = 127337 bytes
+SHA1 (pam_ldap-183.tar.gz) = a41ae31a32f84cc9add59e4ac7502fcc94f0eb04
+RMD160 (pam_ldap-183.tar.gz) = 42c8622677c44b521569b906b1cf53d0e605ed39
+Size (pam_ldap-183.tar.gz) = 127500 bytes
 SHA1 (patch-aa) = 4fb701c85005106c2b3d9cf90590856e16b668ff
-SHA1 (patch-ab) = 42162879090b8b722d2494566bd03f2918c42930
+SHA1 (patch-ab) = 1c1a13dccaab43b88565a03abe9b5706a6a2b54d
diff --git a/security/pam-ldap/patches/patch-ab b/security/pam-ldap/patches/patch-ab
index f1d590bcbe0..396edc611dc 100644
--- a/security/pam-ldap/patches/patch-ab
+++ b/security/pam-ldap/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2005/01/12 02:30:09 xtraeme Exp $
+$NetBSD: patch-ab,v 1.5.16.1 2007/01/17 17:10:31 salo Exp $
 
 --- pam_ldap.c.orig	Sun Oct 31 02:42:54 2004
 +++ pam_ldap.c	Sun Oct 31 02:48:03 2004
@@ -145,4 +145,3 @@ $NetBSD: patch-ab,v 1.5 2005/01/12 02:30:09 xtraeme Exp $
  		}
  	    }
  	  else if (!strcmp (newpass, miscptr))
-