From 30687f343fb08063db57ee529004bd9765f8ae8e Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 11 Nov 2014 13:23:50 +0000 Subject: [PATCH] - version number in svn trunk is 1.5.0 git-svn-id: file:///svn/unbound/trunk@3259 be551aaa-1e26-0410-a405-d3ace91eadb9 --- configure | 28 ++++++++++++++-------------- configure.ac | 6 +++--- doc/Changelog | 1 + 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/configure b/configure index f0a64b65c..32ad5f4f3 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.4.23. +# Generated by GNU Autoconf 2.69 for unbound 1.5.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.4.23' -PACKAGE_STRING='unbound 1.4.23' +PACKAGE_VERSION='1.5.0' +PACKAGE_STRING='unbound 1.5.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1387,7 +1387,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.4.23 to adapt to many kinds of systems. +\`configure' configures unbound 1.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.4.23:";; + short | recursive ) echo "Configuration of unbound 1.5.0:";; esac cat <<\_ACEOF @@ -1627,7 +1627,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.4.23 +unbound configure 1.5.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2336,7 +2336,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.4.23, which was +It was created by unbound $as_me 1.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2686,9 +2686,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=4 +UNBOUND_VERSION_MINOR=5 -UNBOUND_VERSION_MICRO=23 +UNBOUND_VERSION_MICRO=0 LIBUNBOUND_CURRENT=5 @@ -2731,7 +2731,7 @@ LIBUNBOUND_AGE=3 # 1.4.20 had 4:0:2 # adds libunbound.ttl # but shipped 3:5:1 # 1.4.21 had 4:1:2 # 1.4.22 had 4:1:2 -# 1.4.23 had 5:3:3 # adds ub_ctx_add_ta_autr +# 1.5.0 had 5:3:3 # adds ub_ctx_add_ta_autr # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -18720,7 +18720,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -unbound config.lt 1.4.23 +unbound config.lt 1.5.0 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -20156,7 +20156,7 @@ _ACEOF -version=1.4.23 +version=1.5.0 date=`date +'%b %e, %Y'` @@ -20671,7 +20671,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.4.23, which was +This file was extended by unbound $as_me 1.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20737,7 +20737,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.4.23 +unbound config.status 1.5.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 23b72140d..63a60b428 100644 --- a/configure.ac +++ b/configure.ac @@ -9,8 +9,8 @@ sinclude(dnstap/dnstap.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[4]) -m4_define([VERSION_MICRO],[23]) +m4_define([VERSION_MINOR],[5]) +m4_define([VERSION_MICRO],[0]) 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]) @@ -56,7 +56,7 @@ LIBUNBOUND_AGE=3 # 1.4.20 had 4:0:2 # adds libunbound.ttl # but shipped 3:5:1 # 1.4.21 had 4:1:2 # 1.4.22 had 4:1:2 -# 1.4.23 had 5:3:3 # adds ub_ctx_add_ta_autr +# 1.5.0 had 5:3:3 # adds ub_ctx_add_ta_autr # 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 ab38c10b1..5960b664e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ - iana portlist update. - Fix bug where forward or stub addresses with same address but different port number were not tried. + - version number in svn trunk is 1.5.0 7 November 2014: Wouter - dnstap fixes by Robert Edmonds: -- 2.47.2