summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bind/Makefile.in8
-rw-r--r--bind/bind.tar.gzbin7950927 -> 8376949 bytes
-rw-r--r--bind/version.tmp2
-rwxr-xr-xconfigure30
-rw-r--r--configure.ac3
-rw-r--r--configure.ac+lt3
-rw-r--r--configure.ac-base3
-rw-r--r--configure.ac-lt3
-rw-r--r--util/bind.sh2
9 files changed, 48 insertions, 6 deletions
diff --git a/bind/Makefile.in b/bind/Makefile.in
index 8fb5358e..8fe8883f 100644
--- 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 c15be8e5..e2b8203f 100644
--- a/bind/bind.tar.gz
+++ b/bind/bind.tar.gz
Binary files differ
diff --git a/bind/version.tmp b/bind/version.tmp
index ceed606c..cf52f1b9 100644
--- 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 191c6e35..d763852f 100755
--- 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 b2880303..c401d393 100644
--- 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 cadd0d53..44e2517d 100644
--- 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 0d7e2d7c..bcc3546a 100644
--- 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 b2880303..c401d393 100644
--- 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 46c87b01..10feff93 100644
--- 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 ;;