From nobody Sat May 18 11:10:50 2024 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 4VhLjR0XkHz5KZ6X; Sat, 18 May 2024 11:10:51 +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 4VhLjR00CYz4pmb; Sat, 18 May 2024 11:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716030651; 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=xkw3qq1XnbPeHTpMj6bqorUyT0Sio9lSvwimS8QUe5k=; b=IYFqEcCDUi5t6zza0h0/EvyVZPBlobSXHFTyGakRdkuONfYzW2N1PGuqEx4J2f9mPrN1uX 1RDd5iyGp5f1hdMag0ah236JG+YNOlJ/AMof04KhQIGzw4vRiX9LqPbJmp+PpFbPxIp8Y3 UxXMpRzRAOzf5jHXbrpJbftfTljzYTxJj72vJ9MAIo99RVdPyM5t/exY6iOoo1iGmmO0T2 SiEh6RZHLESZtBQ7XEAr1CXn1JQX5wkFQaeCz+DV9o+oazEThIx93ULXOnOOU7MlUdKmZl 9nKNjJkxb3fMTbUiWbRNsuwg3Buf5TlmI/aCnh/RSB1e+LXqc+pM+T5h4yomPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716030651; a=rsa-sha256; cv=none; b=V+A4iG3X2W24y8VkOGB4ZefGH1qjCLb1wVzdwvZYk6GJ/RZOSx7ZcItcmJjQ7mrg+nVMHx Irl1IK8CXcQIwx78A0FrWhFRMzyP0W3U5gcA8qetX1Tpmj+L/F9u9rWF0Nc1PsZeeR+DJr 8QBixsp7+bfaFS/yx/5njekcEsftTbCpffQyYii5tAJ5eQwc2Dls1ZHawvUa1ybvVyJeRF P6ydU1HPCE9b8A//KiCxfg6ZFgbt/pvAeya+ywRvCrpXgmatny86ZXzeZZ15clPpTJ6RUb 26xOte1psU5ZnHX7u2MbKH+0j+30zerQKZCcF3qDMiJf27bTlhR7FzdOg6QQTw== 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=1716030651; 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=xkw3qq1XnbPeHTpMj6bqorUyT0Sio9lSvwimS8QUe5k=; b=vTBLZ7Zz2DsETGd8m8oQDP4H6kgftxQRhs184t2ThYZCiS4SoxVBnFdhenB5r407ZEJOzK /uyu3/kTOvOVOy+IJV40B4u4U5I2/WUYCJJcCeBE782DA7+idnYgHmKbm8kKsExqFVctO9 VSMsPjzMEn9ViyCJFVzKFIx4hste4KWGv159/EbMSurIlJL7oB9QgSpxL0hPNvbRV/Lnw0 xGRYAOy9REtHAq9koe5G6g3pFw+Ojd5+866Mcpsq6CKjlCX9tcZB5lUFrjjVERJ+oPzOhP U+4+KBNClkWeJGhp2pkwHMcShD5FQQ9CIZ2RNihHUConb+hFUVuNWJ/+0osD3g== 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 4VhLjQ6c0yzNmL; Sat, 18 May 2024 11:10:50 +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 44IBAo0C086705; Sat, 18 May 2024 11:10:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44IBAoUs086702; Sat, 18 May 2024 11:10:50 GMT (envelope-from git) Date: Sat, 18 May 2024 11:10:50 GMT Message-Id: <202405181110.44IBAoUs086702@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: 06600764e9a7 - 2024Q2 - dns/bind918: move dnstap-read to bind-tools 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 06600764e9a7829721ee3d90cdb6327ffc4d9fa1 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06600764e9a7829721ee3d90cdb6327ffc4d9fa1 commit 06600764e9a7829721ee3d90cdb6327ffc4d9fa1 Author: Mathieu Arnold AuthorDate: 2024-05-18 09:02:40 +0000 Commit: Mathieu Arnold CommitDate: 2024-05-18 11:09:12 +0000 dns/bind918: move dnstap-read to bind-tools PR: 279050 Reported by: freebsd rail eu org (cherry picked from commit 0663811732c939b0a68a3caee3d9a9fe4bf8bf3a) --- dns/bind-tools/pkg-plist | 3 ++- dns/bind918/Makefile | 6 +++--- dns/bind918/files/extrapatch-no-bind-tools | 22 ++++++++++++++++++++++ dns/bind918/pkg-plist | 3 +-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist index ac953e9d63f3..a0c701233113 100644 --- a/dns/bind-tools/pkg-plist +++ b/dns/bind-tools/pkg-plist @@ -10,6 +10,7 @@ bin/dnssec-revoke bin/dnssec-settime bin/dnssec-signzone bin/dnssec-verify +%%DNSTAP%%bin/dnstap-read bin/host bin/mdig bin/named-rrchecker @@ -42,7 +43,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 -@comment share/man/man1/dnstap-read.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/bind918/Makefile b/dns/bind918/Makefile index d093babefdc6..85755f92817e 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -4,10 +4,10 @@ PORTNAME= bind DISTVERSION= 9.18.26 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 0 +PORTREVISION= 1 .else # dns/bind918 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${DISTVERSION} @@ -87,7 +87,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/bind918/files/extrapatch-no-bind-tools b/dns/bind918/files/extrapatch-no-bind-tools index d53088bec0f4..a79c4832e4de 100644 --- a/dns/bind918/files/extrapatch-no-bind-tools +++ b/dns/bind918/files/extrapatch-no-bind-tools @@ -20,3 +20,25 @@ Exclude the "tools" from building and installing. arpaname_LDADD = \ $(LIBISC_LIBS) +@@ -27,21 +23,6 @@ + $(LIBISCCFG_LIBS) \ + $(LIBDNS_LIBS) \ + $(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/bind918/pkg-plist b/dns/bind918/pkg-plist index 21deb99a906d..34e29aa1c516 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -1,4 +1,3 @@ -%%DNSTAP%%bin/dnstap-read bin/named-checkconf bin/named-checkzone bin/named-compilezone @@ -266,7 +265,7 @@ lib/libns-9.18.26.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