Date: Thu, 19 Mar 2020 11:33:42 +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: r528714 - in head/dns/bind916: . files Message-ID: <202003191133.02JBXgL7037934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Mar 19 11:33:41 2020 New Revision: 528714 URL: https://svnweb.freebsd.org/changeset/ports/528714 Log: Update to 9.16.1 Modified: head/dns/bind916/Makefile (contents, props changed) head/dns/bind916/distinfo (contents, props changed) head/dns/bind916/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind916/files/patch-bin_named_include_named_globals.h (contents, props changed) head/dns/bind916/files/patch-configure (contents, props changed) head/dns/bind916/pkg-plist (contents, props changed) Modified: head/dns/bind916/Makefile ============================================================================== --- head/dns/bind916/Makefile Thu Mar 19 11:33:37 2020 (r528713) +++ head/dns/bind916/Makefile Thu Mar 19 11:33:41 2020 (r528714) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind916 here -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -41,7 +41,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools 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.16.0 +ISCVERSION= 9.16.1 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -65,8 +65,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools .else USE_RC_SUBR= named SUB_FILES= named.conf pkg-message -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools \ - ${PATCHDIR}/bind-v9.16.0-tcp_quota_fix.patch:-p1 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * Modified: head/dns/bind916/distinfo ============================================================================== --- head/dns/bind916/distinfo Thu Mar 19 11:33:37 2020 (r528713) +++ head/dns/bind916/distinfo Thu Mar 19 11:33:41 2020 (r528714) @@ -1,3 +1,3 @@ -TIMESTAMP = 1582188168 -SHA256 (bind-9.16.0.tar.xz) = af4bd9bdaeb1aa7399429972f3a8aa01dd6886b7ae046d703ab8da45330f2e28 -SIZE (bind-9.16.0.tar.xz) = 4533976 +TIMESTAMP = 1584611383 +SHA256 (bind-9.16.1.tar.xz) = a913d7e78135b9123d233215b58102fa0f18130fb1e158465a1c2b6f3bd75e91 +SIZE (bind-9.16.1.tar.xz) = 4541768 Modified: head/dns/bind916/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind916/files/extrapatch-bind-min-override-ttl Thu Mar 19 11:33:37 2020 (r528713) +++ head/dns/bind916/files/extrapatch-bind-min-override-ttl Thu Mar 19 11:33:41 2020 (r528714) @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-02-12 20:03:44 UTC +--- bin/named/config.c.orig 2020-03-11 16:46:53 UTC +++ bin/named/config.c -@@ -177,6 +177,7 @@ options {\n\ +@@ -179,6 +179,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\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-12 20:03:44 UTC +--- bin/named/server.c.orig 2020-03-11 16:46:53 UTC +++ bin/named/server.c -@@ -4178,6 +4178,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4324,6 +4324,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-12 20:03:44 UTC +--- lib/dns/include/dns/view.h.orig 2020-03-11 16:46:53 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-12 20:03:44 UTC +--- lib/dns/resolver.c.orig 2020-03-11 16:46:53 UTC +++ lib/dns/resolver.c -@@ -5975,6 +5975,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6233,6 +6233,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-12 20:03:44 UTC +--- lib/isccfg/namedconf.c.orig 2020-03-11 16:46:53 UTC +++ lib/isccfg/namedconf.c -@@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = { - #endif +@@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = { + #endif /* ifdef HAVE_LMDB */ { "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/bind916/files/patch-bin_named_include_named_globals.h Thu Mar 19 11:33:37 2020 (r528713) +++ head/dns/bind916/files/patch-bin_named_include_named_globals.h Thu Mar 19 11:33:41 2020 (r528714) @@ -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 + #else /* if NAMED_RUN_PID_DIR */ EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/" "named.pid"); Modified: head/dns/bind916/files/patch-configure ============================================================================== --- head/dns/bind916/files/patch-configure Thu Mar 19 11:33:37 2020 (r528713) +++ head/dns/bind916/files/patch-configure Thu Mar 19 11:33:41 2020 (r528714) @@ -1,8 +1,8 @@ Fixup gssapi and db detection. ---- configure.orig 2020-02-12 20:03:44 UTC +--- configure.orig 2020-03-11 16:46:53 UTC +++ configure -@@ -17436,27 +17436,9 @@ done +@@ -17437,27 +17437,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 -@@ -17499,47 +17481,7 @@ $as_echo "no" >&6; } ;; +@@ -17500,47 +17482,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 -@@ -23046,7 +22988,7 @@ $as_echo "" >&6; } +@@ -23049,7 +22991,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind916/pkg-plist ============================================================================== --- head/dns/bind916/pkg-plist Thu Mar 19 11:33:37 2020 (r528713) +++ head/dns/bind916/pkg-plist Thu Mar 19 11:33:41 2020 (r528714) @@ -51,6 +51,8 @@ include/dns/iptable.h include/dns/journal.h include/dns/keydata.h include/dns/keyflags.h +include/dns/kasp.h +include/dns/keymgr.h include/dns/keytable.h include/dns/keyvalues.h include/dns/lib.h @@ -122,6 +124,7 @@ include/irs/resconf.h include/irs/types.h include/irs/version.h include/isc/aes.h +include/isc/align.h include/isc/app.h include/isc/assertions.h include/isc/astack.h @@ -168,10 +171,12 @@ include/isc/md.h include/isc/mem.h include/isc/meminfo.h include/isc/mutex.h +include/isc/mutexatomic.h include/isc/mutexblock.h include/isc/net.h include/isc/netaddr.h include/isc/netdb.h +include/isc/netmgr.h include/isc/netscope.h include/isc/nonce.h include/isc/offset.h @@ -233,6 +238,7 @@ include/isccfg/aclconf.h include/isccfg/cfg.h include/isccfg/dnsconf.h include/isccfg/grammar.h +include/isccfg/kaspconf.h include/isccfg/log.h include/isccfg/namedconf.h include/isccfg/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003191133.02JBXgL7037934>