Thu Jun 9 00:55:41 2011 UTC ()
Update ipv6 patch. Closes PR pkg/44469 by James A. T. Rice. While
here, fix indentation broken in previous and quell pkglint.


(schmonz)
diff -r1.60 -r1.61 pkgsrc/net/djbdns/Makefile
diff -r1.1 -r1.2 pkgsrc/net/djbdns/PLIST.inet6
diff -r1.18 -r1.19 pkgsrc/net/djbdns/distinfo
diff -r1.14 -r1.15 pkgsrc/net/djbdns/options.mk
diff -r1.2 -r1.3 pkgsrc/net/djbdns/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/net/djbdns/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/net/djbdns/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/net/djbdns/patches/patch-ad
cvs diff -r1.60 -r1.61 pkgsrc/net/djbdns/Makefile (expand / switch to unified diff)

--- pkgsrc/net/djbdns/Makefile 2010/03/15 17:31:57 1.60
+++ pkgsrc/net/djbdns/Makefile 2011/06/09 00:55:40 1.61
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.60 2010/03/15 17:31:57 schmonz Exp $ 1# $NetBSD: Makefile,v 1.61 2011/06/09 00:55:40 schmonz Exp $
2 2
3DISTNAME= djbdns-1.05 3DISTNAME= djbdns-1.05
4PKGREVISION= 9 4PKGREVISION= 10
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://cr.yp.to/djbdns/ 6MASTER_SITES= http://cr.yp.to/djbdns/
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://cr.yp.to/djbdns.html 10HOMEPAGE= http://cr.yp.to/djbdns.html
11COMMENT= Collection of secure and reliable DNS tools 11COMMENT= Collection of secure and reliable DNS tools
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14MANPAGES= ${DISTNAME}-man-20031023.tar.gz 14MANPAGES= ${DISTNAME}-man-20031023.tar.gz
15SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/ 15SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
19 19
20# We change conf-home from the default "/usr/local" and don't 20# We change conf-home from the default "/usr/local" and don't
21# provide compatibility symlinks. We also patch to honor PKG_SYSCONFDIR 21# provide compatibility symlinks. We also patch to honor PKG_SYSCONFDIR
22# and to set reasonable permissions on standard pkgsrc directories. 22# and to set reasonable permissions on standard pkgsrc directories.
23# This no longer affects distributability, as djbdns is public domain. 23# This no longer affects distributability, as djbdns is public domain.
24DJB_RESTRICTED= no 24DJB_RESTRICTED= no
25 25
26EGDIR= ${PREFIX}/share/examples/djbdns 26EGDIR= ${PREFIX}/share/examples/djbdns
27CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 27CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
28MAKE_DIRS+= ${PKG_SYSCONFDIR} 28MAKE_DIRS+= ${PKG_SYSCONFDIR}
29CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global 29CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
30PLIST_SRC= ${PKGDIR}/PLIST 30PLIST_SRC= ${PKGDIR}/PLIST
31 31
32INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns 32INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns
33 33
34post-install: 34post-install:
35 cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do \ 35 cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do \
36 for j in *.$$i; do ${INSTALL_MAN} $$j \ 36 for j in *.$$i; do ${INSTALL_MAN} $$j \
37 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \ 37 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \
38 done 38 done
39 39
40.include "../../mk/djbware.mk" 40.include "../../mk/djbware.mk"
41.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/djbdns/Attic/PLIST.inet6 (expand / switch to unified diff)

--- pkgsrc/net/djbdns/Attic/PLIST.inet6 2004/09/01 20:07:35 1.1
+++ pkgsrc/net/djbdns/Attic/PLIST.inet6 2011/06/09 00:55:40 1.2
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
1@comment $NetBSD: PLIST.inet6,v 1.1 2004/09/01 20:07:35 schmonz Exp $ 1@comment $NetBSD: PLIST.inet6,v 1.2 2011/06/09 00:55:40 schmonz Exp $
2bin/dnsip6 2bin/dnsip6
 3bin/dnsip6q
cvs diff -r1.18 -r1.19 pkgsrc/net/djbdns/distinfo (expand / switch to unified diff)

--- pkgsrc/net/djbdns/distinfo 2010/03/15 17:31:57 1.18
+++ pkgsrc/net/djbdns/distinfo 2011/06/09 00:55:40 1.19
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.18 2010/03/15 17:31:57 schmonz Exp $ 1$NetBSD: distinfo,v 1.19 2011/06/09 00:55:40 schmonz Exp $
2 2
3SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d 3SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
4RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed 4RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
5Size (djbdns-1.05.tar.gz) = 85648 bytes 5Size (djbdns-1.05.tar.gz) = 85648 bytes
6SHA1 (djbdns-1.05-man-20031023.tar.gz) = 3bac8a34a4bc681b9a0e603a77fa11492619e3ce 6SHA1 (djbdns-1.05-man-20031023.tar.gz) = 3bac8a34a4bc681b9a0e603a77fa11492619e3ce
7RMD160 (djbdns-1.05-man-20031023.tar.gz) = 42a5b3305513851dfe1da46df6f405bc81602fbe 7RMD160 (djbdns-1.05-man-20031023.tar.gz) = 42a5b3305513851dfe1da46df6f405bc81602fbe
8Size (djbdns-1.05-man-20031023.tar.gz) = 17170 bytes 8Size (djbdns-1.05-man-20031023.tar.gz) = 17170 bytes
9SHA1 (djbdns-1.05-ipv6.diff.bz2) = 225484ea34f8cdefa501e22640c67d093d2f5169 9SHA1 (djbdns-1.05-test23.diff.bz2) = 34251597d211ff00791cb6546e8ef60d75ce5477
10RMD160 (djbdns-1.05-ipv6.diff.bz2) = 9c6e0087d4b99620775224d66b06f148fc016e53 10RMD160 (djbdns-1.05-test23.diff.bz2) = 33037f2a41abb49c305f3efec4402c6965c8b8b8
11Size (djbdns-1.05-ipv6.diff.bz2) = 7306 bytes 11Size (djbdns-1.05-test23.diff.bz2) = 18480 bytes
12SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d 12SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
13RMD160 (djbdns-1.05-ignoreip2.patch) = bf8a0d38ae7bfb09a8ab2a04600680613db10aaa 13RMD160 (djbdns-1.05-ignoreip2.patch) = bf8a0d38ae7bfb09a8ab2a04600680613db10aaa
14Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes 14Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes
15SHA1 (djbdns-cachestats.patch) = ab0b2835140768d89159d5564534d39520d7f403 15SHA1 (djbdns-cachestats.patch) = ab0b2835140768d89159d5564534d39520d7f403
16RMD160 (djbdns-cachestats.patch) = e09994d84573e781ce18b59f909f8bd013de5d8e 16RMD160 (djbdns-cachestats.patch) = e09994d84573e781ce18b59f909f8bd013de5d8e
17Size (djbdns-cachestats.patch) = 2341 bytes 17Size (djbdns-cachestats.patch) = 2341 bytes
18SHA1 (0001-dnscache-merge-similar-outgoing-queries.patch) = 8dd3ce7758d3a97cafbe6a60ea83f48e916f496d 18SHA1 (0001-dnscache-merge-similar-outgoing-queries.patch) = 8dd3ce7758d3a97cafbe6a60ea83f48e916f496d
19RMD160 (0001-dnscache-merge-similar-outgoing-queries.patch) = c416dd6575819cfd40ef0d306ccb14d34a5afc90 19RMD160 (0001-dnscache-merge-similar-outgoing-queries.patch) = c416dd6575819cfd40ef0d306ccb14d34a5afc90
20Size (0001-dnscache-merge-similar-outgoing-queries.patch) = 9914 bytes 20Size (0001-dnscache-merge-similar-outgoing-queries.patch) = 9914 bytes
21SHA1 (0002-dnscache-cache-soa-records.patch) = ac9b6a62c62588205cc4dc71da4e0ad6630f9635 21SHA1 (0002-dnscache-cache-soa-records.patch) = ac9b6a62c62588205cc4dc71da4e0ad6630f9635
22RMD160 (0002-dnscache-cache-soa-records.patch) = 0b58e57bc11b36113c5fef73a64c869895f83889 22RMD160 (0002-dnscache-cache-soa-records.patch) = 0b58e57bc11b36113c5fef73a64c869895f83889
23Size (0002-dnscache-cache-soa-records.patch) = 2944 bytes 23Size (0002-dnscache-cache-soa-records.patch) = 2944 bytes
24SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa 24SHA1 (patch-aa) = 873897ad6b97baff363874a6a79c8da44383c283
25SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1 25SHA1 (patch-ab) = 874af27489ad4597e213cfe05a7f2f919081db20
26SHA1 (patch-ac) = 1d5ab2c90a2c4221bc7ec08d116d3d23799bd5d6 26SHA1 (patch-ac) = 4f089b63664b7e4685b77fc55b287860c8c68229
27SHA1 (patch-ad) = 4f3543ff6c2778001c81197c797303929501f66c 27SHA1 (patch-ad) = 0dffb59090ccb4977c65885f062eb37255ccd0d9
cvs diff -r1.14 -r1.15 pkgsrc/net/djbdns/options.mk (expand / switch to unified diff)

--- pkgsrc/net/djbdns/options.mk 2009/05/03 11:28:41 1.14
+++ pkgsrc/net/djbdns/options.mk 2011/06/09 00:55:40 1.15
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: options.mk,v 1.14 2009/05/03 11:28:41 wiz Exp $ 1# $NetBSD: options.mk,v 1.15 2011/06/09 00:55:40 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns 3PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns
4PKG_SUPPORTED_OPTIONS+= inet6 djbdns-cachestats djbdns-ignoreip2 4PKG_SUPPORTED_OPTIONS+= inet6 djbdns-cachestats djbdns-ignoreip2
5PKG_SUPPORTED_OPTIONS+= djbdns-tinydns64 5PKG_SUPPORTED_OPTIONS+= djbdns-tinydns64
6PKG_OPTIONS_OPTIONAL_GROUPS= qmerge 6PKG_OPTIONS_OPTIONAL_GROUPS= qmerge
7PKG_OPTIONS_GROUP.qmerge= djbdns-qmerge1 djbdns-qmerge2 7PKG_OPTIONS_GROUP.qmerge= djbdns-qmerge1 djbdns-qmerge2
8PKG_SUGGESTED_OPTIONS+= djbdns-qmerge2 8PKG_SUGGESTED_OPTIONS+= djbdns-qmerge2
9 9
10 10
11.if ${MACHINE_ARCH} == "sparc64" || \ 11.if ${MACHINE_ARCH} == "sparc64" || \
12 ${MACHINE_ARCH} == "alpha" || \ 12 ${MACHINE_ARCH} == "alpha" || \
13 ${MACHINE_ARCH} == "x86_64" 13 ${MACHINE_ARCH} == "x86_64"
14PKG_SUGGESTED_OPTIONS+= djbdns-tinydns64 14PKG_SUGGESTED_OPTIONS+= djbdns-tinydns64
15.endif 15.endif
16 16
17.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
18 18
19.if !empty(PKG_OPTIONS:Minet6) 19.if !empty(PKG_OPTIONS:Minet6)
20IPV6_PATCH= djbdns-1.05-ipv6.diff.bz2 20IPV6_PATCH= djbdns-1.05-test23.diff.bz2
21PATCHFILES+= ${IPV6_PATCH} 21PATCHFILES+= ${IPV6_PATCH}
22SITES.${IPV6_PATCH}= http://www.fefe.de/dns/ 22SITES.${IPV6_PATCH}= http://www.fefe.de/dns/
23PATCH_DIST_STRIP.${IPV6_PATCH}= -p1 23PATCH_DIST_STRIP.${IPV6_PATCH}= -p1
24PLIST_SRC+= ${PKGDIR}/PLIST.inet6 24PLIST_SRC+= ${PKGDIR}/PLIST.inet6
25.endif 25.endif
26 26
27.if !empty(PKG_OPTIONS:Mdjbdns-cachestats) 27.if !empty(PKG_OPTIONS:Mdjbdns-cachestats)
28CACHESTATS_PATCH= djbdns-cachestats.patch 28CACHESTATS_PATCH= djbdns-cachestats.patch
29PATCHFILES+= ${CACHESTATS_PATCH} 29PATCHFILES+= ${CACHESTATS_PATCH}
30SITES.${CACHESTATS_PATCH}= http://romana.now.ie/software/ 30SITES.${CACHESTATS_PATCH}= http://romana.now.ie/software/
31PATCH_DIST_STRIP.${CACHESTATS_PATCH}= -p1 31PATCH_DIST_STRIP.${CACHESTATS_PATCH}= -p1
32.endif 32.endif
33 33
cvs diff -r1.2 -r1.3 pkgsrc/net/djbdns/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/djbdns/patches/Attic/patch-aa 2004/09/01 20:07:35 1.2
+++ pkgsrc/net/djbdns/patches/Attic/patch-aa 2011/06/09 00:55:41 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.2 2004/09/01 20:07:35 schmonz Exp $ 1$NetBSD: patch-aa,v 1.3 2011/06/09 00:55:41 schmonz Exp $
 2
 3PKG_SYSCONFDIR support.
2 4
3--- dnscache-conf.c.orig 2001-02-11 16:11:45.000000000 -0500 5--- dnscache-conf.c.orig 2001-02-11 16:11:45.000000000 -0500
4+++ dnscache-conf.c 6+++ dnscache-conf.c
5@@ -89,13 +89,13 @@ int main(int argc,char **argv) 7@@ -89,13 +89,13 @@ int main(int argc,char **argv)
6 if (chdir(auto_home) == -1) 8 if (chdir(auto_home) == -1)
7 strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": "); 9 strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");
8  10
9- fdrootservers = open_read("/etc/dnsroots.local"); 11- fdrootservers = open_read("/etc/dnsroots.local");
10+ fdrootservers = open_read(PKG_SYSCONFDIR"/dnsroots.local"); 12+ fdrootservers = open_read(PKG_SYSCONFDIR"/dnsroots.local");
11 if (fdrootservers == -1) { 13 if (fdrootservers == -1) {
12 if (errno != error_noent) 14 if (errno != error_noent)
13- strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: "); 15- strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
14- fdrootservers = open_read("/etc/dnsroots.global"); 16- fdrootservers = open_read("/etc/dnsroots.global");
cvs diff -r1.2 -r1.3 pkgsrc/net/djbdns/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/djbdns/patches/Attic/patch-ab 2004/09/01 20:07:35 1.2
+++ pkgsrc/net/djbdns/patches/Attic/patch-ab 2011/06/09 00:55:41 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.2 2004/09/01 20:07:35 schmonz Exp $ 1$NetBSD: patch-ab,v 1.3 2011/06/09 00:55:41 schmonz Exp $
 2
 3PKG_SYSCONFDIR support.
2 4
3--- hier.c.orig 2004-07-23 17:55:45.000000000 -0400 5--- hier.c.orig 2004-07-23 17:55:45.000000000 -0400
4+++ hier.c 6+++ hier.c
5@@ -2,10 +2,10 @@ 7@@ -2,10 +2,10 @@
6  8
7 void hier() 9 void hier()
8 { 10 {
9- c("/","etc","dnsroots.global",-1,-1,0644); 11- c("/","etc","dnsroots.global",-1,-1,0644);
10+ c(auto_home,"share/examples/djbdns","dnsroots.global",-1,-1,0644); 12+ c(auto_home,"share/examples/djbdns","dnsroots.global",-1,-1,0644);
11  13
12- h(auto_home,-1,-1,02755); 14- h(auto_home,-1,-1,02755);
13- d(auto_home,"bin",-1,-1,02755); 15- d(auto_home,"bin",-1,-1,02755);
14+ h(auto_home,-1,-1,0755); 16+ h(auto_home,-1,-1,0755);
cvs diff -r1.5 -r1.6 pkgsrc/net/djbdns/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/djbdns/patches/Attic/patch-ac 2009/04/22 04:48:13 1.5
+++ pkgsrc/net/djbdns/patches/Attic/patch-ac 2011/06/09 00:55:41 1.6
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ac,v 1.5 2009/04/22 04:48:13 schmonz Exp $ 1$NetBSD: patch-ac,v 1.6 2011/06/09 00:55:41 schmonz Exp $
 2
 3Fix the security hole found by Matthew Dempsky.
2 4
3--- response.c.orig 2001-02-11 16:11:45.000000000 -0500 5--- response.c.orig 2001-02-11 16:11:45.000000000 -0500
4+++ response.c 6+++ response.c
5@@ -34,7 +34,7 @@ int response_addname(const char *d) 7@@ -34,7 +34,7 @@ int response_addname(const char *d)
6 uint16_pack_big(buf,49152 + name_ptr[i]); 8 uint16_pack_big(buf,49152 + name_ptr[i]);
7 return response_addbytes(buf,2); 9 return response_addbytes(buf,2);
8 } 10 }
9- if (dlen <= 128) 11- if (dlen <= 128)
10+ if ((dlen <= 128) && (response_len < 16384)) 12+ if ((dlen <= 128) && (response_len < 16384))
11 if (name_num < NAMES) { 13 if (name_num < NAMES) {
12 byte_copy(name[name_num],dlen,d); 14 byte_copy(name[name_num],dlen,d);
13 name_ptr[name_num] = response_len; 15 name_ptr[name_num] = response_len;
cvs diff -r1.3 -r1.4 pkgsrc/net/djbdns/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/djbdns/patches/Attic/patch-ad 2010/03/15 17:31:57 1.3
+++ pkgsrc/net/djbdns/patches/Attic/patch-ad 2011/06/09 00:55:41 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ad,v 1.3 2010/03/15 17:31:57 schmonz Exp $ 1$NetBSD: patch-ad,v 1.4 2011/06/09 00:55:41 schmonz Exp $
 2
 3DESTDIR support.
2 4
3--- Makefile.orig 2001-02-11 21:11:45.000000000 +0000 5--- Makefile.orig 2001-02-11 21:11:45.000000000 +0000
4+++ Makefile 6+++ Makefile
5@@ -29,6 +29,14 @@ auto-str.o: \ 7@@ -29,6 +29,14 @@ auto-str.o: \
6 compile auto-str.c buffer.h exit.h 8 compile auto-str.c buffer.h exit.h
7 ./compile auto-str.c 9 ./compile auto-str.c
8  10
9+auto_destdir.c: \ 11+auto_destdir.c: \
10+auto-str conf-destdir 12+auto-str conf-destdir
11+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c 13+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
12+ 14+
13+auto_destdir.o: \ 15+auto_destdir.o: \
14+compile auto_destdir.c 16+compile auto_destdir.c