From nobody Thu Feb 10 15:36:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6350619CEF51; Thu, 10 Feb 2022 15:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvgnX5fWqz3sZn; Thu, 10 Feb 2022 15:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644507361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukBXnTa+Qa5JRT4CeHiib9xR2vzHyZVwpAFs5kwNFWk=; b=huSsqwQg+RArVTJ80w0TYl+TfW3YHao2fzMwHkcaFW95msPl7SHZqFOg5K/zDUWNtX5x3V lc0gm+CnwbqE5HmDCciiWOkReN5+nT7XAhv/TYfkdNFldlmYulROHGAcCA1/zCcWGXyufC IDUsGG8sKL6MHS6do8MNM0r5+KTwyv60XTKozJpCEQj1WM4qatTzxWamzdade3Wp6UExi7 PM9BBj/gWCjGyk8qqPmj/TVpkElD61YyDMSFQrYRyZrvABjK0RIAmh+mUEo36umD+BC4Bj ukRNgSOW50xRHw469sirP//J3Cu7UgxlKFPFV9HxcmoabwkevvWVDdI7YAUSTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97E2622FA6; Thu, 10 Feb 2022 15:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21AFa0di098813; Thu, 10 Feb 2022 15:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AFa04l098812; Thu, 10 Feb 2022 15:36:00 GMT (envelope-from git) Date: Thu, 10 Feb 2022 15:36:00 GMT Message-Id: <202202101536.21AFa04l098812@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 3f8d9dce0815 - main - dns/bind9-devel: update to latest commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f8d9dce081520f839ca51660ec418c132684d70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644507361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukBXnTa+Qa5JRT4CeHiib9xR2vzHyZVwpAFs5kwNFWk=; b=g9ICq/Mcc3RJesrPClza6Dv0QvgXB6gI1hmMT7tvnsmxkNmqNJMxT96Cakl6lsCAupfKUr t+Eui4NEtIdQ5+f+Dbdjr0bHwpDTXWQPrhR9++0Gj2W1q7Uj2gY/doNxlW9yYzfQovpFmd WkQtSTDyTNpaewFSVViPVJ1qfdLnpoF2B/+Y0Yh+ScPGZtIQ/hMTxkfNo43qS5TX1i47Q3 zPYKA9yD0ebdyybB3549ieV2dwZrii5LwhzIgLslt25HkvKe4jDbRsv4v6RMvhRGs6mrzi 3wu71AwGxOg2UBZ42R94GKSf42FIrKIuREwc+sI9B0U2Ts/rh/i/xv0s8xQ5PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644507361; a=rsa-sha256; cv=none; b=cinNEzhciA2bGoi8bJhU7oM1c0Lgv2i1+fSN51Ym3mDYKeK7zGUpoVbb4kJRP+m+e7q0Mh X3P64Oo3WuP+EgMPfnGEa8ePd6Q7T34DqxOfbM/kBAKJjz/GR8BkLopLdm9NZqyjmZhT3t 8qgY9qu/zpvMp+m/uwx2oUcFzkFd5C4Ns3Vm1ajAiedz9DaAzsR0vHsJtd2VnOvSP8sVMk Q0maYW2JRJj5lROGq2sZkgYZIjK15hAJTQx61EKF+VjcoSTsgSRRBBX5M3dB6d4TJ4JhQg xNvpVYk7piL/Zt+hkqg3ROBoKf7TpexBPxBXhP1r3wR9q3ZwyXwuIiNW7JjzNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f8d9dce081520f839ca51660ec418c132684d70 commit 3f8d9dce081520f839ca51660ec418c132684d70 Author: Mathieu Arnold AuthorDate: 2022-02-10 13:59:31 +0000 Commit: Mathieu Arnold CommitDate: 2022-02-10 15:35:32 +0000 dns/bind9-devel: update to latest commit Add back the Administrator Reference Manual in the DOCS option. --- dns/bind9-devel/Makefile | 12 +++++++++--- dns/bind9-devel/distinfo | 6 +++--- .../files/extrapatch-bind-min-override-ttl | 20 ++++++++++---------- dns/bind9-devel/files/patch-configure.ac | 4 ++-- dns/bind9-devel/pkg-plist | 16 +++++++--------- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 493e66d5b3bc..fea2b2dcee58 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.18a0.2021.10.08 +ISCVERSION= 9.17.22a0.2022.02.09 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= e112afa15668bd3b1baed59df2d21e01b46da15e +GL_COMMIT= 59c3b17ad0b7590350b516eff62abde6a1f4382b CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -123,6 +123,11 @@ QUERYTRACE_DESC= Enable the very verbose query tracelogging START_LATE_DESC= Start BIND late in the boot process (see help) 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 + DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c @@ -231,9 +236,10 @@ post-install: @${RM} -rf ${STAGEDIR}/wrkdirs post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/CHANGES* \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm .else do-install: diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 9d8a068d04d7..e72f4dee7f30 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633958377 -SHA256 (isc-projects-bind9-e112afa15668bd3b1baed59df2d21e01b46da15e_GL0.tar.gz) = 9910baa816fc993092ff8e29c1a85b1a57e1d3e382e9b70dd0caa79e0221d314 -SIZE (isc-projects-bind9-e112afa15668bd3b1baed59df2d21e01b46da15e_GL0.tar.gz) = 6111472 +TIMESTAMP = 1644501345 +SHA256 (isc-projects-bind9-59c3b17ad0b7590350b516eff62abde6a1f4382b_GL0.tar.gz) = c6c61f713aeb06dba96b7bb5858564b3f5624cb2e60aec59dae35b3ef2d72bfe +SIZE (isc-projects-bind9-59c3b17ad0b7590350b516eff62abde6a1f4382b_GL0.tar.gz) = 6153436 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 6b7a6e7736f7..5cc994079bca 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 2021-10-08 10:07:46 UTC +--- bin/named/config.c.orig 2022-02-09 16:40:14 UTC +++ bin/named/config.c -@@ -182,6 +182,7 @@ options {\n\ +@@ -172,6 +172,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 2021-10-08 10:07:46 UTC +--- bin/named/server.c.orig 2022-02-09 16:40:14 UTC +++ bin/named/server.c -@@ -4479,6 +4479,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4496,6 +4496,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,9 +24,9 @@ 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 2021-10-08 10:07:46 UTC +--- lib/dns/include/dns/view.h.orig 2022-02-09 16:40:14 UTC +++ lib/dns/include/dns/view.h -@@ -154,6 +154,7 @@ struct dns_view { +@@ -155,6 +155,7 @@ struct dns_view { bool requestnsid; bool sendcookie; dns_ttl_t maxcachettl; @@ -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 2021-10-08 10:07:46 UTC +--- lib/dns/resolver.c.orig 2022-02-09 16:40:14 UTC +++ lib/dns/resolver.c -@@ -5910,6 +5910,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6119,6 +6119,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 2021-10-08 10:07:46 UTC +--- lib/isccfg/namedconf.c.orig 2022-02-09 16:40:14 UTC +++ lib/isccfg/namedconf.c -@@ -2049,6 +2049,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2086,6 +2086,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 ed71cb259b09..00ad7146080b 100644 --- a/dns/bind9-devel/files/patch-configure.ac +++ b/dns/bind9-devel/files/patch-configure.ac @@ -1,8 +1,8 @@ automake has warnings, it is ok here. ---- configure.ac.orig 2021-09-17 07:10:48 UTC +--- configure.ac.orig 2022-02-09 16:40:14 UTC +++ configure.ac -@@ -46,7 +46,7 @@ AC_CANONICAL_HOST +@@ -48,7 +48,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET AC_CONFIG_SRCDIR([bin/named/main.c]) diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 0a156bc25d82..90bb575d5d40 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -156,7 +156,6 @@ include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/lang.h include/isc/lex.h -include/isc/likely.h include/isc/list.h include/isc/log.h include/isc/magic.h @@ -194,7 +193,6 @@ include/isc/safe.h include/isc/serial.h include/isc/siphash.h include/isc/sockaddr.h -include/isc/socket.h include/isc/stat.h include/isc/stats.h include/isc/stdatomic.h @@ -248,19 +246,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.17.18.so +lib/libbind9-9.17.22.so lib/libdns.so -lib/libdns-9.17.18.so +lib/libdns-9.17.22.so lib/libirs.so -lib/libirs-9.17.18.so +lib/libirs-9.17.22.so lib/libisc.so -lib/libisc-9.17.18.so +lib/libisc-9.17.22.so lib/libisccc.so -lib/libisccc-9.17.18.so +lib/libisccc-9.17.22.so lib/libisccfg.so -lib/libisccfg-9.17.18.so +lib/libisccfg-9.17.22.so lib/libns.so -lib/libns-9.17.18.so +lib/libns-9.17.22.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @comment man/man1/dig.1.gz