Changes 265:

* fix: add versioning information to binary
* fix: add AM_MAINTAINER_MODE
* fix: bad LDAP query for ether lookups
* fix: clarify bind timelimit defaults in ldap.conf
* fix: call do_close() if ldap_result() or ldap_parse_result() fails
  (before returning NSS_UNAVAIL)
* fix: FreeBSD thread library check
* fix: deallocate context in
  _nss_ldap_ent_context_release() to avoid bad usage
* fix: don't leak file descriptors in _nss_ldap_readconfig

Changes 264:
* fix: MAP_H_ERRNO() should map NSS_TRYAGAIN to NETDB_INTERNAL not TRY_AGAIN
* fix: ldaps:// URIs only work if "ssl on" is set
* fix: nss_ldap exposes malformed entries to the system

Changes 263:
* fix: nss_ldap returns success from setnetgrent() when the requested netgroup
  doesn't exist
* fix: getXXent() only returns NULL once before implicitly calling
  setXXent(), whereas other backends continue to return NULL

Changes 262:
* fix: nss_ldap fails to work on Solaris without that patch applied

Changes 261:
* fix: ldap.conf template is missing a comment in the first line

6 files changed, 48 insertions, 46 deletions

diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index d6d1c62bba8..00c840a2883 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.21 2010/01/17 12:02:09 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2010/10/29 13:47:11 adam Exp $
 
-DISTNAME=		nss_ldap-260
-PKGREVISION=		1
-CATEGORIES=		databases
-MASTER_SITES=		http://www.padl.com/download/
+DISTNAME=	nss_ldap-265
+CATEGORIES=	databases
+MASTER_SITES=	http://www.padl.com/download/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.padl.com/OSS/nss_ldap.html
-COMMENT=		LDAP client for nsswitch
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.padl.com/OSS/nss_ldap.html
+COMMENT=	LDAP client for nsswitch
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # needs nsswitch
 ONLY_FOR_PLATFORM=	NetBSD-[3-9]*-*
 
-GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-
-CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/nss_ldap.conf
-CONFIGURE_ARGS+= --with-ldap-secret-file=${PKG_SYSCONFDIR}/nss_ldap.secret
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --enable-schema-mapping
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-schema-mapping
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/nss_ldap.conf
+CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/nss_ldap.secret
 MAKE_FLAGS+=		INST_UID=${BINOWN} INST_GID=${BINGRP}
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
diff --git a/databases/nss_ldap/distinfo b/databases/nss_ldap/distinfo
index 7fa8e52c57c..ef02970a9e8 100644
--- a/databases/nss_ldap/distinfo
+++ b/databases/nss_ldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/04/01 01:39:24 taca Exp $
+$NetBSD: distinfo,v 1.6 2010/10/29 13:47:11 adam Exp $
 
-SHA1 (nss_ldap-260.tar.gz) = ad3f5215d66e1dc6c0ef04da83548ed2bc0dcd95
-RMD160 (nss_ldap-260.tar.gz) = ff2bac5650709d702339dde257f310f9ef161d9c
-Size (nss_ldap-260.tar.gz) = 274866 bytes
-SHA1 (patch-ab) = e277f28af92625cb63cbc8ae72e387c312392b12
-SHA1 (patch-af) = efde405016a28cc358081f787cb6c1c7b8d617c4
-SHA1 (patch-ag) = 95741f39fb03195b3238d4f9c24360049fdd3698
+SHA1 (nss_ldap-265.tar.gz) = 743581914fc8c9b4d33955c2cc7acd0c3c44a430
+RMD160 (nss_ldap-265.tar.gz) = 0513f1b62aface531145f739ec8e9867c77eb3ce
+Size (nss_ldap-265.tar.gz) = 280976 bytes
+SHA1 (patch-ab) = 418fca750b9b6f40dd3a904af84fababf8c55022
+SHA1 (patch-af) = 02deabc2a806a5cf82809b770bdc6122a2ff6a9d
+SHA1 (patch-ag) = 880b8867b610b9602fc428beebdeb85dee215816
diff --git a/databases/nss_ldap/files/netbsd.h b/databases/nss_ldap/files/netbsd.h
index e7b99067d29..78e1e7c9aed 100644
--- a/databases/nss_ldap/files/netbsd.h
+++ b/databases/nss_ldap/files/netbsd.h
@@ -1,8 +1,10 @@
-/* $NetBSD: netbsd.h,v 1.1.1.1 2005/08/08 09:47:42 drochner Exp $ */
+/* $NetBSD: netbsd.h,v 1.2 2010/10/29 13:47:11 adam Exp $ */
 
 #undef HAVE_NSSWITCH_H
 #define HAVE_NSS_H
 
+#ifndef _NSS_LDAP_NETBSD_H
+#define _NSS_LDAP_NETBSD_H
 enum nss_status {
 	NSS_STATUS_SUCCESS,
 	NSS_STATUS_NOTFOUND,
@@ -10,3 +12,4 @@ enum nss_status {
 	NSS_STATUS_TRYAGAIN,
 	NSS_STATUS_RETURN
 };
+#endif /* _NSS_LDAP_NETBSD_H */
diff --git a/databases/nss_ldap/patches/patch-ab b/databases/nss_ldap/patches/patch-ab
index 470ccd907dd..7187102d58e 100644
--- a/databases/nss_ldap/patches/patch-ab
+++ b/databases/nss_ldap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2008/04/01 01:39:24 taca Exp $
+$NetBSD: patch-ab,v 1.3 2010/10/29 13:47:11 adam Exp $
 
---- ldap-nss.c.orig	2008-03-04 19:05:12.000000000 +0900
-+++ ldap-nss.c	2008-03-31 13:28:07.000000000 +0900
-@@ -33,6 +33,7 @@
+--- ldap-nss.c.orig	2009-11-06 10:28:08.000000000 +0000
++++ ldap-nss.c
+@@ -33,6 +33,7 @@ static char rcsId[] =
  #include <pthread.h>
  #endif
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2008/04/01 01:39:24 taca Exp $
  #include <assert.h>
  #include <stdlib.h>
  #include <unistd.h>
-@@ -1258,8 +1259,6 @@
+@@ -1256,8 +1257,6 @@ do_init (void)
      __pid = pid;
    else
      __libc_once (__once, do_atfork_setup);
diff --git a/databases/nss_ldap/patches/patch-af b/databases/nss_ldap/patches/patch-af
index 97e50e71293..55b653cba7d 100644
--- a/databases/nss_ldap/patches/patch-af
+++ b/databases/nss_ldap/patches/patch-af
@@ -1,26 +1,26 @@
-$NetBSD: patch-af,v 1.4 2008/04/01 01:39:24 taca Exp $
+$NetBSD: patch-af,v 1.5 2010/10/29 13:47:11 adam Exp $
 
---- Makefile.in.orig	2008-03-04 19:05:12.000000000 +0900
-+++ Makefile.in	2008-03-31 13:05:46.000000000 +0900
-@@ -60,7 +60,7 @@
+--- Makefile.in.orig	2009-11-06 10:28:08.000000000 +0000
++++ Makefile.in
+@@ -60,7 +60,7 @@ am_NSS_LDAP_OBJECTS = ldap-nss.$(OBJEXT)
  	util.$(OBJEXT) ltf.$(OBJEXT) snprintf.$(OBJEXT) \
  	resolve.$(OBJEXT) dnsconfig.$(OBJEXT) irs-nss.$(OBJEXT) \
  	pagectrl.$(OBJEXT) aix_authmeth.$(OBJEXT) \
--	ldap-init-krb5-cache.$(OBJEXT)
+-	ldap-init-krb5-cache.$(OBJEXT) vers.$(OBJEXT)
 +	ldap-init-krb5-cache.$(OBJEXT) netbsd.$(OBJEXT)
  NSS_LDAP_OBJECTS = $(am_NSS_LDAP_OBJECTS)
  NSS_LDAP_LDADD = $(LDADD)
  am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) ldap-pwd.$(OBJEXT) \
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJE
  	ldap-automount.$(OBJEXT) util.$(OBJEXT) ltf.$(OBJEXT) \
  	snprintf.$(OBJEXT) resolve.$(OBJEXT) dnsconfig.$(OBJEXT) \
  	irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) ldap-sldap.$(OBJEXT) \
--	ldap-init-krb5-cache.$(OBJEXT)
+-	ldap-init-krb5-cache.$(OBJEXT) vers.$(OBJEXT)
 +	ldap-init-krb5-cache.$(OBJEXT) netbsd.$(OBJEXT)
  nss_ldap_so_OBJECTS = $(am_nss_ldap_so_OBJECTS)
  nss_ldap_so_LDADD = $(LDADD)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-@@ -201,7 +201,7 @@
+@@ -204,7 +204,7 @@ target_vendor = @target_vendor@
  @AIX_FALSE@authmod = 
  @AIX_TRUE@authmod = NSS_LDAP
  INST_UID = root
@@ -29,29 +29,30 @@ $NetBSD: patch-af,v 1.4 2008/04/01 01:39:24 taca Exp $
  @AIX_TRUE@INST_GID = system
  EXTRA_DIST = CVSVersionInfo.txt ChangeLog \
  	     AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\
-@@ -212,11 +212,11 @@
- 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \
+@@ -216,11 +216,11 @@ nss_ldap_so_SOURCES = ldap-nss.c ldap-pw
  	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \
  	ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \
--	dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c
-+	dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c netbsd.c
+ 	dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c \
+-	vers.c
++	netbsd.c
  
  NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \
  	util.c ltf.c snprintf.c resolve.c dnsconfig.c \
--	irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c
+-	irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c vers.c
 +	irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c netbsd.c
  
  @GCC_FALSE@MULTI_OS_DIRECTORY = .
  #INCLUDES = -I$(top_builddir) -I$(srcdir)
-@@ -327,6 +327,7 @@
+@@ -331,7 +331,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vers.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netbsd.Po@am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -688,10 +689,8 @@
+@@ -693,10 +693,8 @@ uninstall-man: uninstall-man5
  
  install-data-local:
  	@$(NORMAL_INSTALL)
diff --git a/databases/nss_ldap/patches/patch-ag b/databases/nss_ldap/patches/patch-ag
index 26997feef14..87e2eb9a393 100644
--- a/databases/nss_ldap/patches/patch-ag
+++ b/databases/nss_ldap/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/08/08 09:47:42 drochner Exp $
+$NetBSD: patch-ag,v 1.2 2010/10/29 13:47:12 adam Exp $
 
---- config.h.in.orig	2005-08-04 21:29:33.000000000 +0200
+--- config.h.in.orig	2009-11-06 10:28:08.000000000 +0000
 +++ config.h.in
-@@ -302,3 +302,7 @@
+@@ -345,3 +345,7 @@
  
  /* Version number of package */
  #undef VERSION