diff options
| author | Alan Pevec <apevec@fedoraproject.org> | 2009-03-03 15:26:08 +0000 |
|---|---|---|
| committer | Alan Pevec <apevec@fedoraproject.org> | 2009-03-03 15:26:08 +0000 |
| commit | fc850ec3201fdf4ec76bd51959cc6c37fed4c1ad (patch) | |
| tree | c8ea0d7c14970cff087ac10facdd765f025b7fa2 | |
| parent | 12972687aca2262309b860ba5376b6d1612f86ba (diff) | |
| download | collectd-fc850ec3201fdf4ec76bd51959cc6c37fed4c1ad.tar.gz collectd-fc850ec3201fdf4ec76bd51959cc6c37fed4c1ad.tar.xz collectd-fc850ec3201fdf4ec76bd51959cc6c37fed4c1ad.zip | |
fix the patch temp remove ipvs . . . . . . . . no (ip_vs.h not found)collectd-4_5_3-2_fc11F-11-startF-11-split
| -rw-r--r-- | collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch | 8 | ||||
| -rw-r--r-- | collectd.spec | 2 |
2 files changed, 5 insertions, 5 deletions
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 index cbb1c17..6acc072 100644 --- a/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch +++ b/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch @@ -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@redhat.com> Date: Tue, 3 Mar 2009 14:36:36 +0100 Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue @@ -14,7 +14,7 @@ Signed-off-by: Alan Pevec <apevec@redhat.com> 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 @@ index 13bcc92..dee28fb 100644 + 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 @@ index 13bcc92..dee28fb 100644 + 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; diff --git a/collectd.spec b/collectd.spec index d000c93..e96bd53 100644 --- a/collectd.spec +++ b/collectd.spec @@ -162,6 +162,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in %configure \ --disable-ascent \ --disable-static \ + --disable-ipvs \ --enable-mysql \ --enable-sensors \ --enable-email \ @@ -284,7 +285,6 @@ fi %{_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 |