rpms/collectd/devel libiptc-avoid-strict-aliasing-warnings.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 collectd-4.6.2-include-collectd.d.patch, 1.3, 1.4 collectd.spec, 1.28, 1.29 sources, 1.11, 1.12
Alan Pevec
apevec at fedoraproject.org
Tue Feb 16 20:14:17 UTC 2010
Author: apevec
Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3482
Modified Files:
.cvsignore collectd-4.6.2-include-collectd.d.patch
collectd.spec sources
Added Files:
libiptc-avoid-strict-aliasing-warnings.patch
Log Message:
* Tue Feb 16 2010 Alan Pevec <apevec at redhat.com> 4.8.3-1
- New upstream version 4.8.3
http://collectd.org/news.shtml
- FTBS bz#564943 - system libiptc is not usable and owniptc fails to compile:
add a patch from upstream iptables.git to fix owniptc compilation
libiptc-avoid-strict-aliasing-warnings.patch:
libip4tc.c | 3 ++-
libip6tc.c | 3 ++-
libiptc.c | 11 +++++++----
3 files changed, 11 insertions(+), 6 deletions(-)
--- NEW FILE libiptc-avoid-strict-aliasing-warnings.patch ---
>From 43db56e316b1dae1515d4ddf0085435731d3b9be Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh at medozas.de>
Date: Fri, 23 Oct 2009 21:35:49 +0200
Subject: [PATCH] libiptc: avoid strict-aliasing warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
libiptc: avoid strict-aliasing warnings
In file included from libiptc/libip4tc.c:117:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘iptc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip4tc.c: In function ‘dump_entry’:
libiptc/libip4tc.c:157:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
CC libiptc/libip6tc.lo
In file included from libiptc/libip6tc.c:112:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘ip6tc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip6tc.c: In function ‘dump_entry’:
libiptc/libip6tc.c:188:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Rebased for collectd/src/owniptc: Alan Pevec <apevec at gmail.com>
---
src/owniptc/libip4tc.c | 3 ++-
src/owniptc/libip6tc.c | 3 ++-
src/owniptc/libiptc.c | 10 +++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/owniptc/libip4tc.c b/src/owniptc/libip4tc.c
index 66abb44..bf7327c 100644
--- a/src/owniptc/libip4tc.c
+++ b/src/owniptc/libip4tc.c
@@ -173,7 +173,8 @@ dump_entry(STRUCT_ENTRY *e, const TC_HANDLE_T handle)
t = GET_TARGET(e);
printf("Target name: `%s' [%u]\n", t->u.user.name, t->u.target_size);
if (strcmp(t->u.user.name, STANDARD_TARGET) == 0) {
- int pos = *(int *)t->data;
+ const unsigned char *data = t->data;
+ int pos = *(const int *)data;
if (pos < 0)
printf("verdict=%s\n",
pos == -NF_ACCEPT-1 ? "NF_ACCEPT"
diff --git a/src/owniptc/libip6tc.c b/src/owniptc/libip6tc.c
index 276b7af..672dae1 100644
--- a/src/owniptc/libip6tc.c
+++ b/src/owniptc/libip6tc.c
@@ -204,7 +204,8 @@ dump_entry(struct ip6t_entry *e, const ip6tc_handle_t handle)
t = ip6t_get_target(e);
printf("Target name: `%s' [%u]\n", t->u.user.name, t->u.target_size);
if (strcmp(t->u.user.name, IP6T_STANDARD_TARGET) == 0) {
- int pos = *(int *)t->data;
+ const unsigned char *data = t->data;
+ int pos = *(const int *)data;
if (pos < 0)
printf("verdict=%s\n",
pos == -NF_ACCEPT-1 ? "NF_ACCEPT"
diff --git a/src/owniptc/libiptc.c b/src/owniptc/libiptc.c
index 5e5fde0..8f0b0f0 100644
--- a/src/owniptc/libiptc.c
+++ b/src/owniptc/libiptc.c
@@ -744,14 +744,16 @@ static void iptcc_delete_rule(struct rule_head *r)
* to be called from specific places within the parser */
static int __iptcc_p_del_policy(TC_HANDLE_T h, unsigned int num)
{
+ const unsigned char *data;
+
if (h->chain_iterator_cur) {
/* policy rule is last rule */
struct rule_head *pr = (struct rule_head *)
h->chain_iterator_cur->rules.prev;
/* save verdict */
- h->chain_iterator_cur->verdict =
- *(int *)GET_TARGET(pr->entry)->data;
+ data = GET_TARGET(pr->entry)->data;
+ h->chain_iterator_cur->verdict = *(const int *)data;
/* save counter and counter_map information */
h->chain_iterator_cur->counter_map.maptype =
@@ -1563,6 +1565,7 @@ const char *TC_GET_TARGET(const STRUCT_ENTRY *ce,
{
STRUCT_ENTRY *e = (STRUCT_ENTRY *)ce;
struct rule_head *r = container_of(e, struct rule_head, entry[0]);
+ const unsigned char *data;
iptc_fn = TC_GET_TARGET;
@@ -1576,7 +1579,8 @@ const char *TC_GET_TARGET(const STRUCT_ENTRY *ce,
return r->jump->name;
break;
case IPTCC_R_STANDARD:
- spos = *(int *)GET_TARGET(e)->data;
+ data = GET_TARGET(e)->data;
+ spos = *(const int *)data;
DEBUGP("r=%p, spos=%d'\n", r, spos);
return standard_target_map(spos);
break;
--
1.6.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 26 Nov 2009 22:42:42 -0000 1.11
+++ .cvsignore 16 Feb 2010 20:14:17 -0000 1.12
@@ -1 +1 @@
-collectd-4.8.1.tar.bz2
+collectd-4.8.3.tar.bz2
collectd-4.6.2-include-collectd.d.patch:
collectd.conf.in | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
Index: collectd-4.6.2-include-collectd.d.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.6.2-include-collectd.d.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- collectd-4.6.2-include-collectd.d.patch 26 Nov 2009 22:42:42 -0000 1.3
+++ collectd-4.6.2-include-collectd.d.patch 16 Feb 2010 20:14:17 -0000 1.4
@@ -1,6 +1,6 @@
-diff -up collectd-4.8.1/src/collectd.conf.in.lr collectd-4.8.1/src/collectd.conf.in
---- collectd-4.8.1/src/collectd.conf.in.lr 2009-10-04 09:46:19.000000000 +0200
-+++ collectd-4.8.1/src/collectd.conf.in 2009-10-10 11:40:27.000000000 +0200
+diff -rup collectd-4.8.3-orig/src/collectd.conf.in collectd-4.8.3/src/collectd.conf.in
+--- collectd-4.8.3-orig/src/collectd.conf.in 2010-01-14 15:04:27.000000000 +0100
++++ collectd-4.8.3/src/collectd.conf.in 2010-02-16 17:57:11.000000000 +0100
@@ -50,7 +50,6 @@ FQDNLookup true
# to missing dependencies or because they have been deactivated explicitly. #
##############################################################################
@@ -18,7 +18,7 @@ diff -up collectd-4.8.1/src/collectd.con
#@BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
#@BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
#@BUILD_PLUGIN_FILECOUNT_TRUE at LoadPlugin filecount
-@@ -75,41 +72,31 @@ FQDNLookup true
+@@ -75,11 +72,9 @@ FQDNLookup true
#@BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
#@BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
@@ -28,8 +28,9 @@ diff -up collectd-4.8.1/src/collectd.con
#@BUILD_PLUGIN_JAVA_TRUE at LoadPlugin java
-#@BUILD_PLUGIN_LIBVIRT_TRUE at LoadPlugin libvirt
@BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
+ #@BUILD_PLUGIN_MADWIFI_TRUE at LoadPlugin madwifi
#@BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
- #@BUILD_PLUGIN_MEMCACHEC_TRUE at LoadPlugin memcachec
+@@ -87,30 +82,22 @@ FQDNLookup true
#@BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
#@BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
@@ -60,7 +61,7 @@ diff -up collectd-4.8.1/src/collectd.con
#@BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
#@BUILD_PLUGIN_TABLE_TRUE at LoadPlugin table
#@BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
-@@ -574,6 +561,7 @@ FQDNLookup true
+@@ -586,6 +573,7 @@ FQDNLookup true
# CreateFiles true
# CollectStatistics true
#</Plugin>
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- collectd.spec 4 Dec 2009 02:01:50 -0000 1.28
+++ collectd.spec 16 Feb 2010 20:14:17 -0000 1.29
@@ -1,7 +1,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 4.8.1
-Release: 3%{?dist}
+Version: 4.8.3
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
@@ -10,6 +10,8 @@ Source: http://collectd.org/files/%{name
Patch0: %{name}-4.6.2-include-collectd.d.patch
# bug 468067 "pkg-config --libs OpenIPMIpthread" fails
Patch1: %{name}-4.6.2-configure-OpenIPMI.patch
+# bug 564943 FTBFS system libiptc is not usable anymore, fix owniptc
+Patch2: libiptc-avoid-strict-aliasing-warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -152,6 +154,7 @@ This plugin collects information from vi
%setup -q
%patch0 -p1
%patch1 -p0
+%patch2 -p1
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -439,6 +442,12 @@ fi
%changelog
+* Tue Feb 16 2010 Alan Pevec <apevec at redhat.com> 4.8.3-1
+- New upstream version 4.8.3
+ http://collectd.org/news.shtml
+- FTBS bz#564943 - system libiptc is not usable and owniptc fails to compile:
+ add a patch from upstream iptables.git to fix owniptc compilation
+
* Fri Dec 4 2009 Stepan Kasal <skasal at redhat.com> - 4.8.1-3
- rebuild against perl 5.10.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 26 Nov 2009 22:42:42 -0000 1.11
+++ sources 16 Feb 2010 20:14:17 -0000 1.12
@@ -1 +1 @@
-23e07960285d0b5ee746580d6a545175 collectd-4.8.1.tar.bz2
+34e47c23515b52247d8af57e294396a8 collectd-4.8.3.tar.bz2
More information about the scm-commits
mailing list