From nobody Thu Mar 24 17:03:07 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 AF4861A2F8B8; Thu, 24 Mar 2022 17:03:07 +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 4KPWkg4P3cz3CDZ; Thu, 24 Mar 2022 17:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648141387; 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=cDK7EzFZ43erpj7eTNhr3vwP6GO9YiTayrOXDBueXA8=; b=f0mFN1vVImRtu4pZgHu3C6vC3NphN8mD13rrv+1HAeGBfQ5TZcmHfPOc2rNGjH9zOJ5NsN +74LnVS+8gzRe6CRaRYbH3fCGhIn2t3P5P4fsXFpGXy4IVqtXyViv4RKF6v01ilbnH2393 sgo99BfpeHeYaqX+vXcXKIh7JYdewSi8fc1KHt3Mt9y25VQLEaTz0Jz3d5i2xCzrTrW5P8 sKSdL6uBAX7xJmVu3+Sr+Je98Vybk9L793eCR1Ttd7tzHfQaENHYHHULZHumkdtfUoEkHY o+XtcvMB45PF7BFGAVtQv5u5gEJNf3ePrR1DWlTnc9Te2yaZHFZYXWpjgUSvIQ== 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 72A681BA40; Thu, 24 Mar 2022 17:03:07 +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 22OH37VC045379; Thu, 24 Mar 2022 17:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22OH37aV045378; Thu, 24 Mar 2022 17:03:07 GMT (envelope-from git) Date: Thu, 24 Mar 2022 17:03:07 GMT Message-Id: <202203241703.22OH37aV045378@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: 2fad974ce20a - main - dns/bind918: update to 9.18.1 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: 2fad974ce20a88b9186c87ee75db3042e7e53014 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648141387; 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=cDK7EzFZ43erpj7eTNhr3vwP6GO9YiTayrOXDBueXA8=; b=a3AT1DmyTsjsIJR0TFiRYN9g4W88pzuEmIIbfHAbuNCSOoEZPjWPluXK1co9gWdtPcn6dI WDZM1QH/HnAGglzCZEXXQ57U6RdmOBMC8mCXJogmC6NmnMXoIGxHFEb5AIWVhYLygHGmuS SQSAn14mzE/+D95+pmwvIIJ4vAxSMNdtAU+9R+/pP1v9OPEWthfAHjTOySPWRSJz/7MWog j3zAWudmld4hEcdH1tpRmOYfx4I4XRqsBYIcLwpQ44vWjJX47dTFepxEYTSx8k1WkkyVKg fTQnM67PJxjkhWygeGoVH81OpRR1gYtviMLqVGOpI1MDnkwqklMHp8K8Zz4keg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648141387; a=rsa-sha256; cv=none; b=Dkn08DXdzwAO7n9ZX1GVB+S1ED5CTJH0RJ8NwPiXeSjRmdX0IKSI/7epvv5qDXlyIukYhM cov2pumB14rPtvTLOUmoMS5rCLaMNbMNsImFk29KU0lYn3p6ASurYfx2qPjMS6H4ROmwsl wqtGjq0aT7QBVE/YSFgv+UXRmXR1lp9t6vbJJ6L2MssE4X9ioMYHWEyXrI2JOA4AbhevYC QnfSJbWVx+k3Q+oen8r4pHlSrgtop3tQ8DfNLwfCCLT2Dm5BPRCh/+8m1ww+98n0M61rhI /FaYwG6zXoDR1azpFteORb5ugQvgXSArBuyULlw828/o19PmHGVLMY+4ELLGQQ== 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=2fad974ce20a88b9186c87ee75db3042e7e53014 commit 2fad974ce20a88b9186c87ee75db3042e7e53014 Author: Mathieu Arnold AuthorDate: 2022-03-24 15:27:20 +0000 Commit: Mathieu Arnold CommitDate: 2022-03-24 17:02:15 +0000 dns/bind918: update to 9.18.1 MFH: 2021Q1 Security: CVE-2021-25220, CVE-2022-0396, CVE-2022-0635, CVE-2022-0667 --- dns/bind918/Makefile | 2 +- dns/bind918/distinfo | 6 +++--- dns/bind918/files/extrapatch-bind-min-override-ttl | 16 ++++++++-------- dns/bind918/files/patch-configure.ac | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index e25d62f9cfa5..3778ae838135 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.0 +ISCVERSION= 9.18.1 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index c269b36ae275..abf3548ad733 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644500257 -SHA256 (bind-9.18.0.tar.xz) = 56525bf5caf01fd8fd9d90910880cc0f8a90a27a97d169187d651d4ecf0c411c -SIZE (bind-9.18.0.tar.xz) = 5292320 +TIMESTAMP = 1648135372 +SHA256 (bind-9.18.1.tar.xz) = 57c7afd871694d615cb4defb1c1bd6ed023350943d7458414db8d493ef560427 +SIZE (bind-9.18.1.tar.xz) = 5059456 diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl index e9dd87270a1e..f70f5794c603 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-01-24 08:28:57 UTC +--- bin/named/config.c.orig 2022-03-07 08:05:16 UTC +++ bin/named/config.c @@ -172,6 +172,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-01-24 08:28:57 UTC +--- bin/named/server.c.orig 2022-03-07 08:05:16 UTC +++ bin/named/server.c -@@ -4482,6 +4482,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,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-01-24 08:28:57 UTC +--- lib/dns/include/dns/view.h.orig 2022-03-07 08:05:16 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-01-24 08:28:57 UTC +--- lib/dns/resolver.c.orig 2022-03-07 08:05:16 UTC +++ lib/dns/resolver.c -@@ -6119,6 +6119,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6130,6 +6130,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-01-24 08:28:57 UTC +--- lib/isccfg/namedconf.c.orig 2022-03-07 08:05:16 UTC +++ lib/isccfg/namedconf.c -@@ -2086,6 +2086,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2091,6 +2091,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/files/patch-configure.ac b/dns/bind918/files/patch-configure.ac index 7ca1502ec151..a5d7ab563b46 100644 --- a/dns/bind918/files/patch-configure.ac +++ b/dns/bind918/files/patch-configure.ac @@ -1,13 +1,13 @@ automake has warnings, it is ok here. ---- configure.ac.orig 2022-01-24 20:06:11 UTC +--- configure.ac.orig 2022-03-07 08:05:16 UTC +++ configure.ac @@ -48,7 +48,7 @@ AC_CANONICAL_HOST 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])