prep 9.16.4

diff --git a/CHANGES b/CHANGES
index 578081f860fd9d59fb28909116b6d19320b7a829..a4d549660c46ef073eb756b72547d9c146a64853 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+       --- 9.16.4 released ---
+
 5438.  [bug]           Fix a race in TCP accepting code. [GL #1930]
 
 5437.  [bug]           Fix a data race in lib/dns/resolver.c:log_formerr().

diff --git a/configure b/configure
index 9f2a50ec74041574eaf122ef34539f4f709d1c2f..d87ca904c45998c2a4fa8ace29f87b91b20d3be3 100755 (executable)
--- a/configure
+++ b/configure
@@ -860,7 +860,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1034,7 +1033,6 @@ 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}'
@@ -1287,15 +1285,6 @@ 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=* \
@@ -1433,7 +1422,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 runstatedir
+               libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1586,7 +1575,6 @@ 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]
@@ -4032,7 +4020,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4078,7 +4066,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4102,7 +4090,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4147,7 +4135,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4171,7 +4159,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -12763,7 +12751,7 @@ case "$INSTALL" in
                ;;
 esac
 
-for ac_prog in pytest-3 pytest pytest-pypy
+for ac_prog in pytest-3 py.test-3 pytest pytest-pypy
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

diff --git a/doc/man/dnssec-importkey.8in b/doc/man/dnssec-importkey.8in
index 6144e3cace08159fc1dcbd882f5e2334ea07b651..a951e528fa46a6258960db0c169deae3f975da87 100644 (file)
--- a/doc/man/dnssec-importkey.8in
+++ b/doc/man/dnssec-importkey.8in
@@ -39,7 +39,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 \fBdnssec\-importkey\fP reads a public DNSKEY record and generates a pair
 of .key/.private files. The DNSKEY record may be read from an existing
-.key file, in which case a corresponding .private file will be
+\&.key file, in which case a corresponding .private file will be
 generated, or it may be read from any other file or from the standard
 input, in which case both .key and .private files will be generated.
 .sp

diff --git a/lib/bind9/api b/lib/bind9/api
index 8317b41e7d449128a205eb4a98240ab9935a12f6..425e431aad2b8157cdbbdf3c07f434c7b3fa1805 100644 (file)
--- a/lib/bind9/api
+++ b/lib/bind9/api
@@ -11,5 +11,5 @@
 # 9.13/9.14: 1300-1499
 # 9.15/9.16: 1500-1699
 LIBINTERFACE = 1600
-LIBREVISION = 2
+LIBREVISION = 3
 LIBAGE = 0

diff --git a/lib/dns/api b/lib/dns/api
index 2713ea8a60c8abf0be0fe0f997e5a67decee86f7..96ab7410283348afb590d23bcf41523e9b2e6b5c 100644 (file)
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -10,6 +10,6 @@
 # 9.12: 1200-1299
 # 9.13/9.14: 1300-1499
 # 9.15/9.16: 1500-1699
-LIBINTERFACE = 1603
+LIBINTERFACE = 1604
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1

diff --git a/lib/isc/api b/lib/isc/api
index 2713ea8a60c8abf0be0fe0f997e5a67decee86f7..96ab7410283348afb590d23bcf41523e9b2e6b5c 100644 (file)
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -10,6 +10,6 @@
 # 9.12: 1200-1299
 # 9.13/9.14: 1300-1499
 # 9.15/9.16: 1500-1699
-LIBINTERFACE = 1603
+LIBINTERFACE = 1604
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1

diff --git a/lib/isccfg/api b/lib/isccfg/api
index 8317b41e7d449128a205eb4a98240ab9935a12f6..425e431aad2b8157cdbbdf3c07f434c7b3fa1805 100644 (file)
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -11,5 +11,5 @@
 # 9.13/9.14: 1300-1499
 # 9.15/9.16: 1500-1699
 LIBINTERFACE = 1600
-LIBREVISION = 2
+LIBREVISION = 3
 LIBAGE = 0

diff --git a/lib/ns/api b/lib/ns/api
index 2713ea8a60c8abf0be0fe0f997e5a67decee86f7..1c9bb8b38eeb97d4544d3904c37807ac9436126b 100644 (file)
--- a/lib/ns/api
+++ b/lib/ns/api
@@ -11,5 +11,5 @@
 # 9.13/9.14: 1300-1499
 # 9.15/9.16: 1500-1699
 LIBINTERFACE = 1603
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

diff --git a/version b/version
index 6ba7fd3d86f804f069ed852274a6727b3d99df3a..cf0fa369559e35d113385abc74605d03e0a31c59 100644 (file)
--- a/version
+++ b/version
@@ -5,7 +5,7 @@ PRODUCT=BIND
 DESCRIPTION="(Stable Release)"
 MAJORVER=9
 MINORVER=16
-PATCHVER=3
+PATCHVER=4
 RELEASETYPE=
 RELEASEVER=
 EXTENSIONS=