rpms/collectd/F-12 .cvsignore, 1.10, 1.11 collectd-4.6.2-include-collectd.d.patch, 1.2, 1.3 collectd.spec, 1.25, 1.26 sources, 1.10, 1.11 collectd-4.5.4-fix-condrestart.patch, 1.1, NONE collectd-4.5.4-libvirt-reconnect.patch, 1.1, NONE
Alan Pevec
apevec at fedoraproject.org
Tue Mar 16 22:29:17 UTC 2010
Author: apevec
Update of /cvs/pkgs/rpms/collectd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6923
Modified Files:
.cvsignore collectd-4.6.2-include-collectd.d.patch
collectd.spec sources
Removed Files:
collectd-4.5.4-fix-condrestart.patch
collectd-4.5.4-libvirt-reconnect.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#news81
- FTBFS bz#564943 - system libiptc is not usable and owniptc fails to compile:
add a patch from upstream iptables.git to fix owniptc compilation
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 12 Sep 2009 00:17:15 -0000 1.10
+++ .cvsignore 16 Mar 2010 22:29:16 -0000 1.11
@@ -1 +1 @@
-collectd-4.6.5.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/F-12/collectd-4.6.2-include-collectd.d.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- collectd-4.6.2-include-collectd.d.patch 12 Sep 2009 00:17:15 -0000 1.2
+++ collectd-4.6.2-include-collectd.d.patch 16 Mar 2010 22:29:17 -0000 1.3
@@ -1,63 +1,71 @@
-diff -up collectd-4.6.5/src/collectd.conf.in.orig collectd-4.6.5/src/collectd.conf.in
---- collectd-4.6.5/src/collectd.conf.in.orig 2009-09-10 14:16:52.000000000 -0400
-+++ collectd-4.6.5/src/collectd.conf.in 2009-09-11 19:34:18.865782426 -0400
-@@ -26,7 +26,6 @@ FQDNLookup true
- # LogLevel info
- #</Plugin>
+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. #
+ ##############################################################################
-- 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
-@@ -39,45 +38,33 @@ FQDNLookup true
- @BUILD_PLUGIN_DBI_TRUE at LoadPlugin dbi
- @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
- @BUILD_PLUGIN_OPENVPN_TRUE at LoadPlugin openvpn
- @BUILD_PLUGIN_ORACLE_TRUE at LoadPlugin oracle
-- 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
- @BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
-- 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
-@@ -560,3 +547,5 @@ FQDNLookup true
- #<Chain "PostCache">
- # Target "write"
- #</Chain>
-+
+-#@BUILD_PLUGIN_APACHE_TRUE at 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
+@@ -65,8 +64,6 @@ FQDNLookup true
+ #@BUILD_PLUGIN_DBI_TRUE at LoadPlugin dbi
+ #@BUILD_PLUGIN_DF_TRUE at LoadPlugin df
+ #@BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
+-#@BUILD_PLUGIN_DNS_TRUE at LoadPlugin dns
+-#@BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
+ #@BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
+ #@BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
+ #@BUILD_PLUGIN_FILECOUNT_TRUE at LoadPlugin filecount
+@@ -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
+-#@BUILD_PLUGIN_IPMI_TRUE at LoadPlugin ipmi
+ #@BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
+ #@BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
+ #@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
+@@ -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
+-#@BUILD_PLUGIN_MYSQL_TRUE at LoadPlugin mysql
+ #@BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
+ @LOAD_PLUGIN_NETWORK at LoadPlugin network
+ #@BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
+-#@BUILD_PLUGIN_NGINX_TRUE at 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
+-#@BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
+ #@BUILD_PLUGIN_OLSRD_TRUE at LoadPlugin olsrd
+ #@BUILD_PLUGIN_ONEWIRE_TRUE at LoadPlugin onewire
+ #@BUILD_PLUGIN_OPENVPN_TRUE at LoadPlugin openvpn
+ #@BUILD_PLUGIN_ORACLE_TRUE at LoadPlugin oracle
+-#@BUILD_PLUGIN_PERL_TRUE at LoadPlugin perl
+ #@BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
+-#@BUILD_PLUGIN_POSTGRESQL_TRUE at LoadPlugin postgresql
+ #@BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
+ #@BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
+ #@BUILD_PLUGIN_PROTOCOLS_TRUE at LoadPlugin protocols
+ #@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
+- at LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
+-#@BUILD_PLUGIN_SENSORS_TRUE at LoadPlugin sensors
+ #@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
+-#@BUILD_PLUGIN_SNMP_TRUE at LoadPlugin snmp
+ #@BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
+ #@BUILD_PLUGIN_TABLE_TRUE at LoadPlugin table
+ #@BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
+@@ -586,6 +573,7 @@ FQDNLookup true
+ # CreateFiles true
+ # CollectStatistics true
+ #</Plugin>
+Include "/etc/collectd.d"
+
+ #<Plugin rrdtool>
+ # DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-12/collectd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- collectd.spec 12 Sep 2009 00:17:15 -0000 1.25
+++ collectd.spec 16 Mar 2010 22:29:17 -0000 1.26
@@ -1,6 +1,6 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 4.6.5
+Version: 4.8.3
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
@@ -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
@@ -30,16 +32,7 @@ BuildRequires: mysql-devel
BuildRequires: OpenIPMI-devel
BuildRequires: postgresql-devel
BuildRequires: nut-devel
-
-# In function 'strncpy',
-# inlined from 'ping_send_one_ipv6' at liboping.c:626:
-# /usr/include/bits/string3.h:122: error: call to __builtin___strncpy_chk will always overflow destination buffer
-# In function 'strncpy',
-# inlined from 'ping_send_one_ipv4' at liboping.c:579:
-# /usr/include/bits/string3.h:122: error: call to __builtin___strncpy_chk will always overflow destination buffer
-
-# PPC/PPC64 disabled due to above error.
-ExcludeArch: ppc ppc64
+BuildRequires: iptables-devel
%description
collectd is a small daemon written in C for performance. It reads various
@@ -161,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
@@ -180,6 +174,8 @@ sed -i.orig -e 's|-Werror||g' Makefile.i
--enable-nut \
--enable-postgresql \
--enable-iptables \
+ --disable-ping \
+ --with-libiptc \
--with-perl-bindings=INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
@@ -295,6 +291,8 @@ fi
%{_libdir}/collectd/irq.so
%{_libdir}/collectd/load.so
%{_libdir}/collectd/logfile.so
+%{_libdir}/collectd/madwifi.so
+%{_libdir}/collectd/match_empty_counter.so
%{_libdir}/collectd/mbmon.so
%{_libdir}/collectd/memcached.so
%{_libdir}/collectd/memory.so
@@ -302,7 +300,7 @@ fi
%{_libdir}/collectd/network.so
%{_libdir}/collectd/nfs.so
%{_libdir}/collectd/ntpd.so
-%{_libdir}/collectd/ping.so
+%{_libdir}/collectd/olsrd.so
%{_libdir}/collectd/powerdns.so
%{_libdir}/collectd/processes.so
%{_libdir}/collectd/serial.so
@@ -318,17 +316,25 @@ fi
%{_libdir}/collectd/vmem.so
%{_libdir}/collectd/vserver.so
%{_libdir}/collectd/wireless.so
-%{_datadir}/collectd/types.db
+%{_libdir}/collectd/write_http.so
%{_libdir}/collectd/bind.so
+%{_libdir}/collectd/conntrack.so
%{_libdir}/collectd/curl.so
+%{_libdir}/collectd/fscache.so
%{_libdir}/collectd/match_regex.so
%{_libdir}/collectd/match_timediff.so
%{_libdir}/collectd/match_value.so
%{_libdir}/collectd/openvpn.so
+%{_libdir}/collectd/protocols.so
+%{_libdir}/collectd/table.so
%{_libdir}/collectd/target_notification.so
%{_libdir}/collectd/target_replace.so
%{_libdir}/collectd/target_set.so
+%{_libdir}/collectd/ted.so
+%{_libdir}/collectd/uptime.so
+
+%{_datadir}/collectd/types.db
# collectdclient - TBD reintroduce -devel subpackage?
%{_libdir}/libcollectdclient.so
@@ -344,6 +350,7 @@ fi
%doc %{_mandir}/man1/collectdmon.1*
%doc %{_mandir}/man5/collectd.conf.5*
%doc %{_mandir}/man5/collectd-exec.5*
+%doc %{_mandir}/man5/collectd-java.5*
%doc %{_mandir}/man5/collectd-unixsock.5*
%doc %{_mandir}/man5/types.db.5*
@@ -435,6 +442,22 @@ 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#news81
+- FTBFS 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
+
+* Fri Nov 27 2009 Alan Pevec <apevec at redhat.com> 4.8.1-2
+- use Fedora libiptc, owniptc in collectd sources fails to compile
+
+* Wed Nov 25 2009 Alan Pevec <apevec at redhat.com> 4.8.1-1
+- update to 4.8.1 (Florian La Roche) bz# 516276
+- disable ping plugin until liboping is packaged bz# 541744
+
* Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> 4.6.5-1
- update to 4.6.5
- disable ppc/ppc64 due to compile error
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 12 Sep 2009 00:17:15 -0000 1.10
+++ sources 16 Mar 2010 22:29:17 -0000 1.11
@@ -1 +1 @@
-131e6fbb55f0cf6a069a98eedd21d293 collectd-4.6.5.tar.bz2
+34e47c23515b52247d8af57e294396a8 collectd-4.8.3.tar.bz2
--- collectd-4.5.4-fix-condrestart.patch DELETED ---
--- collectd-4.5.4-libvirt-reconnect.patch DELETED ---
More information about the scm-commits
mailing list