The following diff adds a dns64 FLAVOR to the Unbound port to integrate the
DNS64 support as provided by the Ecdysis project.

Caveat.. do not run with the malloc flags J or U and thus also S.
This seems to expose bugs in the new code.

Anyone who would be better at tracking down such bugs interested
in trying to find the root cause and fix them?

I noticed a similar diff was posted back in 2011 for Unbound
1.4.9 but it never actually went in.

OK?


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/unbound/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile    24 Mar 2013 21:33:24 -0000      1.50
+++ Makefile    11 Apr 2013 18:28:22 -0000
@@ -3,9 +3,11 @@
 COMMENT=       validating DNS resolver
 
 DISTNAME=      unbound-1.4.20
+REVISION=      0
 CATEGORIES=    net
 
 MASTER_SITES=  http://www.unbound.net/downloads/
+MASTER_SITES0= http://comstyle.com/source/
 HOMEPAGE=      http://www.unbound.net/
 
 MAINTAINER=     Jakob Schlyter <ja...@openbsd.org>
@@ -33,6 +35,16 @@ CONFIGURE_ARGS+=     --enable-allsymbols \
                        --with-pidfile=/var/unbound/var/run/unbound.pid \
                        --with-conf-file=/var/unbound/etc/unbound.conf \
                        --with-username=_unbound
+
+FLAVORS=       dns64
+FLAVOR?=
+
+.if ${FLAVOR:Mdns64}
+PATCHFILES=    unbound-1.4.20-dns64.diff.bz2:0
+PATCH_DIST_STRIP= -p1
+.endif
+
+SUPDISTFILES=  unbound-1.4.20-dns64.diff.bz2:0
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/unbound
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/unbound/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo    24 Mar 2013 21:33:24 -0000      1.30
+++ distinfo    11 Apr 2013 18:28:29 -0000
@@ -1,2 +1,4 @@
+SHA256 (unbound-1.4.20-dns64.diff.bz2) = 
SJ7x7Asg78BqUVczNXoqETyTeltYqX8waZ4koRkGQYU=
 SHA256 (unbound-1.4.20.tar.gz) = FFJwAjB4c+VXNIpNdrYqwDaTfZwwM2EKhCUBjDeftW4=
+SIZE (unbound-1.4.20-dns64.diff.bz2) = 53002
 SIZE (unbound-1.4.20.tar.gz) = 3613963
Index: pkg/DESCR
===================================================================
RCS file: /home/cvs/ports/net/unbound/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   23 May 2008 06:52:21 -0000      1.1.1.1
+++ pkg/DESCR   10 Apr 2013 23:53:56 -0000
@@ -1,2 +1,5 @@
 Unbound is an implementation of a recursive DNS resolver, that does caching
 and DNSSEC validation.
+
+Flavors:
+        dns64 - Build with DNS64 support
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared    23 May 2008 06:52:21 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/05/23 06:52:21 jakob Exp $
-@lib lib/libunbound.so.${LIBunbound_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/unbound/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   12 Dec 2012 16:00:34 -0000      1.9
+++ pkg/PLIST   11 Apr 2013 00:07:50 -0000
@@ -1,10 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.9 2012/12/12 16:00:34 sthen Exp $
 @newgroup _unbound:601
 @newuser _unbound:601:601:daemon:Unbound Daemon:/var/unbound:/sbin/nologin
-%%SHARED%%
 include/unbound.h
 lib/libunbound.a
 lib/libunbound.la
+@lib lib/libunbound.so.${LIBunbound_VERSION}
 @man man/man1/unbound-host.1
 @man man/man3/libunbound.3
 @man man/man3/ub_cancel.3

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply via email to