From owner-svn-ports-all@freebsd.org Thu Nov 5 15:01:31 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A608A27169; Thu, 5 Nov 2015 15:01:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DEE6F1C21; Thu, 5 Nov 2015 15:01:30 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA5F1TSo021004; Thu, 5 Nov 2015 15:01:29 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA5F1T8G020997; Thu, 5 Nov 2015 15:01:29 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201511051501.tA5F1T8G020997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 5 Nov 2015 15:01:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400855 - in head/dns: . bind9-devel bind9-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2015 15:01:31 -0000 Author: mat Date: Thu Nov 5 15:01:29 2015 New Revision: 400855 URL: https://svnweb.freebsd.org/changeset/ports/400855 Log: Add a bind9 development version, extracted from their git repository. Requested by: many Sponsored by: Absolight Added: head/dns/bind9-devel/ - copied from r400849, head/dns/bind910/ Modified: head/dns/Makefile head/dns/bind9-devel/Makefile head/dns/bind9-devel/distinfo head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl head/dns/bind9-devel/files/patch-configure head/dns/bind9-devel/files/pkg-message.in head/dns/bind9-devel/pkg-plist Modified: head/dns/Makefile ============================================================================== --- head/dns/Makefile Thu Nov 5 13:59:10 2015 (r400854) +++ head/dns/Makefile Thu Nov 5 15:01:29 2015 (r400855) @@ -10,6 +10,7 @@ SUBDIR += axfr2acl SUBDIR += bind-tools SUBDIR += bind10 + SUBDIR += bind9-devel SUBDIR += bind910 SUBDIR += bind99 SUBDIR += bindgraph Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind910/Makefile Thu Nov 5 13:14:45 2015 (r400849) +++ head/dns/bind9-devel/Makefile Thu Nov 5 15:01:29 2015 (r400855) @@ -3,37 +3,24 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} -.if defined(BIND_TOOLS_SLAVE) -# dns/bind-tools here -PORTREVISION= 1 -.else -# dns/bind910 here -PORTREVISION= 1 -.endif +PORTREVISION= 0 CATEGORIES= dns net ipv6 -MASTER_SITES= ISC/bind9/${ISCVERSION} -.if defined(BIND_TOOLS_SLAVE) -PKGNAMESUFFIX= -tools -.else -PKGNAMESUFFIX= 910 -.endif -DISTNAME= ${PORTNAME}-${ISCVERSION} +MASTER_SITES= LOCAL/mat/bind +PKGNAMESUFFIX= 9-devel +DISTNAME= ${PORTNAME}-${HASH} MAINTAINER= mat@FreeBSD.org -.if defined(BIND_TOOLS_SLAVE) -COMMENT= Command line tools from BIND: delv, dig, host, nslookup... -.else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 -.endif LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.3 +ISCVERSION= 9.11.0.a20151106 +HASH= f4b1a7e MAKE_JOBS_UNSAFE= yes -USES= cpe libedit +USES= cpe libedit tar:xz CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -50,16 +37,11 @@ CONFIGURE_ARGS+= --localstatedir=/var -- --with-libxml2=${LOCALBASE} \ --with-readline=-ledit \ --sysconfdir=${ETCDIR} -.if defined(BIND_TOOLS_SLAVE) -CONFIGURE_ARGS+= --disable-shared -.endif ETCDIR= ${PREFIX}/etc/namedb CONFLICTS+= bind9*-9.[456789].* bind9*-sdb-9.[456789].* -.if !defined(BIND_TOOLS_SLAVE) SUB_FILES= pkg-message -.endif OPTIONS_DEFAULT= IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE OPTIONS_DEFINE= IDN LARGE_FILE PYTHON START_LATE \ @@ -68,14 +50,12 @@ OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 -.if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= RRL OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS GEOIP \ MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB -.endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE @@ -119,12 +99,6 @@ MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extr FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit QUERYTRACE_CONFIGURE_ENABLE= querytrace -.if defined(BIND_TOOLS_SLAVE) -CONFLICTS+= bind910-9.10.* -.else -CONFLICTS+= bind-tools-9.* -.endif # BIND_TOOLS_SLAVE - SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USE= openssl=yes SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl @@ -215,10 +189,8 @@ CONFIGURE_ARGS+= --disable-threads PKGINSTALL= ${NONEXISTENT} PLIST_SUB+= NOBASE="" BASE="@comment " SUB_LIST+= NOBASE="" BASE="@comment " -.if !defined(BIND_TOOLS_SLAVE) USE_RC_SUBR+= named SUB_FILES+= named.conf -.endif # !defined(BIND_TOOLS_SLAVE) .if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} WITH_OPENSSL_PORT=yes .endif @@ -235,20 +207,20 @@ PKGDEINSTALL= ${PKGINSTALL} PORTDOCS= * +make-distfile: + git pull; \ + git show-ref --abbrev HEAD; \ + rev=`git rev-parse --short HEAD`; \ + git archive --format tar -o bind-$${rev}.tar --prefix bind-$${rev}/ $${rev}; \ + xz -v9 bind-$${rev}.tar + +post-extract: + echo "SRCID=${HASH}" > ${WRKSRC}/srcid + post-patch: @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \ s|readline/history.h|histedit.h|' \ ${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c -.if defined(BIND_TOOLS_SLAVE) - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ - -e 's#isc-config.sh installdirs#installdirs#' \ - -e 's#.*INSTALL.*isc-config.*##' \ - -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \ - -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in -.else . for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ @@ -256,9 +228,7 @@ post-patch: -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} . endfor -.endif -.if !defined(BIND_TOOLS_SLAVE) .if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ @@ -291,6 +261,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample -.endif # BIND_TOOLS_SLAVE - .include Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind910/distinfo Thu Nov 5 13:14:45 2015 (r400849) +++ head/dns/bind9-devel/distinfo Thu Nov 5 15:01:29 2015 (r400855) @@ -1,2 +1,2 @@ -SHA256 (bind-9.10.3.tar.gz) = 9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0 -SIZE (bind-9.10.3.tar.gz) = 8552545 +SHA256 (bind-f4b1a7e.tar.xz) = f586654809b7e7425a23934cd6a3f7e81441738d2d45800adf84ee9b4295bd35 +SIZE (bind-f4b1a7e.tar.xz) = 6799880 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind910/files/extrapatch-bind-min-override-ttl Thu Nov 5 13:14:45 2015 (r400849) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Nov 5 15:01:29 2015 (r400855) @@ -64,13 +64,12 @@ diff -Nabdur bind-9.6.0-P1.orig/lib/dns/ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) -diff -Nabdur bind-9.6.0-P1.orig/lib/isccfg/namedconf.c bind-9.6.0-P1/lib/isccfg/namedconf.c ---- lib/isccfg/namedconf.c 2009-05-22 12:24:49.000000000 +0400 -+++ lib/isccfg/namedconf.c 2009-05-22 12:31:21.000000000 +0400 -@@ -821,6 +821,8 @@ - { "lame-ttl", &cfg_type_uint32, 0 }, +--- lib/isccfg/namedconf.c.orig 2015-11-05 13:15:23 UTC ++++ lib/isccfg/namedconf.c +@@ -1676,6 +1676,8 @@ view_clauses[] = { + { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, - { "max-cache-size", &cfg_type_sizenodefault, 0 }, + { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, { "max-cache-ttl", &cfg_type_uint32, 0 }, Modified: head/dns/bind9-devel/files/patch-configure ============================================================================== --- head/dns/bind910/files/patch-configure Thu Nov 5 13:14:45 2015 (r400849) +++ head/dns/bind9-devel/files/patch-configure Thu Nov 5 15:01:29 2015 (r400855) @@ -1,6 +1,6 @@ ---- configure.orig 2015-09-09 02:23:40 UTC +--- configure.orig 2015-11-05 13:15:23 UTC +++ configure -@@ -14100,27 +14100,9 @@ done +@@ -14113,27 +14113,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14163,47 +14145,7 @@ $as_echo "no" >&6; } ;; +@@ -14176,47 +14158,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -21451,7 +21393,7 @@ $as_echo "" >&6; } +@@ -21865,7 +21807,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind9-devel/files/pkg-message.in ============================================================================== --- head/dns/bind910/files/pkg-message.in Thu Nov 5 13:14:45 2015 (r400849) +++ head/dns/bind9-devel/files/pkg-message.in Thu Nov 5 15:01:29 2015 (r400855) @@ -19,4 +19,10 @@ %%BASE%%* * %%BASE%%* named_program="%%PREFIX%%/sbin/named" * * * +* * +* * +* THIS IS A DEVELOPMENT VERSION IF BIND, IT WILL EAT YOUR DATA * +* * +* * +* * ********************************************************************** Modified: head/dns/bind9-devel/pkg-plist ============================================================================== --- head/dns/bind910/pkg-plist Thu Nov 5 13:14:45 2015 (r400849) +++ head/dns/bind9-devel/pkg-plist Thu Nov 5 15:01:29 2015 (r400855) @@ -11,6 +11,7 @@ include/bind9/version.h include/dns/acache.h include/dns/acl.h include/dns/adb.h +include/dns/badcache.h include/dns/bit.h include/dns/byaddr.h include/dns/cache.h @@ -28,9 +29,13 @@ include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnssec.h +include/dns/dnstap.h +include/dns/dnstap.pb-c.h include/dns/ds.h include/dns/dsdigest.h +include/dns/dyndb.h include/dns/ecdb.h +include/dns/edns.h include/dns/enumclass.h include/dns/enumtype.h include/dns/events.h @@ -260,8 +265,10 @@ man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz man/man1/dig.1.gz +man/man1/dnstap-read.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz +man/man1/mdig.1.gz man/man1/named-rrchecker.1.gz man/man1/nslookup.1.gz man/man1/nsupdate.1.gz @@ -394,6 +401,7 @@ sbin/dnssec-verify sbin/genrandom sbin/isc-hmac-fixup sbin/lwresd +sbin/mdig sbin/named sbin/named-checkconf sbin/named-checkzone