Disable nagel algorithm

Disable TCP's nagal algorithm which was causing massive slowdown
in processing rrdcached requests.

Also check for other setsockopt call errors.

diff --git a/CHANGES b/CHANGES
index 73099c72e93d9157f931fa712db4c49d9ccba5ba..c2afd2abc1c01f396e0621fdaf2115f0d8aeacf8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+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
 ==========================
 
@@ -8,7 +19,7 @@ Bugfixes
 * 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 ... 
+* shorten test precision to 7 digits ...
 * never exit from a library function
 * buffer overflow in rrd_restore.c fixed #669
 
@@ -116,7 +127,7 @@ Bugfixes
 * properly verify validity of user suplied 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
@@ -163,321 +174,321 @@ Detail
 * commit 3bbe02f924ec0e0342c5c728ee93a52e2ae1104f
 | Author: Trevor Bowen <trevor.bowen@adtran.com>
 | Date:   Mon May 13 16:47:29 2013 -0500
-| 
+|
 |     Fixed failed IEEE check for cross-compile support.
-|  
+|
 * commit 2948dde97fa8cef4f6c72e345601de566fc28e23
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | Date:   Tue Mar 19 07:17:23 2013 +0100
-| 
+|
 |     fixed overflow probem with partial matching
-|  
+|
 * commit a1768b2580bdd4451be66928e8bfc32a82c9ada9
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | Date:   Sat Mar 16 18:09:38 2013 +0100
-| 
+|
 |     raise an error if part of an CDEF is unparsable
-|  
+|
 * commit f860a1c88ad1eb2d46b69c9b5fe9f357d2f9d28e
 | Author: Nick <nick@example.com>
 | 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 <nick@example.com>
 | Date:   Sat Feb 9 16:38:17 2013 +0000
-| 
+|
 |     Fixed overflow bug.
-|  
+|
 * commit a234579cdf7eb99b3c93a4463dcf82b50f709785
 | Author: Max Khon <fjoe@samodelkin.net>
 | 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 <webmaster@ajeux.com>
 | Date:   Wed Jan 9 15:52:44 2013 +0100
-| 
+|
 |     Updated rrdgraph_libdbi doc about MySQL performance issues
-|  
+|
 * commit db4fe1aaf420d0f636c8bed37f7f7bc166a51016
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | Date:   Mon Nov 19 09:17:55 2012 +0100
-| 
+|
 |     fixed regression from renaming skipscale
-|  
+|
 * commit 774e1aec924a48a6299033adc173387e104827bc
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | Date:   Mon Nov 19 09:09:15 2012 +0100
-| 
+|
 |     properly fix handling of time_t size in rrd_restore
-|  
+|
 * commit 1591fffceb3878b785c358e4d8d884f6ebe707ba
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | Date:   Wed Nov 14 17:48:32 2012 +0100
-| 
+|
 |     use skipscale everywhere and not SKIPSCALE
-|  
+|
 * commit cab7c3817687772ecd816a220703d04ce4d92a22
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | 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 <antony.dovgal@gmail.com>
 | 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 <tobi@oetiker.ch>
 | | 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 <tobi@oetiker.ch>
 | | | 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 <sh@teamix.net>
 | | | 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 <sh@teamix.net>
 | |   Date:   Fri Oct 19 19:11:30 2012 +0200
-| |   
+| |
 | |       ruby bindings: Fixed a miss-placed cast.
-| |   
+| |
 * | commit f6d786d9146d45234c32999adae6ae7286ea8701
 | | Author: Tobias Oetiker <tobi@oetiker.ch>
 | | Date:   Sat Nov 10 17:47:28 2012 +0100
-| | 
+| |
 | |     do not die when failing to add link
-| |   
+| |
 * | commit 8381c9b92283b576929a7317f982a23d0b3254f3
 |/  Author: Tobias Oetiker <tobi@oetiker.ch>
 |   Date:   Sat Nov 10 17:46:44 2012 +0100
-|   
+|
 |       fix trendnan variable access
-|  
+|
 * commit 57a84914e0bc7725ba1741e1a399153c8e44d407
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | Date:   Tue Sep 11 14:33:08 2012 +0200
-| 
+|
 |     add git notes
-|  
+|
 * commit 35c423dff643bc4d9dcd2e259d4cbfe5c564b871
 | Author: Tobias Oetiker <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | Date:   Thu Feb 2 15:38:44 2012 +0000
-| 
+|
 |     use  posix_fallocate when initialiying 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
 | 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 <tobi@oetiker.ch>
   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
@@ -537,7 +548,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
@@ -568,7 +579,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
@@ -604,11 +615,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
@@ -629,7 +640,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
@@ -638,14 +649,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
 ==========================
@@ -680,7 +691,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
@@ -689,9 +700,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
@@ -701,7 +712,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
 
@@ -1137,7 +1148,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
@@ -3116,7 +3127,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
@@ -3274,7 +3285,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
          <rene@margar.fr>
 
 2008-09-11 07:01  oetiker
@@ -8097,6 +8108,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 9075be495155f803d705f2f1f65b03d48f449c9d..eac1e0ada6d89d9aae6e38b1d168a63d65310dba 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.5
+1.5.6

diff --git a/configure b/configure
index d47efbac7f7e99ca3e9af84639743119435a69e3..e89dd65d1b1085ff791c4a82e0c50dfc34beb71c 100755 (executable)
--- 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.5.
+# Generated by GNU Autoconf 2.69 for rrdtool 1.5.6.
 #
 #
 # 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.5'
-PACKAGE_STRING='rrdtool 1.5.5'
+PACKAGE_VERSION='1.5.6'
+PACKAGE_STRING='rrdtool 1.5.6'
 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.5 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.5.6 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.5:";;
+     short | recursive ) echo "Configuration of rrdtool 1.5.6:";;
    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.5
+rrdtool configure 1.5.6
 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.5, which was
+It was created by rrdtool $as_me 1.5.6, 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.5'
+ VERSION='1.5.6'
 
 
 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.5, which was
+This file was extended by rrdtool $as_me 1.5.6, 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.5
+rrdtool config.status 1.5.6
 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.5, which was
+This file was extended by rrdtool $as_me 1.5.6, 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.5
+rrdtool config.status 1.5.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index e4407644895a60b3c6e14761497d7cd39b6129a9..cf7817d0f70ecf8bb93fc208857c77ac08e2f857 100644 (file)
--- 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.4
+ INSTALL_DIR=/opt/rrdtool-1.5.6
 
 
 If your F</tmp> 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.4.tar.gz
- gunzip -c rrdtool-1.5.4.tar.gz | tar xf -
- cd rrdtool-1.5.4
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.6.tar.gz
+ gunzip -c rrdtool-1.5.6.tar.gz | tar xf -
+ cd rrdtool-1.5.6
  ./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.4
+ cd $BUILD_DIR/rrdtool-1.5.6
  ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
  $MAKE clean
  $MAKE

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 856a2b41a92634dd4c7797903459b850f781bbe8..f57d1fffdb02dae57a3cc2778ecc3ad2b9568091 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -542,7 +542,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