rpms/collectd/EL-5 collectd-4.5.1-configure-OpenIPMI.patch, NONE, 1.1 collectd-4.5.1-include-collectd.d.patch, NONE, 1.1 collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, NONE, 1.1

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/collectd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15016

Added Files:
	collectd-4.5.1-configure-OpenIPMI.patch 
	collectd-4.5.1-include-collectd.d.patch 
	collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 
Log Message:
Add patches that were forgotten

collectd-4.5.1-configure-OpenIPMI.patch:

--- NEW FILE collectd-4.5.1-configure-OpenIPMI.patch ---
--- 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"

collectd-4.5.1-include-collectd.d.patch:

--- NEW FILE collectd-4.5.1-include-collectd.d.patch ---
--- 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
@@ -26,7 +26,6 @@
 #	LogLevel info
 #</Plugin>
 
- at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
 @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
 @BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
@@ -36,42 +35,30 @@
 @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
 @BUILD_PLUGIN_DF_TRUE at LoadPlugin df
 @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
- at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
- at BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
 @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
 @BUILD_PLUGIN_FILECOUNT_TRUE at LoadPlugin filecount
 @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
 @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
- at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
 @BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
 @BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
- at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
 @BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
 @BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
 @BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
 @BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
- at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
 @BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
 @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
 @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
- at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
 @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE at LoadPlugin notify_desktop
 @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE at LoadPlugin notify_email
 @BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
- at BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
 @BUILD_PLUGIN_ONEWIRE_TRUE at LoadPlugin onewire
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 @BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
- at BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
 @BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
 @BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
- at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
- at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
 @BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
 @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
 @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
 @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
@@ -423,3 +410,4 @@
 #	Verbose false
 #</Plugin>
 
+Include "/etc/collectd.d"

collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch:

--- NEW FILE collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch ---
>From b96ca3bd632f5fef539486a4c2c9906b32c31817 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at 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 at 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