- Merge 1.9.4 release with fix for vulnerability CVE-2019-16866.

- Continue with development of 1.9.5.

diff --git a/configure b/configure
index 5d6b6dbe0e8c0b979a7300061332abe4dee98abb..4e222879ee94c65fe8d7473f8daf3fcae970b454 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unbound 1.9.4.
+# Generated by GNU Autoconf 2.69 for unbound 1.9.5.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.9.4'
-PACKAGE_STRING='unbound 1.9.4'
+PACKAGE_VERSION='1.9.5'
+PACKAGE_STRING='unbound 1.9.5'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues'
 PACKAGE_URL=''
 
@@ -1446,7 +1446,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures unbound 1.9.4 to adapt to many kinds of systems.
+\`configure' configures unbound 1.9.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1511,7 +1511,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.9.4:";;
+     short | recursive ) echo "Configuration of unbound 1.9.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1732,7 +1732,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unbound configure 1.9.4
+unbound configure 1.9.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2441,7 +2441,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by unbound $as_me 1.9.4, which was
+It was created by unbound $as_me 1.9.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2793,11 +2793,11 @@ UNBOUND_VERSION_MAJOR=1
 
 UNBOUND_VERSION_MINOR=9
 
-UNBOUND_VERSION_MICRO=4
+UNBOUND_VERSION_MICRO=5
 
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=4
+LIBUNBOUND_REVISION=5
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2869,6 +2869,7 @@ LIBUNBOUND_AGE=1
 # 1.9.2 had 9:2:1
 # 1.9.3 had 9:3:1
 # 1.9.4 had 9:4:1
+# 1.9.5 had 9:5:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -21298,7 +21299,7 @@ _ACEOF
 
 
 
-version=1.9.4
+version=1.9.5
 
 date=`date +'%b %e, %Y'`
 
@@ -21817,7 +21818,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unbound $as_me 1.9.4, which was
+This file was extended by unbound $as_me 1.9.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21883,7 +21884,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unbound config.status 1.9.4
+unbound config.status 1.9.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 589465d98f3db5d3bdb4d43884831614eb0d72fa..216a78c65fa526d289657c54cb614d9947d4cf9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4)
 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[9])
-m4_define([VERSION_MICRO],[4])
+m4_define([VERSION_MICRO],[5])
 AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues, unbound)
 AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=4
+LIBUNBOUND_REVISION=5
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -90,6 +90,7 @@ LIBUNBOUND_AGE=1
 # 1.9.2 had 9:2:1
 # 1.9.3 had 9:3:1
 # 1.9.4 had 9:4:1
+# 1.9.5 had 9:5:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary

diff --git a/doc/Changelog b/doc/Changelog
index cbb89c9d8a6bd7a728c28554680eed545bf765b6..1a7f7f425827907ce3dc47d297328856a99bfd48 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 3 October 2019: Wouter
        - Merge #90 from vcunat: fix build with nettle-3.5.
+       - Merge 1.9.4 release with fix for vulnerability CVE-2019-16866.
+       - Continue with development of 1.9.5.
 
 26 September 2019: Wouter
        - Merge #87 from hardfalcon: Fix contrib/unbound.service.in,