FreeBSD Port: djbdns-1.05_13

[Rick]

Hello,

There are some patches to djbdns to fix some very well explained issues
at
http://homepage.ntlworld.com./jonathan.deboynepollard/FGA/djbdns-problems.html
that I think would be useful to have as config options.  Particularly
the following:

1) Detect and report semantic errors in the data file that tinydns-data
ignores but will result in unexpected DNS behavior
2) Fix client-side alias publishing in tinydns and axfrdns
3) fix handling/caching of CNAME records in dnscache
4) modify "forwardonly" mode to prevent proxy loops and behave as a true
forwarding proxy

If you agree, I've updated the port accordingly and attached the diff
for review.

Regards,
Rick
-------------- next part --------------
diff -ruN djbdns.orig/Makefile djbdns/Makefile
--- djbdns.orig/Makefile	2009-09-04 07:09:27.000000000 -0700
+++ djbdns/Makefile	2010-12-09 05:32:46.137403379 -0800
@@ -7,7 +7,7 @@
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	13
+PORTREVISION?=	14
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
@@ -26,7 +26,11 @@
 		JUMBO		"jumbo patch by Claudiu Costin" off \
 		MAN		"manual pages by Gerritt Pape" on \
 		PERSISTENT_MMAP	"persistent mmap patch by Lennert Buytenhek" off \
-		SRV		"SRV record patch by Michael Handler" off
+		SRV		"SRV record patch by Michael Handler" off \
+		REPORT_ERRORS	"report semantic errors in the data file" off \
+		CNAME_FIX	"fix deficiencies in handling CNAME records" off \
+		CNAME_PUBLISH	"publish alises according to RFC1034 4.3.2" off \
+		FWD_PROXY_PATCH	"ignore referrals when 'forwardonly' is set" off
 
 .include <bsd.port.pre.mk>
 
@@ -99,6 +103,29 @@
 PATCH_DIST_STRIP=	-p1
 .endif
 
+.if defined(WITH_REPORT_ERRORS)
+PATCH_SITES+=	http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/djbdns/:semantic
+PATCHFILES+=	tinydns-data-semantic-error.patch:semantic
+.endif
+
+.if defined(WITH_CNAME_FIX)
+PATCH_SITES+=	http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/djbdns/:cname
+PATCHFILES+=	dnscache-cname-handling.patch:cname
+PATCH_DIST_STRIP=	-p1
+.endif
+
+.if defined(WITH_CNAME_PUBLISH)
+PATCH_SITES+=	http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/djbdns/:publish
+PATCHFILES+=	tinydns-alias-chain-truncation.patch:publish
+PATCH_DIST_STRIP=	-p1
+.endif
+
+.if defined(WITH_FWD_PROXY_PATCH)
+PATCH_SITES+=	http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/djbdns/:proxy
+PATCHFILES+=	dnscache-strict-forwardonly.patch:proxy
+PATCH_DIST_STRIP=	-p1
+.endif
+
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test23
 
diff -ruN djbdns.orig/distinfo djbdns/distinfo
--- djbdns.orig/distinfo	2009-09-04 07:09:28.000000000 -0700
+++ djbdns/distinfo	2010-12-09 05:36:38.106734344 -0800
@@ -1,24 +1,18 @@
-MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
 SHA256 (djbdns-1.05.tar.gz) = 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
 SIZE (djbdns-1.05.tar.gz) = 85648
-MD5 (djbdns-1.05-man-20031023.tar.gz) = 14d7329cff69f604fac607436eb8485e
 SHA256 (djbdns-1.05-man-20031023.tar.gz) = ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569
 SIZE (djbdns-1.05-man-20031023.tar.gz) = 17170
-MD5 (jumbo-p13.patch.gz) = c96a7cf19968f26ff1422cd197b1a72d
-SHA256 (jumbo-p13.patch.gz) = 04397e9a5b35546ae4b5dc134142ad6cc47014791cad2284e5465f6a35a69304
-SIZE (jumbo-p13.patch.gz) = 11779
-MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
 SHA256 (patch-dnscache-dumpcache-v4.txt) = c2fbc21035fccbb3564226fc40edaa44643119b7b103483825f82786c89009f0
 SIZE (patch-dnscache-dumpcache-v4.txt) = 16065
-MD5 (djbdns-1.05-test23.diff.bz2) = dc35e88e20ffe2670cef5bb4d8a2c183
-SHA256 (djbdns-1.05-test23.diff.bz2) = e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
-SIZE (djbdns-1.05-test23.diff.bz2) = 18480
-MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865
-SHA256 (djbdns-1.05-ignoreip2.patch) = ca5d759380c316132be6680e77c37d24a5d715cd6e1c325a75c8450e01133be0
-SIZE (djbdns-1.05-ignoreip2.patch) = 3890
-MD5 (tinydns-persistmmap-20040418.patch) = c721977364502180f9563b85cecf133b
 SHA256 (tinydns-persistmmap-20040418.patch) = 9c8e685ed628ef80b92611023c098066633f7bf63be434f373edfba0a465ebb6
 SIZE (tinydns-persistmmap-20040418.patch) = 920
-MD5 (srv-patch) = df1578c70d52809184a417556f0fce39
 SHA256 (srv-patch) = 779546218b09544493c6ba5e23bc29c33c5d284cfc78ac6fa74fa8e050bb3779
 SIZE (srv-patch) = 4508
+SHA256 (tinydns-data-semantic-error.patch) = 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40
+SIZE (tinydns-data-semantic-error.patch) = 5096
+SHA256 (dnscache-cname-handling.patch) = 9ba0b4652aaff53ced6739c6586cc9e6841f14df91669e3b4e20deff1ce47e05
+SIZE (dnscache-cname-handling.patch) = 7343
+SHA256 (tinydns-alias-chain-truncation.patch) = d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb
+SIZE (tinydns-alias-chain-truncation.patch) = 1994
+SHA256 (dnscache-strict-forwardonly.patch) = 42a01e292523e82a0443ac14de9d46f824221cec0859dfd710ced4145bdfee1a
+SIZE (dnscache-strict-forwardonly.patch) = 1768