Update to sync with the ldns update to version 1.6.15.

This changes the default trust anchor file from the dig-compatible
value to a default of /usr/pkg/etc/unbound/root.key.

Part of change log relevant to drill:

        * Configurable default trust anchor with --with-trust-anchor=FILE
          for drill, ldns-verify-zone and ldns-dane
        * bugfix #473: Dead code removal and resource leak fix in drill

4 files changed, 6 insertions, 72 deletions

diff --git a/net/drill/Makefile b/net/drill/Makefile
index e0aea810d73..93afb9751a6 100644
--- a/net/drill/Makefile
+++ b/net/drill/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:18 asau Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/25 20:59:46 he Exp $
 
-VERSION=	1.6.13
+VERSION=	1.6.15
 DISTNAME=	ldns-${VERSION}
 PKGNAME=	drill-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/
 
diff --git a/net/drill/distinfo b/net/drill/distinfo
index 8c032b894cc..c15a4aa23ec 100644
--- a/net/drill/distinfo
+++ b/net/drill/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/10/08 13:58:48 he Exp $
+$NetBSD: distinfo,v 1.7 2012/10/25 20:59:46 he Exp $
 
-SHA1 (ldns-1.6.13.tar.gz) = 859f633d10b763f06b602e2113828cbbd964c7eb
-RMD160 (ldns-1.6.13.tar.gz) = c01c30699be2df5712a397516cd1a17bd8b155be
-Size (ldns-1.6.13.tar.gz) = 1066139 bytes
-SHA1 (patch-aa) = 3bbfcea6f44b49526451286590eac5de62841e72
-SHA1 (patch-ab) = 706e5edcf6982337b7360051f9964d77ad8716c2
+SHA1 (ldns-1.6.15.tar.gz) = a47cb11fa5c601410e2e8feda36ab343162fe92b
+RMD160 (ldns-1.6.15.tar.gz) = d2770e53bb01579b91380533cfac42057f7750d0
+Size (ldns-1.6.15.tar.gz) = 1109667 bytes
diff --git a/net/drill/patches/patch-aa b/net/drill/patches/patch-aa
deleted file mode 100644
index 6e6148c9053..00000000000
--- a/net/drill/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/10/08 13:58:48 he Exp $
-
-For compatibility with dig, if neither -k <key> nor -D is specified,
-read /etc/trusted-key.key if it exists, and if successful, turn on
-DNSSEC handling.
-
---- drill.c.orig	2012-01-20 10:18:41.000000000 +0000
-+++ drill.c
-@@ -10,6 +10,8 @@
- #include "drill.h"
- #include <ldns/ldns.h>
- 
-+#include <sys/stat.h>
-+
- #ifdef HAVE_SSL
- #include <openssl/err.h>
- #endif
-@@ -397,6 +399,25 @@ main(int argc, char *argv[])
- 	argc -= optind;
- 	argv += optind;
- 
-+	/* 
-+	 * If DNSSEC isn't enabled already, and /etc/trusted-key.key
-+	 * exists, try to read it and turn on DNSSEC handling if successful.
-+	 */
-+	{
-+		struct stat sb;
-+
-+		if (stat("/etc/trusted-key.key", &sb) == 0) {
-+			if (qdnssec != true) {
-+				status = read_key_file("/etc/trusted-key.key", key_list);
-+				if (status != LDNS_STATUS_OK) {
-+					error("Could not parse the key file /etc/trusted-key.key: %s", ldns_get_errorstr_by_id(status));
-+				} else {
-+					qdnssec = true; /* enable that too */
-+				}
-+			}
-+		}
-+	}
-+
- 	/* do a secure trace when requested */
- 	if (PURPOSE == DRILL_TRACE && qdnssec) {
- #ifdef HAVE_SSL
diff --git a/net/drill/patches/patch-ab b/net/drill/patches/patch-ab
deleted file mode 100644
index 5053edbeeed..00000000000
--- a/net/drill/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2012/10/08 13:58:48 he Exp $
-
-Document the automatic probing for /etc/trusted-key.key.
-
---- drill.1.orig	2010-08-06 07:09:45.000000000 +0000
-+++ drill.1
-@@ -161,6 +161,13 @@ given \fBdrill\fR tries to validate the 
- key. No chasing is done. When \fBdrill\fR is doing a secure trace, this
- key will be used as trust anchor. Can contain a DNSKEY or a DS record.
- 
-+Alternatively, if
-+\fB-k\fR
-+is not specified, and
-+\fI/etc/trusted-key.key\fR
-+exists and contains a valid DNSKEY or DS record, it will be used
-+as the trust anchor.
-+
- .TP
- \fB\-o \fImnemonic\fR
- Use this option to set or unset specific header bits. A bit is