svn commit: r476687 - in branches/2018Q3/dns: bind911 bind911/files bind912 bind912/files
Mathieu Arnold
mat at FreeBSD.org
Wed Aug 8 21:28:57 UTC 2018
Author: mat
Date: Wed Aug 8 21:28:53 2018
New Revision: 476687
URL: https://svnweb.freebsd.org/changeset/ports/476687
Log:
Update to 9.11.4-P1 and 9.12.2-P1.
Security: CVE-2018-5740
Sponsored by: Absolight
Deleted:
branches/2018Q3/dns/bind911/files/patch-CVE-2018-5738
branches/2018Q3/dns/bind912/files/patch-CVE-2018-5738
branches/2018Q3/dns/bind912/files/patch-libressl2.7
Modified:
branches/2018Q3/dns/bind911/Makefile
branches/2018Q3/dns/bind911/distinfo
branches/2018Q3/dns/bind911/files/extrapatch-bind-min-override-ttl
branches/2018Q3/dns/bind911/files/patch-bin_named_include_named_globals.h
branches/2018Q3/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
branches/2018Q3/dns/bind911/files/patch-configure
branches/2018Q3/dns/bind912/Makefile
branches/2018Q3/dns/bind912/distinfo
branches/2018Q3/dns/bind912/files/extrapatch-bind-min-override-ttl
branches/2018Q3/dns/bind912/files/patch-bin_named_include_named_globals.h
branches/2018Q3/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in
branches/2018Q3/dns/bind912/files/patch-configure
Directory Properties:
branches/2018Q3/ (props changed)
Modified: branches/2018Q3/dns/bind911/Makefile
==============================================================================
--- branches/2018Q3/dns/bind911/Makefile Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind911/Makefile Wed Aug 8 21:28:53 2018 (r476687)
@@ -3,7 +3,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 911
@@ -20,7 +20,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
USES= cpe libedit
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.11.3
+ISCVERSION= 9.11.4-P1
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
Modified: branches/2018Q3/dns/bind911/distinfo
==============================================================================
--- branches/2018Q3/dns/bind911/distinfo Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind911/distinfo Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521455716
-SHA256 (bind-9.11.3.tar.gz) = 0d9dde14b2ec7f9cdc3b69f19540c7a2e4eee7b6c727965dfae48810965876f5
-SIZE (bind-9.11.3.tar.gz) = 9523375
+TIMESTAMP = 1533712466
+SHA256 (bind-9.11.4-P1.tar.gz) = b0e0dc3c8bf26989b1cad53f90d44a48e39404afc68f65c45bae79b446f0fe23
+SIZE (bind-9.11.4-P1.tar.gz) = 9623403
Modified: branches/2018Q3/dns/bind911/files/extrapatch-bind-min-override-ttl
==============================================================================
--- branches/2018Q3/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig 2018-01-24 21:23:16 UTC
+--- bin/named/config.c.orig 2018-06-10 06:06:33 UTC
+++ bin/named/config.c
-@@ -171,6 +171,8 @@ options {\n\
+@@ -176,6 +176,8 @@ options {\n\
" max-acache-size 16M;\n\
max-cache-size 90%;\n\
max-cache-ttl 604800; /* 1 week */\n\
@@ -9,9 +9,9 @@
max-clients-per-query 100;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
max-recursion-depth 7;\n\
---- bin/named/server.c.orig 2018-01-24 21:23:16 UTC
+--- bin/named/server.c.orig 2018-06-10 06:06:33 UTC
+++ bin/named/server.c
-@@ -3699,6 +3699,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3692,6 +3692,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@@ -28,9 +28,9 @@
result = ns_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-01-24 21:23:16 UTC
+--- lib/dns/include/dns/view.h.orig 2018-06-10 06:06:33 UTC
+++ lib/dns/include/dns/view.h
-@@ -146,6 +146,8 @@ struct dns_view {
+@@ -150,6 +150,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
dns_ttl_t maxcachettl;
@@ -39,9 +39,9 @@
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2018-01-24 21:23:16 UTC
+--- lib/dns/resolver.c.orig 2018-06-10 06:06:33 UTC
+++ lib/dns/resolver.c
-@@ -5477,6 +5477,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5473,6 +5473,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@@ -60,9 +60,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2018-01-24 21:23:16 UTC
+--- lib/isccfg/namedconf.c.orig 2018-06-10 06:06:33 UTC
+++ lib/isccfg/namedconf.c
-@@ -1766,6 +1766,8 @@ view_clauses[] = {
+@@ -1770,6 +1770,8 @@ view_clauses[] = {
#endif
{ "max-acache-size", &cfg_type_sizenodefault, 0 },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
Modified: branches/2018Q3/dns/bind911/files/patch-bin_named_include_named_globals.h
==============================================================================
--- branches/2018Q3/dns/bind911/files/patch-bin_named_include_named_globals.h Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind911/files/patch-bin_named_include_named_globals.h Wed Aug 8 21:28:53 2018 (r476687)
@@ -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-04 05:28:11 UTC
+--- bin/named/include/named/globals.h.orig 2018-06-10 06:06:33 UTC
+++ bin/named/include/named/globals.h
-@@ -135,7 +135,7 @@ EXTERN isc_boolean_t ns_g_forcelock IN
+@@ -138,7 +138,7 @@ EXTERN isc_boolean_t ns_g_forcelock IN
#if NS_RUN_PID_DIR
EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR
"/run/named/"
Modified: branches/2018Q3/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
==============================================================================
--- branches/2018Q3/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,6 +1,6 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig 2017-04-14 03:58:25 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig 2018-06-10 06:06:33 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
-@@ -31,7 +31,7 @@ OBJS =
+@@ -34,7 +34,7 @@ OBJS =
@BIND9_MAKE_RULES@
CFLAGS = @CFLAGS@ @SO_CFLAGS@
Modified: branches/2018Q3/dns/bind911/files/patch-configure
==============================================================================
--- branches/2018Q3/dns/bind911/files/patch-configure Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind911/files/patch-configure Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,6 +1,6 @@
---- configure.orig 2018-03-08 20:55:28 UTC
+--- configure.orig 2018-06-10 06:06:33 UTC
+++ configure
-@@ -14465,27 +14465,9 @@ done
+@@ -14961,27 +14961,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
-@@ -14528,47 +14510,7 @@ $as_echo "no" >&6; } ;;
+@@ -15024,47 +15006,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
-@@ -23242,7 +23184,7 @@ $as_echo "" >&6; }
+@@ -23847,7 +23789,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
Modified: branches/2018Q3/dns/bind912/Makefile
==============================================================================
--- branches/2018Q3/dns/bind912/Makefile Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind912/Makefile Wed Aug 8 21:28:53 2018 (r476687)
@@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc
PORTREVISION= 0
.else
# dns/bind912 here
-PORTREVISION= 1
+PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
@@ -35,7 +35,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
USES= cpe libedit
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.12.1-P2
+ISCVERSION= 9.12.2-P1
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
Modified: branches/2018Q3/dns/bind912/distinfo
==============================================================================
--- branches/2018Q3/dns/bind912/distinfo Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind912/distinfo Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526711298
-SHA256 (bind-9.12.1-P2.tar.gz) = 0de7c3453461e2f0505ac634b984f8e7afa1952cf7fc972cbefbcc169edf2d29
-SIZE (bind-9.12.1-P2.tar.gz) = 9305005
+TIMESTAMP = 1533712498
+SHA256 (bind-9.12.2-P1.tar.gz) = 9c4b55c2b8a2052ce488ebaeca1b715721d1a6cbffd7da3634c41287b86954a4
+SIZE (bind-9.12.2-P1.tar.gz) = 9429002
Modified: branches/2018Q3/dns/bind912/files/extrapatch-bind-min-override-ttl
==============================================================================
--- branches/2018Q3/dns/bind912/files/extrapatch-bind-min-override-ttl Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind912/files/extrapatch-bind-min-override-ttl Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig 2018-02-18 05:26:12 UTC
+--- bin/named/config.c.orig 2018-07-03 07:08:14 UTC
+++ bin/named/config.c
-@@ -176,12 +176,14 @@ options {\n\
+@@ -182,12 +182,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-18 05:26:12 UTC
+--- bin/named/server.c.orig 2018-07-03 07:08:14 UTC
+++ bin/named/server.c
-@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -4072,6 +4072,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-18 05:26:12 UTC
+--- lib/dns/include/dns/view.h.orig 2018-07-03 07:08:14 UTC
+++ lib/dns/include/dns/view.h
-@@ -145,6 +145,8 @@ struct dns_view {
+@@ -149,6 +149,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-18 05:26:12 UTC
+--- lib/dns/resolver.c.orig 2018-07-03 07:08:14 UTC
+++ lib/dns/resolver.c
-@@ -5762,6 +5762,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5756,6 +5756,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-18 05:26:12 UTC
+--- lib/isccfg/namedconf.c.orig 2018-07-03 07:08:14 UTC
+++ lib/isccfg/namedconf.c
-@@ -1910,6 +1910,8 @@ view_clauses[] = {
+@@ -1914,6 +1914,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
Modified: branches/2018Q3/dns/bind912/files/patch-bin_named_include_named_globals.h
==============================================================================
--- branches/2018Q3/dns/bind912/files/patch-bin_named_include_named_globals.h Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind912/files/patch-bin_named_include_named_globals.h Wed Aug 8 21:28:53 2018 (r476687)
@@ -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-06-10 06:06:19 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/"
Modified: branches/2018Q3/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in
==============================================================================
--- branches/2018Q3/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Aug 8 21:28:53 2018 (r476687)
@@ -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-06-10 06:06:19 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
-@@ -31,7 +31,7 @@ OBJS =
+@@ -34,7 +34,7 @@ OBJS =
@BIND9_MAKE_RULES@
CFLAGS = @CFLAGS@ @SO_CFLAGS@
Modified: branches/2018Q3/dns/bind912/files/patch-configure
==============================================================================
--- branches/2018Q3/dns/bind912/files/patch-configure Wed Aug 8 21:25:56 2018 (r476686)
+++ branches/2018Q3/dns/bind912/files/patch-configure Wed Aug 8 21:28:53 2018 (r476687)
@@ -1,6 +1,6 @@
---- configure.orig 2018-03-08 20:56:40 UTC
+--- configure.orig 2018-06-10 06:06:19 UTC
+++ configure
-@@ -14455,27 +14455,9 @@ done
+@@ -14939,27 +14939,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
-@@ -14518,47 +14500,7 @@ $as_echo "no" >&6; } ;;
+@@ -15002,47 +14984,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
-@@ -23197,7 +23139,7 @@ $as_echo "" >&6; }
+@@ -23790,7 +23732,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
More information about the svn-ports-all
mailing list