Index: head/dns/adns/Makefile =================================================================== --- head/dns/adns/Makefile (revision 385758) +++ head/dns/adns/Makefile (revision 385759) @@ -1,51 +1,52 @@ # Created by: Kostya Lukin # $FreeBSD$ PORTNAME= adns PORTVERSION= 1.5.0 CATEGORIES= dns MASTER_SITES= http://www.chiark.greenend.org.uk/~ian/adns/ftp/ MAINTAINER= pi@FreeBSD.org COMMENT= Easy to use asynchronous-capable DNS client library and utilities LICENSE= GPLv3 USES= gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes +PORTSCOUT= skipv:1.5.0~rc1 LIBVERSION= 1 PLIST_SUB+= LIBVERSION="${LIBVERSION}" BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4 CFLAGS+= -Ds6_addr16=__u6_addr.__u6_addr16 CFLAGS+= -Ds6_addr32=__u6_addr.__u6_addr32 MAKE_FLAGS+= M4=gm4 DOCS= COPYING GPL-vs-LGPL INSTALL README \ README.html TODO changelog TOSTRIP= bin/adnsheloex \ bin/adnsresfilter \ bin/adnslogres \ bin/adnshost \ lib/libadns.so.1 OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= DOCS .include .if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .endif post-stage: .for f in ${TOSTRIP} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor .include Index: head/dns/adns/files/patch-cname-chains =================================================================== --- head/dns/adns/files/patch-cname-chains (revision 385758) +++ head/dns/adns/files/patch-cname-chains (nonexistent) @@ -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", Property changes on: head/dns/adns/files/patch-cname-chains ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/adns/files/patch-client-Makefile.in =================================================================== --- head/dns/adns/files/patch-client-Makefile.in (revision 385758) +++ head/dns/adns/files/patch-client-Makefile.in (revision 385759) @@ -1,14 +1,14 @@ ---- 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) - mkdir -p $(bindir) + mkdir -p $(DESTDIR)$(bindir) set -xe; for f in $(TARG_INSTALL); \ - do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done + do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done uninstall: for f in $(TARGETS); do rm -f $(bindir)/$$f; done Index: head/dns/adns/files/patch-configure =================================================================== --- head/dns/adns/files/patch-configure (revision 385758) +++ head/dns/adns/files/patch-configure (revision 385759) @@ -1,11 +1,11 @@ ---- 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)' -SHLIBFILE='$(SHLIBSONAME).$(MINOR)' +SHLIBFILE='$(SHLIBSONAME)' SHLIBCC='$(CC) $(CFLAGS) -fpic' MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o' Index: head/dns/adns/files/patch-configure.in =================================================================== --- head/dns/adns/files/patch-configure.in (revision 385758) +++ head/dns/adns/files/patch-configure.in (revision 385759) @@ -1,11 +1,11 @@ ---- 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)' -SHLIBFILE='$(SHLIBSONAME).$(MINOR)' +SHLIBFILE='$(SHLIBSONAME)' SHLIBCC='$(CC) $(CFLAGS) -fpic' MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o' Index: head/dns/adns/files/patch-dynamic-Makefile.in =================================================================== --- head/dns/adns/files/patch-dynamic-Makefile.in (revision 385758) +++ head/dns/adns/files/patch-dynamic-Makefile.in (revision 385759) @@ -1,16 +1,16 @@ ---- 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: - mkdir -p $(libdir) - $(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE) - ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME) - ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK) + mkdir -p $(DESTDIR)$(libdir) + $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE) + (cd $(DESTDIR)$(libdir) && ln -sf $(SHLIBSONAME) $(SHLIBFORLINK)) uninstall: rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME) Index: head/dns/adns/files/patch-regress-Makefile.in =================================================================== --- head/dns/adns/files/patch-regress-Makefile.in (revision 385758) +++ head/dns/adns/files/patch-regress-Makefile.in (revision 385759) @@ -1,11 +1,11 @@ ---- 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@ -CLIENTS= adnstest adnshost adnslogres $(PROGS_SYSDEP) +CLIENTS= adnstest adnslogres $(PROGS_SYSDEP) AUTOCHDRS= harness.h hsyscalls.h hredirect.h AUTOCSRCS= hrecord.c hplayback.c hcommon.c include ../settings.make Index: head/dns/adns/files/patch-src-Makefile.in =================================================================== --- head/dns/adns/files/patch-src-Makefile.in (revision 385758) +++ head/dns/adns/files/patch-src-Makefile.in (revision 385759) @@ -1,16 +1,16 @@ ---- 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) + mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) set -xe; for f in $(TARGETS); \ - do $(INSTALL_DATA) $$f $(libdir)/$$f; done - $(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h + do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done + $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h uninstall: for f in $(TARGETS); do rm -f $(libdir)/$$f; done