- New upstream version 4.6.2 http://collectd.org/news.shtml#news64collectd-4_6_2-1_fc12

7 files changed, 51 insertions, 98 deletions

diff --git a/.cvsignore b/.cvsignore
index ca3acfc..e5d7a1a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 collectd-4.5.3.tar.bz2
+collectd-4.6.2.tar.bz2
diff --git a/collectd-4.5.1-configure-OpenIPMI.patch b/collectd-4.5.1-configure-OpenIPMI.patch
deleted file mode 100644
index 2a2deab..0000000
--- a/collectd-4.5.1-configure-OpenIPMI.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.ORIG	2008-10-16 22:43:28.000000000 +0200
-+++ configure	2008-11-30 11:30:53.000000000 +0100
-@@ -36831,7 +36831,7 @@
- then
- 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
- echo $ECHO_N "checking for libOpenIPMIpthread... $ECHO_C" >&6; }
--	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
-+	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
- 	if test "$?" != "0"
- 	then
- 		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
-@@ -36844,7 +36844,7 @@
- then
- 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
- echo $ECHO_N "checking for libOpenIPMIpthread CFLAGS... $ECHO_C" >&6; }
--	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
-+	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
- 	if test "$?" = "0"
- 	then
- 		with_libopenipmipthread_cflags="$temp_result"
-@@ -36860,7 +36860,7 @@
- then
- 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
- echo $ECHO_N "checking for libOpenIPMIpthread LDFLAGS... $ECHO_C" >&6; }
--	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
-+	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
- 	if test "$?" = "0"
- 	then
- 		with_libopenipmipthread_ldflags="$temp_result"
diff --git a/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch b/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
deleted file mode 100644
index 6acc072..0000000
--- a/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b96ca3bd632f5fef539486a4c2c9906b32c31817 Mon Sep 17 00:00:00 2001
-From: Alan Pevec <apevec@redhat.com>
-Date: Tue, 3 Mar 2009 14:36:36 +0100
-Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue
-
-cc1: warnings being treated as errors
-liboping.c: In function 'ping_host_add':
-liboping.c:995: error: dereferencing pointer 'si' does break strict-aliasing rules
-...
-
-Signed-off-by: Alan Pevec <apevec@redhat.com>
----
- src/liboping/liboping.c |   18 ++++++++++++------
- 1 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c
-index 13bcc92..94adb1d 100644
---- a/src/liboping/liboping.c
-+++ b/src/liboping/liboping.c
-@@ -987,9 +987,12 @@ int ping_host_add (pingobj_t *obj, const char *host)
- 
- 		if (ai_ptr->ai_family == AF_INET)
- 		{
--			struct sockaddr_in *si;
--
--			si = (struct sockaddr_in *) &sockaddr;
-+			union {
-+			    struct sockaddr_storage any_socket;
-+			    struct sockaddr_in si;
-+			} s;
-+			s.any_socket = sockaddr;
-+			struct sockaddr_in *si = &s.si;
- 			si->sin_family = AF_INET;
- 			si->sin_port   = htons (ph->ident);
- 			si->sin_addr.s_addr = htonl (INADDR_ANY);
-@@ -999,9 +1002,12 @@ int ping_host_add (pingobj_t *obj, const char *host)
- 		}
- 		else if (ai_ptr->ai_family == AF_INET6)
- 		{
--			struct sockaddr_in6 *si;
--
--			si = (struct sockaddr_in6 *) &sockaddr;
-+			union {
-+			    struct sockaddr_storage any_socket;
-+			    struct sockaddr_in6 si;
-+			} s;
-+			s.any_socket = sockaddr;
-+			struct sockaddr_in6 *si = &s.si;
- 			si->sin6_family = AF_INET6;
- 			si->sin6_port   = htons (ph->ident);
- 			si->sin6_addr   = in6addr_any;
--- 
-1.6.0.6
-
diff --git a/collectd-4.6.2-configure-OpenIPMI.patch b/collectd-4.6.2-configure-OpenIPMI.patch
new file mode 100644
index 0000000..592f9dc
--- /dev/null
+++ b/collectd-4.6.2-configure-OpenIPMI.patch
@@ -0,0 +1,29 @@
+--- configure.orig	2009-03-18 11:56:42.000000000 +0100
++++ configure	2009-05-20 11:05:33.000000000 +0200
+@@ -40327,7 +40327,7 @@
+ then
+ 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
+ $as_echo_n "checking for libOpenIPMIpthread... " >&6; }
+-	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
++	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
+ 	if test "$?" != "0"
+ 	then
+ 		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
+@@ -40340,7 +40340,7 @@
+ then
+ 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
+ $as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; }
+-	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
++	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
+ 	if test "$?" = "0"
+ 	then
+ 		with_libopenipmipthread_cflags="$temp_result"
+@@ -40356,7 +40356,7 @@
+ then
+ 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
+ $as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; }
+-	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
++ 	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
+ 	if test "$?" = "0"
+ 	then
+ 		with_libopenipmipthread_ldflags="$temp_result"
diff --git a/collectd-4.5.1-include-collectd.d.patch b/collectd-4.6.2-include-collectd.d.patch
index 832ca74..cec948f 100644
--- a/collectd-4.5.1-include-collectd.d.patch
+++ b/collectd-4.6.2-include-collectd.d.patch
@@ -1,5 +1,5 @@
---- collectd-4.5.1/src/collectd.conf.in.ORIG	2008-10-16 22:29:56.000000000 +0200
-+++ collectd-4.5.1/src/collectd.conf.in	2008-11-30 10:39:23.000000000 +0100
+--- collectd-4.6.2/src/collectd.conf.in.orig	2009-03-18 11:55:39.000000000 +0100
++++ collectd-4.6.2/src/collectd.conf.in	2009-05-20 10:59:34.000000000 +0200
 @@ -26,7 +26,6 @@
  #	LogLevel info
  #</Plugin>
@@ -8,8 +8,8 @@
  @BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
  @BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
  @BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent
-@@ -36,42 +35,30 @@
- @BUILD_PLUGIN_CSV_TRUE@LoadPlugin csv
+@@ -39,45 +38,33 @@
+ @BUILD_PLUGIN_DBI_TRUE@LoadPlugin dbi
  @BUILD_PLUGIN_DF_TRUE@LoadPlugin df
  @BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk
 -@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
@@ -39,11 +39,14 @@
  @BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd
 -@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
  @BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
+ @BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
+ @BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
 -@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
  @BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
 -@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
  @BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns
  @BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
+ @BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
 -@BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
 -@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
  @BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial
@@ -51,8 +54,9 @@
  @BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
  @BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail
  @BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
-@@ -423,3 +410,4 @@
- #	Verbose false
- #</Plugin>
- 
+@@ -551,3 +538,5 @@
+ #<Chain "Main">
+ #  Target "write"
+ #</Chain>
++
 +Include "/etc/collectd.d"
diff --git a/collectd.spec b/collectd.spec
index e96bd53..c913ede 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,17 +1,15 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.5.3
-Release: 2%{?dist}
+Version: 4.6.2
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
 
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
-Patch0: %{name}-4.5.1-include-collectd.d.patch
+Patch0: %{name}-%{version}-include-collectd.d.patch
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
-Patch1: %{name}-4.5.1-configure-OpenIPMI.patch
-# posted upstream
-Patch2: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
+Patch1: %{name}-%{version}-configure-OpenIPMI.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -153,7 +151,6 @@ This plugin collects information from virtualized guests.
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -410,6 +407,10 @@ fi
 
 
 %changelog
+* Wed May 20 2009 Alan Pevec <apevec@redhat.com> 4.6.2-1
+- New upstream version 4.6.2
+  http://collectd.org/news.shtml#news64
+
 * Tue Mar 03 2009 Alan Pevec <apevec@redhat.com> 4.5.3-2
 - patch for strict-aliasing issue in liboping.c
 
diff --git a/sources b/sources
index 5d66334..4c04ede 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 f368200c4bedd64baba46094906e81ee  collectd-4.5.3.tar.bz2
+ca1282372f15882ce07fdff6c61340d5  collectd-4.6.2.tar.bz2