Update from version 1.5.1 to 1.6.1.

Pkgsrc changes:
 o Adjust the patch to Makefile.in to match, and make sure to use
   ./install-sh with the "-c" option, to ensure we can reinstall
   after an install + deinstall.
 o Fix PLIST issues (a few more than in the PR mentioned below).

Should fix PR pkg/41868.

Upstream changes:

1.6.1   2009-09-14
	* --enable-gost : use the GOST algorithm (experimental).
	* Added some missing options to drill manpage
	* Some fixes to --without-ssl option
	* Fixed quote parsing withing strings
	* Bitmask fix in EDNS handling
	* Fixed non-fqdn domain name completion for rdata field domain
	  names of length 1
	* Fixed chain validation with SHA256 DS records

1.6.0
	Additions:
	* Addition of an ldns-config script which gives cflags and libs
	  values, for use in configure scripts for applications that use
	  use ldns. Can be disabled with ./configure --disable-ldns-config
	* Added direct sha1, sha256, and sha512 support in ldns.
	  With these functions, all NSEC3 functionality can still be
	  used, even if ldns is built without OpenSSL. Thanks to OpenBSD,
	  Steve Reid, and Aaron D. Gifford for the code.
	* Added reading/writing support for the SPF Resource Record
	* Base32 functions are now exported
	Bugfixes:
	* ldns_is_rrset did not go through the complete rrset, but
	  only compared the first two records. Thanks to Olafur
	  Gudmundsson for report and patch
	* Fixed a small memory bug in ldns_rr_list_subtype_by_rdf(),
	  thanks to Marius Rieder for finding an patching this.
	* --without-ssl should now work. Make sure that examples/ and
	  drill also get the --without-ssl flag on their configure, if
	  this is used.
	* Some malloc() return value checks have been added
	* NSEC3 creation has been improved wrt to empty nonterminals,
	  and opt-out.
	* Fixed a bug in the parser when reading large NSEC3 salt
	  values.
	* Made the allowed length for domain names on wire
	  and presentation format the same.
	Example tools:
	* ldns-key2ds can now also generate DS records for keys without
	  the SEP flag
	* ldns-signzone now equalizes the TTL of the DNSKEY RRset (to
	  the first non-default DNSKEY TTL value it sees)

4 files changed, 60 insertions, 13 deletions

diff --git a/net/ldns/Makefile b/net/ldns/Makefile
index 4595820efe7..830b59b0a2c 100644
--- a/net/ldns/Makefile
+++ b/net/ldns/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2009/06/25 11:34:37 he Exp $
+# $NetBSD: Makefile,v 1.7 2009/08/18 12:48:04 he Exp $
 
-DISTNAME=	ldns-1.5.1
+DISTNAME=	ldns-1.6.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/drill/
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/
diff --git a/net/ldns/PLIST b/net/ldns/PLIST
index 62718ef8aee..265de35a585 100644
--- a/net/ldns/PLIST
+++ b/net/ldns/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/18 12:48:04 he Exp $
+bin/ldns-config
 include/ldns/buffer.h
 include/ldns/common.h
 include/ldns/dname.h
@@ -20,6 +21,8 @@ include/ldns/rdata.h
 include/ldns/resolver.h
 include/ldns/rr.h
 include/ldns/rr_functions.h
+include/ldns/sha1.h
+include/ldns/sha2.h
 include/ldns/str2host.h
 include/ldns/tsig.h
 include/ldns/update.h
@@ -439,9 +442,11 @@ man/man3/ldns_update_set_zocount.3
 man/man3/ldns_update_upcount.3
 man/man3/ldns_update_zocount.3
 man/man3/ldns_verify.3
+man/man3/ldns_verify_notime.3
 man/man3/ldns_verify_rrsig.3
 man/man3/ldns_verify_rrsig_dsa.3
 man/man3/ldns_verify_rrsig_keylist.3
+man/man3/ldns_verify_rrsig_keylist_notime.3
 man/man3/ldns_verify_rrsig_rsamd5.3
 man/man3/ldns_verify_rrsig_rsasha1.3
 man/man3/ldns_wire2dname.3
diff --git a/net/ldns/distinfo b/net/ldns/distinfo
index 9bf3635ea25..e7711a98d01 100644
--- a/net/ldns/distinfo
+++ b/net/ldns/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/06/25 11:34:37 he Exp $
+$NetBSD: distinfo,v 1.4 2009/08/18 12:48:04 he Exp $
 
-SHA1 (ldns-1.5.1.tar.gz) = 070210a417633b7358bb3466da40e6f1872f36c2
-RMD160 (ldns-1.5.1.tar.gz) = 02cc331041de096124ec76601c119b97db24a1a5
-Size (ldns-1.5.1.tar.gz) = 781562 bytes
-SHA1 (patch-aa) = 4c1e3cdda7bf4fe2b7558baa8ded08f49e2a850d
+SHA1 (ldns-1.6.1.tar.gz) = 625ad56970ebf91ae91af2fbb92b048164717df1
+RMD160 (ldns-1.6.1.tar.gz) = c477c76308b56bd18920ea0deeac286857c93e22
+Size (ldns-1.6.1.tar.gz) = 830714 bytes
+SHA1 (patch-aa) = 3ab3597bf5d922e7727f5a35dc0e3baf1f55f00c
diff --git a/net/ldns/patches/patch-aa b/net/ldns/patches/patch-aa
index 163b5e6b918..ee562e12dfc 100644
--- a/net/ldns/patches/patch-aa
+++ b/net/ldns/patches/patch-aa
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/07/22 08:29:06 he Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/18 12:48:04 he Exp $
 
---- Makefile.in.orig	2008-05-28 08:12:29.000000000 +0200
+Install man-pages using ${INSTALL} specifying the correct mode
+instead of cp -Rp.
+...and do "install-sh -c" instead of "install-sh", which ends up
+moving the include files instead of copying them...
+
+--- Makefile.in.orig	2009-08-06 14:44:16.000000000 +0200
 +++ Makefile.in
-@@ -83,7 +83,7 @@ LINK_LIB	= $(LIBTOOL) --mode=link $(CC) 
+@@ -87,7 +87,7 @@ LINK_LIB	= $(LIBTOOL) --mode=link $(CC) 
  .PHONY: install uninstall install-doc uninstall-doc 
  .PHONY: install-h uninstall-h install-lib uninstall-lib 
  
@@ -10,8 +15,32 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/07/22 08:29:06 he Exp $
 +all:		copy-headers lib linktest manpages
  
  linktest:	$(srcdir)/linktest.c $(LIBDNS_HEADERS) ldns/util.h ldns/config.h libldns.la
- 		$(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(CFLAGS) -lldns -o linktest
-@@ -127,7 +127,9 @@ destclean:	uninstall
+ 		$(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(CFLAGS) -lldns $(LIBS) -o linktest
+@@ -107,7 +107,7 @@ libldns.la-export-all:	$(LIBDNS_OBJECTS)
+ $(addprefix include/ldns/, $(notdir $(LIBDNS_HEADERS))): include/ldns/%.h: $(srcdir)/ldns/%.h
+ 		@if [ ! -d include ] ; then ($(INSTALL) -d include || echo "include exists") ; fi ;
+ 		@if [ ! -d include/ldns ] ; then (cd include; ln -s ../ldns ./ldns || echo "include/ldns exists") ; fi ;
+-		$(INSTALL) -m 644 $< ./include/ldns/
++		$(INSTALL) -c -m 644 $< ./include/ldns/
+ 
+ copy-headers:	$(addprefix include/ldns/, $(notdir $(LIBDNS_HEADERS)))
+ 
+@@ -119,7 +119,7 @@ doxygen:	manpages
+ ifdef doxygen
+ 		# if we are not in base we need to copy some html files too
+ 		if [ ! -e doc/header.html ] ; then \
+-			$(INSTALL) -m 644 $(srcdir)/doc/header.html doc/ ; \
++			$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
+ 		fi ;
+ 		$(doxygen) $(srcdir)/libdns.doxygen
+ endif
+@@ -138,12 +138,14 @@ destclean:	uninstall
+ install-config:
+ 	if [ $(INSTALL_LDNS_CONFIG) = "yes" ] ; then \
+ 		$(INSTALL) -d $(DESTDIR)$(bindir); \
+-		$(INSTALL) -m 755 packaging/ldns-config $(DESTDIR)$(bindir)/; \
++		$(INSTALL) -c -m 755 packaging/ldns-config $(DESTDIR)$(bindir)/; \
+ 	fi
  
  install-manpages:	manpages
  		${INSTALL} -d $(DESTDIR)$(mandir)/man3
@@ -22,3 +51,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/07/22 08:29:06 he Exp $
  
  uninstall-manpages:
  		for i in `cat doc/ldns_manpages`; do \
+@@ -153,9 +155,9 @@ uninstall-manpages:
+ install-h:	lib
+ 		$(INSTALL) -m 755 -d $(DESTDIR)$(includedir)/ldns
+ 		for i in $(LIBDNS_HEADERS); do \
+-			$(INSTALL) -m 644 $$i $(DESTDIR)$(includedir)/ldns/; done
+-		$(INSTALL) -m 644 include/ldns/util.h $(DESTDIR)$(includedir)/ldns/
+-		$(INSTALL) -m 644 include/ldns/net.h $(DESTDIR)$(includedir)/ldns/
++			$(INSTALL) -c -m 644 $$i $(DESTDIR)$(includedir)/ldns/; done
++		$(INSTALL) -c -m 644 include/ldns/util.h $(DESTDIR)$(includedir)/ldns/
++		$(INSTALL) -c -m 644 include/ldns/net.h $(DESTDIR)$(includedir)/ldns/
+ 
+ uninstall-h:
+ 		for i in $(LIBDNS_HEADERS); do \