Add a "dnstap" option, defaults to off. Bump PKGREVISION.diff -r1.7 -r1.8 pkgsrc/net/bind912/Makefile
(he)
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2018/12/15 16:40:20 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2019/01/17 08:53:37 he Exp $ | |
2 | 2 | |||
3 | DISTNAME= bind-${BIND_VERSION} | 3 | DISTNAME= bind-${BIND_VERSION} | |
4 | PKGNAME= ${DISTNAME:S/-P/pl/} | 4 | PKGNAME= ${DISTNAME:S/-P/pl/} | |
5 | PKGREVISION= 1 | |||
5 | CATEGORIES= net | 6 | CATEGORIES= net | |
6 | MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ | 7 | MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ | |
7 | 8 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.isc.org/software/bind/ | 10 | HOMEPAGE= http://www.isc.org/software/bind/ | |
10 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.12 | 11 | COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.12 | |
11 | LICENSE= mpl-2.0 | 12 | LICENSE= mpl-2.0 | |
12 | 13 | |||
13 | CONFLICTS+= host-[0-9]* | 14 | CONFLICTS+= host-[0-9]* | |
14 | 15 | |||
15 | MAKE_JOBS_SAFE= no | 16 | MAKE_JOBS_SAFE= no | |
16 | USE_CWRAPPERS= no | 17 | USE_CWRAPPERS= no | |
17 | 18 |
@@ -1,50 +1,52 @@ | @@ -1,50 +1,52 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1 2018/09/09 13:16:01 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2019/01/17 08:53:37 he Exp $ | |
2 | bin/arpaname | 2 | bin/arpaname | |
3 | bin/bind9-config | 3 | bin/bind9-config | |
4 | bin/delv | 4 | bin/delv | |
5 | bin/dig | 5 | bin/dig | |
6 | bin/host | 6 | bin/host | |
7 | bin/isc-config.sh | 7 | bin/isc-config.sh | |
8 | bin/mdig | 8 | bin/mdig | |
9 | bin/named-rrchecker | 9 | bin/named-rrchecker | |
10 | bin/nslookup | 10 | bin/nslookup | |
11 | bin/nsupdate | 11 | bin/nsupdate | |
12 | ${PLIST.dnstap}bin/dnstap-read | |||
12 | include/bind9/check.h | 13 | include/bind9/check.h | |
13 | include/bind9/getaddresses.h | 14 | include/bind9/getaddresses.h | |
14 | include/bind9/version.h | 15 | include/bind9/version.h | |
15 | include/dns/acl.h | 16 | include/dns/acl.h | |
16 | include/dns/adb.h | 17 | include/dns/adb.h | |
17 | include/dns/badcache.h | 18 | include/dns/badcache.h | |
18 | include/dns/bit.h | 19 | include/dns/bit.h | |
19 | include/dns/byaddr.h | 20 | include/dns/byaddr.h | |
20 | include/dns/cache.h | 21 | include/dns/cache.h | |
21 | include/dns/callbacks.h | 22 | include/dns/callbacks.h | |
22 | include/dns/catz.h | 23 | include/dns/catz.h | |
23 | include/dns/cert.h | 24 | include/dns/cert.h | |
24 | include/dns/client.h | 25 | include/dns/client.h | |
25 | include/dns/clientinfo.h | 26 | include/dns/clientinfo.h | |
26 | include/dns/compress.h | 27 | include/dns/compress.h | |
27 | include/dns/db.h | 28 | include/dns/db.h | |
28 | include/dns/dbiterator.h | 29 | include/dns/dbiterator.h | |
29 | include/dns/dbtable.h | 30 | include/dns/dbtable.h | |
30 | include/dns/diff.h | 31 | include/dns/diff.h | |
31 | include/dns/dispatch.h | 32 | include/dns/dispatch.h | |
32 | include/dns/dlz.h | 33 | include/dns/dlz.h | |
33 | include/dns/dlz_dlopen.h | 34 | include/dns/dlz_dlopen.h | |
34 | include/dns/dns64.h | 35 | include/dns/dns64.h | |
35 | include/dns/dnsrps.h | 36 | include/dns/dnsrps.h | |
36 | include/dns/dnssec.h | 37 | include/dns/dnssec.h | |
37 | include/dns/dnstap.h | 38 | include/dns/dnstap.h | |
39 | ${PLIST.dnstap}include/dns/dnstap.pb-c.h | |||
38 | include/dns/ds.h | 40 | include/dns/ds.h | |
39 | include/dns/dsdigest.h | 41 | include/dns/dsdigest.h | |
40 | include/dns/dyndb.h | 42 | include/dns/dyndb.h | |
41 | include/dns/ecdb.h | 43 | include/dns/ecdb.h | |
42 | include/dns/ecs.h | 44 | include/dns/ecs.h | |
43 | include/dns/edns.h | 45 | include/dns/edns.h | |
44 | include/dns/enumclass.h | 46 | include/dns/enumclass.h | |
45 | include/dns/enumtype.h | 47 | include/dns/enumtype.h | |
46 | include/dns/events.h | 48 | include/dns/events.h | |
47 | include/dns/fixedname.h | 49 | include/dns/fixedname.h | |
48 | include/dns/forward.h | 50 | include/dns/forward.h | |
49 | include/dns/geoip.h | 51 | include/dns/geoip.h | |
50 | include/dns/ipkeylist.h | 52 | include/dns/ipkeylist.h | |
@@ -300,26 +302,27 @@ man/man8/dnssec-settime.8 | @@ -300,26 +302,27 @@ man/man8/dnssec-settime.8 | |||
300 | man/man8/dnssec-signzone.8 | 302 | man/man8/dnssec-signzone.8 | |
301 | man/man8/dnssec-verify.8 | 303 | man/man8/dnssec-verify.8 | |
302 | man/man8/genrandom.8 | 304 | man/man8/genrandom.8 | |
303 | man/man8/named-checkconf.8 | 305 | man/man8/named-checkconf.8 | |
304 | man/man8/named-checkzone.8 | 306 | man/man8/named-checkzone.8 | |
305 | man/man8/named-compilezone.8 | 307 | man/man8/named-compilezone.8 | |
306 | man/man8/named-journalprint.8 | 308 | man/man8/named-journalprint.8 | |
307 | man/man8/named.8 | 309 | man/man8/named.8 | |
308 | man/man8/nsec3hash.8 | 310 | man/man8/nsec3hash.8 | |
309 | ${PLIST.pkcs11}man/man8/pkcs11-destroy.8 | 311 | ${PLIST.pkcs11}man/man8/pkcs11-destroy.8 | |
310 | ${PLIST.pkcs11}man/man8/pkcs11-keygen.8 | 312 | ${PLIST.pkcs11}man/man8/pkcs11-keygen.8 | |
311 | ${PLIST.pkcs11}man/man8/pkcs11-list.8 | 313 | ${PLIST.pkcs11}man/man8/pkcs11-list.8 | |
312 | ${PLIST.pkcs11}man/man8/pkcs11-tokens.8 | 314 | ${PLIST.pkcs11}man/man8/pkcs11-tokens.8 | |
315 | ${PLIST.dnstap}man/man1/dnstap-read.1 | |||
313 | man/man8/rndc-confgen.8 | 316 | man/man8/rndc-confgen.8 | |
314 | man/man8/rndc.8 | 317 | man/man8/rndc.8 | |
315 | man/man8/tsig-keygen.8 | 318 | man/man8/tsig-keygen.8 | |
316 | sbin/ddns-confgen | 319 | sbin/ddns-confgen | |
317 | sbin/dnssec-cds | 320 | sbin/dnssec-cds | |
318 | sbin/dnssec-dsfromkey | 321 | sbin/dnssec-dsfromkey | |
319 | sbin/dnssec-importkey | 322 | sbin/dnssec-importkey | |
320 | sbin/dnssec-keyfromlabel | 323 | sbin/dnssec-keyfromlabel | |
321 | sbin/dnssec-keygen | 324 | sbin/dnssec-keygen | |
322 | sbin/dnssec-revoke | 325 | sbin/dnssec-revoke | |
323 | sbin/dnssec-settime | 326 | sbin/dnssec-settime | |
324 | sbin/dnssec-signzone | 327 | sbin/dnssec-signzone | |
325 | sbin/dnssec-verify | 328 | sbin/dnssec-verify |
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | # $NetBSD: options.mk,v 1.2 2018/10/24 11:10:31 jperkin Exp $ | 1 | # $NetBSD: options.mk,v 1.3 2019/01/17 08:53:37 he Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.bind912 | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.bind912 | |
4 | PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server | 4 | PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server | |
5 | PKG_SUPPORTED_OPTIONS+= bind-json-statistics-server | 5 | PKG_SUPPORTED_OPTIONS+= bind-json-statistics-server | |
6 | PKG_SUPPORTED_OPTIONS+= inet6 threads readline mysql pgsql ldap dlz-filesystem | 6 | PKG_SUPPORTED_OPTIONS+= inet6 threads readline mysql pgsql ldap dlz-filesystem | |
7 | PKG_SUPPORTED_OPTIONS+= fetchlimit geoip pkcs11 sit tuning | 7 | PKG_SUPPORTED_OPTIONS+= fetchlimit geoip pkcs11 sit tuning dnstap | |
8 | PKG_SUGGESTED_OPTIONS+= readline | 8 | PKG_SUGGESTED_OPTIONS+= readline | |
9 | 9 | |||
10 | PLIST_VARS+= inet6 pkcs11 | 10 | PLIST_VARS+= inet6 pkcs11 dnstap | |
11 | 11 | |||
12 | PTHREAD_OPTS+= native | 12 | PTHREAD_OPTS+= native | |
13 | .include "../../mk/pthread.buildlink3.mk" | 13 | .include "../../mk/pthread.buildlink3.mk" | |
14 | 14 | |||
15 | .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") || \ | 15 | .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") || \ | |
16 | !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \ | 16 | !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \ | |
17 | !empty(MACHINE_PLATFORM:MNetBSD-*-sparc) || \ | 17 | !empty(MACHINE_PLATFORM:MNetBSD-*-sparc) || \ | |
18 | !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || \ | 18 | !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || \ | |
19 | !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) | 19 | !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) | |
20 | # don't touch PKG_SUGGESTED_OPTIONS | 20 | # don't touch PKG_SUGGESTED_OPTIONS | |
21 | .else | 21 | .else | |
22 | PKG_SUGGESTED_OPTIONS+= threads | 22 | PKG_SUGGESTED_OPTIONS+= threads | |
23 | .endif | 23 | .endif | |
@@ -72,26 +72,34 @@ LDFLAGS+= -lGeoIP | @@ -72,26 +72,34 @@ LDFLAGS+= -lGeoIP | |||
72 | .if !empty(PKG_OPTIONS:Mpkcs11) | 72 | .if !empty(PKG_OPTIONS:Mpkcs11) | |
73 | CONFIGURE_ARGS+= --with-pkcs11=yes | 73 | CONFIGURE_ARGS+= --with-pkcs11=yes | |
74 | PLIST.pkcs11= yes | 74 | PLIST.pkcs11= yes | |
75 | .endif | 75 | .endif | |
76 | 76 | |||
77 | .if !empty(PKG_OPTIONS:Msit) | 77 | .if !empty(PKG_OPTIONS:Msit) | |
78 | CONFIGURE_ARGS+= --enable-sit | 78 | CONFIGURE_ARGS+= --enable-sit | |
79 | .endif | 79 | .endif | |
80 | 80 | |||
81 | .if !empty(PKG_OPTIONS:Mtuning) | 81 | .if !empty(PKG_OPTIONS:Mtuning) | |
82 | CONFIGURE_ARGS+= --with-tuning=large | 82 | CONFIGURE_ARGS+= --with-tuning=large | |
83 | .endif | 83 | .endif | |
84 | 84 | |||
85 | .if !empty(PKG_OPTIONS:Mdnstap) | |||
86 | CONFIGURE_ARGS+= --enable-dnstap | |||
87 | PLIST.dnstap= yes | |||
88 | .include "../../net/fstrm/buildlink3.mk" | |||
89 | .include "../../devel/protobuf/buildlink3.mk" | |||
90 | .include "../../devel/protobuf-c/buildlink3.mk" | |||
91 | .endif | |||
92 | ||||
85 | ### | 93 | ### | |
86 | ### The statistics server in bind99 and later needs libxml2 | 94 | ### The statistics server in bind99 and later needs libxml2 | |
87 | ### | 95 | ### | |
88 | .if !empty(PKG_OPTIONS:Mbind-xml-statistics-server) | 96 | .if !empty(PKG_OPTIONS:Mbind-xml-statistics-server) | |
89 | .include "../../textproc/libxml2/buildlink3.mk" | 97 | .include "../../textproc/libxml2/buildlink3.mk" | |
90 | CONFIGURE_ARGS+= --with-libxml2 | 98 | CONFIGURE_ARGS+= --with-libxml2 | |
91 | LDFLAGS+= -lxml2 | 99 | LDFLAGS+= -lxml2 | |
92 | .else | 100 | .else | |
93 | CONFIGURE_ARGS+= --without-libxml2 | 101 | CONFIGURE_ARGS+= --without-libxml2 | |
94 | .endif | 102 | .endif | |
95 | 103 | |||
96 | ### | 104 | ### | |
97 | ### The statistics server in bind911 and later supports json | 105 | ### The statistics server in bind911 and later supports json |