From nobody Mon Apr 11 08:21:33 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 32B741A84AA0; Mon, 11 Apr 2022 08:21:34 +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 4KcMJY5NSjz3Lt9; Mon, 11 Apr 2022 08:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649665294; 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=9vhbiRZFxL79j7YTdMGCYae1lvKS66rIY1O7lOVT6WM=; b=mbjsWOSeSfJ4Re/D5THEG45fFErFI0lR8kK1u4ESs24jIK3i2a1pWpGrUBl6xgByHpsrs8 cxJrLRhL+bT/MZSqekftpI2sLO2aLepBmxxQh06Fk4IZzJmzs9aLXNi5EbxJCWxeYD6mc4 1tqVvqrR971MFRmJ2NlEkPWcaJCAA1/9fH3gT3a27sIbZZiPai15PbVx3U33dRI42UO8ZR qyyViK7BqOe8HKnbiC+8KW1bABxfTELuzmxQVYz8J6BblkF0tHz8rWIqdBkh395dF6PKJX f07xwP9LcLhWIvuc3lg7dv8sKGLjV4NWLBbyuTxgNof/xY51LbELD6yqttNBpQ== 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 92F241F736; Mon, 11 Apr 2022 08:21:33 +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 23B8LXpA097250; Mon, 11 Apr 2022 08:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23B8LXVt097249; Mon, 11 Apr 2022 08:21:33 GMT (envelope-from git) Date: Mon, 11 Apr 2022 08:21:33 GMT Message-Id: <202204110821.23B8LXVt097249@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: 9524f35705c0 - main - dns/bind9-devel: Update to latest commit 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: 9524f35705c0f0d346d0f0b17c9ff424ab277a5d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649665294; 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=9vhbiRZFxL79j7YTdMGCYae1lvKS66rIY1O7lOVT6WM=; b=p3q+Hs0WZ578hCm1Y/KXr1NXHlqBZgSy6Jz/O+E4GzIeJde7KmMOPHEkyfwhtyFG/CHSsj el03QYm09IxL2s0MhyICWxjHVeVY9UxHOIeHW4+tWV9vZEFp0wlOcBNsVDiGipAJd0q+EP 6yXpZP1ZG5rpLhBLyPSg335FXeKimDF5hYE5tzGYlmBeSPO/kldBW5RCJoJL6bowIJ6sox T80Zf+8aa/QAFf8T8rNfttE6bNFEpHjnQOpQeBLuqI8/ehDCSI4b/C26CaAo6HhS3fyMh3 PNeal7x13aEVXDCDqujok+Xdk9epPmPo+zUvtBhH41He/mHaZPZtPUXi9pp2Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649665294; a=rsa-sha256; cv=none; b=rNw3jjsKzVs3JrD8Rds5NOlYt6kDGUsDeDH6hTGiwo8waklNuQjdbCfB/WRSjVCzHt8c1h G/xZ4ydxzJhkgH0yozzbp9WB1P9l+E/vf04vz1Tf8tDrVKYsfQZ+PKJwaRuSnLgnbpo26Y A95FwhTWaAVBWwXtE9UA1L1pIThVglIVE1CDor1GqOQ8bofl4Xb6xEA7heqlOWGGlww4l6 7EnyyRDKQgP8tvnuCPVhb6aDoIzuu5SgOe5RwZNg7hc1vYUevxUpG9A5El4BsQNMTtVZBz 2/7Bn5mIR/2S9/yvCByYHO78BxsHo0YmcxrFSVZjw5E66Do9uws2FRBL87Qj8g== 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=9524f35705c0f0d346d0f0b17c9ff424ab277a5d commit 9524f35705c0f0d346d0f0b17c9ff424ab277a5d Author: Mathieu Arnold AuthorDate: 2022-04-11 07:56:44 +0000 Commit: Mathieu Arnold CommitDate: 2022-04-11 08:21:20 +0000 dns/bind9-devel: Update to latest commit While there, remove PORTREVISION option, it has not worked in a long time, and was never really useful. --- dns/bind9-devel/Makefile | 19 ++++++------------- dns/bind9-devel/distinfo | 6 +++--- .../files/extrapatch-bind-min-override-ttl | 16 ++++++++-------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 084def0a1290..7e7953d76ab9 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -4,11 +4,11 @@ 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 # XXX: correct version # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net # XXX: put the ISC master_site @@ -49,13 +49,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools # XXX: remove tar:bz2 USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.17.22a0.2022.04.01 +ISCVERSION= 9.17.22a0.2022.04.08 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= d4eef9e89a0add9e63a6939c73106125d4b58360 +GL_COMMIT= 6cdc4114cb205b44be4f1cfdf752368e64757a4a CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -95,7 +95,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 @@ -103,7 +103,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 @@ -118,7 +118,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 @@ -212,12 +211,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/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 8f9482890edf..d2f09d1fea5e 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649054912 -SHA256 (isc-projects-bind9-d4eef9e89a0add9e63a6939c73106125d4b58360_GL0.tar.gz) = ce854ab1d78cd8db7c83c4e3242412d48840fc79e859c7a527d6abbfd45da251 -SIZE (isc-projects-bind9-d4eef9e89a0add9e63a6939c73106125d4b58360_GL0.tar.gz) = 6194533 +TIMESTAMP = 1649660475 +SHA256 (isc-projects-bind9-6cdc4114cb205b44be4f1cfdf752368e64757a4a_GL0.tar.gz) = 08697d3416406dc82fa922cc147af63c4210685ba71399e09f55ad8fa92b6752 +SIZE (isc-projects-bind9-6cdc4114cb205b44be4f1cfdf752368e64757a4a_GL0.tar.gz) = 6203915 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index a382f62e56e8..cc78d545b34d 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 2022-04-01 23:48:26 UTC +--- bin/named/config.c.orig 2022-04-08 10:15:26 UTC +++ bin/named/config.c -@@ -171,6 +171,7 @@ options {\n\ +@@ -181,6 +181,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-04-01 23:48:26 UTC +--- bin/named/server.c.orig 2022-04-08 10:15:26 UTC +++ bin/named/server.c -@@ -4487,6 +4487,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4488,6 +4488,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-01 23:48:26 UTC +--- lib/dns/include/dns/view.h.orig 2022-04-08 10:15:26 UTC +++ lib/dns/include/dns/view.h @@ -155,6 +155,7 @@ struct dns_view { bool requestnsid; @@ -34,7 +34,7 @@ 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-01 23:48:26 UTC +--- lib/dns/resolver.c.orig 2022-04-08 10:15:26 UTC +++ lib/dns/resolver.c @@ -6113,6 +6113,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-04-01 23:48:26 UTC +--- lib/isccfg/namedconf.c.orig 2022-04-08 10:15:26 UTC +++ lib/isccfg/namedconf.c -@@ -2092,6 +2092,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2093,6 +2093,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 },