Date: Tue, 30 Jan 2018 23:50:54 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> To: Mathieu Arnold <mat@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r460385 - in head/dns: bind9-devel bind911 bind912 Message-ID: <CAMHz58Rbvb-V8oFVg4xWE_CSfkK6gU2qyTsfaiJbsj6Den6K_A@mail.gmail.com> In-Reply-To: <201801301344.w0UDijmA083648@repo.freebsd.org> References: <201801301344.w0UDijmA083648@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jan 30, 2018 at 9:44 PM, Mathieu Arnold <mat@freebsd.org> wrote: > Author: mat > Date: Tue Jan 30 13:44:44 2018 > New Revision: 460385 > URL: https://svnweb.freebsd.org/changeset/ports/460385 > > Log: > Add a TCP_FASTOPEN option (default on) to allow not building it in. [1] > > It is annoying because it outputs one line saying it cannot enable > TCP_FASTOPEN when the deamon starts. > > While there, discover that FILTER_AAAA is always enabled in 9.12+ and no > longer an option, so remove it. > > These 2 options are also available for dns/bind-tools. It may need PORTREVISION bump. > PR: 217288 [1] (based on) > Reported by: doktornotor mailinator com > Sponsored by: Absolight > > Modified: > head/dns/bind9-devel/Makefile (contents, props changed) > head/dns/bind911/Makefile (contents, props changed) > head/dns/bind912/Makefile (contents, props changed) > > Modified: head/dns/bind9-devel/Makefile > ============================================================ > ================== > --- head/dns/bind9-devel/Makefile Tue Jan 30 12:35:05 2018 > (r460384) > +++ head/dns/bind9-devel/Makefile Tue Jan 30 13:44:44 2018 > (r460385) > @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc > PORTREVISION= 0 > .else > # dns/bind9xx here > -PORTREVISION= 0 > +PORTREVISION= 1 > .endif > CATEGORIES= dns net ipv6 > MASTER_SITES= LOCAL/mat/bind > @@ -69,9 +69,9 @@ MAKE_JOBS_UNSAFE= yes > > PORTDOCS= * > > -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON > +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON > TCP_FASTOPEN > OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ > - FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA > + FIXED_RRSET SIGCHASE IPV6 THREADS TCP_FASTOPEN > > OPTIONS_RADIO= CRYPTO GOSTDEF > OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 > @@ -100,7 +100,6 @@ DLZ_MYSQL_DESC= DLZ MySQL driver (no > threading) > DLZ_POSTGRESQL_DESC= DLZ Postgres driver > DLZ_STUB_DESC= DLZ stub driver > DNSTAP_DESC= Provides fast passive logging of DNS messages > -FILTER_AAAA_DESC= Enable filtering of AAAA records > FIXED_RRSET_DESC= Enable fixed rrset ordering > GEOIP_DESC= Allow geographically based ACL. > GOSTDEF_DESC= Enable GOST ciphers, needs SSL > @@ -122,6 +121,7 @@ RPZ_NSIP_DESC= Enable RPZ NSIP trigger > rules > SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation > SSL_DESC= Build with OpenSSL (Required for DNSSEC) > START_LATE_DESC= Start BIND late in the boot process (see help) > +TCP_FASTOPEN_DESC= RFC 7413 support > TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) > > DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes > @@ -146,8 +146,6 @@ DNSTAP_IMPLIES= THREADS > DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ > libprotobuf-c.so:devel/protobuf-c > > -FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa > - > FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset > > GEOIP_CONFIGURE_WITH= geoip > @@ -212,6 +210,8 @@ START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS > cleanvar" > NAMED_BEFORE="LOGIN" > START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ > NAMED_BEFORE="SERVERS" > + > +TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen > > THREADS_CONFIGURE_ENABLE= threads > > > Modified: head/dns/bind911/Makefile > ============================================================ > ================== > --- head/dns/bind911/Makefile Tue Jan 30 12:35:05 2018 (r460384) > +++ head/dns/bind911/Makefile Tue Jan 30 13:44:44 2018 (r460385) > @@ -3,7 +3,7 @@ > > PORTNAME= bind > PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= dns net ipv6 > MASTER_SITES= ISC/bind9/${ISCVERSION} > PKGNAMESUFFIX= 911 > @@ -48,12 +48,12 @@ MAKE_JOBS_UNSAFE= yes > PORTDOCS= * > > OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON \ > - DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP > + DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP > TCP_FASTOPEN > OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ > FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ > RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ > MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ > - START_LATE TUNING_LARGE > + START_LATE TUNING_LARGE TCP_FASTOPEN > > OPTIONS_RADIO= CRYPTO GOSTDEF > OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 > @@ -98,6 +98,7 @@ RPZ_NSIP_DESC= Enable RPZ NSIP trigger > rules > SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation > SSL_DESC= Build with OpenSSL (Required for DNSSEC) > START_LATE_DESC= Start BIND late in the boot process (see help) > +TCP_FASTOPEN_DESC= RFC 7413 support > TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) > > DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes > @@ -221,6 +222,9 @@ post-patch-PORTREVISION-on: > @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ > ${WRKSRC}/version > .endif > + > +post-patch-TCP_FASTOPEN-off: > + @${REINPLACE_CMD} -e 's/#define ISC_PLATFORM_HAVETFO 1/#undef > ISC_PLATFORM_HAVETFO/' ${WRKSRC}/configure > > post-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree > > Modified: head/dns/bind912/Makefile > ============================================================ > ================== > --- head/dns/bind912/Makefile Tue Jan 30 12:35:05 2018 (r460384) > +++ head/dns/bind912/Makefile Tue Jan 30 13:44:44 2018 (r460385) > @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc > PORTREVISION= 0 > .else > # dns/bind912 here > -PORTREVISION= 0 > +PORTREVISION= 1 > .endif > CATEGORIES= dns net ipv6 > MASTER_SITES= ISC/bind9/${ISCVERSION} > @@ -67,9 +67,9 @@ MAKE_JOBS_UNSAFE= yes > > PORTDOCS= * > > -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON > +OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON > TCP_FASTOPEN > OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ > - FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA > + FIXED_RRSET SIGCHASE IPV6 THREADS TCP_FASTOPEN > > OPTIONS_RADIO= CRYPTO GOSTDEF > OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 > @@ -98,7 +98,6 @@ DLZ_MYSQL_DESC= DLZ MySQL driver (no > threading) > DLZ_POSTGRESQL_DESC= DLZ Postgres driver > DLZ_STUB_DESC= DLZ stub driver > DNSTAP_DESC= Provides fast passive logging of DNS messages > -FILTER_AAAA_DESC= Enable filtering of AAAA records > FIXED_RRSET_DESC= Enable fixed rrset ordering > GEOIP_DESC= Allow geographically based ACL. > GOSTDEF_DESC= Enable GOST ciphers, needs SSL > @@ -120,6 +119,7 @@ RPZ_NSIP_DESC= Enable RPZ NSIP trigger > rules > SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation > SSL_DESC= Build with OpenSSL (Required for DNSSEC) > START_LATE_DESC= Start BIND late in the boot process (see help) > +TCP_FASTOPEN_DESC= RFC 7413 support > TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) > > DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes > @@ -144,8 +144,6 @@ DNSTAP_IMPLIES= THREADS > DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ > libprotobuf-c.so:devel/protobuf-c > > -FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa > - > FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset > > GEOIP_CONFIGURE_WITH= geoip > @@ -210,6 +208,8 @@ START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS > cleanvar" > NAMED_BEFORE="LOGIN" > START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ > NAMED_BEFORE="SERVERS" > + > +TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen > > THREADS_CONFIGURE_ENABLE= threads > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58Rbvb-V8oFVg4xWE_CSfkK6gU2qyTsfaiJbsj6Den6K_A>