From bff2c734466b6be8dcb4bbf3fe76d912fa853e5a Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 10 Nov 2015 18:14:24 +0100
Subject: [PATCH] get ready for 1.5.5

---
 CHANGES   |  7 ++++++-
 VERSION   |  2 +-
 configure | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7f53f649d..73099c72e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,13 @@
-RRDtool 1.5.x - 2015-xx-xx
+RRDtool 1.5.5 - 2015-11-10
 ==========================
 
 Bugfixes
 --------
+* fix JSON output in xport with legend and gprint blocks
+* fix parse_time mutex unlocking in the error case
+* don't crash on invalid variable names in CDEF
+* add mutex locking in rrdc_fetch
+* fix buffer overflow in rrd_restore
 * shorten test precision to 7 digits ... 
 * never exit from a library function
 * buffer overflow in rrd_restore.c fixed #669
diff --git a/VERSION b/VERSION
index 94fe62c27..9075be495 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.4
+1.5.5
diff --git a/configure b/configure
index c9fa597e8..d47efbac7 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 rrdtool 1.5.4.
+# Generated by GNU Autoconf 2.69 for rrdtool 1.5.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rrdtool'
 PACKAGE_TARNAME='rrdtool'
-PACKAGE_VERSION='1.5.4'
-PACKAGE_STRING='rrdtool 1.5.4'
+PACKAGE_VERSION='1.5.5'
+PACKAGE_STRING='rrdtool 1.5.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1481,7 +1481,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 rrdtool 1.5.4 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.5.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1552,7 +1552,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rrdtool 1.5.4:";;
+     short | recursive ) echo "Configuration of rrdtool 1.5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1736,7 +1736,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rrdtool configure 1.5.4
+rrdtool configure 1.5.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 rrdtool $as_me 1.5.4, which was
+It was created by rrdtool $as_me 1.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4797,7 +4797,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rrdtool'
- VERSION='1.5.4'
+ VERSION='1.5.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22807,7 +22807,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 rrdtool $as_me 1.5.4, which was
+This file was extended by rrdtool $as_me 1.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22873,7 +22873,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="\\
-rrdtool config.status 1.5.4
+rrdtool config.status 1.5.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25459,7 +25459,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 rrdtool $as_me 1.5.4, which was
+This file was extended by rrdtool $as_me 1.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25525,7 +25525,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="\\
-rrdtool config.status 1.5.4
+rrdtool config.status 1.5.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"