ports/142468: [PATCH] security/pam_ldap: update to 1.8.5

[Sergey Skvortsov]

>Number:         142468
>Category:       ports
>Synopsis:       [PATCH] security/pam_ldap: update to 1.8.5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 08 12:30:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Skvortsov
>Release:        FreeBSD 8.0-STABLE-20100101 amd64
>Organization:
>Environment:
System: FreeBSD protey.ru 8.0-STABLE-20100101 FreeBSD 8.0-STABLE-20100101 #0: Wed Jan  6 16:11:34 UTC
>Description:
- Update to 1.8.5:
	* fix for BUG#232: LDAP write on userPassword fails
          when chasing referral and cached policy error is
          POLICY_ERROR_PASSWORD_EXPIRED
        * fix for BUG#366: only request attributes that are
          actually used
        * fix for BUG#394: canonicalize PAM_USER name


- Add define PAM_LDAP_CONF (to be able override it to "nss_ldap.conf")

>How-To-Repeat:
>Fix:

--- pam_ldap-1.8.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/pam_ldap/Makefile,v
retrieving revision 1.41
diff -u -u -r1.41 Makefile
--- Makefile	5 Jan 2009 19:04:34 -0000	1.41
+++ Makefile	8 Jan 2010 12:20:02 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pam_ldap
-PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	security net
 MASTER_SITES=	http://www.padl.com/download/ \
 		ftp://ftp.padl.com/pub/
@@ -20,9 +19,10 @@
 GNU_CONFIGURE=	yes
 USE_OPENLDAP=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g}
+PAM_LDAP_CONF?=	ldap.conf
 CONFIGURE_ARGS=	--with-ldap-lib=openldap \
 		--with-ldap-dir=${LOCALBASE} \
-		--with-ldap-conf-file=${PREFIX}/etc/ldap.conf \
+		--with-ldap-conf-file=${PREFIX}/etc/${PAM_LDAP_CONF} \
 		--with-ldap-secret-file=${PREFIX}/etc/ldap.secret
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/pam_ldap/distinfo,v
retrieving revision 1.30
diff -u -u -r1.30 distinfo
--- distinfo	24 Oct 2007 06:15:14 -0000	1.30
+++ distinfo	8 Jan 2010 12:20:02 -0000
@@ -1,3 +1,3 @@
-MD5 (pam_ldap-184.tar.gz) = 1b381b5f1ce67fe0a885d9a7c69b93af
-SHA256 (pam_ldap-184.tar.gz) = 2dd4df6bfddd80580af599dbfb631f907d796df478c22949af4552eaf750c6f3
-SIZE (pam_ldap-184.tar.gz) = 128053
+MD5 (pam_ldap-185.tar.gz) = 639260f0c81d57a6fcbd1cb47dd6c5e7
+SHA256 (pam_ldap-185.tar.gz) = 5f4dfca68d33e4a99a17da9632c6abb782c9af8bcbc4953e4d2c40e2e5b32304
+SIZE (pam_ldap-185.tar.gz) = 163467
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/security/pam_ldap/files/patch-aa,v
retrieving revision 1.6
diff -u -u -r1.6 patch-aa
--- files/patch-aa	27 Aug 2005 19:20:04 -0000	1.6
+++ files/patch-aa	8 Jan 2010 12:20:02 -0000
@@ -1,14 +1,14 @@
---- Makefile.in.orig	Sat Aug 20 18:44:27 2005
-+++ Makefile.in	Sat Aug 20 18:45:57 2005
-@@ -434,17 +434,13 @@
+--- Makefile.in.orig	2010-01-08 12:09:42.124679000 +0000
++++ Makefile.in	2010-01-08 12:16:10.000000000 +0000
+@@ -594,24 +594,20 @@
  
  install-exec-local: pam_ldap.so
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
 - at EXTENSION_SO_TRUE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
-- at EXTENSION_SO_FALSE@@EXTENSION_1_TRUE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/libpam_ldap.1
-- at EXTENSION_SO_FALSE@@EXTENSION_1_FALSE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1
-- at EXTENSION_SO_FALSE@@EXTENSION_1_FALSE@	(cd $(DESTDIR)$(libdir)/security; rm -f pam_ldap.so; ln -s pam_ldap.so.1 pam_ldap.so)
+- at EXTENSION_1_TRUE@@EXTENSION_SO_FALSE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/libpam_ldap.1
+- at EXTENSION_1_FALSE@@EXTENSION_SO_FALSE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1
+- at EXTENSION_1_FALSE@@EXTENSION_SO_FALSE@	(cd $(DESTDIR)$(libdir)/security; rm -f pam_ldap.so; ln -s pam_ldap.so.1 pam_ldap.so)
 +	$(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so
  
  install-data-local:
@@ -21,3 +21,11 @@
  	fi
  
  uninstall-local:
+ 	@$(NORMAL_UNINSTALL)
+ 
+ vers.c: $(top_srcdir)/CVSVersionInfo.txt
+-	CVSVERSIONDIR=$(top_srcdir) vers_string -v
++	CVSVERSIONDIR=$(top_srcdir) $(top_srcdir)/vers_string -v
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
--- pam_ldap-1.8.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: