[master] Updated bundled Bind9 to 9.11.14

bind/Makefile.in
bind/bind.tar.gz
bind/version.tmp
configure
configure.ac
configure.ac+lt
configure.ac-base
configure.ac-lt
util/bind.sh

diff --git a/bind/Makefile.in b/bind/Makefile.in
index 8fb5358ee5957724b5c8c4052dea25abe75940cc..8fe8883f11a3472bcfae3f976a281481f0f4d88d 100644 (file)
--- a/bind/Makefile.in
+++ b/bind/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2019  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -26,13 +26,15 @@ bindconfig = --without-openssl --without-libxml2 --without-libjson \
        --includedir=@includedir@ --libdir=@libdir@  --without-python\
        @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report
 
-cleandirs = ./lib ./include
+@BIND_ATF_FALSE@cleandirs = ./lib ./include
+@BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf
 cleanfiles = ./configure.log ./build.log ./install.log
 
 bindlibs = isc dns isccfg irs
 installdirs = includedir=${binddir}/include libdir=${binddir}/lib
 
-all: bind1 bind2
+@BIND_ATF_FALSE@all: bind1 bind2
+@BIND_ATF_TRUE@all: bind1 atf bind2
 
 bind1:
 # Extract the source from the tarball, if it hasn't been already.

diff --git a/bind/bind.tar.gz b/bind/bind.tar.gz
index c15be8e5ea681fb3bb56fcaf7f6980050bb8d762..e2b8203fc9571cf05ff810777be3778af86dd7c6 100644 (file)
Binary files a/bind/bind.tar.gz and b/bind/bind.tar.gz differ

diff --git a/bind/version.tmp b/bind/version.tmp
index ceed606c9eca901807ce45b82197fe5b9def7ac1..cf52f1b9537968b2d88c0e5ca3d4bb355b7ddbb3 100644 (file)
--- a/bind/version.tmp
+++ b/bind/version.tmp
@@ -5,7 +5,7 @@ PRODUCT=BIND
 DESCRIPTION="(Extended Support Version)"
 MAJORVER=9
 MINORVER=11
-PATCHVER=8
+PATCHVER=14
 RELEASETYPE=
 RELEASEVER=
 EXTENSIONS=

diff --git a/configure b/configure
index 191c6e358b3c7f18138c94a85b0db82c17215d48..d763852ffdeb394e63884af01bd9f3ee964fc6d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -654,6 +654,8 @@ ATF_BIN
 ATF_LDFLAGS
 ATF_CFLAGS
 pkgcfg_found
+BIND_ATF_FALSE
+BIND_ATF_TRUE
 byte_order
 AR
 RANLIB
@@ -734,6 +736,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -846,6 +849,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1098,6 +1102,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1235,7 +1248,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+               libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1388,6 +1401,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -5588,6 +5602,16 @@ fi
 
 # Testing section
 
+# Bind Makefile needs to know ATF is not included.
+ if 0; then
+  BIND_ATF_TRUE=
+  BIND_ATF_FALSE='#'
+else
+  BIND_ATF_TRUE='#'
+  BIND_ATF_FALSE=
+fi
+
+
 DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 
@@ -7668,6 +7692,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
+if test -z "${BIND_ATF_TRUE}" && test -z "${BIND_ATF_FALSE}"; then
+  as_fn_error $? "conditional \"BIND_ATF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_ATF_TRUE}" && test -z "${HAVE_ATF_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_ATF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

diff --git a/configure.ac b/configure.ac
index b2880303416e509b0a5fee837dbba5ba3555b616..c401d393708afbc175bfb06258f72f0b4136c581 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,9 @@ fi
 
 # Testing section
 
+# Bind Makefile needs to know ATF is not included.
+AM_CONDITIONAL(BIND_ATF, 0)
+
 DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 AC_ARG_WITH([atf],

diff --git a/configure.ac+lt b/configure.ac+lt
index cadd0d538113a7553cde406192ff00e97b89a031..44e2517dbb844a03803e13dc08a28989a7a2f948 100644 (file)
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -250,6 +250,9 @@ fi
 
 # Testing section
 
+# Bind Makefile needs to know ATF is not included.
+AM_CONDITIONAL(BIND_ATF, 0)
+
 DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 AC_ARG_WITH([atf],

diff --git a/configure.ac-base b/configure.ac-base
index 0d7e2d7c08f5ef6be18bf9b7d669c61b65780bf2..bcc3546ae41c915398ecbbfdc461a223f04a55e1 100644 (file)
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -255,6 +255,9 @@ fi
 
 # Testing section
 
+# Bind Makefile needs to know ATF is not included.
+AM_CONDITIONAL(BIND_ATF, 0)
+
 DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 AC_ARG_WITH([atf],

diff --git a/configure.ac-lt b/configure.ac-lt
index b2880303416e509b0a5fee837dbba5ba3555b616..c401d393708afbc175bfb06258f72f0b4136c581 100644 (file)
--- a/configure.ac-lt
+++ b/configure.ac-lt
@@ -249,6 +249,9 @@ fi
 
 # Testing section
 
+# Bind Makefile needs to know ATF is not included.
+AM_CONDITIONAL(BIND_ATF, 0)
+
 DISTCHECK_ATF_CONFIGURE_FLAG=
 atf_path="no"
 AC_ARG_WITH([atf],

diff --git a/util/bind.sh b/util/bind.sh
index 46c87b016ff451648df85144a368e30ec65f0c7c..10feff93905399a78821bd30330ecf8660fad665 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -73,7 +73,7 @@ case $# in
        ### For ease of use, this records the sticky tag of versions
        ### released with each point release.
        ###
-       4.4.2b1) noSNAP=snapshot BINDTAG=v9_11_8 ;;
+       4.4.2b1) noSNAP=snapshot BINDTAG=v9_11_14 ;;
        4.4.2-dev) noSNAP=snapshot BINDTAG=v9_11_8 ;;
        4.4.1) noSNAP=snapshot BINDTAG=v9_11_2_P1 ;;
        4.4.0) noSNAP=snapshot BINDTAG=v9_11_2_P1 ;;