Update ipv6 patch. Closes PR pkg/44469 by James A. T. Rice. While

here, fix indentation broken in previous and quell pkglint.

8 files changed, 28 insertions, 19 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index c040aa42cb4..61e2f8cb85d 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2010/03/15 17:31:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.61 2011/06/09 00:55:40 schmonz Exp $
 
 DISTNAME=		djbdns-1.05
-PKGREVISION=	9
+PKGREVISION=		10
 CATEGORIES=		net
-MASTER_SITES=	http://cr.yp.to/djbdns/
+MASTER_SITES=		http://cr.yp.to/djbdns/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
 
 MAINTAINER=		schmonz@NetBSD.org
@@ -26,7 +26,7 @@ DJB_RESTRICTED=	no
 EGDIR=			${PREFIX}/share/examples/djbdns
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
-CONF_FILES+=	${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
+CONF_FILES+=		${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
 PLIST_SRC=		${PKGDIR}/PLIST
 
 INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns
diff --git a/net/djbdns/PLIST.inet6 b/net/djbdns/PLIST.inet6
index bc7d2a3b579..2d0ff970477 100644
--- a/net/djbdns/PLIST.inet6
+++ b/net/djbdns/PLIST.inet6
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.inet6,v 1.1 2004/09/01 20:07:35 schmonz Exp $
+@comment $NetBSD: PLIST.inet6,v 1.2 2011/06/09 00:55:40 schmonz Exp $
 bin/dnsip6
+bin/dnsip6q
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index cea24681c0e..5e88c78b810 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2010/03/15 17:31:57 schmonz Exp $
+$NetBSD: distinfo,v 1.19 2011/06/09 00:55:40 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -6,9 +6,9 @@ Size (djbdns-1.05.tar.gz) = 85648 bytes
 SHA1 (djbdns-1.05-man-20031023.tar.gz) = 3bac8a34a4bc681b9a0e603a77fa11492619e3ce
 RMD160 (djbdns-1.05-man-20031023.tar.gz) = 42a5b3305513851dfe1da46df6f405bc81602fbe
 Size (djbdns-1.05-man-20031023.tar.gz) = 17170 bytes
-SHA1 (djbdns-1.05-ipv6.diff.bz2) = 225484ea34f8cdefa501e22640c67d093d2f5169
-RMD160 (djbdns-1.05-ipv6.diff.bz2) = 9c6e0087d4b99620775224d66b06f148fc016e53
-Size (djbdns-1.05-ipv6.diff.bz2) = 7306 bytes
+SHA1 (djbdns-1.05-test23.diff.bz2) = 34251597d211ff00791cb6546e8ef60d75ce5477
+RMD160 (djbdns-1.05-test23.diff.bz2) = 33037f2a41abb49c305f3efec4402c6965c8b8b8
+Size (djbdns-1.05-test23.diff.bz2) = 18480 bytes
 SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
 RMD160 (djbdns-1.05-ignoreip2.patch) = bf8a0d38ae7bfb09a8ab2a04600680613db10aaa
 Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes
@@ -21,7 +21,7 @@ Size (0001-dnscache-merge-similar-outgoing-queries.patch) = 9914 bytes
 SHA1 (0002-dnscache-cache-soa-records.patch) = ac9b6a62c62588205cc4dc71da4e0ad6630f9635
 RMD160 (0002-dnscache-cache-soa-records.patch) = 0b58e57bc11b36113c5fef73a64c869895f83889
 Size (0002-dnscache-cache-soa-records.patch) = 2944 bytes
-SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa
-SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1
-SHA1 (patch-ac) = 1d5ab2c90a2c4221bc7ec08d116d3d23799bd5d6
-SHA1 (patch-ad) = 4f3543ff6c2778001c81197c797303929501f66c
+SHA1 (patch-aa) = 873897ad6b97baff363874a6a79c8da44383c283
+SHA1 (patch-ab) = 874af27489ad4597e213cfe05a7f2f919081db20
+SHA1 (patch-ac) = 4f089b63664b7e4685b77fc55b287860c8c68229
+SHA1 (patch-ad) = 0dffb59090ccb4977c65885f062eb37255ccd0d9
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index 24624f32dd3..a6d7478d9e7 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2009/05/03 11:28:41 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2011/06/09 00:55:40 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.djbdns
 PKG_SUPPORTED_OPTIONS+=		inet6 djbdns-cachestats djbdns-ignoreip2
@@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS+=   djbdns-tinydns64
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
-IPV6_PATCH=			djbdns-1.05-ipv6.diff.bz2
+IPV6_PATCH=			djbdns-1.05-test23.diff.bz2
 PATCHFILES+=			${IPV6_PATCH}
 SITES.${IPV6_PATCH}=		http://www.fefe.de/dns/
 PATCH_DIST_STRIP.${IPV6_PATCH}=	-p1
diff --git a/net/djbdns/patches/patch-aa b/net/djbdns/patches/patch-aa
index 75621e240af..7fec36ed3bf 100644
--- a/net/djbdns/patches/patch-aa
+++ b/net/djbdns/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/09/01 20:07:35 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2011/06/09 00:55:41 schmonz Exp $
+
+PKG_SYSCONFDIR support.
 
 --- dnscache-conf.c.orig	2001-02-11 16:11:45.000000000 -0500
 +++ dnscache-conf.c
diff --git a/net/djbdns/patches/patch-ab b/net/djbdns/patches/patch-ab
index 3d3591c3e45..21b7103a225 100644
--- a/net/djbdns/patches/patch-ab
+++ b/net/djbdns/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/09/01 20:07:35 schmonz Exp $
+$NetBSD: patch-ab,v 1.3 2011/06/09 00:55:41 schmonz Exp $
+
+PKG_SYSCONFDIR support.
 
 --- hier.c.orig	2004-07-23 17:55:45.000000000 -0400
 +++ hier.c
diff --git a/net/djbdns/patches/patch-ac b/net/djbdns/patches/patch-ac
index bca0708d2ef..96a6a50931b 100644
--- a/net/djbdns/patches/patch-ac
+++ b/net/djbdns/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2009/04/22 04:48:13 schmonz Exp $
+$NetBSD: patch-ac,v 1.6 2011/06/09 00:55:41 schmonz Exp $
+
+Fix the security hole found by Matthew Dempsky.
 
 --- response.c.orig	2001-02-11 16:11:45.000000000 -0500
 +++ response.c
diff --git a/net/djbdns/patches/patch-ad b/net/djbdns/patches/patch-ad
index b26c8a1b314..b68608af0d8 100644
--- a/net/djbdns/patches/patch-ad
+++ b/net/djbdns/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2010/03/15 17:31:57 schmonz Exp $
+$NetBSD: patch-ad,v 1.4 2011/06/09 00:55:41 schmonz Exp $
+
+DESTDIR support.
 
 --- Makefile.orig	2001-02-11 21:11:45.000000000 +0000
 +++ Makefile