Date: Mon, 11 Sep 2017 12:57:08 +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: r449633 - in head/dns/bind9-devel: . files Message-ID: <201709111257.v8BCv8Rt029254@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Sep 11 12:57:08 2017 New Revision: 449633 URL: https://svnweb.freebsd.org/changeset/ports/449633 Log: Update to latest commit. 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) head/dns/bind9-devel/pkg-plist (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon Sep 11 12:57:05 2017 (r449632) +++ head/dns/bind9-devel/Makefile Mon Sep 11 12:57:08 2017 (r449633) @@ -31,8 +31,8 @@ LICENSE= MPL LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0a.2017.09.05 -HASH= e8a4edf +ISCVERSION= 9.12.0a.2017.09.10 +HASH= 8334115 USES= cpe libedit Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon Sep 11 12:57:05 2017 (r449632) +++ head/dns/bind9-devel/distinfo Mon Sep 11 12:57:08 2017 (r449633) @@ -1,3 +1,3 @@ -TIMESTAMP = 1504608701 -SHA256 (bind9-e8a4edf.tar.gz) = a8917c5ba2879ff49a3e8a98853d6641dce7267fcb6111185147f10ea64a4b3d -SIZE (bind9-e8a4edf.tar.gz) = 11911423 +TIMESTAMP = 1505133022 +SHA256 (bind9-8334115.tar.gz) = d59fc6eec14f15644288e1ae9e93caf57ac4b0c8f61bc3e0c87fbb508b8ac147 +SIZE (bind9-8334115.tar.gz) = 11605180 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Sep 11 12:57:05 2017 (r449632) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Sep 11 12:57:08 2017 (r449633) @@ -1,8 +1,8 @@ ---- bin/named/config.c.orig 2017-09-05 01:10:49 UTC +--- bin/named/config.c.orig 2017-09-10 01:10:23 UTC +++ bin/named/config.c -@@ -176,12 +176,14 @@ options {\n\ - max-recursion-depth 7;\n\ +@@ -179,12 +179,14 @@ options {\n\ max-recursion-queries 75;\n\ + max-stale-ttl 604800; /* 1 week */\n\ message-compression yes;\n\ + min-cache-ttl 0; /* no minimal, zero is allowed */\n\ # min-roots <obsolete>;\n\ @@ -15,26 +15,26 @@ provide-ixfr true;\n\ query-source address *;\n\ query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2017-09-05 01:10:49 UTC +--- bin/named/server.c.orig 2017-09-10 01:10:23 UTC +++ bin/named/server.c -@@ -3722,6 +3722,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3741,6 +3741,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; -+ result = ns_config_get(maps, "override-cache-ttl", &obj); ++ result = named_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asuint32(obj); + + obj = NULL; -+ result = ns_config_get(maps, "min-cache-ttl", &obj); ++ result = named_config_get(maps, "min-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->mincachettl = cfg_obj_asuint32(obj); + + obj = NULL; - result = ns_config_get(maps, "max-cache-ttl", &obj); + 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 2017-09-05 01:10:49 UTC +--- lib/dns/include/dns/view.h.orig 2017-09-10 01:10:23 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -45,9 +45,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-09-05 01:10:49 UTC +--- lib/dns/resolver.c.orig 2017-09-10 01:10:23 UTC +++ lib/dns/resolver.c -@@ -5722,6 +5722,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5726,6 +5726,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 2017-09-05 01:10:49 UTC +--- lib/isccfg/namedconf.c.orig 2017-09-10 01:10:23 UTC +++ lib/isccfg/namedconf.c @@ -1894,6 +1894,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 Sep 11 12:57:05 2017 (r449632) +++ head/dns/bind9-devel/files/patch-configure Mon Sep 11 12:57:08 2017 (r449633) @@ -1,6 +1,6 @@ ---- configure.orig 2017-09-05 01:10:49 UTC +--- configure.orig 2017-09-10 01:10:23 UTC +++ configure -@@ -14434,27 +14434,9 @@ done +@@ -14403,27 +14403,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -9,9 +9,9 @@ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss -lkrb5" + "$($KRB5CONFIG gssapi --libs)"; \ do @@ -22,15 +22,15 @@ - # when you are trying to build with KTH in /usr/lib. - if test "/usr" = "$use_gssapi" - then -- LIBS="$TRY_LIBS" +- LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS" - else -- LIBS="-L$use_gssapi/lib $TRY_LIBS" +- LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS" - fi + LIBS="$TRY_LIBS" { $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 -@@ -14497,47 +14479,7 @@ $as_echo "no" >&6; } ;; +@@ -14466,47 +14448,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 -@@ -23023,7 +22965,7 @@ $as_echo "" >&6; } +@@ -22701,7 +22643,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind9-devel/pkg-plist ============================================================================== --- head/dns/bind9-devel/pkg-plist Mon Sep 11 12:57:05 2017 (r449632) +++ head/dns/bind9-devel/pkg-plist Mon Sep 11 12:57:08 2017 (r449633) @@ -241,21 +241,6 @@ include/isccfg/grammar.h include/isccfg/log.h include/isccfg/namedconf.h include/isccfg/version.h -include/lwres/context.h -include/lwres/int.h -include/lwres/ipv6.h -include/lwres/lang.h -include/lwres/list.h -include/lwres/lwbuffer.h -include/lwres/lwpacket.h -include/lwres/lwres.h -include/lwres/net.h -include/lwres/netdb.h -include/lwres/platform.h -include/lwres/result.h -include/lwres/stdlib.h -include/lwres/string.h -include/lwres/version.h include/pk11/constants.h include/pk11/internal.h include/pk11/pk11.h @@ -272,7 +257,7 @@ lib/libirs.a lib/libisc.a lib/libisccc.a lib/libisccfg.a -lib/liblwres.a +lib/libns.a man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz @@ -284,91 +269,6 @@ man/man1/mdig.1.gz man/man1/named-rrchecker.1.gz man/man1/nslookup.1.gz man/man1/nsupdate.1.gz -man/man3/lwres.3.gz -man/man3/lwres_addr_parse.3.gz -man/man3/lwres_buffer.3.gz -man/man3/lwres_buffer_add.3.gz -man/man3/lwres_buffer_back.3.gz -man/man3/lwres_buffer_clear.3.gz -man/man3/lwres_buffer_first.3.gz -man/man3/lwres_buffer_forward.3.gz -man/man3/lwres_buffer_getmem.3.gz -man/man3/lwres_buffer_getuint16.3.gz -man/man3/lwres_buffer_getuint32.3.gz -man/man3/lwres_buffer_getuint8.3.gz -man/man3/lwres_buffer_init.3.gz -man/man3/lwres_buffer_invalidate.3.gz -man/man3/lwres_buffer_putmem.3.gz -man/man3/lwres_buffer_putuint16.3.gz -man/man3/lwres_buffer_putuint32.3.gz -man/man3/lwres_buffer_putuint8.3.gz -man/man3/lwres_buffer_subtract.3.gz -man/man3/lwres_conf_clear.3.gz -man/man3/lwres_conf_get.3.gz -man/man3/lwres_conf_init.3.gz -man/man3/lwres_conf_parse.3.gz -man/man3/lwres_conf_print.3.gz -man/man3/lwres_config.3.gz -man/man3/lwres_context.3.gz -man/man3/lwres_context_allocmem.3.gz -man/man3/lwres_context_create.3.gz -man/man3/lwres_context_destroy.3.gz -man/man3/lwres_context_freemem.3.gz -man/man3/lwres_context_initserial.3.gz -man/man3/lwres_context_nextserial.3.gz -man/man3/lwres_context_sendrecv.3.gz -man/man3/lwres_endhostent.3.gz -man/man3/lwres_endhostent_r.3.gz -man/man3/lwres_freeaddrinfo.3.gz -man/man3/lwres_freehostent.3.gz -man/man3/lwres_gabn.3.gz -man/man3/lwres_gabnrequest_free.3.gz -man/man3/lwres_gabnrequest_parse.3.gz -man/man3/lwres_gabnrequest_render.3.gz -man/man3/lwres_gabnresponse_free.3.gz -man/man3/lwres_gabnresponse_parse.3.gz -man/man3/lwres_gabnresponse_render.3.gz -man/man3/lwres_gai_strerror.3.gz -man/man3/lwres_getaddrinfo.3.gz -man/man3/lwres_getaddrsbyname.3.gz -man/man3/lwres_gethostbyaddr.3.gz -man/man3/lwres_gethostbyaddr_r.3.gz -man/man3/lwres_gethostbyname.3.gz -man/man3/lwres_gethostbyname2.3.gz -man/man3/lwres_gethostbyname_r.3.gz -man/man3/lwres_gethostent.3.gz -man/man3/lwres_gethostent_r.3.gz -man/man3/lwres_getipnode.3.gz -man/man3/lwres_getipnodebyaddr.3.gz -man/man3/lwres_getipnodebyname.3.gz -man/man3/lwres_getnamebyaddr.3.gz -man/man3/lwres_getnameinfo.3.gz -man/man3/lwres_getrrsetbyname.3.gz -man/man3/lwres_gnba.3.gz -man/man3/lwres_gnbarequest_free.3.gz -man/man3/lwres_gnbarequest_parse.3.gz -man/man3/lwres_gnbarequest_render.3.gz -man/man3/lwres_gnbaresponse_free.3.gz -man/man3/lwres_gnbaresponse_parse.3.gz -man/man3/lwres_gnbaresponse_render.3.gz -man/man3/lwres_herror.3.gz -man/man3/lwres_hstrerror.3.gz -man/man3/lwres_inetntop.3.gz -man/man3/lwres_lwpacket_parseheader.3.gz -man/man3/lwres_lwpacket_renderheader.3.gz -man/man3/lwres_net_ntop.3.gz -man/man3/lwres_noop.3.gz -man/man3/lwres_nooprequest_free.3.gz -man/man3/lwres_nooprequest_parse.3.gz -man/man3/lwres_nooprequest_render.3.gz -man/man3/lwres_noopresponse_free.3.gz -man/man3/lwres_noopresponse_parse.3.gz -man/man3/lwres_noopresponse_render.3.gz -man/man3/lwres_packet.3.gz -man/man3/lwres_resutil.3.gz -man/man3/lwres_sethostent.3.gz -man/man3/lwres_sethostent_r.3.gz -man/man3/lwres_string_parse.3.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz @@ -385,7 +285,6 @@ man/man8/dnssec-signzone.8.gz man/man8/dnssec-verify.8.gz man/man8/genrandom.8.gz man/man8/isc-hmac-fixup.8.gz -man/man8/lwresd.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz @@ -414,7 +313,6 @@ sbin/dnssec-signzone sbin/dnssec-verify sbin/genrandom sbin/isc-hmac-fixup -sbin/lwresd sbin/named sbin/named-checkconf sbin/named-checkzone
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709111257.v8BCv8Rt029254>