Date: Mon, 7 May 2018 12:42: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: r469286 - in head/dns/bind9-devel: . files Message-ID: <201805071242.w47CgPOV065312@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 7 12:42:25 2018 New Revision: 469286 URL: https://svnweb.freebsd.org/changeset/ports/469286 Log: Update to latest commit. OpenSSL is no longer optional, and upstream switched from idnkit to libidn2. Sponsored by: Absolight Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/distinfo (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind9-devel/files/patch-configure (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon May 7 12:42:01 2018 (r469285) +++ head/dns/bind9-devel/Makefile Mon May 7 12:42:25 2018 (r469286) @@ -34,16 +34,16 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.0a0.2018.04.27 +ISCVERSION= 9.13.0a0.2018.05.04 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 16dea1c5779e749e5477670d48790508abcbb2ed +GL_COMMIT= f0d3fe5d959ab29d5d1e9e5426a62d7c11edf9ff # XXX: remove tar:bz2 -USES= cpe libedit tar:bz2 +USES= cpe libedit ssl tar:bz2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -60,6 +60,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-c --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ + --with-openssl=${OPENSSLBASE} \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb @@ -80,12 +81,12 @@ MAKE_JOBS_UNSAFE= yes PORTDOCS= * -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON +OPTIONS_DEFAULT= THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS OPTIONS_RADIO= CRYPTO GOSTDEF -OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 +OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) @@ -113,7 +114,7 @@ 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, needs SSL +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 @@ -130,7 +131,6 @@ QUERYTRACE_DESC= Enable the very verbose query tracelo RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records 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**) @@ -180,9 +180,9 @@ GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -IDN_CONFIGURE_OFF= --without-idn -IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} -IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit +IDN_CONFIGURE_OFF= --without-libidn2 +IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE} +IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv IPV6_CONFIGURE_ENABLE= ipv6 @@ -213,9 +213,6 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" -SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl -SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -SSL_USES= ssl START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ NAMED_BEFORE="LOGIN" Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon May 7 12:42:01 2018 (r469285) +++ head/dns/bind9-devel/distinfo Mon May 7 12:42:25 2018 (r469286) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525084176 -SHA256 (isc-projects-bind9-16dea1c5779e749e5477670d48790508abcbb2ed_GL0.tar.gz) = a4ea458d9f055482139c7b5c7a08a0a7a140b5a9804aa857abcaad3f3b8b006b -SIZE (isc-projects-bind9-16dea1c5779e749e5477670d48790508abcbb2ed_GL0.tar.gz) = 8970516 +TIMESTAMP = 1525690138 +SHA256 (isc-projects-bind9-f0d3fe5d959ab29d5d1e9e5426a62d7c11edf9ff_GL0.tar.gz) = 330e837bc02f61b9b0b13a53d35f768606a61124a233636444236edef02cb2a8 +SIZE (isc-projects-bind9-f0d3fe5d959ab29d5d1e9e5426a62d7c11edf9ff_GL0.tar.gz) = 8963375 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 7 12:42:01 2018 (r469285) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 7 12:42:25 2018 (r469286) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2018-04-21 00:18:28 UTC +--- bin/named/config.c.orig 2018-05-05 00:51:14 UTC +++ bin/named/config.c -@@ -179,12 +179,14 @@ options {\n\ +@@ -175,12 +175,14 @@ options {\n\ max-recursion-queries 75;\n\ max-stale-ttl 604800; /* 1 week */\n\ message-compression yes;\n\ @@ -15,7 +15,7 @@ provide-ixfr true;\n\ query-source address *;\n\ query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2018-04-21 00:18:28 UTC +--- bin/named/server.c.orig 2018-05-05 00:51:14 UTC +++ bin/named/server.c @@ -4068,6 +4068,16 @@ configure_view(dns_view_t *view, dns_vie } @@ -34,7 +34,7 @@ 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-04-21 00:18:28 UTC +--- lib/dns/include/dns/view.h.orig 2018-05-05 00:51:14 UTC +++ lib/dns/include/dns/view.h @@ -149,6 +149,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -45,7 +45,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2018-04-21 00:18:28 UTC +--- lib/dns/resolver.c.orig 2018-05-05 00:51:14 UTC +++ lib/dns/resolver.c @@ -5746,6 +5746,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -66,7 +66,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-04-21 00:18:28 UTC +--- lib/isccfg/namedconf.c.orig 2018-05-05 00:51:14 UTC +++ lib/isccfg/namedconf.c @@ -1916,6 +1916,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, Modified: head/dns/bind9-devel/files/patch-configure ============================================================================== --- head/dns/bind9-devel/files/patch-configure Mon May 7 12:42:01 2018 (r469285) +++ head/dns/bind9-devel/files/patch-configure Mon May 7 12:42:25 2018 (r469286) @@ -1,6 +1,6 @@ ---- configure.orig 2018-04-13 19:02:44 UTC +--- configure.orig 2018-05-05 00:51:14 UTC +++ configure -@@ -14763,27 +14763,9 @@ done +@@ -14760,27 +14760,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 -@@ -14826,47 +14808,7 @@ $as_echo "no" >&6; } ;; +@@ -14823,47 +14805,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 -@@ -23456,7 +23398,7 @@ $as_echo "" >&6; } +@@ -23416,7 +23358,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805071242.w47CgPOV065312>