From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 16 Oct 2008 20:13:33 +0000 (+0200)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fd9c88963b04c9e9050a952ba0f018493e8b7638;p=collectd.git

Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

	ChangeLog
	version-gen.sh
---

fd9c88963b04c9e9050a952ba0f018493e8b7638
diff --cc ChangeLog
index 00a04add,9a87ac27..474f56fd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,34 -1,26 +1,57 @@@
 +2008-09-04, Version 4.5.0
 +	* collectd: Added the ability to flush certain identifiers.
 +	* collectd: The concept of `notification meta data' has been
 +	  introduced.
 +	* filecount plugin: The new filecount plugin counts the number of
 +	  files in a directory and its subdirectories.
 +	* ipmi plugin: Sensor names have been changed to ensure unique names.
 +	  Notifications upon added and removed sensors can now be generated.
 +	* notify_desktop plugin: This new plugin sends notifications to the
 +	  X desktop using the structure defined in the `Desktop Notification
 +	  Specification'.
 +	* notify_email plugin: This new plugin sends out notifications via
 +	  email, using the `esmtp' library.
 +	* onewire plugin: The new experimental(!) onewire plugin reads values,
 +	  such as temperatures, from sensors connected to the computer via the
 +	  onewire bus.
 +	* perl plugin: Improved synchronized access to internal data structures
 +	  and fixed a possible dead-lock.
 +	* perl plugin: Added the ability to flush certain identifiers and marked
 +	  plugin_flush_all() and plugin_flush_one() as deprecated in favor of
 +	  plugin_flush().
 +	* perl plugin: Added the ability to configure Perl plugins.
 +	* postgresql plugin: The new postgresql plugin collects statistics
 +	  about or from a PostgreSQL database.
 +	* processes plugin: The `ProcessMatch' option has been added.
 +	* rrdtool plugin: Implement throttling of the `update queue' to lessen
 +	  IO load.
 +	* tcpconns plugin: This plugin has been ported to OpenBSD.
 +	* thermal plugin: The new thermal plugin collects system temperatures
 +	  using Linux ACPI thermal zone data.
 +
+ 2008-10-16, Version 4.4.4
+ 	* build system: Change `--enable-<plugin>' to abort with an error if
+ 	  dependencies are not met. Thanks to Bruno Prémont for the patch.
+ 	  Also, the poisoning of various string functions has been restricted
+ 	  to debug builds.
+ 	* collectd: Fix a memory leak in the global value cache. With every
+ 	  *missing* value a couple of bytes would be leaked. Another memory
+ 	  leak in the configuration handling code has been fixed. Thanks to
+ 	  Niraj Tolia for reporting these issues.
+ 	* collectd: Fix an off-by-one error in the ignorelist functionality.
+ 	  When using regular expressions, the last character would be missing,
+ 	  possibly matching differently from what one would expect.
+ 	* collectdmon: Don't block SIGCHLD. This fixes a potential portability
+ 	  problem.
+ 	* collectd-nagios: Fix handling of the `-d' option. Thanks to Fabian
+ 	  Linzberger for reporting the but.
+ 	* network plugin: Fix a memory leak in the configuration handling
+ 	  code. Thanks to Niraj Tolia for reporting this issue.
+ 	* perl plugin: Log an error message if bootstrapping `Collectd' fails.
+ 	* tail plugin: Call `clearerr' after reading an EOF. This fixes
+ 	  problems with some `libc's. Thanks to Matthias Lay for reporting the
+ 	  bug.
+ 
  2008-09-01, Version 4.4.3
  	* collectd: Fix a memory leak in the threshold checking code.
  	* memcached plugin: Fix a too short timeout and a related file
diff --cc src/Makefile.am
index 1ffcc6f0,34de4fb7..bace5537
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -130,10 -128,9 +130,10 @@@ if BUILD_PLUGIN_ASCEN
  pkglib_LTLIBRARIES += ascent.la
  ascent_la_SOURCES = ascent.c
  ascent_la_LDFLAGS = -module -avoid-version
 -ascent_la_CFLAGS = $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 +ascent_la_CFLAGS = $(AM_CFLAGS) \
 +		$(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
  ascent_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
- collectd_LDADD += "-dlopen" apache.la
+ collectd_LDADD += "-dlopen" ascent.la
  collectd_DEPENDENCIES += ascent.la
  endif