From: Tobias Oetiker Date: Sun, 9 Aug 2015 11:23:18 +0000 (+0200) Subject: get ready for 1.5.4 X-Git-Tag: v1.5.4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f70058cc894c0a3ee5d555ea1bb5a8d4bb8a0e;p=thirdparty%2Frrdtool-1.x.git get ready for 1.5.4 --- diff --git a/CHANGES b/CHANGES index 9e6d7251..06424259 100644 --- a/CHANGES +++ b/CHANGES @@ -1,12 +1,29 @@ -RRDtool 1.5.4 - 2015-05-14 +RRDtool 1.5.4 - 2015-08-09 ========================== Bug Fixes --------- * parse floating point numbers according to C locale in rrdtool create arguments, regardles of the systems locale setting. * include missing rrd_rados.h into distribution archive -* rrd_parsetime now uses a mutex lock to become threadsafe +* make rrdtool work on ARM again +* make rrdtool test suit pass on 32bit OSs +* fix --grid-dash option regression in graph +* fix systemd support +* fix link dependency for libpng since we are using functions directly +* fix python modulename +* fix rrdtool tune to accept U in minimum and maximum options +* fi +* rrd_parsetime now uses a mutex lock to become threadsafe * rrd_xport is now threadsafe +* stop using MAX_PATH and make everything dynamic and make rrdtool work on + Gnu HURD ... thanks nirgal! + +Features +-------- +* new RPN operators: STEPWIDTH, NEWDAY, NEWWEEK, NEWMONTH and NEWWEEK + together they allow to draw graphs where a rate is converted back to + absolute numbers and accumulated over a periode. + RRDtool 1.5.3 - 2015-04-30 ========================== diff --git a/VERSION b/VERSION index 8af85beb..94fe62c2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.3 +1.5.4 diff --git a/bindings/Makefile.in b/bindings/Makefile.in index c787210f..a859f6c3 100644 --- a/bindings/Makefile.in +++ b/bindings/Makefile.in @@ -382,6 +382,8 @@ top_srcdir = @top_srcdir@ @BUILD_TCL_TRUE@SUB_tcl = tcl @BUILD_LUA_TRUE@SUB_lua = lua SUBDIRS = $(SUB_tcl) $(SUB_lua) +@ENABLE_RPATH_TRUE@PYTHON_RPATH = --rpath=$(libdir) +@ENABLE_RPATH_TRUE@PERL_RPATH = RPATH=$(libdir) # the following files are not mentioned in any other Makefile EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \ @@ -749,7 +751,7 @@ python: ABS_TOP_SRCDIR=${abs_top_srcdir} \ ABS_TOP_BUILDDIR=${abs_top_builddir} \ LD_RUN_PATH=$(libdir) \ - $(PYTHON) ${abs_srcdir}/$@/setup.py build_ext --rpath=$(libdir) \ + $(PYTHON) ${abs_srcdir}/$@/setup.py build_ext $(PYTHON_RPATH) \ && env \ ABS_TOP_SRCDIR=${abs_top_srcdir} \ ABS_TOP_BUILDDIR=${abs_top_builddir} \ @@ -781,7 +783,7 @@ perl-shared: ABS_TOP_SRCDIR=${abs_top_srcdir} \ ABS_TOP_BUILDDIR=${abs_top_builddir} \ ABS_SRCDIR=${abs_srcdir}/$@ \ - $(PERL) Makefile.PL $(PERLFLAGS) $(PERL_MAKE_OPTIONS) RPATH=$(libdir) \ + $(PERL) Makefile.PL $(PERLFLAGS) $(PERL_MAKE_OPTIONS) $(PERL_RPATH) \ && $(MAKE) ) -mkdir -p ${builddir}/perl-shared diff --git a/bindings/tcl/Makefile.in b/bindings/tcl/Makefile.in index 7d1fde40..d7052c0d 100644 --- a/bindings/tcl/Makefile.in +++ b/bindings/tcl/Makefile.in @@ -734,7 +734,7 @@ $(TCL_RRD_LIB): tclrrd.o $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS) tclrrd.o: tclrrd.c - $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c $(srcdir)/tclrrd.c -DVERSION=\"$(VERSION)\" + $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -c $(srcdir)/tclrrd.c -DVERSION=\"$(VERSION)\" pkgIndex.tcl: echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@ diff --git a/configure b/configure index 367fe0e6..63afb372 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.3. +# Generated by GNU Autoconf 2.69 for rrdtool 1.5.4. # # # 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.3' -PACKAGE_STRING='rrdtool 1.5.3' +PACKAGE_VERSION='1.5.4' +PACKAGE_STRING='rrdtool 1.5.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -700,6 +700,8 @@ PERLCC POD2HTML POD2MAN PERL +ENABLE_RPATH_FALSE +ENABLE_RPATH_TRUE ALL_LIBS CORE_LIBS PKGCONFIG @@ -1479,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.3 to adapt to many kinds of systems. +\`configure' configures rrdtool 1.5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1550,7 +1552,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rrdtool 1.5.3:";; + short | recursive ) echo "Configuration of rrdtool 1.5.4:";; esac cat <<\_ACEOF @@ -1734,7 +1736,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rrdtool configure 1.5.3 +rrdtool configure 1.5.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2439,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.3, which was +It was created by rrdtool $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4795,7 +4797,7 @@ fi # Define the identity of the package. PACKAGE='rrdtool' - VERSION='1.5.3' + VERSION='1.5.4' cat >>confdefs.h <<_ACEOF @@ -20681,6 +20683,15 @@ $as_echo "" >&6; } $as_echo "${T_MD}Prep for Building Language Bindings${T_ME}" >&6; } + if test "x$enable_rpath" = "xyes"; then + ENABLE_RPATH_TRUE= + ENABLE_RPATH_FALSE='#' +else + ENABLE_RPATH_TRUE='#' + ENABLE_RPATH_FALSE= +fi + + PATH=$PATH:/usr/perl5/bin export PATH # Extract the first word of "perl", so it can be a program name with args. @@ -22367,6 +22378,10 @@ if test -z "${BUILD_RRDRESTORE_TRUE}" && test -z "${BUILD_RRDRESTORE_FALSE}"; th as_fn_error $? "conditional \"BUILD_RRDRESTORE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_RPATH_TRUE}" && test -z "${ENABLE_RPATH_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_RPATH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${LUA_NEED_OUR_COMPAT51_TRUE}" && test -z "${LUA_NEED_OUR_COMPAT51_FALSE}"; then as_fn_error $? "conditional \"LUA_NEED_OUR_COMPAT51\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -22792,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.3, which was +This file was extended by rrdtool $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22858,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.3 +rrdtool config.status 1.5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -25007,6 +25022,10 @@ if test -z "${BUILD_RRDRESTORE_TRUE}" && test -z "${BUILD_RRDRESTORE_FALSE}"; th as_fn_error $? "conditional \"BUILD_RRDRESTORE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_RPATH_TRUE}" && test -z "${ENABLE_RPATH_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_RPATH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${LUA_NEED_OUR_COMPAT51_TRUE}" && test -z "${LUA_NEED_OUR_COMPAT51_FALSE}"; then as_fn_error $? "conditional \"LUA_NEED_OUR_COMPAT51\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -25440,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.3, which was +This file was extended by rrdtool $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25506,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.3 +rrdtool config.status 1.5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/rrdtool-1.4-release b/rrdtool-release similarity index 100% rename from rrdtool-1.4-release rename to rrdtool-release diff --git a/tests/Makefile.am b/tests/Makefile.am index 2fd90017..1362a21e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,7 @@ TESTS = modify1 modify2 modify3 modify4 modify5 \ create-from-template-1 dcounter1 vformatter1 xport1 EXTRA_DIST = Makefile.am \ - alltests functions $(TESTS) \ + functions $(TESTS) \ modify-test1.create.dump modify-test1.mod1.dump \ modify2-testa-create.dump modify2-testb-mod1.dump modify2-testc-mod1.dump \ modify-test3.create.dump modify-test3.mod1.dump \ @@ -29,3 +29,4 @@ CLEANFILES = *.rrd \ ct.out dur.out \ modify5-testa1-mod.dump modify5-testa2-mod.dump \ modify5-testa1-mod.dump.tmp modify5-testa2-mod.dump.tmp + diff --git a/tests/Makefile.in b/tests/Makefile.in index 113adfa9..856a2b41 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -533,7 +533,7 @@ TESTS = modify1 modify2 modify3 modify4 modify5 \ create-from-template-1 dcounter1 vformatter1 xport1 EXTRA_DIST = Makefile.am \ - alltests functions $(TESTS) \ + functions $(TESTS) \ modify-test1.create.dump modify-test1.mod1.dump \ modify2-testa-create.dump modify2-testb-mod1.dump modify2-testc-mod1.dump \ modify-test3.create.dump modify-test3.mod1.dump \