8 files changed, 20 insertions, 75 deletions

diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 0ceaf5683f85..afbfde1ab8a9 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv3
 USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+PORTSCOUT=	skipv:1.5.0~rc1
 
 LIBVERSION=	1
 PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
diff --git a/dns/adns/files/patch-client-Makefile.in b/dns/adns/files/patch-client-Makefile.in
index 8dfac29317cc..ab9ed11bd8b5 100644
--- a/dns/adns/files/patch-client-Makefile.in
+++ b/dns/adns/files/patch-client-Makefile.in
@@ -1,6 +1,6 @@
---- client/Makefile.in.orig	2006-05-10 12:58:02.000000000 +0200
-+++ client/Makefile.in	2013-10-09 10:56:22.929654486 +0200
-@@ -58,9 +58,9 @@
+--- client/Makefile.in.orig	2014-10-19 23:07:01 UTC
++++ client/Makefile.in
+@@ -58,9 +58,9 @@ ALL_OBJS=	$(ADH_OBJS) $(TARG_OBJS)
  all:		$(TARGETS)
  
  install:	$(TARG_INSTALL)
diff --git a/dns/adns/files/patch-cname-chains b/dns/adns/files/patch-cname-chains
deleted file mode 100644
index 4958d48eafd8..000000000000
--- a/dns/adns/files/patch-cname-chains
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: src/query.c
-===================================================================
---- src/query.c	(revision 14)
-+++ src/query.c	(working copy)
-@@ -63,6 +63,10 @@
- 
-   qu->cname_dgram= 0;
-   qu->cname_dglen= qu->cname_begin= 0;
-+  /* Patch to allow CNAME chains */
-+  /* Credits: Brad Spencer, see http://www.chiark.greenend.org.uk/pipermail/adns-discuss/2006/001161.html */
-+  /* Allow CNAME chains up to some sane limit */
-+  qu->cname_alias_hops_left = 10;
- 
-   adns__vbuf_init(&qu->search_vb);
-   qu->search_origlen= qu->search_pos= qu->search_doneabs= 0;
-Index: src/internal.h
-===================================================================
---- src/internal.h	(revision 14)
-+++ src/internal.h	(working copy)
-@@ -231,6 +231,11 @@
-   int cname_dglen, cname_begin;
-   /* If non-0, has been allocated using . */
- 
-+  /* Patch to allow CNAME chains */
-+  /* Credits: Brad Spencer, see http://www.chiark.greenend.org.uk/pipermail/adns-discuss/2006/001161.html */
-+  int cname_alias_hops_left;
-+  /* The number of cname alias hops we will allow */
-+
-   vbuf search_vb;
-   int search_origlen, search_pos, search_doneabs;
-   /* Used by the searching algorithm.  The query domain in textual form
-Index: src/reply.c
-===================================================================
---- src/reply.c	(revision 14)
-+++ src/reply.c	(working copy)
-@@ -190,12 +190,17 @@
-       if (qu->flags & adns_qf_cname_forbid) {
- 	adns__query_fail(qu,adns_s_prohibitedcname);
- 	return;
--      } else if (qu->cname_dgram) { /* Ignore second and subsequent CNAME(s) */
-+      }
-+
-+    /* Patch to allow CNAME chains */
-+    /* Credits: Brad Spencer, see http://www.chiark.greenend.org.uk/pipermail/adns-discuss/2006/001161.html */
-+    else if (qu->cname_dgram && --(qu->cname_alias_hops_left) <= 0) { /* Don't follow "too long" CNAME chains */
- 	adns__debug(ads,serv,qu,"allegedly canonical name %s"
--		    " is actually alias for %s", qu->answer->cname,
-+           " is actually alias for %s and aliases too deep",
-+                    qu->answer->cname,
- 		    adns__diag_domain(ads,serv,qu, &qu->vb,
- 				      dgram,dglen,rdstart));
--	adns__query_fail(qu,adns_s_prohibitedcname);
-+    adns__query_fail(qu,adns_s_norecurse);
- 	return;
-       } else if (wantedrrs) { /* Ignore CNAME(s) after RR(s). */
- 	adns__debug(ads,serv,qu,"ignoring CNAME (to %s) coexisting with RR",
diff --git a/dns/adns/files/patch-configure b/dns/adns/files/patch-configure
index cb1c4952408c..a015d2cf86b2 100644
--- a/dns/adns/files/patch-configure
+++ b/dns/adns/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr 20 13:27:46 2006
-+++ configure	Thu Apr 20 13:27:51 2006
-@@ -1728,7 +1728,7 @@
+--- configure.orig	2014-10-26 13:22:06 UTC
++++ configure
+@@ -4047,7 +4047,7 @@ $as_echo "no" >&6; }
  
  SHLIBFORLINK='libadns.so'
  SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
diff --git a/dns/adns/files/patch-configure.in b/dns/adns/files/patch-configure.in
index 74b94f6d1b02..0c80994e20fa 100644
--- a/dns/adns/files/patch-configure.in
+++ b/dns/adns/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu Apr 20 12:46:10 2006
-+++ configure.in	Thu Apr 20 12:56:21 2006
-@@ -140,7 +140,7 @@
+--- configure.in.orig	2014-10-20 00:14:40 UTC
++++ configure.in
+@@ -140,7 +140,7 @@ AC_SUBST(SHLIBSONAME)
  
  SHLIBFORLINK='libadns.so'
  SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
diff --git a/dns/adns/files/patch-dynamic-Makefile.in b/dns/adns/files/patch-dynamic-Makefile.in
index a6736b810b71..178049c73711 100644
--- a/dns/adns/files/patch-dynamic-Makefile.in
+++ b/dns/adns/files/patch-dynamic-Makefile.in
@@ -1,6 +1,6 @@
---- dynamic/Makefile.in.orig	2006-05-10 12:58:02.000000000 +0200
-+++ dynamic/Makefile.in	2013-10-09 10:55:03.235655634 +0200
-@@ -30,10 +30,9 @@
+--- dynamic/Makefile.in.orig	2014-10-19 23:07:01 UTC
++++ dynamic/Makefile.in
+@@ -30,10 +30,9 @@ include		$(srcdir)/../src/adns.make
  ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
  
  install:
diff --git a/dns/adns/files/patch-regress-Makefile.in b/dns/adns/files/patch-regress-Makefile.in
index bb6c0defb518..e882d762fe3f 100644
--- a/dns/adns/files/patch-regress-Makefile.in
+++ b/dns/adns/files/patch-regress-Makefile.in
@@ -1,6 +1,6 @@
---- regress/Makefile.in.orig	2014-10-25 13:43:05.000000000 +0200
-+++ regress/Makefile.in	2014-10-25 13:43:08.000000000 +0200
-@@ -25,7 +25,7 @@
+--- regress/Makefile.in.orig	2014-10-26 12:03:41 UTC
++++ regress/Makefile.in
+@@ -25,7 +25,7 @@ VPATH=		@srcdir@
  
  PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
  
diff --git a/dns/adns/files/patch-src-Makefile.in b/dns/adns/files/patch-src-Makefile.in
index 66a1186f60d4..876cabb1dc07 100644
--- a/dns/adns/files/patch-src-Makefile.in
+++ b/dns/adns/files/patch-src-Makefile.in
@@ -1,7 +1,7 @@
---- src/Makefile.in.orig	2006-05-10 12:58:03.000000000 +0200
-+++ src/Makefile.in	2013-10-09 10:46:18.314690101 +0200
-@@ -28,10 +28,10 @@
- include		adns.make
+--- src/Makefile.in.orig	2014-10-19 23:07:03 UTC
++++ src/Makefile.in
+@@ -30,10 +30,10 @@ include		$(srcdir)/adns.make
+ DIRCFLAGS=	-I. -I$(srcdir)
  
  install:
 -		mkdir -p $(libdir) $(includedir)