[fedora-virt-maint] rpms/collectd/devel collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, 1.1, 1.2 collectd.spec, 1.17, 1.18
Alan Pevec
apevec at fedoraproject.org
Tue Mar 3 15:26:39 UTC 2009
Author: apevec
Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23034
Modified Files:
collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
collectd.spec
Log Message:
fix the patch
temp remove ipvs . . . . . . . . no (ip_vs.h not found)
collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch:
Index: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 3 Mar 2009 13:47:59 -0000 1.1
+++ collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 3 Mar 2009 15:26:08 -0000 1.2
@@ -1,4 +1,4 @@
-From 76cdc4d21f40a65d775bbce3468996c4d0045d96 Mon Sep 17 00:00:00 2001
+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
@@ -14,7 +14,7 @@
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c
-index 13bcc92..dee28fb 100644
+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)
@@ -29,7 +29,7 @@
+ struct sockaddr_in si;
+ } s;
+ s.any_socket = sockaddr;
-+ si = &s.si;
++ 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);
@@ -45,7 +45,7 @@
+ struct sockaddr_in6 si;
+ } s;
+ s.any_socket = sockaddr;
-+ si = &s.si;
++ struct sockaddr_in6 *si = &s.si;
si->sin6_family = AF_INET6;
si->sin6_port = htons (ph->ident);
si->sin6_addr = in6addr_any;
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- collectd.spec 3 Mar 2009 13:47:59 -0000 1.17
+++ collectd.spec 3 Mar 2009 15:26:08 -0000 1.18
@@ -162,6 +162,7 @@
%configure \
--disable-ascent \
--disable-static \
+ --disable-ipvs \
--enable-mysql \
--enable-sensors \
--enable-email \
@@ -284,7 +285,6 @@
%{_libdir}/collectd/hddtemp.so
%{_libdir}/collectd/interface.so
%{_libdir}/collectd/iptables.so
-%{_libdir}/collectd/ipvs.so
%{_libdir}/collectd/irq.so
%{_libdir}/collectd/load.so
%{_libdir}/collectd/logfile.so
More information about the Fedora-virt-maint
mailing list