Merged forgotten patches and removed obsolete ones

4 files changed, 12 insertions, 188 deletions

diff --git a/collectd-4.10.0-include-collectd.d.patch b/collectd-4.10.0-include-collectd.d.patch
new file mode 100644
index 0000000..8039312
--- /dev/null
+++ b/collectd-4.10.0-include-collectd.d.patch
@@ -0,0 +1,10 @@
+--- collectd-4.10.0/src/collectd.conf.in	2010-05-01 11:15:45.000000000 +0200
++++ collectd-4.10.0/src/collectd.conf.in	2010-09-19 15:00:15.893887909 +0200
+@@ -709,6 +709,7 @@
+ #	CreateFiles true
+ #	CollectStatistics true
+ #</Plugin>
++Include "/etc/collectd.d"
+ 
+ #<Plugin rrdtool>
+ #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
diff --git a/collectd-4.9.1-include-collectd.d.patch b/collectd-4.9.1-include-collectd.d.patch
deleted file mode 100644
index 4832b12..0000000
--- a/collectd-4.9.1-include-collectd.d.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/collectd.conf.in b/src/collectd.conf.in
-index 049b07d..a795169 100644
---- a/src/collectd.conf.in
-+++ b/src/collectd.conf.in
-@@ -50,7 +50,6 @@ FQDNLookup   true
- # to missing dependencies or because they have been deactivated explicitly.  #
- ##############################################################################
- 
--#@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
- #@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
- #@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
- #@BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent
-@@ -66,8 +65,6 @@ FQDNLookup   true
- #@BUILD_PLUGIN_DBI_TRUE@LoadPlugin dbi
- #@BUILD_PLUGIN_DF_TRUE@LoadPlugin df
- #@BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk
--#@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
--#@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
- #@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
- #@BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
- #@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
-@@ -76,11 +73,9 @@ FQDNLookup   true
- #@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
- @BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
- #@BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
--#@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
- #@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
- #@BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq
- #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
--#@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
- @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
- #@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
- #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
-@@ -88,33 +83,24 @@ FQDNLookup   true
- #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
- @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory
- #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter
--#@BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
- #@BUILD_PLUGIN_NETAPP_TRUE@LoadPlugin netapp
- #@BUILD_PLUGIN_NETLINK_TRUE@LoadPlugin netlink
- @LOAD_PLUGIN_NETWORK@LoadPlugin network
- #@BUILD_PLUGIN_NFS_TRUE@LoadPlugin nfs
--#@BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
- #@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop
- #@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@LoadPlugin notify_email
- #@BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd
--#@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
- #@BUILD_PLUGIN_OLSRD_TRUE@LoadPlugin olsrd
- #@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_PROTOCOLS_TRUE@LoadPlugin protocols
- #@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
- #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
- #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
--@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
--#@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
- #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial
--#@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
- #@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
- #@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table
- #@BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail
-@@ -674,6 +661,7 @@ FQDNLookup   true
- #	CreateFiles true
- #	CollectStatistics true
- #</Plugin>
-+Include "/etc/collectd.d"
- 
- #<Plugin rrdtool>
- #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
diff --git a/collectd.spec b/collectd.spec
index de38baa..6d2d79d 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -11,6 +11,7 @@ Source1: collectd-httpd.conf
 Source2: collection.conf
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
 Patch0: %{name}-4.6.2-configure-OpenIPMI.patch
+Patch1: %{name}-4.10.0-include-collectd.d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -177,6 +178,7 @@ This plugin collects information from virtualized guests.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
diff --git a/libiptc-avoid-strict-aliasing-warnings.patch b/libiptc-avoid-strict-aliasing-warnings.patch
deleted file mode 100644
index 2392ded..0000000
--- a/libiptc-avoid-strict-aliasing-warnings.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 43db56e316b1dae1515d4ddf0085435731d3b9be Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@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@medozas.de>
-
-Rebased for collectd/src/owniptc: Alan Pevec <apevec@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
-