1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-17 03:25:46 +00:00

Update to latest commit.

Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2018-02-26 12:39:59 +00:00
parent 32020809ff
commit 055ff18377
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=463016
6 changed files with 23 additions and 23 deletions

View File

@ -31,8 +31,8 @@ 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.02.19
HASH= 2a50992ab3f9762912e2d4c3f76ab50f213225ed
ISCVERSION= 9.13.0a0.2018.02.26
HASH= e1d6c9a6631f2db967d1a6331b5a177b78e08b89
USES= cpe libedit tar:bz2

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1519049419
SHA256 (bind9-2a50992ab3f9762912e2d4c3f76ab50f213225ed-2a50992ab3f9762912e2d4c3f76ab50f213225ed.tar.bz2) = 8b8524af457132febd65c7bad7704f143c194fe9bb019e72a21ae6013744ee30
SIZE (bind9-2a50992ab3f9762912e2d4c3f76ab50f213225ed-2a50992ab3f9762912e2d4c3f76ab50f213225ed.tar.bz2) = 9265793
TIMESTAMP = 1519641726
SHA256 (bind9-e1d6c9a6631f2db967d1a6331b5a177b78e08b89-e1d6c9a6631f2db967d1a6331b5a177b78e08b89.tar.bz2) = 5eb8109898b7e8ce4c0f14195cc7040716c970f9e35c291d8e591fbec0bc298c
SIZE (bind9-e1d6c9a6631f2db967d1a6331b5a177b78e08b89-e1d6c9a6631f2db967d1a6331b5a177b78e08b89.tar.bz2) = 7827728

View File

@ -1,6 +1,6 @@
--- bin/named/config.c.orig 2018-02-19 09:25:15 UTC
--- bin/named/config.c.orig 2018-02-26 06:30:28 UTC
+++ bin/named/config.c
@@ -176,12 +176,14 @@ options {\n\
@@ -179,12 +179,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\
query-source address *;\n\
query-source-v6 address *;\n\
--- bin/named/server.c.orig 2018-02-19 09:25:15 UTC
--- bin/named/server.c.orig 2018-02-26 06:30:28 UTC
+++ bin/named/server.c
@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie
@@ -4077,6 +4077,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@ -34,9 +34,9 @@
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-02-19 09:25:15 UTC
--- lib/dns/include/dns/view.h.orig 2018-02-26 06:30:28 UTC
+++ lib/dns/include/dns/view.h
@@ -145,6 +145,8 @@ struct dns_view {
@@ -148,6 +148,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
dns_ttl_t maxcachettl;
@ -45,9 +45,9 @@
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-02-19 09:25:15 UTC
--- lib/dns/resolver.c.orig 2018-02-26 06:30:28 UTC
+++ lib/dns/resolver.c
@@ -5745,6 +5745,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
@@ -5748,6 +5748,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-02-19 09:25:15 UTC
--- lib/isccfg/namedconf.c.orig 2018-02-26 06:30:28 UTC
+++ lib/isccfg/namedconf.c
@@ -1913,6 +1913,8 @@ view_clauses[] = {
@@ -1916,6 +1916,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },

View File

@ -1,8 +1,8 @@
We reference the pid file as being run/named/pid everywere else.
--- bin/named/include/named/globals.h.orig 2018-01-17 06:56:09 UTC
--- bin/named/include/named/globals.h.orig 2018-02-26 06:30:28 UTC
+++ bin/named/include/named/globals.h
@@ -125,7 +125,7 @@ EXTERN isc_boolean_t named_g_forcelock
@@ -128,7 +128,7 @@ EXTERN isc_boolean_t named_g_forcelock
#if NAMED_RUN_PID_DIR
EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR
"/run/named/"

View File

@ -1,6 +1,6 @@
--- bin/tests/system/dlzexternal/Makefile.in.orig 2016-11-01 20:46:42 UTC
--- bin/tests/system/dlzexternal/Makefile.in.orig 2018-02-26 06:30:28 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
@@ -31,7 +31,7 @@ OBJS =
@@ -34,7 +34,7 @@ OBJS =
@BIND9_MAKE_RULES@
CFLAGS = @CFLAGS@ @SO_CFLAGS@

View File

@ -1,6 +1,6 @@
--- configure.orig 2018-02-19 09:25:15 UTC
--- configure.orig 2018-02-26 06:30:28 UTC
+++ configure
@@ -14939,27 +14939,9 @@ done
@@ -14799,27 +14799,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
@@ -15002,47 +14984,7 @@ $as_echo "no" >&6; } ;;
@@ -14862,47 +14844,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
@@ -23681,7 +23623,7 @@ $as_echo "" >&6; }
@@ -23541,7 +23483,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).