From nobody Wed Nov 15 17:41:27 2023 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 4SVr7W2Sb7z50XYs; Wed, 15 Nov 2023 17:41:27 +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 4SVr7W21c9z4H9M; Wed, 15 Nov 2023 17:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700070087; 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=9rlJobkd2AUGmxGKd3cik+WvJKcyios6u4QKfrLlzJw=; b=bnJrwiViZGKM0DyEIgqXCWXeidfq3kkz63zfZqpGt3va9cFlmjYmyTGaBYeNpNY0VQR9g6 PnrKKcUIaxMMBTzRCK2mcZOS0aZBPKckP9rSQ/KbHH4xIivEks0lndF0OoOTkD5pmgd1K8 YHFyJ0X3sxBbbQT3vg6hLY1hwZ3iwnbfIU5bM5goUNT3eDqFtP+4rLyd8/Hrbycdxvyth+ ytYgDZOJYQwFODROZ8+pXFrJnY61scPLP4SGlt608UP9+syu8jHdbxiUyUbiYzgpl6Qt4G 4hVUipijqaKsN+PuNWkA93h7+JuCPT7Oeog7cn2SSiyWwsaCX09K4I9It2mcvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700070087; 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=9rlJobkd2AUGmxGKd3cik+WvJKcyios6u4QKfrLlzJw=; b=pI0AzdWBd1+jT/NRSe3ahHjajce4C+Fs18ffpGBd4pk71A4PDZDlDQmlTVmP466Wz/KuMN e3LfjwJ9q/ZukWeoxCumd349PlRB8jXjhRl9bH1sodBDHtDdPP5eKrIS/fGJ7zyI4p9LJp H9OXh5oXb/VHIq3gADbMIvIt/BXaSir4TerFcy/BCMPZB+P2LR+ivjRFUVtDE/mPwME/2h jv12ot2/sJ4A6BGqZFmiEUPrTI/p+jNYrjvKV0TaIuMQwxV2GZMbj6oITyGgnvsCSIIJ72 lp4AFJ8AOFmPuu8eYKmwwY3xB/varvpjxpNUE7GxPvqU/JDCzVW0xgafHJMXMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700070087; a=rsa-sha256; cv=none; b=Ul3N7t6EjgBKaYMNLsDwo5XZKPxPCBCFcMWLij8eoCPaBt+AH1/Yd9yFF4slUY3XbA0nl3 X15/Xli9RfTlZcBhBm0o6iWpztZwup73AR1CMU6uSENFdjKMLtDYiFS5BJXvOjJXgYZZtq 3jnTHUUHv0KSQn/Z4guqNSJ12ld5HzKsHxntFamUWxUd4r+BXuQ5CrrxiJsWAClY8u+XX4 xlVxkm58oxCkQbf4hFXvs87Sz/lJZNmqGvJNMABlaj2deRMGt1vQ1V/l3xmMB+YZntUkLj dVaWvd2/z2DS1sUtq/xT5xO3El72V9ZZhwydhQB7e4PNYZtGuNY3hQrfR4ETeg== 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 4SVr7W14MdzB6L; Wed, 15 Nov 2023 17:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AFHfRHA020966; Wed, 15 Nov 2023 17:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AFHfRtt020963; Wed, 15 Nov 2023 17:41:27 GMT (envelope-from git) Date: Wed, 15 Nov 2023 17:41:27 GMT Message-Id: <202311151741.3AFHfRtt020963@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: 0636310bf881 - 2023Q4 - dns/bind918: update to 9.18.20 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 0636310bf88119cf46052d4745e61245ffc10b31 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=0636310bf88119cf46052d4745e61245ffc10b31 commit 0636310bf88119cf46052d4745e61245ffc10b31 Author: Mathieu Arnold AuthorDate: 2023-11-15 17:14:37 +0000 Commit: Mathieu Arnold CommitDate: 2023-11-15 17:41:04 +0000 dns/bind918: update to 9.18.20 (cherry picked from commit 064028917d02d66074c0c7c6c2d434f11425765c) --- dns/bind918/Makefile | 13 +++++-------- dns/bind918/distinfo | 6 +++--- dns/bind918/files/extrapatch-bind-min-override-ttl | 14 +++++++------- dns/bind918/pkg-plist | 14 +++++++------- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index 2c459d0ecf7c..fb451e1cc4d0 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -1,7 +1,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} +DISTVERSION= 9.18.20 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 @@ -10,13 +10,12 @@ PORTREVISION= 0 PORTREVISION= 0 .endif CATEGORIES= dns net -MASTER_SITES= ISC/bind9/${ISCVERSION} +MASTER_SITES= ISC/bind9/${DISTVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 918 .endif -DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org WWW= https://www.isc.org/bind/ @@ -43,13 +42,11 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools .endif 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.19 CPE_VENDOR= isc -CPE_VERSION= ${ISCVERSION:C/-.*//} -.if ${ISCVERSION:M*-*} -CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} +CPE_VERSION= ${DISTVERSION:C/-.*//} +.if ${DISTVERSION:M*-*} +CPE_UPDATE= ${DISTVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index fe4d19de71fe..d44536bee7b8 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695220312 -SHA256 (bind-9.18.19.tar.xz) = 115e09c05439bebade1d272eda08fa88eb3b60129edef690588c87a4d27612cc -SIZE (bind-9.18.19.tar.xz) = 5508464 +TIMESTAMP = 1700066291 +SHA256 (bind-9.18.20.tar.xz) = 4b891ebf58d3f2a7ac3dd2682990f528a3448eaa1c992ddc5c141b8587a98ec5 +SIZE (bind-9.18.20.tar.xz) = 5506368 diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl index a9c1504f7e7a..6bd113a99594 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 2023-09-11 08:51:08 UTC +--- bin/named/config.c.orig 2023-11-09 12:44:11 UTC +++ bin/named/config.c @@ -184,6 +184,7 @@ options {\n\ notify-source *;\n\ @@ -10,7 +10,7 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2023-09-11 08:51:08 UTC +--- bin/named/server.c.orig 2023-11-09 12:44:11 UTC +++ bin/named/server.c @@ -4571,6 +4571,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -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); ---- doc/arm/reference.rst.orig 2023-09-11 08:51:09 UTC +--- doc/arm/reference.rst.orig 2023-11-09 12:44:11 UTC +++ doc/arm/reference.rst @@ -4338,6 +4338,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a @@ -37,7 +37,7 @@ 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 2023-09-11 08:51:09 UTC +--- lib/dns/include/dns/view.h.orig 2023-11-09 12:44:12 UTC +++ lib/dns/include/dns/view.h @@ -157,6 +157,7 @@ struct dns_view { bool requestnsid; @@ -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 2023-09-11 08:51:09 UTC +--- lib/dns/resolver.c.orig 2023-11-09 12:44:12 UTC +++ lib/dns/resolver.c -@@ -6250,6 +6250,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6252,6 +6252,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -62,7 +62,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2023-09-11 08:51:09 UTC +--- lib/isccfg/namedconf.c.orig 2023-11-09 12:44:12 UTC +++ lib/isccfg/namedconf.c @@ -2100,6 +2100,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist index 32a8bc1bdfa0..83e48f9a2b45 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -241,19 +241,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.18.19.so +lib/libbind9-9.18.20.so lib/libdns.so -lib/libdns-9.18.19.so +lib/libdns-9.18.20.so lib/libirs.so -lib/libirs-9.18.19.so +lib/libirs-9.18.20.so lib/libisc.so -lib/libisc-9.18.19.so +lib/libisc-9.18.20.so lib/libisccc.so -lib/libisccc-9.18.19.so +lib/libisccc-9.18.20.so lib/libisccfg.so -lib/libisccfg-9.18.19.so +lib/libisccfg-9.18.20.so lib/libns.so -lib/libns-9.18.19.so +lib/libns-9.18.20.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @comment man/man1/dig.1.gz