Date: Mon, 28 Mar 2022 09:50:57 GMT From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fd68b282ec97 - main - dns/bind9-devel: update to latest commit Message-ID: <202203280950.22S9ov7Z040212@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd68b282ec970823a93794e4c520104d8efae622 commit fd68b282ec970823a93794e4c520104d8efae622 Author: Mathieu Arnold <mat@FreeBSD.org> AuthorDate: 2022-03-28 09:25:55 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> CommitDate: 2022-03-28 09:50:33 +0000 dns/bind9-devel: update to latest commit The ISC is doing new strange things in their Makefiles, so add back gmake to the dependency chain when building DOCS or MANPAGES. --- dns/bind-tools/pkg-plist-devel | 14 +++++++------- dns/bind9-devel/Makefile | 7 ++++--- dns/bind9-devel/distinfo | 6 +++--- dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 18 +++++++++--------- dns/bind9-devel/files/patch-configure.ac | 4 ++-- dns/bind9-devel/pkg-plist | 3 --- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index f0e490276003..490023d60049 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -17,19 +17,19 @@ bin/nsec3hash bin/nslookup bin/nsupdate lib/bind-tools/libbind9.so -lib/bind-tools/libbind9-9.17.18.so +lib/bind-tools/libbind9-9.17.22.so lib/bind-tools/libdns.so -lib/bind-tools/libdns-9.17.18.so +lib/bind-tools/libdns-9.17.22.so lib/bind-tools/libirs.so -lib/bind-tools/libirs-9.17.18.so +lib/bind-tools/libirs-9.17.22.so lib/bind-tools/libisc.so -lib/bind-tools/libisc-9.17.18.so +lib/bind-tools/libisc-9.17.22.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccc-9.17.18.so +lib/bind-tools/libisccc-9.17.22.so lib/bind-tools/libisccfg.so -lib/bind-tools/libisccfg-9.17.18.so +lib/bind-tools/libisccfg-9.17.22.so lib/bind-tools/libns.so -lib/bind-tools/libns-9.17.18.so +lib/bind-tools/libns-9.17.22.so man/man1/arpaname.1.gz man/man1/delv.1.gz man/man1/dig.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index fea2b2dcee58..1c510c890f7d 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -49,13 +49,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools # XXX: remove tar:bz2 USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.17.22a0.2022.02.09 +ISCVERSION= 9.17.22a0.2022.03.25 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 59c3b17ad0b7590350b516eff62abde6a1f4382b +GL_COMMIT= 23cb022247e414bb99d901ed5de0f8f0bc9b9b90 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -126,7 +126,7 @@ TCP_FASTOPEN_DESC= RFC 7413 support DOCS_ALL_TARGET= all html DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} -DOCS_USES= python:env +DOCS_USES= gmake python:env DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ @@ -168,6 +168,7 @@ LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_USES= gmake OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index e72f4dee7f30..e1d0a8a90063 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644501345 -SHA256 (isc-projects-bind9-59c3b17ad0b7590350b516eff62abde6a1f4382b_GL0.tar.gz) = c6c61f713aeb06dba96b7bb5858564b3f5624cb2e60aec59dae35b3ef2d72bfe -SIZE (isc-projects-bind9-59c3b17ad0b7590350b516eff62abde6a1f4382b_GL0.tar.gz) = 6153436 +TIMESTAMP = 1648457921 +SHA256 (isc-projects-bind9-23cb022247e414bb99d901ed5de0f8f0bc9b9b90_GL0.tar.gz) = 524add3da7991b7987e90d5d6450db0c41dfc8cab087d1c600371caaa26b0f0a +SIZE (isc-projects-bind9-23cb022247e414bb99d901ed5de0f8f0bc9b9b90_GL0.tar.gz) = 6155737 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 5cc994079bca..ebb596e99f54 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2022-02-09 16:40:14 UTC +--- bin/named/config.c.orig 2022-03-25 15:13:28 UTC +++ bin/named/config.c -@@ -172,6 +172,7 @@ options {\n\ +@@ -171,6 +171,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. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2022-02-09 16:40:14 UTC +--- bin/named/server.c.orig 2022-03-25 15:13:28 UTC +++ bin/named/server.c -@@ -4496,6 +4496,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4484,6 +4484,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 2022-02-09 16:40:14 UTC +--- lib/dns/include/dns/view.h.orig 2022-03-25 15:13:28 UTC +++ lib/dns/include/dns/view.h @@ -155,6 +155,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 2022-02-09 16:40:14 UTC +--- lib/dns/resolver.c.orig 2022-03-25 15:13:28 UTC +++ lib/dns/resolver.c -@@ -6119,6 +6119,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6126,6 +6126,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -49,9 +49,9 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2022-02-09 16:40:14 UTC +--- lib/isccfg/namedconf.c.orig 2022-03-25 15:13:28 UTC +++ lib/isccfg/namedconf.c -@@ -2086,6 +2086,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2092,6 +2092,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, diff --git a/dns/bind9-devel/files/patch-configure.ac b/dns/bind9-devel/files/patch-configure.ac index 00ad7146080b..ecb07886e570 100644 --- a/dns/bind9-devel/files/patch-configure.ac +++ b/dns/bind9-devel/files/patch-configure.ac @@ -6,8 +6,8 @@ automake has warnings, it is ok here. AC_CANONICAL_TARGET AC_CONFIG_SRCDIR([bin/named/main.c]) --AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall -Werror]) -+AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall]) +-AM_INIT_AUTOMAKE([1.14 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall -Werror]) ++AM_INIT_AUTOMAKE([1.14 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall]) AM_SILENT_RULES([yes]) AM_EXTRA_RECURSIVE_TARGETS([test unit doc]) diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 90bb575d5d40..1eddc578ecc4 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -97,7 +97,6 @@ include/dns/soa.h include/dns/ssu.h include/dns/stats.h include/dns/time.h -include/dns/timer.h include/dns/tkey.h include/dns/transport.h include/dns/tsec.h @@ -149,7 +148,6 @@ include/isc/hash.h include/isc/heap.h include/isc/hex.h include/isc/hmac.h -include/isc/hp.h include/isc/ht.h include/isc/httpd.h include/isc/interfaceiter.h @@ -178,7 +176,6 @@ include/isc/parseint.h include/isc/pool.h include/isc/portset.h include/isc/print.h -include/isc/queue.h include/isc/quota.h include/isc/radix.h include/isc/random.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203280950.22S9ov7Z040212>