Date: Thu, 20 Feb 2020 09:06:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526548 - in head/dns: . bind916 bind916/files Message-ID: <202002200906.01K96wg9061798@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Feb 20 09:06:58 2020 New Revision: 526548 URL: https://svnweb.freebsd.org/changeset/ports/526548 Log: Add the newly minted BIND9 9.16. Changes: https://downloads.isc.org/isc/bind9/9.16.0/RELEASE-NOTES-bind-9.16.0.html Added: head/dns/bind916/ - copied from r526544, head/dns/bind9-devel/ Modified: head/dns/Makefile head/dns/bind916/Makefile head/dns/bind916/distinfo head/dns/bind916/files/extrapatch-bind-min-override-ttl head/dns/bind916/files/patch-bin_named_include_named_globals.h head/dns/bind916/files/patch-configure Modified: head/dns/Makefile ============================================================================== --- head/dns/Makefile Thu Feb 20 08:37:41 2020 (r526547) +++ head/dns/Makefile Thu Feb 20 09:06:58 2020 (r526548) @@ -13,6 +13,7 @@ SUBDIR += bind9-devel SUBDIR += bind911 SUBDIR += bind914 + SUBDIR += bind916 SUBDIR += bindgraph SUBDIR += bundy SUBDIR += c-ares Modified: head/dns/bind916/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Thu Feb 20 07:01:55 2020 (r526544) +++ head/dns/bind916/Makefile Thu Feb 20 09:06:58 2020 (r526548) @@ -7,21 +7,17 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc # dns/bind-tools here PORTREVISION= 0 .else -# XXX: correct version -# dns/bind9xx here +# dns/bind916 here PORTREVISION= 0 .endif CATEGORIES= dns net -# XXX: put the ISC master_site -#MASTER_SITES= ISC/bind9/${ISCVERSION} -MASTER_SITES= LOCAL/mat/bind +MASTER_SITES= ISC/bind9/${ISCVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else -PKGNAMESUFFIX= 9-devel +PKGNAMESUFFIX= 916 .endif -# XXX: correct DISTNAME. -#DISTNAME= ${PORTNAME}-${ISCVERSION} +DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) @@ -30,6 +26,10 @@ COMMENT= Command line tools from BIND: delv, dig, host COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif +# Uncomment when bind920 comes of age. +# DEPRECATED= End of life, please migrate to a newer version of BIND9 +# EXPIRATION_DATE= 2023-12-31 + LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT @@ -39,16 +39,9 @@ LIB_DEPENDS= libuv.so:devel/libuv \ RUN_DEPENDS= bind-tools>0:dns/bind-tools .endif -# XXX: remove tar:bz2 -USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2 +USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.15.8a0.2020.02.16 -# XXX: Remove gitlab -USE_GITLAB= yes -GL_SITE= https://gitlab.isc.org -GL_ACCOUNT= isc-projects -GL_PROJECT= bind9 -GL_COMMIT= e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7 +ISCVERSION= 9.16.0 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -76,8 +69,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * -# XXX: Add -devel -CONFLICTS= bind911 bind912 bind913 bind914 +CONFLICTS= bind911 bind912 bind913 bind914 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes @@ -232,14 +224,7 @@ SUB_LIST+= ENGINES=/usr/lib/engines SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines .endif -# XXX: Remove -post-extract: - echo "SRCID=${GL_COMMIT}" > ${WRKSRC}/srcid - -# XXX: Remove first REINPLACE_CMD post-patch: - @${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \ - ${WRKSRC}/version .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' \ Modified: head/dns/bind916/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Thu Feb 20 07:01:55 2020 (r526544) +++ head/dns/bind916/distinfo Thu Feb 20 09:06:58 2020 (r526548) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581932819 -SHA256 (isc-projects-bind9-e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7_GL0.tar.gz) = 123f39e3b2f2495a276e74bfd1917e044599e87a8f742ac6563df0d246756415 -SIZE (isc-projects-bind9-e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7_GL0.tar.gz) = 6363381 +TIMESTAMP = 1582188168 +SHA256 (bind-9.16.0.tar.xz) = af4bd9bdaeb1aa7399429972f3a8aa01dd6886b7ae046d703ab8da45330f2e28 +SIZE (bind-9.16.0.tar.xz) = 4533976 Modified: head/dns/bind916/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Feb 20 07:01:55 2020 (r526544) +++ head/dns/bind916/files/extrapatch-bind-min-override-ttl Thu Feb 20 09:06:58 2020 (r526548) @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-02-16 17:41:30 UTC +--- bin/named/config.c.orig 2020-02-12 20:03:44 UTC +++ bin/named/config.c @@ -177,6 +177,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-02-16 17:41:30 UTC +--- bin/named/server.c.orig 2020-02-12 20:03:44 UTC +++ bin/named/server.c -@@ -4323,6 +4323,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4178,6 +4178,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ Add the override-cache-ttl feature. result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- lib/dns/include/dns/view.h.orig 2020-02-16 17:41:30 UTC +--- lib/dns/include/dns/view.h.orig 2020-02-12 20:03:44 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,9 +34,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2020-02-16 17:41:30 UTC +--- lib/dns/resolver.c.orig 2020-02-12 20:03:44 UTC +++ lib/dns/resolver.c -@@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -5975,6 +5975,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -49,10 +49,10 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-02-16 17:41:30 UTC +--- lib/isccfg/namedconf.c.orig 2020-02-12 20:03:44 UTC +++ lib/isccfg/namedconf.c -@@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = { - #endif /* ifdef HAVE_LMDB */ +@@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = { + #endif { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_duration, 0 }, Modified: head/dns/bind916/files/patch-bin_named_include_named_globals.h ============================================================================== --- head/dns/bind9-devel/files/patch-bin_named_include_named_globals.h Thu Feb 20 07:01:55 2020 (r526544) +++ head/dns/bind916/files/patch-bin_named_include_named_globals.h Thu Feb 20 09:06:58 2020 (r526548) @@ -1,6 +1,6 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2020-02-16 17:41:30 UTC +--- bin/named/include/named/globals.h.orig 2020-02-12 20:03:44 UTC +++ bin/named/include/named/globals.h @@ -127,7 +127,7 @@ EXTERN bool named_g_forcelock INIT(false); @@ -8,6 +8,6 @@ We reference the pid file as being run/named/pid every EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" - "named.pid"); + "pid"); - #else /* if NAMED_RUN_PID_DIR */ + #else EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/" "named.pid"); Modified: head/dns/bind916/files/patch-configure ============================================================================== --- head/dns/bind9-devel/files/patch-configure Thu Feb 20 07:01:55 2020 (r526544) +++ head/dns/bind916/files/patch-configure Thu Feb 20 09:06:58 2020 (r526548) @@ -1,8 +1,8 @@ Fixup gssapi and db detection. ---- configure.orig 2020-02-11 10:42:52 UTC +--- configure.orig 2020-02-12 20:03:44 UTC +++ configure -@@ -17448,27 +17448,9 @@ done +@@ -17436,27 +17436,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -32,7 +32,7 @@ Fixup gssapi and db detection. { $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 -@@ -17511,47 +17493,7 @@ $as_echo "no" >&6; } ;; +@@ -17499,47 +17481,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -81,7 +81,7 @@ Fixup gssapi and db detection. DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -23058,7 +23000,7 @@ $as_echo "" >&6; } +@@ -23046,7 +22988,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002200906.01K96wg9061798>