From 0393f598d5ecfb2d5588dcb6701009a9acfd8942 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 27 Jun 2017 10:53:52 +0000 Subject: [PATCH] - Trunk contains 1.6.5, with changes from 26, 27 june. git-svn-id: file:///svn/unbound/trunk@4250 be551aaa-1e26-0410-a405-d3ace91eadb9 --- configure | 25 +++++++++++++------------ configure.ac | 5 +++-- doc/Changelog | 7 ++++++- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 202dc7d6e..9b8496c4b 100755 --- 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.6.4. +# Generated by GNU Autoconf 2.69 for unbound 1.6.5. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.6.4' -PACKAGE_STRING='unbound 1.6.4' +PACKAGE_VERSION='1.6.5' +PACKAGE_STRING='unbound 1.6.5' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1437,7 +1437,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.6.4 to adapt to many kinds of systems. +\`configure' configures unbound 1.6.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.6.4:";; + short | recursive ) echo "Configuration of unbound 1.6.5:";; esac cat <<\_ACEOF @@ -1714,7 +1714,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.6.4 +unbound configure 1.6.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2423,7 +2423,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.6.4, which was +It was created by unbound $as_me 1.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2775,11 +2775,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=6 -UNBOUND_VERSION_MICRO=4 +UNBOUND_VERSION_MICRO=5 LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=3 +LIBUNBOUND_REVISION=4 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2834,6 +2834,7 @@ LIBUNBOUND_AGE=5 # 1.6.2 had 7:1:5 # 1.6.3 had 7:2:5 # 1.6.4 had 7:3:5 +# 1.6.5 had 7:4:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -20642,7 +20643,7 @@ _ACEOF -version=1.6.4 +version=1.6.5 date=`date +'%b %e, %Y'` @@ -21161,7 +21162,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.6.4, which was +This file was extended by unbound $as_me 1.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21227,7 +21228,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.6.4 +unbound config.status 1.6.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e908ff213..ccbb33d49 100644 --- 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],[6]) -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, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=3 +LIBUNBOUND_REVISION=4 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -73,6 +73,7 @@ LIBUNBOUND_AGE=5 # 1.6.2 had 7:1:5 # 1.6.3 had 7:2:5 # 1.6.4 had 7:3:5 +# 1.6.5 had 7:4:5 # 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 f0c0fdbda..f5a10fbef 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,10 @@ +27 June 2017: Wouter + - Tag 1.6.4 is created with the 1.6.4rc2 contents. + - Trunk contains 1.6.5, with changes from 26, 27 june. + 26 June 2017: Wouter - - Better fixup of dnscrypt_cert_chacha test for different escapes. + - (for 1.6.5) + Better fixup of dnscrypt_cert_chacha test for different escapes. - First fix for zero b64 and hex text zone format in sldns. - unbound-control dump_infra prints port number for address if not 53. -- 2.47.3