From nobody Thu May 19 14:34:01 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 8F5A61AEDDAE; Thu, 19 May 2022 14:34:02 +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 4L3smp1lMFz4Zlm; Thu, 19 May 2022 14:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652970842; 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=YULLex5U3KoKFPc2bsZWUiuLxaucihXUjtmazb9g6Wg=; b=Z90+/Pl5xD1/l9LO5RJv4tJYgRSA2gsyCv6vesdLg72125+atIVgPK30UO4+6VSr2O8jCL BknEXNmYWbhREhPhqpL/BP6YiYf9BVNEbytB3W6nc/NFK4h+9w4lVr1pqEHa26QGI2wKUw D08oeO/fASzjF/CdSNeys/CZwN2s0M3WQr88Nc9AvnGIjBhAQkiwSUFzRTSdvZtl0+XPUE /QHvAIdkA/sqqMoF8ew4aLsL0Q86ErHQC1FZMRNfnqlG0WrtyverQWVSc3upnyBVOhaGjG i6IeFjZWkVPgZl4ZfzpsURJnNkjJDf5fuYWdcYuCCKpyTW0TH9Vy8kBIjNAz4g== 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 F10921F80C; Thu, 19 May 2022 14:34:01 +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 24JEY1UR069648; Thu, 19 May 2022 14:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JEY18O069647; Thu, 19 May 2022 14:34:01 GMT (envelope-from git) Date: Thu, 19 May 2022 14:34:01 GMT Message-Id: <202205191434.24JEY18O069647@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: bdd863090065 - 2022Q2 - dns/bind918: Update to 9.18.3 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: bdd8630900657075486975095c7ba74d503050dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652970842; 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=YULLex5U3KoKFPc2bsZWUiuLxaucihXUjtmazb9g6Wg=; b=l0wSpNJBaSqQuNKfEYF3RhOV2K/S049chDGxHiPFXspnrRRwVnZbxTQxRPyWkmmTPUST3g u9VXdV2YBIn7tXOj++PWfss7Ig+zI5pT3YnnaUNzxg1wKAJWKJk56dxdwVcAX3XsajOKAs 4HwpckGDZE0+L6+ziDeQZMC69OIkYmzxEtMnNK8biufB3Tz1d8SzonmXt0LL1bi9hhkI5L boIDUqSIQhwgpdhBQdSE+q0OBMNTSbn1JPDZsayOP9zMOWljl2EGe8KyAB6kldbt9rwPU5 2vKSGC5E6wRwtbYSRUq4yslx4bdpyHQMiCFn3Gdi0DHgiGuL+2SeLvRLMugK6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652970842; a=rsa-sha256; cv=none; b=cAE+wz6p3hDvZMPK7cKrlLeXtkeqr1Ck3XOXmw62vrEQfYCjpllCKAePdA6/KdMDjaz38d zpXfp8m5/TCdU8R2P0r69VghuwnHnI85Y5Uy5aoiC9jGjzuFResP6AkH5lMf/Az+MPXrS0 rIKPG7R/+CUAmjTqCaGj99jHi1iXszl+J/FyMrLmas1gcIi/4Trg6L5E1bgWKHil45myxv ax6LU5LcNd4mhirCEMd6nvJ0tntq9ZTZRM+ynWFqXIb3N7JzDlnGrZ3Rh0N9mHe7qLIfJM Jt4CXfIY8SmldDmHXRAFm9P+KUHz7nnuoHndC28kXK71sk2vh2qG7yRyvQtvQg== 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=bdd8630900657075486975095c7ba74d503050dd commit bdd8630900657075486975095c7ba74d503050dd Author: Mathieu Arnold AuthorDate: 2022-05-18 09:55:05 +0000 Commit: Mathieu Arnold CommitDate: 2022-05-19 14:33:25 +0000 dns/bind918: Update to 9.18.3 MFH: 2022Q2 Security: CVE-2022-1183 Changes: https://downloads.isc.org/isc/bind9/9.18.3/doc/arm/html/notes.html (cherry picked from commit 4aba7dcbfbdb3b9a483773bd5c3373e4d2ff8cc9) --- dns/bind-tools/pkg-plist | 14 +++++++------- dns/bind918/Makefile | 2 +- dns/bind918/distinfo | 6 +++--- dns/bind918/files/extrapatch-bind-min-override-ttl | 14 +++++++------- dns/bind918/pkg-plist | 14 +++++++------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist index d5e11951854b..e055c23d974f 100644 --- a/dns/bind-tools/pkg-plist +++ b/dns/bind-tools/pkg-plist @@ -17,19 +17,19 @@ bin/nsec3hash bin/nslookup bin/nsupdate lib/bind-tools/libbind9.so -lib/bind-tools/libbind9-9.18.2.so +lib/bind-tools/libbind9-9.18.3.so lib/bind-tools/libdns.so -lib/bind-tools/libdns-9.18.2.so +lib/bind-tools/libdns-9.18.3.so lib/bind-tools/libirs.so -lib/bind-tools/libirs-9.18.2.so +lib/bind-tools/libirs-9.18.3.so lib/bind-tools/libisc.so -lib/bind-tools/libisc-9.18.2.so +lib/bind-tools/libisc-9.18.3.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccc-9.18.2.so +lib/bind-tools/libisccc-9.18.3.so lib/bind-tools/libisccfg.so -lib/bind-tools/libisccfg-9.18.2.so +lib/bind-tools/libisccfg-9.18.3.so lib/bind-tools/libns.so -lib/bind-tools/libns-9.18.2.so +lib/bind-tools/libns-9.18.3.so %%MANPAGES%%man/man1/arpaname.1.gz %%MANPAGES%%man/man1/delv.1.gz %%MANPAGES%%man/man1/dig.1.gz diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index cdb2f43a9357..abc0c4d68f30 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -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.2 +ISCVERSION= 9.18.3 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index b2e5089052ba..d7f0512d008a 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650638652 -SHA256 (bind-9.18.2.tar.xz) = 2e4b38779bba0a23ee634fdf7c525fd9794c41d692bfd83cda25823a2a3ed969 -SIZE (bind-9.18.2.tar.xz) = 5109916 +TIMESTAMP = 1652867217 +SHA256 (bind-9.18.3.tar.xz) = 0ad8da773bd93cba0ef66cc81999698ebdf9c3e51faed5e5c8c1eb75cad2ae6f +SIZE (bind-9.18.3.tar.xz) = 5136984 diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl index bb6ae4977755..5269d4a779b8 100644 --- a/dns/bind918/files/extrapatch-bind-min-override-ttl +++ b/dns/bind918/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2022-04-11 13:36:54 UTC +--- bin/named/config.c.orig 2022-05-09 09:32:19 UTC +++ bin/named/config.c @@ -182,6 +182,7 @@ options {\n\ notify-source *;\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-04-11 13:36:54 UTC +--- bin/named/server.c.orig 2022-05-09 09:32:19 UTC +++ bin/named/server.c -@@ -4497,6 +4497,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4523,6 +4523,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-04-11 13:36:54 UTC +--- lib/dns/include/dns/view.h.orig 2022-05-09 09:32:19 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-04-11 13:36:54 UTC +--- lib/dns/resolver.c.orig 2022-05-09 09:32:19 UTC +++ lib/dns/resolver.c -@@ -6129,6 +6129,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6184,6 +6184,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2022-04-11 13:36:54 UTC +--- lib/isccfg/namedconf.c.orig 2022-05-09 09:32:19 UTC +++ lib/isccfg/namedconf.c @@ -2092,6 +2092,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist index b3c319ead19a..1a10cb41fc25 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -242,19 +242,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.18.2.so +lib/libbind9-9.18.3.so lib/libdns.so -lib/libdns-9.18.2.so +lib/libdns-9.18.3.so lib/libirs.so -lib/libirs-9.18.2.so +lib/libirs-9.18.3.so lib/libisc.so -lib/libisc-9.18.2.so +lib/libisc-9.18.3.so lib/libisccc.so -lib/libisccc-9.18.2.so +lib/libisccc-9.18.3.so lib/libisccfg.so -lib/libisccfg-9.18.2.so +lib/libisccfg-9.18.3.so lib/libns.so -lib/libns-9.18.2.so +lib/libns-9.18.3.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @comment man/man1/dig.1.gz