From nobody Thu May 19 14:34:00 2022 X-Original-To: dev-commits-ports-branches@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 156581AEDAEA; Thu, 19 May 2022 14:34: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 4L3smm6Thyz4Zcg; Thu, 19 May 2022 14:34:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652970841; 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=F9Hs3WkxXGApPMOrnoMHykbQTQquLFh6KCjObd72ENw=; b=qvVvPpC/B2kw37ojH+OifKh619mSapkXfG+z4hT5bhEHoXYR54kdwyMFu2JJILZeI1aoME Ikm+2jJVWZMoToPNv2t/jSsYq9bZa9maAxt+v4fzWOd9Bi/z4gNXRgVBksMIqFZzWRNQgd MH8JnnZWzsM8Kuk8KGiaEbrG4X2AWKdmjIbw0Gskg9ZboXoZGCvoIuifxtKQetg9eIHrXU RvVz2tZGdB6AmDMSaeJfdpJyvXw6gO5LiESbj6pGH1XTtkSd9F8KK4VRDHkyzo2aAZ7ZCt 8ueh6E8sneieKSKBbv1LmwceIIon4yZXhz+P7KEXD28J7+RHDu/U3kVoikfMxA== 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 BF62E1F5FE; Thu, 19 May 2022 14:34: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 24JEY0u9069622; Thu, 19 May 2022 14:34:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JEY0uw069621; Thu, 19 May 2022 14:34:00 GMT (envelope-from git) Date: Thu, 19 May 2022 14:34:00 GMT Message-Id: <202205191434.24JEY0uw069621@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: f9e996ff73c2 - 2022Q2 - dns/bind918: upgrade to 9.18.2 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: f9e996ff73c2b9cb19a724b31dd3fc8e46f28c97 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652970841; 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=F9Hs3WkxXGApPMOrnoMHykbQTQquLFh6KCjObd72ENw=; b=APIeCaOQct2M4yjLU6U/liVnKmYcv+NZ6nN9SKC9Moi9IvkzZsv0UgAa9ms/cSmRPgn2y0 LUjq1uI65Cevp5d3NFsaiUh0IaWFeRzSKz2++u7MIAAhtwszjlhfOoi5GrWgSTPxNyWq1H dBO/p3Q53xdfsYMAF0N4S+ef9ZHioS/6gUibelwIdhU+1KGERJPbLsEqWwPTZMeNOVnFEV jLTZv+HE3wXlIqkgyvY8qMGWZm41RQNQvoE+O5AXj5nZrRL6/7t9DcPKRzgIAps00y9UX+ 1uVMdOVz/gpFIWBBGRM6BTXAgAsHcBtM5mIGmXgxjSKz67jcluHTF53Ambsf2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652970841; a=rsa-sha256; cv=none; b=KWYEEJYS286HodBzzQOeAZ7GOTQrUqNtsD5ZZC9CVoAfOjP5exzsVT6b0M5MtECZSBbqUt nYTzwMUaqV0xeSq1BXuMGI/qKgrOd0u31O1g1dLiNukHBMIUd1e6TzTytWXc9Nm3bu+eq5 3U9yUg4E8aFGtJ2cArYY8ZEIrkzrNhJjtZMTg0c4CbK6YbK9qznqmix2HYy3E3eFWoQcRA d5GMfOSMmW3V77f54/xipAuBTy+7GsIESvHug0WhMry2pg7c4cpxwpzMeJpfrypw1Ljncv E8/U3shdutOw8PPdOZNhh3rvdAkPkNnYUdw0Y1zd1tlr37SCDvq6O6zMT5qt6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9e996ff73c2b9cb19a724b31dd3fc8e46f28c97 commit f9e996ff73c2b9cb19a724b31dd3fc8e46f28c97 Author: Mathieu Arnold AuthorDate: 2022-04-22 14:47:00 +0000 Commit: Mathieu Arnold CommitDate: 2022-05-19 14:33:21 +0000 dns/bind918: upgrade to 9.18.2 With this release, the 9.18 branch switches from bind-dev to bind, so it is now used for bind-tools. Changes: https://downloads.isc.org/isc/bind9/9.18.2/doc/arm/html/notes.html#notes-for-bind-9-18-2 (cherry picked from commit 279801056eb46b74ce3828a77a7b679225817a2d) --- dns/bind-tools/Makefile | 3 +- dns/bind-tools/pkg-plist | 82 ++++++++++++---------- dns/bind918/Makefile | 19 ++--- dns/bind918/distinfo | 6 +- dns/bind918/files/extrapatch-bind-min-override-ttl | 18 ++--- dns/bind918/pkg-plist | 16 ++--- 6 files changed, 71 insertions(+), 73 deletions(-) diff --git a/dns/bind-tools/Makefile b/dns/bind-tools/Makefile index 0461b559e008..c63647f57f2a 100644 --- a/dns/bind-tools/Makefile +++ b/dns/bind-tools/Makefile @@ -4,10 +4,9 @@ MASTERDIR= ${.CURDIR}/../../dns/bind9-devel PLIST= ${.CURDIR}/pkg-plist-devel .else -MASTERDIR= ${.CURDIR}/../../dns/bind916 +MASTERDIR= ${.CURDIR}/../../dns/bind918 PLIST= ${.CURDIR}/pkg-plist -INSTALL_WRKSRC= ${WRKSRC}/bin .endif DESCR= ${.CURDIR}/pkg-descr diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist index c7399f89b78f..d5e11951854b 100644 --- a/dns/bind-tools/pkg-plist +++ b/dns/bind-tools/pkg-plist @@ -1,57 +1,65 @@ bin/arpaname bin/delv bin/dig +bin/dnssec-cds +bin/dnssec-dsfromkey +bin/dnssec-importkey +bin/dnssec-keyfromlabel +bin/dnssec-keygen +bin/dnssec-revoke +bin/dnssec-settime +bin/dnssec-signzone +bin/dnssec-verify bin/host bin/mdig bin/named-rrchecker +bin/nsec3hash bin/nslookup bin/nsupdate +lib/bind-tools/libbind9.so +lib/bind-tools/libbind9-9.18.2.so +lib/bind-tools/libdns.so +lib/bind-tools/libdns-9.18.2.so +lib/bind-tools/libirs.so +lib/bind-tools/libirs-9.18.2.so +lib/bind-tools/libisc.so +lib/bind-tools/libisc-9.18.2.so +lib/bind-tools/libisccc.so +lib/bind-tools/libisccc-9.18.2.so +lib/bind-tools/libisccfg.so +lib/bind-tools/libisccfg-9.18.2.so +lib/bind-tools/libns.so +lib/bind-tools/libns-9.18.2.so %%MANPAGES%%man/man1/arpaname.1.gz %%MANPAGES%%man/man1/delv.1.gz %%MANPAGES%%man/man1/dig.1.gz +%%MANPAGES%%man/man1/dnssec-cds.1.gz +%%MANPAGES%%man/man1/dnssec-dsfromkey.1.gz +%%MANPAGES%%man/man1/dnssec-importkey.1.gz +%%MANPAGES%%man/man1/dnssec-keyfromlabel.1.gz +%%MANPAGES%%man/man1/dnssec-keygen.1.gz +%%MANPAGES%%man/man1/dnssec-revoke.1.gz +%%MANPAGES%%man/man1/dnssec-settime.1.gz +%%MANPAGES%%man/man1/dnssec-signzone.1.gz +%%MANPAGES%%man/man1/dnssec-verify.1.gz @comment man/man1/dnstap-read.1.gz -%%MANPAGES%%man/man1/host.1.gz -%%MANPAGES%%man/man1/mdig.1.gz -%%MANPAGES%%man/man1/named-rrchecker.1.gz -%%MANPAGES%%man/man1/nslookup.1.gz -%%MANPAGES%%man/man1/nsupdate.1.gz +man/man1/host.1.gz +man/man1/mdig.1.gz +@comment man/man1/named-checkconf.1.gz +@comment man/man1/named-checkzone.1.gz +@comment man/man1/named-compilezone.1.gz +@comment man/man1/named-journalprint.1.gz +@comment man/man1/named-nzd2nzf.1.gz +man/man1/named-rrchecker.1.gz +man/man1/nsec3hash.1.gz +man/man1/nslookup.1.gz +man/man1/nsupdate.1.gz @comment man/man5/named.conf.5.gz @comment man/man5/rndc.conf.5.gz @comment man/man8/ddns-confgen.8.gz -%%MANPAGES%%man/man8/dnssec-cds.8.gz -%%MANPAGES%%%%PYTHON%%man/man8/dnssec-checkds.8.gz -%%MANPAGES%%%%PYTHON%%man/man8/dnssec-coverage.8.gz -%%MANPAGES%%man/man8/dnssec-dsfromkey.8.gz -%%MANPAGES%%man/man8/dnssec-importkey.8.gz -%%MANPAGES%%man/man8/dnssec-keyfromlabel.8.gz -%%MANPAGES%%man/man8/dnssec-keygen.8.gz -%%MANPAGES%%%%PYTHON%%man/man8/dnssec-keymgr.8.gz -%%MANPAGES%%man/man8/dnssec-revoke.8.gz -%%MANPAGES%%man/man8/dnssec-settime.8.gz -%%MANPAGES%%man/man8/dnssec-signzone.8.gz -%%MANPAGES%%man/man8/dnssec-verify.8.gz +@comment man/man8/filter-a.8.gz @comment man/man8/filter-aaaa.8.gz -@comment man/man8/named-checkconf.8.gz -@comment man/man8/named-checkzone.8.gz -@comment man/man8/named-compilezone.8.gz -%%MANPAGES%%man/man8/named-journalprint.8.gz -@comment man/man8/named-nzd2nzf.8.gz @comment man/man8/named.8.gz -%%MANPAGES%%man/man8/nsec3hash.8.gz @comment man/man8/rndc-confgen.8.gz @comment man/man8/rndc.8.gz @comment man/man8/tsig-keygen.8.gz -sbin/dnssec-cds -%%PYTHON%%sbin/dnssec-checkds -%%PYTHON%%sbin/dnssec-coverage -sbin/dnssec-dsfromkey -sbin/dnssec-importkey -sbin/dnssec-keyfromlabel -sbin/dnssec-keygen -%%PYTHON%%sbin/dnssec-keymgr -sbin/dnssec-revoke -sbin/dnssec-settime -sbin/dnssec-signzone -sbin/dnssec-verify -sbin/named-journalprint -sbin/nsec3hash diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index 82c05e008b47..cdb2f43a9357 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -4,10 +4,10 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 1 +PORTREVISION= 0 .else # dns/bind918 here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -31,7 +31,7 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 # EXPIRATION_DATE= 2023-12-31 LICENSE= MPL20 -LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 \ @@ -43,7 +43,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.18.1 +ISCVERSION= 9.18.2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -81,7 +81,7 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFAULT= GSSAPI_NONE IDN JSON LMDB MANPAGES \ TCP_FASTOPEN DNSTAP OPTIONS_DEFINE= DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \ - MANPAGES OVERRIDECACHE PORTREVISION QUERYTRACE \ + MANPAGES OVERRIDECACHE QUERYTRACE \ START_LATE TCP_FASTOPEN OPTIONS_SINGLE= GSSAPI @@ -89,7 +89,7 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if defined(BIND_TOOLS_SLAVE) OPTIONS_EXCLUDE= DNSTAP DOCS GEOIP LMDB \ - OVERRIDECACHE PORTREVISION QUERYTRACE START_LATE \ + OVERRIDECACHE QUERYTRACE START_LATE \ TCP_FASTOPEN .endif # BIND_TOOLS_SLAVE @@ -104,7 +104,6 @@ GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management OVERRIDECACHE_DESC= Use the override-cache patch -PORTREVISION_DESC= Show PORTREVISION in the version string 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 @@ -195,12 +194,6 @@ post-patch: .endfor .if !defined(BIND_TOOLS_SLAVE) -. if ${PORTREVISION:N0} -post-patch-PORTREVISION-on: - @${REINPLACE_CMD} '/^m4_define.*bind_VERSION_EXTRA/s#)#_${PORTREVISION})#' \ - ${WRKSRC}/configure.ac -. endif - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index abf3548ad733..b2e5089052ba 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648135372 -SHA256 (bind-9.18.1.tar.xz) = 57c7afd871694d615cb4defb1c1bd6ed023350943d7458414db8d493ef560427 -SIZE (bind-9.18.1.tar.xz) = 5059456 +TIMESTAMP = 1650638652 +SHA256 (bind-9.18.2.tar.xz) = 2e4b38779bba0a23ee634fdf7c525fd9794c41d692bfd83cda25823a2a3ed969 +SIZE (bind-9.18.2.tar.xz) = 5109916 diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl index f70f5794c603..bb6ae4977755 100644 --- a/dns/bind918/files/extrapatch-bind-min-override-ttl +++ b/dns/bind918/files/extrapatch-bind-min-override-ttl @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2022-03-07 08:05:16 UTC +--- bin/named/config.c.orig 2022-04-11 13:36:54 UTC +++ bin/named/config.c -@@ -172,6 +172,7 @@ options {\n\ +@@ -182,6 +182,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-03-07 08:05:16 UTC +--- bin/named/server.c.orig 2022-04-11 13:36:54 UTC +++ bin/named/server.c -@@ -4496,6 +4496,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4497,6 +4497,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-03-07 08:05:16 UTC +--- lib/dns/include/dns/view.h.orig 2022-04-11 13:36:54 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-03-07 08:05:16 UTC +--- lib/dns/resolver.c.orig 2022-04-11 13:36:54 UTC +++ lib/dns/resolver.c -@@ -6130,6 +6130,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6129,6 +6129,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-03-07 08:05:16 UTC +--- lib/isccfg/namedconf.c.orig 2022-04-11 13:36:54 UTC +++ lib/isccfg/namedconf.c -@@ -2091,6 +2091,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/bind918/pkg-plist b/dns/bind918/pkg-plist index 4698d8936983..b3c319ead19a 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -147,7 +147,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 @@ -176,7 +175,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 @@ -244,19 +242,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.18.1.so +lib/libbind9-9.18.2.so lib/libdns.so -lib/libdns-9.18.1.so +lib/libdns-9.18.2.so lib/libirs.so -lib/libirs-9.18.1.so +lib/libirs-9.18.2.so lib/libisc.so -lib/libisc-9.18.1.so +lib/libisc-9.18.2.so lib/libisccc.so -lib/libisccc-9.18.1.so +lib/libisccc-9.18.2.so lib/libisccfg.so -lib/libisccfg-9.18.1.so +lib/libisccfg-9.18.2.so lib/libns.so -lib/libns-9.18.1.so +lib/libns-9.18.2.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @comment man/man1/dig.1.gz