ports/164833: Update: dns/djbdns to support DNSCurve

[David Thiel]

>Number:         164833
>Category:       ports
>Synopsis:       Update: dns/djbdns to support DNSCurve
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 06 22:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     David Thiel
>Release:        FreeBSD 8.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:45:57 UTC 2011 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

This updates djbdns to support DNSCurve, with Michael Dempsky's patch. I've 
tested compatibility with other patches and marked BROKEN accordingly. A 
PORTREVISION bump would probably be appropriate as well.

>How-To-Repeat:
>Fix:

diff -ruN djbdns.bak/Makefile djbdns/Makefile
--- djbdns.bak/Makefile	2009-09-04 07:09:27.000000000 -0700
+++ djbdns/Makefile	2011-10-03 16:10:54.499758591 -0700
@@ -26,13 +26,15 @@
 		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 \
+		DNSCURVE	"DNSCurve support by Matthew Dempsky" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_JUMBO)
-.if defined(WITH_IPV6) || defined(WITH_IGNOREIP) || defined(WITH_SRV)
-BROKEN=		The jumbo patch currently conflicts with the IPv6, ignoreip2, and SRV patches
+.if defined(WITH_IPV6) || defined(WITH_IGNOREIP) || defined(WITH_SRV) || \
+	defined(WITH_DNSCURVE)
+BROKEN=		The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and DNSCURVE patches
 .endif
 
 PATCH_SITES+=	http://people.FreeBSD.org/~roam/ports/dns/djbdns/:jumbo \
@@ -99,6 +101,18 @@
 PATCH_DIST_STRIP=	-p1
 .endif
 
+.if defined(WITH_DNSCURVE)
+.if defined(WITH_IPV6)
+BROKEN=	The IPv6 and DNSCurve patches are currently in conflict
+.endif
+PATCH_SITES+=	http://shinobi.dempsky.org/~matthew/patches/:dnscurve
+PATCHFILES+=	djbdns-dnscurve-20090602.patch:dnscurve
+PATCH_DIST_STRIP=	-p1
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+BUILD_DEPENDS+=	nacl-sha256:${PORTSDIR}/security/nacl
+.endif
+
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test23
 
@@ -113,7 +127,7 @@
 
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@echo "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
+	@echo "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
 .if defined(WITH_MAN)
diff -ruN djbdns.bak/distinfo djbdns/distinfo
--- djbdns.bak/distinfo	2011-10-03 16:16:19.449800776 -0700
+++ djbdns/distinfo	2011-10-03 16:13:09.959777113 -0700
@@ -14,3 +14,5 @@
 SIZE (tinydns-persistmmap-20040418.patch) = 920
 SHA256 (srv-patch) = 779546218b09544493c6ba5e23bc29c33c5d284cfc78ac6fa74fa8e050bb3779
 SIZE (srv-patch) = 4508
+SHA256 (djbdns-dnscurve-20090602.patch) = 7efc54bd1981d0eb920de02b97f9b152c57e6add8023c9b82566358dc9525bba
+SIZE (djbdns-dnscurve-20090602.patch) = 26674
>Release-Note:
>Audit-Trail:
>Unformatted: