From nobody Mon Feb 03 10:03:02 2025 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 4Ymhrl2ls4z5mq0g; Mon, 03 Feb 2025 10:03:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ymhrk715wz3V4T; Mon, 03 Feb 2025 10:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738576983; 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=+AH0DlNiDMq02YVWZs/O3p4fcOR6lmhjwiySjKBbcuI=; b=EudnAIoAdLU8eRWxUjTsBjYixQSzqa5wbkP0gTp6uU4dvh+Se/FLJUf7gRu4oJCiPDqIRn 6T93Xco9pqcJAk5Uze2wyZUTAe5U1O4OYVPQ7VHIu/m78wnfyZrANKYNLnzM0AOf0UB85D ys5H/I3reCPzto1ytKaO1Z5yBSEyzHUQyUbRPmSt7d3YcPpKEocER4pmFjj7s4j6iCaNKR xna6Zb5BhyN62YA/zpTEZBiGg1VsvCvqD2eN2kESYCHzyXPfNqeWgYK7hLKK3+SLpSDPxl t6bY0s99v/R6YTpfVCgqSE5qNihdiC9ktekGvLl4+ckOSir0Pxgzmz0U0OzQXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738576983; 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=+AH0DlNiDMq02YVWZs/O3p4fcOR6lmhjwiySjKBbcuI=; b=r6rSbFMrJfZxSnQvTOp8XQXxQ3sIEBuCwQFW2csCTsGgWrQr+KwW4F1dhnLbdh0pLiIxGo JJK6ZGAqWnP66VWGyGxYAbKHu/9+jcXmRvqoWvNBK+dIdGf3MInGChgbfFrkp4qCsJMV0w lBZpJ8FqA8piSlz2SLKlD04rqo8Cano4ijBf2w8VQMa9Vz60DCY3lHVowlWWTyDCJwsBGF cZFcFib8IsllTxp2ZS86+47t9ofoXLQkGMVw5tkJSEzKQcVYQ8MXPzHNM6GFdvXq+BCqqS osmf2lv90jA4XWCA2FD3os/05J55mBucFm3FGQmsIUAy00mEo/eG6v4wUp4f6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738576983; a=rsa-sha256; cv=none; b=IJGTO0A+6oo74JRhUymfKpKm7GTvnEdbGBwT49Y3fnZtV8f8hl8jqtLXUMaAaEM+0QvZHr pPss/siaMYe62QJ/OAmvInWPFcePdJ5ZvzTGZKeXUVw/FwmEIca1CUAfWBn12FH69YIN/A 6o1Dx8ChDt02nGSnWH0vtt0P5QIPjA3o5mKdmSvSoZwAkAspa5a+p7cCwAkaYUUJWbuNEE tz0imtmitig7kLVrMvknu6bldOFz2TEWqwNFkhQAm43kAIpTzuo8MMPYj7LInK7V9+/NCt yK5jOPIVZ9ZVJSM5cBLhqKr4gEzDX9aiZ9Hydw6/9GIvDyyYGlTLk/RtllgBhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymhrk6bW2zX7X; Mon, 03 Feb 2025 10:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 513A32cX037517; Mon, 3 Feb 2025 10:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513A32Os037514; Mon, 3 Feb 2025 10:03:02 GMT (envelope-from git) Date: Mon, 3 Feb 2025 10:03:02 GMT Message-Id: <202502031003.513A32Os037514@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: 06916019a495 - 2025Q1 - dns/bind9-devel: upgrade to 9.21.4 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 06916019a49545b9e32cf0e62e312a58d46a38d4 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06916019a49545b9e32cf0e62e312a58d46a38d4 commit 06916019a49545b9e32cf0e62e312a58d46a38d4 Author: Mathieu Arnold AuthorDate: 2025-02-03 09:57:50 +0000 Commit: Mathieu Arnold CommitDate: 2025-02-03 10:02:32 +0000 dns/bind9-devel: upgrade to 9.21.4 Security: CVE-2024-11187, CVE-2024-12705 (cherry picked from commit 069389781f672ea4065704181f799050333e1f17) --- dns/bind-tools/pkg-plist-devel | 10 ++++----- dns/bind9-devel/Makefile | 2 +- dns/bind9-devel/distinfo | 6 +++--- .../files/extrapatch-bind-min-override-ttl | 24 +++++++++++----------- dns/bind9-devel/pkg-plist | 12 +++++------ 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index f451a25dabfb..1609ae2a249e 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -18,15 +18,15 @@ bin/named-rrchecker bin/nsec3hash bin/nslookup bin/nsupdate -lib/bind-tools/libdns-9.21.3.so +lib/bind-tools/libdns-9.21.4.so lib/bind-tools/libdns.so -lib/bind-tools/libisc-9.21.3.so +lib/bind-tools/libisc-9.21.4.so lib/bind-tools/libisc.so -lib/bind-tools/libisccc-9.21.3.so +lib/bind-tools/libisccc-9.21.4.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccfg-9.21.3.so +lib/bind-tools/libisccfg-9.21.4.so lib/bind-tools/libisccfg.so -lib/bind-tools/libns-9.21.3.so +lib/bind-tools/libns-9.21.4.so lib/bind-tools/libns.so share/man/man1/arpaname.1.gz share/man/man1/delv.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 50fff6e129fa..d2132ad8f0cc 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -1,7 +1,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.21.3 +DISTVERSION= 9.21.4 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 2e49bd2dd574..1f86284199e7 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734171556 -SHA256 (bind-9.21.3.tar.xz) = 8fe04f713f5da38392e9e8d990f516d809b5af785e7e87c29f4de11bb30be02a -SIZE (bind-9.21.3.tar.xz) = 5533408 +TIMESTAMP = 1738573073 +SHA256 (bind-9.21.4.tar.xz) = f98efd18c98896c00112fd5cb7e4004d5284be139a5fa9d35f98ed66c5b84a08 +SIZE (bind-9.21.4.tar.xz) = 5527896 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 4829ab2fe4f3..9280dab46c28 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 2024-12-03 09:47:47 UTC +--- bin/named/config.c.orig 2025-01-20 12:57:29 UTC +++ bin/named/config.c -@@ -179,6 +179,7 @@ options {\n\ +@@ -180,6 +180,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 2024-12-03 09:47:47 UTC +--- bin/named/server.c.orig 2025-01-20 12:57:29 UTC +++ bin/named/server.c -@@ -4302,6 +4302,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4201,6 +4201,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); ---- doc/arm/reference.rst.orig 2024-12-03 09:47:48 UTC +--- doc/arm/reference.rst.orig 2025-01-20 12:57:29 UTC +++ doc/arm/reference.rst -@@ -4235,6 +4235,10 @@ Tuning +@@ -4109,6 +4109,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a greater value. @@ -37,9 +37,9 @@ Add the override-cache-ttl feature. .. namedconf:statement:: max-cache-ttl :tags: server :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers. ---- lib/dns/include/dns/view.h.orig 2024-12-03 09:47:48 UTC +--- lib/dns/include/dns/view.h.orig 2025-01-20 12:57:29 UTC +++ lib/dns/include/dns/view.h -@@ -151,6 +151,7 @@ struct dns_view { +@@ -147,6 +147,7 @@ struct dns_view { bool requestnsid; bool sendcookie; dns_ttl_t maxcachettl; @@ -47,9 +47,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2024-12-03 09:47:48 UTC +--- lib/dns/resolver.c.orig 2025-01-20 12:57:29 UTC +++ lib/dns/resolver.c -@@ -5894,6 +5894,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -5963,6 +5963,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -62,9 +62,9 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2024-12-03 09:47:48 UTC +--- lib/isccfg/namedconf.c.orig 2025-01-20 12:57:29 UTC +++ lib/isccfg/namedconf.c -@@ -2095,6 +2095,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2068,6 +2068,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/pkg-plist b/dns/bind9-devel/pkg-plist index 73f2ff18659d..bab8bc647af1 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -144,7 +144,6 @@ include/isc/httpd.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/job.h -include/isc/lang.h include/isc/lex.h include/isc/list.h include/isc/log.h @@ -228,22 +227,21 @@ include/ns/listenlist.h include/ns/notify.h include/ns/query.h include/ns/server.h -include/ns/sortlist.h include/ns/stats.h include/ns/types.h include/ns/update.h include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so -lib/libdns-9.21.3.so +lib/libdns-9.21.4.so lib/libdns.so -lib/libisc-9.21.3.so +lib/libisc-9.21.4.so lib/libisc.so -lib/libisccc-9.21.3.so +lib/libisccc-9.21.4.so lib/libisccc.so -lib/libisccfg-9.21.3.so +lib/libisccfg-9.21.4.so lib/libisccfg.so -lib/libns-9.21.3.so +lib/libns-9.21.4.so lib/libns.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz