Date: Thu, 20 Sep 2018 14:12:25 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480176 - in head/dns/bind913: . files Message-ID: <201809201412.w8KECP0W035052@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Sep 20 14:12:24 2018 New Revision: 480176 URL: https://svnweb.freebsd.org/changeset/ports/480176 Log: Update to 9.13.3. Cleanup options. Modified: head/dns/bind913/Makefile (contents, props changed) head/dns/bind913/distinfo (contents, props changed) head/dns/bind913/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind913/files/patch-bin_named_include_named_globals.h (contents, props changed) head/dns/bind913/files/patch-configure (contents, props changed) head/dns/bind913/pkg-plist (contents, props changed) Modified: head/dns/bind913/Makefile ============================================================================== --- head/dns/bind913/Makefile Thu Sep 20 14:12:21 2018 (r480175) +++ head/dns/bind913/Makefile Thu Sep 20 14:12:24 2018 (r480176) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind913 here -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -33,7 +33,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= cpe libedit ssl # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.2 +ISCVERSION= 9.13.3 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -44,7 +44,6 @@ CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ - --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ @@ -67,13 +66,12 @@ PORTDOCS= * MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFAULT= THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON +OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ - FIXED_RRSET SIGCHASE IPV6 THREADS + FIXED_RRSET SIGCHASE IPV6 -OPTIONS_RADIO= CRYPTO GOSTDEF +OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 -OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN @@ -100,9 +98,6 @@ DLZ_STUB_DESC= DLZ stub driver DNSTAP_DESC= Provides fast passive logging of DNS messages FIXED_RRSET_DESC= Enable fixed rrset ordering GEOIP_DESC= Allow geographically based ACL. -GOSTDEF_DESC= Enable GOST ciphers -GOST_ASN1_DESC= GOST using ASN.1 -GOST_DESC= GOST raw keys (new default) GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 @@ -130,7 +125,6 @@ DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes -DLZ_MYSQL_PREVENTS= THREADS DLZ_MYSQL_USES= mysql DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes @@ -139,7 +133,6 @@ DLZ_POSTGRESQL_USES= pgsql DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes DNSTAP_CONFIGURE_ENABLE= dnstap -DNSTAP_IMPLIES= THREADS DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c @@ -148,10 +141,6 @@ FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 - -GOST_CONFIGURE_ON= --with-gost - GSSAPI_BASE_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi @@ -184,7 +173,6 @@ LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 -NATIVE_PKCS11_IMPLIES= THREADS PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} @@ -206,23 +194,10 @@ START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldco TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen -THREADS_CONFIGURE_ENABLE= threads - -TUNING_LARGE_IMPLIES= THREADS TUNING_LARGE_CONFIGURE_ON= --with-tuning=large TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default .include <bsd.port.pre.mk> - -.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} -CONFIGURE_ARGS+= --without-gost -.endif - -.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base -BROKEN= OpenSSL from the base system does not support GOST, add \ - DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ - that needs SSL. -.endif post-patch: .if defined(BIND_TOOLS_SLAVE) Modified: head/dns/bind913/distinfo ============================================================================== --- head/dns/bind913/distinfo Thu Sep 20 14:12:21 2018 (r480175) +++ head/dns/bind913/distinfo Thu Sep 20 14:12:24 2018 (r480176) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531290964 -SHA256 (bind-9.13.2.tar.gz) = 6c044e9ea81add9dbbd2f5dfc224964cc6b6e364e43a8d6d8b574d9282651802 -SIZE (bind-9.13.2.tar.gz) = 8547111 +TIMESTAMP = 1537447591 +SHA256 (bind-9.13.3.tar.gz) = 76674cf2a3e61766aed5c7fd1ee6ed3da133a9e331b35b24f40efdf1bbac5b44 +SIZE (bind-9.13.3.tar.gz) = 7805551 Modified: head/dns/bind913/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind913/files/extrapatch-bind-min-override-ttl Thu Sep 20 14:12:21 2018 (r480175) +++ head/dns/bind913/files/extrapatch-bind-min-override-ttl Thu Sep 20 14:12:24 2018 (r480176) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2018-07-03 07:51:40 UTC +--- bin/named/config.c.orig 2018-09-06 00:15:26 UTC +++ bin/named/config.c -@@ -177,12 +177,14 @@ options {\n\ +@@ -174,12 +174,14 @@ options {\n\ max-recursion-queries 75;\n\ max-stale-ttl 604800; /* 1 week */\n\ message-compression yes;\n\ @@ -15,9 +15,9 @@ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2018-07-03 07:51:40 UTC +--- bin/named/server.c.orig 2018-09-06 00:15:26 UTC +++ bin/named/server.c -@@ -4071,6 +4071,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -34,20 +34,20 @@ result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2018-07-03 07:51:40 UTC +--- lib/dns/include/dns/view.h.orig 2018-09-06 00:15:26 UTC +++ lib/dns/include/dns/view.h -@@ -151,6 +151,8 @@ struct dns_view { - isc_boolean_t requestnsid; - isc_boolean_t sendcookie; +@@ -153,6 +153,8 @@ struct dns_view { + bool requestnsid; + bool sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t mincachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; - isc_uint32_t nta_lifetime; - isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2018-07-03 07:51:40 UTC + uint32_t nta_lifetime; + uint32_t nta_recheck; +--- lib/dns/resolver.c.orig 2018-09-06 00:15:26 UTC +++ lib/dns/resolver.c -@@ -5799,6 +5799,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5758,6 +5758,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -66,9 +66,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-07-03 07:51:40 UTC +--- lib/isccfg/namedconf.c.orig 2018-09-06 00:15:26 UTC +++ lib/isccfg/namedconf.c -@@ -1917,6 +1917,8 @@ view_clauses[] = { +@@ -1919,6 +1919,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: head/dns/bind913/files/patch-bin_named_include_named_globals.h ============================================================================== --- head/dns/bind913/files/patch-bin_named_include_named_globals.h Thu Sep 20 14:12:21 2018 (r480175) +++ head/dns/bind913/files/patch-bin_named_include_named_globals.h Thu Sep 20 14:12:24 2018 (r480176) @@ -1,8 +1,8 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2018-05-18 05:44:02 UTC +--- bin/named/include/named/globals.h.orig 2018-09-06 00:15:26 UTC +++ bin/named/include/named/globals.h -@@ -126,7 +126,7 @@ EXTERN isc_boolean_t named_g_forcelock +@@ -128,7 +128,7 @@ EXTERN bool named_g_forcelock INIT(fals #if NAMED_RUN_PID_DIR EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" Modified: head/dns/bind913/files/patch-configure ============================================================================== --- head/dns/bind913/files/patch-configure Thu Sep 20 14:12:21 2018 (r480175) +++ head/dns/bind913/files/patch-configure Thu Sep 20 14:12:24 2018 (r480176) @@ -1,6 +1,6 @@ ---- configure.orig 2018-07-03 07:51:40 UTC +--- configure.orig 2018-09-06 00:15:26 UTC +++ configure -@@ -14993,27 +14993,9 @@ done +@@ -16468,27 +16468,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15056,47 +15038,7 @@ $as_echo "no" >&6; } ;; +@@ -16531,47 +16513,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -23693,7 +23635,7 @@ $as_echo "" >&6; } +@@ -21337,7 +21279,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind913/pkg-plist ============================================================================== --- head/dns/bind913/pkg-plist Thu Sep 20 14:12:21 2018 (r480175) +++ head/dns/bind913/pkg-plist Thu Sep 20 14:12:24 2018 (r480176) @@ -141,7 +141,6 @@ include/isc/backtrace.h include/isc/base32.h include/isc/base64.h include/isc/bind9.h -include/isc/boolean.h include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h @@ -165,11 +164,9 @@ include/isc/hmacmd5.h include/isc/hmacsha.h include/isc/ht.h include/isc/httpd.h -include/isc/int.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/json.h -include/isc/keyboard.h include/isc/lang.h include/isc/lex.h include/isc/lfsr.h @@ -219,9 +216,8 @@ include/isc/socket.h include/isc/stat.h include/isc/stats.h include/isc/stdio.h -include/isc/stdlib.h include/isc/stdtime.h -include/isc/strerror.h +include/isc/strerr.h include/isc/string.h include/isc/symtab.h include/isc/syslog.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809201412.w8KECP0W035052>