From nobody Sat May 18 11:07:41 2024 X-Original-To: dev-commits-ports-main@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 4VhLdn5jtbz5KZBj; Sat, 18 May 2024 11:07:41 +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 4VhLdn55cZz4pwB; Sat, 18 May 2024 11:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716030461; 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=nhabpPXLe0Cf1x+ob1xlqSso7rQbSUToeoYiX3DUa+k=; b=va1kzMpJcqi0VM/d0iR1PFUOQFmp0BdOWx1BHzOw8uRKYLDMXFzED2ru1g7Yo7ty0pkCkw yLRkV1IofPtPzHz8HUBpOWT/nlVNVH6TjsZDChJIaVgKIPBNkDO5pkbBmw2pMH3pBbCSnz 9qgcvkipCcyTvDLnVNCb5ApElb+Dt6nZrFXLSoxcGsdb8u11g2F2nJZyTBmmXdKx6v8vCd zr9+znX6r5H67CqHg+RbzocETRoZRF/sAW4i605oBj0kuWET//BBQGvxlJv/RTOBpS9O/D l82ZKkvZMLsS1Or+PSQFf7pre4Ccz7lkfWQXXrXXq7k9zII5Z1kYjOP1HlLZ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716030461; a=rsa-sha256; cv=none; b=JV/98MGlLUwnNTFjk77uV5dMBupabySg9eytgUAJLbjRh1287UBHVL9z11EI9qAmi2kWek F2yJ32rfbKpFQbhmV4FOdQpTnUQVypmMFxFspm51W7JPl1zoDZOg2+4p6K3wram8+NSnyT CmFze86wQBqEHR9+4/gnU+K0ZLJeT+uPpbG2fuijWJz64LhumLail1pvDKAx5aSTujUbQm BEt8Ega3iblzPeljXc62/4Ig0fWzELk+rHh3N4mnhPyGze9pLhqsoezaO0lRe3JUhMIJQE 3KhpUQtpHOyRwsSp6y+kXu2noUEwBxOexocQYycCz6JfaegRkg1FzKal+SCs/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716030461; 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=nhabpPXLe0Cf1x+ob1xlqSso7rQbSUToeoYiX3DUa+k=; b=SvSZ/7b7uROQtOOD4Ei6sQnJpFaliMjdePloQl609rStgnvUrrAKY+K6ap3cBKpOSV2dXd 10N/LiAV78620Pjty9y2MDhd9Avt4nr4d2xHO44JDzw6fhYDvW0lnjCKUlmZ60tg3Encaq iYudu5y0eyBWXm4ZuAD3MT9b7q9KBvKO2QcNT7Es19xmudIKs3AqbEI/ETJ8lzX6PZctM4 wSpSDK1ocFZ/+6cb+lLxzoiLposCQfzhMoFYFBXc4zec+wPrhDs3A3vj5V5wwlzCVJ7jlT UfzkB+XOV1bTgOeItBV5m8pqr+itMhZqGBAlYPEPAWtP1W6TmPKq1jp2x5XQ6g== 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 4VhLdn4jmZzN5G; Sat, 18 May 2024 11:07:41 +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 44IB7fYg076743; Sat, 18 May 2024 11:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44IB7fYh076740; Sat, 18 May 2024 11:07:41 GMT (envelope-from git) Date: Sat, 18 May 2024 11:07:41 GMT Message-Id: <202405181107.44IB7fYh076740@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: 0663812b214b - main - dns/bind9-devel: move dnstap-read to bind-tools List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 0663812b214b33288c7dfeab2a9e1b03d9d27454 Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=0663812b214b33288c7dfeab2a9e1b03d9d27454 commit 0663812b214b33288c7dfeab2a9e1b03d9d27454 Author: Mathieu Arnold AuthorDate: 2024-05-18 09:03:24 +0000 Commit: Mathieu Arnold CommitDate: 2024-05-18 11:07:05 +0000 dns/bind9-devel: move dnstap-read to bind-tools PR: 279050 Reported by: freebsd rail eu org --- dns/bind-tools/pkg-plist-devel | 2 ++ dns/bind9-devel/Makefile | 6 +++--- dns/bind9-devel/files/extrapatch-no-bind-tools | 24 +++++++++++++++++++++--- dns/bind9-devel/pkg-plist | 3 +-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index f1a5056105bb..97364a9ada9b 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -11,6 +11,7 @@ bin/dnssec-revoke bin/dnssec-settime bin/dnssec-signzone bin/dnssec-verify +%%DNSTAP%%bin/dnstap-read bin/host bin/mdig bin/named-rrchecker @@ -40,6 +41,7 @@ share/man/man1/dnssec-revoke.1.gz share/man/man1/dnssec-settime.1.gz share/man/man1/dnssec-signzone.1.gz share/man/man1/dnssec-verify.1.gz +%%DNSTAP%%share/man/man1/dnstap-read.1.gz share/man/man1/host.1.gz share/man/man1/mdig.1.gz @comment share/man/man1/named-checkconf.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 455fee803961..8ad053470db7 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -4,11 +4,11 @@ PORTNAME= bind DISTVERSION= 9.19.24 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 0 +PORTREVISION= 1 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${DISTVERSION} @@ -90,7 +90,7 @@ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if defined(BIND_TOOLS_SLAVE) -OPTIONS_EXCLUDE= DNSTAP DOCS GEOIP LMDB \ +OPTIONS_EXCLUDE= DOCS GEOIP LMDB \ OVERRIDECACHE QUERYTRACE START_LATE \ TCP_FASTOPEN .endif # BIND_TOOLS_SLAVE diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools index d53088bec0f4..9a168202eb50 100644 --- a/dns/bind9-devel/files/extrapatch-no-bind-tools +++ b/dns/bind9-devel/files/extrapatch-no-bind-tools @@ -1,13 +1,13 @@ Exclude the "tools" from building and installing. ---- bin/Makefile.am.orig 2021-09-17 07:10:48 UTC +--- bin/Makefile.am.orig 2024-05-03 07:23:28 UTC +++ bin/Makefile.am @@ -1 +1 @@ -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins +SUBDIRS = named rndc tools check confgen tests plugins ---- bin/tools/Makefile.am.orig 2021-09-17 07:10:48 UTC +--- bin/tools/Makefile.am.orig 2024-05-03 07:23:29 UTC +++ bin/tools/Makefile.am -@@ -9,11 +9,7 @@ LDADD += \ +@@ -9,29 +9,10 @@ LDADD += \ $(LIBISC_LIBS) bin_PROGRAMS = \ @@ -20,3 +20,21 @@ Exclude the "tools" from building and installing. arpaname_LDADD = \ $(LIBISC_LIBS) +- +-if HAVE_DNSTAP +-bin_PROGRAMS += \ +- dnstap-read +- +-dnstap_read_CPPFLAGS = \ +- $(AM_CPPFLAGS) \ +- $(DNSTAP_CFLAGS) \ +- -I$(top_builddir)/lib/dns +- +-dnstap_read_LDADD = \ +- $(LIBDNS_LIBS) \ +- $(LIBISC_LIBS) \ +- $(DNSTAP_LIBS) +-endif + + if HAVE_LMDB + bin_PROGRAMS += \ diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index ed2f52232b8a..b4fc3d1d90e6 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -1,4 +1,3 @@ -%%DNSTAP%%bin/dnstap-read bin/named-checkconf bin/named-checkzone bin/named-compilezone @@ -262,7 +261,7 @@ lib/libns.so @comment share/man/man1/dnssec-settime.1.gz @comment share/man/man1/dnssec-signzone.1.gz @comment share/man/man1/dnssec-verify.1.gz -%%DNSTAP%%share/man/man1/dnstap-read.1.gz +@comment share/man/man1/dnstap-read.1.gz @comment share/man/man1/host.1.gz @comment share/man/man1/mdig.1.gz share/man/man1/named-checkconf.1.gz