mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

dns/bind9-devel: move dnstap-read to bind-tools

Browse Source 
PR:		279050
Reported by:	freebsd rail eu org
This commit is contained in:
Mathieu Arnold 2024-05-18 11:03:24 +02:00
parent 0663811732
commit 0663812b21
No known key found for this signature in database
GPG Key ID: 7F620E0A9E9D41BE
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns/bind-tools/pkg-plist-devel
View File

@ -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

6
dns/bind9-devel/Makefile
View File

@ -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

24
dns/bind9-devel/files/extrapatch-no-bind-tools
View File

@ -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 += \

3
dns/bind9-devel/pkg-plist
View File

@ -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