Date: Mon, 17 Dec 2018 14:29:54 +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: r487688 - in head/dns/bind9-devel: . files Message-ID: <201812171429.wBHETsRV096524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Dec 17 14:29:54 2018 New Revision: 487688 URL: https://svnweb.freebsd.org/changeset/ports/487688 Log: Update to latest commit. While there, rename MINCACHE option, most of its features have been integrated in BIND9, the only remaining bit of the patch is the override cache feature to force all cached TTL to a specific one. Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/distinfo (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon Dec 17 14:29:51 2018 (r487687) +++ head/dns/bind9-devel/Makefile Mon Dec 17 14:29:54 2018 (r487688) @@ -38,13 +38,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 # XXX: remove tar:bz2 USES= compiler:c11 cpe libedit ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.4a0.2018.12.10 +ISCVERSION= 9.13.4a0.2018.12.14 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= e5da71f746f11cc8df458d41d97d9f9c4a9a318d +GL_COMMIT= 4af9f9718989212480f2a5243a79886b8e7934c2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -88,7 +88,7 @@ OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ - MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ + OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE TUNING_LARGE TCP_FASTOPEN OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ @@ -116,7 +116,7 @@ GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management -MINCACHE_DESC= Use the mincachettl patch +OVERRIDECACHE_DESC= Use the override-cache patch NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string PYTHON_DESC= Build with Python utilities @@ -180,7 +180,7 @@ LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl +OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon Dec 17 14:29:51 2018 (r487687) +++ head/dns/bind9-devel/distinfo Mon Dec 17 14:29:54 2018 (r487688) @@ -1,3 +1,3 @@ -TIMESTAMP = 1544431759 -SHA256 (isc-projects-bind9-e5da71f746f11cc8df458d41d97d9f9c4a9a318d_GL0.tar.gz) = 5b89328fdf4b37e10f8d649818d0eb1524cfc931a2679d77a49efe58be11b088 -SIZE (isc-projects-bind9-e5da71f746f11cc8df458d41d97d9f9c4a9a318d_GL0.tar.gz) = 6344168 +TIMESTAMP = 1545045986 +SHA256 (isc-projects-bind9-4af9f9718989212480f2a5243a79886b8e7934c2_GL0.tar.gz) = 9a400af41968ade21df0f72d8b197b2f7bb43400fe2d5332a1549b2c7b73a1bb +SIZE (isc-projects-bind9-4af9f9718989212480f2a5243a79886b8e7934c2_GL0.tar.gz) = 6341661 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Dec 17 14:29:51 2018 (r487687) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Dec 17 14:29:54 2018 (r487688) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2018-12-10 05:51:06 UTC +--- bin/named/config.c.orig 2018-12-15 02:47:23 UTC +++ bin/named/config.c @@ -179,6 +179,7 @@ options {\n\ notify-source *;\n\ @@ -8,9 +8,9 @@ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2018-12-10 05:51:06 UTC +--- bin/named/server.c.orig 2018-12-15 02:47:23 UTC +++ bin/named/server.c -@@ -4154,6 +4154,11 @@ configure_view(dns_view_t *view, dns_vie +@@ -4153,6 +4153,11 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -22,7 +22,7 @@ result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2018-12-10 05:51:06 UTC +--- lib/dns/include/dns/view.h.orig 2018-12-15 02:47:23 UTC +++ lib/dns/include/dns/view.h @@ -153,6 +153,7 @@ struct dns_view { bool requestnsid; @@ -32,7 +32,7 @@ dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2018-12-10 05:51:06 UTC +--- lib/dns/resolver.c.orig 2018-12-15 02:47:23 UTC +++ lib/dns/resolver.c @@ -5967,6 +5967,12 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -47,7 +47,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-12-10 05:51:06 UTC +--- lib/isccfg/namedconf.c.orig 2018-12-15 02:47:23 UTC +++ lib/isccfg/namedconf.c @@ -1900,6 +1900,7 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812171429.wBHETsRV096524>