Update nss_ldap package to 260 based on PR pkg/38346 from Taku YASUI.

This update includes security fix for CVE-2007-5794.

Changes from 240 is too much to list here.  See ChangeLog, please.

5 files changed, 68 insertions, 51 deletions

diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index 1548fb49f24..0dd4ea00711 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2008/01/18 05:06:28 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2008/04/01 01:39:24 taca Exp $
 #
 
-DISTNAME=		nss_ldap-240
-PKGREVISION=		9
+DISTNAME=		nss_ldap-260
 CATEGORIES=		databases
 MASTER_SITES=		http://www.padl.com/download/
 
diff --git a/databases/nss_ldap/distinfo b/databases/nss_ldap/distinfo
index 30221891b9b..7fa8e52c57c 100644
--- a/databases/nss_ldap/distinfo
+++ b/databases/nss_ldap/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/08/10 17:14:40 drochner Exp $
+$NetBSD: distinfo,v 1.5 2008/04/01 01:39:24 taca Exp $
 
-SHA1 (nss_ldap-240.tar.gz) = 929cea7e0fe4542bf24112ae428efffb7dc510ba
-RMD160 (nss_ldap-240.tar.gz) = 58a94bc8441461e779c546cbb447bee3efb0fead
-Size (nss_ldap-240.tar.gz) = 228656 bytes
-SHA1 (patch-ab) = 01493e92ffff0125dd3267810ee33cdeaab32ab2
-SHA1 (patch-af) = 6dc9d1df0f601361686832ac8d632936e260281e
+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 (patch-ah) = 79bcb3b98fbb037520cbe242d50e8ee144bbc66c
diff --git a/databases/nss_ldap/patches/patch-ab b/databases/nss_ldap/patches/patch-ab
index 32d5d853b31..470ccd907dd 100644
--- a/databases/nss_ldap/patches/patch-ab
+++ b/databases/nss_ldap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/08/08 09:47:42 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2008/04/01 01:39:24 taca Exp $
 
---- ldap-nss.c.orig	2005-07-26 23:00:16.000000000 +0200
-+++ ldap-nss.c
-@@ -33,6 +33,7 @@ static char rcsId[] =
+--- 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 @@
  #include <pthread.h>
  #endif
  
@@ -10,3 +10,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/08/08 09:47:42 drochner Exp $
  #include <assert.h>
  #include <stdlib.h>
  #include <unistd.h>
+@@ -1258,8 +1259,6 @@
+     __pid = pid;
+   else
+     __libc_once (__once, do_atfork_setup);
+-#else
+-  __pid = pid;
+ #endif
+ 
+   __euid = euid;
diff --git a/databases/nss_ldap/patches/patch-af b/databases/nss_ldap/patches/patch-af
index c49adfaea96..97e50e71293 100644
--- a/databases/nss_ldap/patches/patch-af
+++ b/databases/nss_ldap/patches/patch-af
@@ -1,34 +1,57 @@
-$NetBSD: patch-af,v 1.3 2005/09/19 16:13:26 drochner Exp $
+$NetBSD: patch-af,v 1.4 2008/04/01 01:39:24 taca Exp $
 
---- Makefile.in.orig	2005-09-18 19:47:08.000000000 +0100
-+++ Makefile.in
-@@ -75,14 +75,14 @@ nss_ldap_so_LD = @nss_ldap_so_LD@
- noinst_PROGRAMS = nss_ldap.so $(authmod)
+--- 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 @@
+ 	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) 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 @@
+ 	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) 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 @@
+ @AIX_FALSE@authmod = 
+ @AIX_TRUE@authmod = NSS_LDAP
  INST_UID = root
- @AIX_TRUE@INST_GID = system
 -@AIX_FALSE@INST_GID = root
 +@AIX_FALSE@INST_GID = wheel
+ @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 \
+ 	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
  
- EXTRA_DIST = CVSVersionInfo.txt ChangeLog 	     AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING 	     ldap.conf nss_ldap.spec nsswitch.ldap 
- 
- 
- man_MANS = nss_ldap.5
- 
--nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	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
-+nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	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 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 netbsd.c
  
+ @GCC_FALSE@MULTI_OS_DIRECTORY = .
+ #INCLUDES = -I$(top_builddir) -I$(srcdir)
+@@ -327,6 +327,7 @@
+ @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)/netbsd.Po@am__quote@
  
- nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
-@@ -122,7 +122,7 @@ nss_ldap_so_OBJECTS =  ldap-nss.o ldap-p
- ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \
- ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \
- ldap-automount.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
--irs-nss.o pagectrl.o
-+irs-nss.o pagectrl.o netbsd.o
- nss_ldap_so_LDADD = $(LDADD)
- nss_ldap_so_DEPENDENCIES = 
- NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \
-@@ -498,10 +498,8 @@ maintainer-clean-generic clean mostlycle
+ .c.o:
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@@ -688,10 +689,8 @@
  
  install-data-local:
  	@$(NORMAL_INSTALL)
diff --git a/databases/nss_ldap/patches/patch-ah b/databases/nss_ldap/patches/patch-ah
deleted file mode 100644
index fcc5fefb7fc..00000000000
--- a/databases/nss_ldap/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/08/10 17:14:40 drochner Exp $
-
---- ldap-pwd.c.orig	2007-08-09 19:20:45.000000000 +0200
-+++ ldap-pwd.c
-@@ -185,7 +185,7 @@ _nss_ldap_parse_pw (LDAPMessage * e,
-         _nss_ldap_assign_attrval (e, AT (shadowLastChange), &tmp, &buffer,
- 		    	          &buflen);
-       if (stat == NSS_SUCCESS)
--        pw->pw_change += atol(tmp);
-+        pw->pw_change += atol(tmp) * (24*60*60);
-       else
- 	pw->pw_change = 0;
-     }