From bf37b2c6bb2c33db27bac6327f0155025154518b Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 19 Apr 2016 17:45:11 +0200 Subject: [PATCH 1/7] preparing for 1.6.0 release --- CHANGES | 312 ++++++++++++++++++++++++-------------------- VERSION | 2 +- configure | 24 ++-- src/rrd_config.h.in | 2 +- tests/Makefile.in | 2 +- 5 files changed, 187 insertions(+), 155 deletions(-) diff --git a/CHANGES b/CHANGES index 934256fd8..44d9c572b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,41 @@ -RRDtool 1.5.x - 2015-xx-xx +RRDtool 1.6.0 - 2016-04-19 +========================== +Features +-------- +* librrd is now fully thread-safe. librrd_th is gone +* make lua bindings work with lua 5.1 +* configure option to disable doc building --enable-docs=no +* new CDEF function SMIN: a,b,c,3,SMIN -> min(a,b,c) +* new CDEF function SMAX: a,b,c,3,SMAX -> max(a,b,c) +* new CDEF function STDEV: a,b,c,3,STDEV -> stdev(a,b,c) +* new CDEF function POW: a,b,POW -> a**b +* new CDEF function PERCENT: a,b,c,95,3,PERCENT -> find 95percentile of a,b,c +* re-introducted --showtime option on rrdxport +* be more careful in determining the locales idea of first day of the week +* lots of spelling fixes all around + +RRDtool 1.5.6 - 2016-04-19 +========================== + +Bugfixes +-------- +* segfault on CDEF:x= +* Disable nagel algorithm as it is causing massive slowdown +* make vname nameing rules more liberal and more in line with 1.4 +* Fix recursive directory creation in rrdcached on FREEBSD +* Fixed compilation when there's no sigwaitinfo + +RRDtool 1.5.5 - 2015-11-10 ========================== Bugfixes -------- -* shorten test precision to 7 digits ... +* 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 @@ -111,7 +143,7 @@ Bugfixes * properly verify validity of user supplied format strings * remove graph functions from python module when compiled without graphing support -* verify that only short integers are used in COMPUTE rpn expressions +* verify that only short integers are used in COMPUTE rpn expressions * eliminate duplicate setlocale calls * fixed endless loop and double frees in rrd_restore * fixed missing variable initializations in rrd_graph @@ -158,321 +190,321 @@ Detail * commit 3bbe02f924ec0e0342c5c728ee93a52e2ae1104f | Author: Trevor Bowen | Date: Mon May 13 16:47:29 2013 -0500 -| +| | Fixed failed IEEE check for cross-compile support. -| +| * commit 2948dde97fa8cef4f6c72e345601de566fc28e23 | Author: Tobias Oetiker | Date: Tue Apr 30 11:28:20 2013 +0200 -| +| | backport of the (C)DEF hash patch to accelerate processing of large (+100 statements) graph instructions. -| +| * commit fd4cfab7f2a05950b15292bacd8a00251fdaa1e4 | Author: Tobias Oetiker | Date: Tue Mar 19 07:17:23 2013 +0100 -| +| | fixed overflow problem with partial matching -| +| * commit a1768b2580bdd4451be66928e8bfc32a82c9ada9 | Author: Tobias Oetiker | Date: Sat Mar 16 18:09:38 2013 +0100 -| +| | raise an error if part of an CDEF is unparsable -| +| * commit f860a1c88ad1eb2d46b69c9b5fe9f357d2f9d28e | Author: Nick | Date: Sat Feb 9 18:46:40 2013 +0000 -| +| | Added check for graph timespan overflowing if time_t is 32 bits. -| +| * commit 14eca7ff5e5f63e50274a2dc712b43f36d06d18e | Author: Nick | Date: Sat Feb 9 16:38:17 2013 +0000 -| +| | Fixed overflow bug. -| +| * commit a234579cdf7eb99b3c93a4463dcf82b50f709785 | Author: Max Khon | Date: Wed Dec 12 13:48:23 2012 +0700 -| +| | Fix build when glib is in non-standard location (e.g. /opt). -| +| * commit 8b3d3f161169733cd46dc1d29293265d0a045a02 | Author: Olivier Doucet | Date: Wed Jan 9 15:52:44 2013 +0100 -| +| | Updated rrdgraph_libdbi doc about MySQL performance issues -| +| * commit db4fe1aaf420d0f636c8bed37f7f7bc166a51016 | Author: Tobias Oetiker | Date: Mon Nov 19 09:17:55 2012 +0100 -| +| | fixed regression from renaming skipscale -| +| * commit 774e1aec924a48a6299033adc173387e104827bc | Author: Tobias Oetiker | Date: Mon Nov 19 09:09:15 2012 +0100 -| +| | properly fix handling of time_t size in rrd_restore -| +| * commit 1591fffceb3878b785c358e4d8d884f6ebe707ba | Author: Tobias Oetiker | Date: Wed Nov 14 17:48:32 2012 +0100 -| +| | use skipscale everywhere and not SKIPSCALE -| +| * commit cab7c3817687772ecd816a220703d04ce4d92a22 | Author: Tobias Oetiker | Date: Wed Nov 14 14:19:44 2012 +0100 -| +| | Normally the graphing function makes sure that the entire LINE or AREA | is visible in the chart. The scaling of the chart will be modified | accordingly if necessary. Any LINE or AREA can be excluded from this | process by adding the option SKIPSCALE. -| +| | LINE:x#f00::SKIPSCALE -| +| * commit 4c583ec30a4d7b37e49f930d5fe4d6afc9b81ccd | Author: Antony Dovgal | Date: Tue Nov 13 15:57:49 2012 +0100 -| +| | fix for first day of the week detection logic -| +| * commit 6259d3ec4db96daa4839edcae0537ddedac58b12 |\ Merge: f6d786d 743e34f | | Author: Tobias Oetiker | | Date: Sat Nov 10 17:49:20 2012 +0100 -| | +| | | | Merge branch '1.4' of github.com:oetiker/rrdtool-1.x into 1.4 -| | +| | | * commit 743e34f5d66ea41698ff2f499283de532137408b | |\ Merge: 57a8491 ec0f5d3 | | | Author: Tobias Oetiker | | | Date: Fri Oct 19 13:47:25 2012 -0700 -| | | +| | | | | | Merge pull request #352 from tokkee/sh/build-issues -| | | +| | | | | | ruby bindings: Fixed a few build issues. -| | | +| | | | | * commit ec0f5d31bb77f72dca926ca5f44ceec115a84226 | | | Author: Sebastian Harl | | | Date: Fri Oct 19 19:12:31 2012 +0200 -| | | +| | | | | | ruby/main: Fixed "format not a string literal and no format arguments" errors. -| | | +| | | | | | These kind of errors are reported by current versions of GCC. -| | | +| | | | | * commit 3fef26354ee9c257a433f7296f73c760f96ccc15 | |/ Author: Sebastian Harl | | Date: Fri Oct 19 19:11:30 2012 +0200 -| | +| | | | ruby bindings: Fixed a miss-placed cast. -| | +| | * | commit f6d786d9146d45234c32999adae6ae7286ea8701 | | Author: Tobias Oetiker | | Date: Sat Nov 10 17:47:28 2012 +0100 -| | +| | | | do not die when failing to add link -| | +| | * | commit 8381c9b92283b576929a7317f982a23d0b3254f3 |/ Author: Tobias Oetiker | Date: Sat Nov 10 17:46:44 2012 +0100 -| +| | fix trendnan variable access -| +| * commit 57a84914e0bc7725ba1741e1a399153c8e44d407 | Author: Tobias Oetiker | Date: Tue Sep 11 14:33:08 2012 +0200 -| +| | add git notes -| +| * commit 35c423dff643bc4d9dcd2e259d4cbfe5c564b871 | Author: Tobias Oetiker | Date: Mon Sep 3 13:39:29 2012 +0000 -| +| | fix off by 1 error -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2305 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 859873eaed82f0e1ab79e15cbd8db45659340ad0 | Author: Tobias Oetiker | Date: Wed Aug 22 09:57:33 2012 +0000 -| +| | fixed pango markup link -| -| -| +| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2304 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 4f18e03460e91cf6ec433a43d355d77cec364eb2 | Author: Tobias Oetiker | Date: Tue Aug 14 09:23:11 2012 +0000 -| +| | remove a bunch of variables which were set but never used as pointed out by gcc -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2303 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit d8b366750ef91e7f49ec1e826e91276c4a91110a | Author: Tobias Oetiker | Date: Tue Aug 14 09:22:19 2012 +0000 -| +| | fix locations for installing the sample programs to make automake happy -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2302 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 55231968de6715004cd821630d5737696566a148 | Author: Tobias Oetiker | Date: Mon Aug 13 14:04:15 2012 +0000 -| +| | integrate rrdinfo and rrdcreate into the rrdupdate binary - Sven-Göran Bergh -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2300 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 9684a2680d57cd22434f8b226e3b6afab4f72bff | Author: Tobias Oetiker | Date: Sun Aug 12 20:49:17 2012 +0000 -| +| | openbsd does not know EPROTO it seems -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2298 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 6698fd7b3324f9887d8f5f920a8d18aad870b113 | Author: Tobias Oetiker | Date: Sun Aug 12 14:37:31 2012 +0000 -| +| | complete segfault fix for second axis %s format begun in r2123 (thanks Martin Pelikan for the hint) -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2297 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 2f88a17bbe097d3ebf7ff17b57a9111a1bd4e0bb | Author: Tobias Oetiker | Date: Tue Jul 31 12:43:45 2012 +0000 -| +| | RRDs.xs uses &PL_sv_undef to insert undefined values into arrays and hashes. This leads to all sorts of problems. For details, please see "AVs, HVs and undefined values" section in perlguts(1). -- patch by tobez+lars -| -| -| -| +| +| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2296 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit afdc69a5a631fb7d2a18b2a82c8f0c3c4a439ba7 | Author: Tobias Oetiker | Date: Sat Jul 28 13:54:59 2012 +0000 -| +| | support for the xport command -- Jimmy Ngo -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2294 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 17be83c4cb0ff16ec7020e97556dd662b8fba52c | Author: Tobias Oetiker | Date: Mon May 7 07:31:28 2012 +0000 -| +| | fix warning: "__STRICT_ANSI__" is not defined warning patch by Gilles Esp -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2288 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 37fd3455ee4517e80c4213b3407cb4871a4d2967 | Author: Tobias Oetiker | Date: Tue Apr 10 10:12:28 2012 +0000 -| +| | make sure the grid and label positioner does NOT take the dst state of the current time into account. -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2286 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 649d79623f5170f3eab4a397a674600791dc57d4 | Author: Tobias Oetiker | Date: Mon Mar 12 10:47:21 2012 +0000 -| +| | fix rrdcached crash as reported in debian bug #663505 -- Witold Baryluk -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2285 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit f124f8b045a70c3859f67bd6b0745078c641514c | Author: Tobias Oetiker | Date: Thu Mar 8 07:46:04 2012 +0000 -| +| | if the perl bindings are to be installed together with rrdtool, make sure INSTALL_BASE does not confuse things. Inspired by Mike Schilli. -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2284 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit ba19ea752c9d4bc364356ca768a2896cd1c3857d | Author: Tobias Oetiker | Date: Mon Mar 5 16:49:01 2012 +0000 -| +| | fix flush race in rrdcached -- Christian Hitz -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2282 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 9675fcbe69b95e527a9327e9fbe4ff86217af5f8 | Author: Tobias Oetiker | Date: Wed Feb 22 22:11:18 2012 +0000 -| +| | json requires keys to be proper strings and thus quoted ... -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2276 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 2e8bfaf37b374e7c3814d42febe51f04da916710 | Author: Tobias Oetiker | Date: Thu Feb 2 15:39:54 2012 +0000 -| +| | remove duplicate code in rrd_open -- Richard Laager -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2271 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 6618a475c42b0ec966d71f76b786bc4a871060ba | Author: Tobias Oetiker | Date: Thu Feb 2 15:38:44 2012 +0000 -| +| | use posix_fallocate when initializing rrd files ... instead of filling them with yero explicitly -- Richard Laager -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2270 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit 2cbb285c19ec369db5eb1dcf584b09a1bd691ab6 | Author: Tobias Oetiker | Date: Thu Feb 2 15:35:24 2012 +0000 -| +| | fix for tcl bindings ... -- George Ross -| -| +| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2269 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit c8ba4b3fd7e8815f615adcdc0dd52aabd9fed1cd | Author: Tobias Oetiker | Date: Tue Jan 24 10:08:48 2012 +0000 -| +| | prepare for the release of rrdtool-1.4.7 -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2267 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit aa25939a8aed3c86d5c4953b84140d916991b6d4 | Author: Tobias Oetiker | Date: Tue Jan 24 08:20:45 2012 +0000 -| +| | regression fix for r2265 -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2266 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit c30daf7e738d6d17087a77eb99c19686107f8a8e | Author: Tobias Oetiker | Date: Tue Jan 24 08:18:37 2012 +0000 -| +| | test for tm.tm_gmtoff presence in configure.ac fix for #330 -| +| | git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2265 a5681a0c-68f1-0310-ab6d-d61299d08faa -| +| * commit eb7b462e9a6373653bd9b844a76245b8b100ebfa Author: Tobias Oetiker Date: Tue Jan 24 07:38:31 2012 +0000 - + check in /usr/lib64 for tclConfig.sh too - + git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2264 a5681a0c-68f1-0310-ab6d-d61299d08faa RRDtool 1.4.7 - 2012-01-24 @@ -532,7 +564,7 @@ Bugfixes: * the number of COMPUTE rpn nodes is architecture dependent. calculate the right number and complain otherwise. Fix for #300. * make rrd_mkdir_p work on bsd* Unixes too ... their dirname call works - differently ... #305 + differently ... #305 * allow to restore XML files with zero row rras ... this is a degenerated case that does not occur in the wild, as rrdtool prevents the creation of such rrd files. But rrdtool restore 1.3 did allows to create them via @@ -563,7 +595,7 @@ Bugfixes: * fix double free in rrd_resize * do not close the file handle to the resize file of there was a problem getting it in the first place. - + RRDtool 1.4.5 - 2010-12-26 @@ -599,11 +631,11 @@ Bugfixes: * compilation: AIX does not like MAP_PRIVATE and -lW in LDFLAGS #216 -- tobi * compliation: add extra space in LDFLAGS #284 -- dam at opencsw * rrdcached: Fix permissions of the default socket -- Florian Forster - * rrdgraph-libdbi: Fix sigma calculation -- Hans Jørgen Jakobsen + * rrdgraph-libdbi: Fix sigma calculation -- Hans J�rgen Jakobsen * rrdcreate: better checks for RRA arguments * configure: make configure recognize tcl-site argument (#281) * rrdgraph: if there is no right label, do not reserve any space for it --tobi - + Enhancements: * rrdcached: add hosts_access support added -- Shaun Reitan * rrdfetch/graph: introduce "epoch" as a new base time reference, meaning @@ -624,7 +656,7 @@ Bugfixes: * compile: fix libtool and libtoolize names for OSX compiles -- Antoine Musso * compile: fix for HAVE_BROKEN_MS_ASYNC (old linux kernels) * rrd_xport: fix --daemon handling - * rrd_client: explicitly close connection on error -- Thorsten von Eicken + * rrd_client: explicitly close connection on error -- Thorsten von Eicken * rrd_update: fix memory leak for COMPUTE datasources -- Frederik Kriewitz * rrd_daemon: fix segfault when specifying a relative path (-j option) -- Adrian-Ioan Vasile * compile: make rrdtool compile with gcc 4.5 -- anicka@suse.cz @@ -633,14 +665,14 @@ Bugfixes: * compile: re-integrate intl into compile dependency so that hosts with old (or no) gettext can get access to the included copy. * rrd_cached: exit with status !=0 on invalid cli -- Sebastian Harl - + Enhancements: * updated build files and instructions for win32 port by Chris Larsen - * legal: Relicense the RRDCacheD client interface under the MIT license -- Florian Forster + * legal: Relicense the RRDCacheD client interface under the MIT license -- Florian Forster * legal: Updted FLOSS Exception for latest PHP license * rrd_cached: better help output -- Sebastian Harl - + ------------------------------------------------------------------------ RRDtool 1.4.3 - 2010-03-22 ========================== @@ -675,7 +707,7 @@ New Features * use locale settings and _NL_TIME_WEEK_1STDAY to determine the first day of the week. Works on Linux at least -- Tobi Oetiker -* rrd_graph: \u to backup one line for special legend placement tricks +* rrd_graph: \u to backup one line for special legend placement tricks -- tobi oetiker * rrd_update: new (better) checker for incoming COUNTER or DERIVED data. -- Florian @@ -684,9 +716,9 @@ Bug Fixes * rrdcached: Do not put any code in assert(). -- Sebastian Harl -* add 'm' as a shortcut for 'zoom' in rrd_graph as it was in 1.3 +* add 'm' as a shortcut for 'zoom' in rrd_graph as it was in 1.3 -- Sebastian Harl - + * rrd_update: fix for max calculation ... the MAX value of the current consolidation interval was pre-initialized with the MAX value from the previous interval (an over optimization). -- Tobi Oetiker @@ -696,7 +728,7 @@ Bug Fixes * ruby bindings: reset rrd_state for grapv in ruby bindings -- Sven Engelhardt -* rrd_cgi: make sure that (argv-1)[0] points to something sensible ... +* rrd_cgi: make sure that (argv-1)[0] points to something sensible ... hack to undo the damage caused by a senseless optimization. see bug #251 -- tobi oetiker @@ -1132,7 +1164,7 @@ Bug Fixes via a UNIX domain socket only. There are a couple of exceptions: - The commands `HELP' and `QUIT' are always allowed. - If the command `BATCH' is allowed, the command `.' is automatically - allowed, too. By default, i. e. if no `-P' option is specified, + allowed, too. By default, i.�e. if no `-P' option is specified, all commands will be allowed. As a shortcut to reset the behavior to the default behavior, you can use the slightly hackish `-P ""' syntax. Signed-off-by: Florian Forster @@ -3111,7 +3143,7 @@ Bug Fixes * branches/1.2/program/src/rrd_xport.c, branches/1.3/program/src/rrd_xport.c, src/rrd_xport.c: rrdxport was completely broken for exporting datasources that did not have - a uniform step size. Thanks to Peter Valdemar Mørch for finding + a uniform step size. Thanks to Peter Valdemar M�rch for finding this. 2008-09-26 05:11 oetiker @@ -3269,7 +3301,7 @@ Bug Fixes 2008-09-11 20:27 oetiker - * src/rrd_graph.c: fixed processing of custom fonts René GARCIA + * src/rrd_graph.c: fixed processing of custom fonts Ren� GARCIA 2008-09-11 07:01 oetiker @@ -8092,6 +8124,6 @@ Bug Fixes trunk/CVSROOT/notify, trunk/CVSROOT/rcsinfo, trunk/CVSROOT/taginfo, trunk/CVSROOT/verifymsg: initial checkin -2001-02-25 15:29 +2001-02-25 15:29 * branches, tags, trunk: New repository initialized by cvs2svn. diff --git a/VERSION b/VERSION index 6b989b82b..dc1e644a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.999 +1.6.0 diff --git a/configure b/configure index 2aaef3e37..0daaa2452 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.999. +# Generated by GNU Autoconf 2.69 for rrdtool 1.6.0. # # # 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.999' -PACKAGE_STRING='rrdtool 1.5.999' +PACKAGE_VERSION='1.6.0' +PACKAGE_STRING='rrdtool 1.6.0' 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.999 to adapt to many kinds of systems. +\`configure' configures rrdtool 1.6.0 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.999:";; + short | recursive ) echo "Configuration of rrdtool 1.6.0:";; esac cat <<\_ACEOF @@ -1737,7 +1737,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rrdtool configure 1.5.999 +rrdtool configure 1.6.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2442,7 +2442,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.999, which was +It was created by rrdtool $as_me 1.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4798,7 +4798,7 @@ fi # Define the identity of the package. PACKAGE='rrdtool' - VERSION='1.5.999' + VERSION='1.6.0' cat >>confdefs.h <<_ACEOF @@ -22799,7 +22799,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.999, which was +This file was extended by rrdtool $as_me 1.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22865,7 +22865,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.999 +rrdtool config.status 1.6.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -25449,7 +25449,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.999, which was +This file was extended by rrdtool $as_me 1.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25515,7 +25515,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.999 +rrdtool config.status 1.6.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/src/rrd_config.h.in b/src/rrd_config.h.in index 459f31e30..efafea2d2 100644 --- a/src/rrd_config.h.in +++ b/src/rrd_config.h.in @@ -13,7 +13,7 @@ /* realloc does not support NULL as argument */ #undef NO_NULL_REALLOC -/* lets enable madvise defines in NetBSD */ +/* lets enable madvise defines in NetBSD */ #if defined(__NetBSD__) # if !defined(_NETBSD_SOURCE) # define _NETBSD_SOURCE diff --git a/tests/Makefile.in b/tests/Makefile.in index dd5b253ae..5b05cb55d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -541,7 +541,7 @@ EXTRA_DIST = Makefile.am \ rrdcreate \ tune1-testa-mod1.dump tune1-testa-mod2.dump tune1-testorg.dump \ tune2-testa-mod1.dump tune2-testorg.dump \ - valgrind-supressions dcounter1 dcounter1.output vformatter1 rpn2.output \ + valgrind-supressions dcounter1 dcounter1.output vformatter1 rpn1.output rpn2.output \ xport1.json.output xport1.xml.output From 61f116744262c4c18922dcf806e496715f199669 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 19 Apr 2016 17:50:56 +0200 Subject: [PATCH 2/7] add section on changes from 1.5 to 1.6 --- NEWS | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/NEWS b/NEWS index c92c4a950..3200dcb26 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +##################################### +Major Changes between 1.6.x and 1.6.x +------------------------------------- +API +--- +* librrd_th is gone. librrd is now fully thread-safe + +RRD Graph +--------- +* new CDEF function SMIN: a,b,c,3,SMIN -> min(a,b,c) +* new CDEF function SMAX: a,b,c,3,SMAX -> max(a,b,c) +* new CDEF function STDEV: a,b,c,3,STDEV -> stdev(a,b,c) +* new CDEF function POW: a,b,POW -> a**b +* new CDEF function PERCENT: a,b,c,95,3,PERCENT -> find 95percentile of a,b,c + ##################################### Major Changes between 1.4.x and 1.5.x ------------------------------------- From 0f3c5f05bf5ce79aa2b9e55dbf10a6e3907d5057 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 19 Apr 2016 18:05:16 +0200 Subject: [PATCH 3/7] travis-link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56d6fa3ea..69791f30b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ RRDtool - Round Robin Database Tool RRDTool 1.x master build status: [![Build Status](https://travis-ci.org/oetiker/rrdtool-1.x.png?branch=master)](https://travis-ci.org/oetiker/rrdtool-1.x) test coverage [![Coverage Status](https://coveralls.io/repos/oetiker/rrdtool-1.x/badge.png?branch=master)](https://coveralls.io/r/oetiker/rrdtool-1.x?branch=master) -RRDtool 1.5.x build status: [![Build Status](https://travis-ci.org/oetiker/rrdtool-1.x.png?branch=1.5)](https://travis-ci.org/oetiker/rrdtool-1.x) +RRDtool 1.6.x build status: [![Build Status](https://travis-ci.org/oetiker/rrdtool-1.x.png?branch=1.6)](https://travis-ci.org/oetiker/rrdtool-1.x) RRDtool is a little program for easily maintaining a database of time-series data. It comes with a charting program for drawing pretty graphs based on From cc07cf0f09aa5c3feb383e36f145da1e38734aea Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 19 Apr 2016 18:05:40 +0200 Subject: [PATCH 4/7] update build instructions --- doc/rrdbuild.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod index cca13bd28..853b407fe 100644 --- a/doc/rrdbuild.pod +++ b/doc/rrdbuild.pod @@ -41,7 +41,7 @@ Where you want to install the software. Once you have decided. Save the two locations into environment variables. BUILD_DIR=/tmp/rrdbuild - INSTALL_DIR=/opt/rrdtool-1.5.999 + INSTALL_DIR=/opt/rrdtool-1.6.0 If your F is mounted with the option noexec (RHEL seems todo that) you have to choose @@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there: Lets first assume you already have all the necessary libraries pre-installed. - wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.999.tar.gz - gunzip -c rrdtool-1.5.999.tar.gz | tar xf - - cd rrdtool-1.5.999 + wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz + gunzip -c rrdtool-1.6.0.tar.gz | tar xf - + cd rrdtool-1.6.0 ./configure --prefix=$INSTALL_DIR && make && make install Ok, this was very optimistic. This try will probably have ended with @@ -345,7 +345,7 @@ because it seems that a fair number of people have ill configured python and tcl setups that would prevent RRDtool from building if they are included in their current state. - cd $BUILD_DIR/rrdtool-1.5.999 + cd $BUILD_DIR/rrdtool-1.6.0 ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python $MAKE clean $MAKE From 621b763959749d534de028062e8393e00855dc27 Mon Sep 17 00:00:00 2001 From: nirgal Date: Fri, 22 Apr 2016 17:12:54 +0200 Subject: [PATCH 5/7] Fixed CHANGES about supported lua version lua 5.1 already was supported. What version 1.6.0 brings is lua 5.2 and lua 5.3 support. --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 44d9c572b..af6126df9 100644 --- a/CHANGES +++ b/CHANGES @@ -3,7 +3,7 @@ RRDtool 1.6.0 - 2016-04-19 Features -------- * librrd is now fully thread-safe. librrd_th is gone -* make lua bindings work with lua 5.1 +* make lua bindings work with lua 5.2 and 5.3 * configure option to disable doc building --enable-docs=no * new CDEF function SMIN: a,b,c,3,SMIN -> min(a,b,c) * new CDEF function SMAX: a,b,c,3,SMAX -> max(a,b,c) From a9b8ad307582d5440e423cea246998cd0ad8300e Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Mon, 9 May 2016 08:38:57 +0200 Subject: [PATCH 6/7] fix release number --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3200dcb26..34e96c1da 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ##################################### -Major Changes between 1.6.x and 1.6.x +Major Changes between 1.5.x and 1.6.x ------------------------------------- API --- From aa2f314ad20f7cfdaa2df2bb38be69bd40f24891 Mon Sep 17 00:00:00 2001 From: Rich Alloway Date: Tue, 12 Jul 2016 13:45:00 -0400 Subject: [PATCH 7/7] FIX for Issue 695 - rrdtool 1.6 --- src/rrd_daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index ffdcfe51d..8eb5f0597 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -356,8 +356,8 @@ static void* signal_receiver (void UNUSED(*args)) switch(status) { case -1: - RRDD_LOG(LOG_ERR, "%s: %s\nerrno: %d", __func__, "Signal wait failed.", errno); - abort(); + RRDD_LOG(LOG_NOTICE, "%s: %s (May be OK if occuring while attaching/attached to strace, gdb, etc)\nerrno: %d", __func__, "Signal wait failed.", errno); + break; case SIGINT: sig_common("INT");