rpms/collectd/devel .cvsignore, 1.9, 1.10 collectd-4.6.2-configure-OpenIPMI.patch, 1.1, 1.2 collectd-4.6.2-include-collectd.d.patch, 1.1, 1.2 collectd.spec, 1.24, 1.25 sources, 1.9, 1.10

Tom Callaway spot at fedoraproject.org
Sat Sep 12 00:17:17 UTC 2009 

Author: spot

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7117

Modified Files:
	.cvsignore collectd-4.6.2-configure-OpenIPMI.patch 
	collectd-4.6.2-include-collectd.d.patch collectd.spec sources 
Log Message:
4.6.5, excludearch ppc to get it building again


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Sep 2009 13:45:01 -0000	1.9
+++ .cvsignore	12 Sep 2009 00:17:15 -0000	1.10
@@ -1 +1 @@
-collectd-4.6.4.tar.bz2
+collectd-4.6.5.tar.bz2

collectd-4.6.2-configure-OpenIPMI.patch:
 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: collectd-4.6.2-configure-OpenIPMI.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.6.2-configure-OpenIPMI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- collectd-4.6.2-configure-OpenIPMI.patch	20 May 2009 10:40:50 -0000	1.1
+++ collectd-4.6.2-configure-OpenIPMI.patch	12 Sep 2009 00:17:15 -0000	1.2
@@ -1,29 +1,30 @@
---- configure.orig	2009-03-18 11:56:42.000000000 +0100
-+++ configure	2009-05-20 11:05:33.000000000 +0200
-@@ -40327,7 +40327,7 @@
+diff -up ./configure.orig ./configure
+--- ./configure.orig	2009-09-10 14:22:48.000000000 -0400
++++ ./configure	2009-09-11 19:39:02.408651561 -0400
+@@ -27913,7 +27913,7 @@ if test "x$with_libopenipmipthread" = "x
  then
- 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread" >&5
  $as_echo_n "checking for libOpenIPMIpthread... " >&6; }
 -	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
 +	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
  	if test "$?" != "0"
  	then
  		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
-@@ -40340,7 +40340,7 @@
+@@ -27926,7 +27926,7 @@ if test "x$with_libopenipmipthread" = "x
  then
- 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread CFLAGS" >&5
  $as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; }
 -	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
-+	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
++	temp_result="`$PKG_CONFIG --cflags OpenIPMI`"
  	if test "$?" = "0"
  	then
  		with_libopenipmipthread_cflags="$temp_result"
-@@ -40356,7 +40356,7 @@
+@@ -27942,7 +27942,7 @@ if test "x$with_libopenipmipthread" = "x
  then
- 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread LDFLAGS" >&5
  $as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; }
 -	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
-+ 	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
++	temp_result="`$PKG_CONFIG --libs OpenIPMI`"
  	if test "$?" = "0"
  	then
  		with_libopenipmipthread_ldflags="$temp_result"

collectd-4.6.2-include-collectd.d.patch:
 collectd.conf.in |   15 ++-------------
 1 file changed, 2 insertions(+), 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- collectd-4.6.2-include-collectd.d.patch	20 May 2009 10:40:50 -0000	1.1
+++ collectd-4.6.2-include-collectd.d.patch	12 Sep 2009 00:17:15 -0000	1.2
@@ -1,6 +1,7 @@
---- collectd-4.6.2/src/collectd.conf.in.orig	2009-03-18 11:55:39.000000000 +0100
-+++ collectd-4.6.2/src/collectd.conf.in	2009-05-20 10:59:34.000000000 +0200
-@@ -26,7 +26,6 @@
+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>
  
@@ -8,7 +9,7 @@
  @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 @@
+@@ -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
@@ -54,8 +55,8 @@
  @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
  @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
  @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
-@@ -551,3 +538,5 @@
- #<Chain "Main">
+@@ -560,3 +547,5 @@ FQDNLookup   true
+ #<Chain "PostCache">
  #  Target "write"
  #</Chain>
 +


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- collectd.spec	2 Sep 2009 13:45:01 -0000	1.24
+++ collectd.spec	12 Sep 2009 00:17:15 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.6.4
+Version: 4.6.5
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
@@ -10,10 +10,6 @@ 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 516273 on upgrade collectd is not restarted
-Patch2: %{name}-4.5.4-fix-condrestart.patch
-# bug 480997 collectd does not re-connect to libvirtd
-Patch3: %{name}-4.5.4-libvirt-reconnect.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -35,6 +31,16 @@ 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
+
 %description
 collectd is a small daemon written in C for performance.  It reads various
 system  statistics  and updates  RRD files,  creating  them if necessary.
@@ -155,8 +161,6 @@ This plugin collects information from vi
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
-%patch3 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -431,6 +435,10 @@ fi
 
 
 %changelog
+* 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
+
 * Wed Sep 02 2009 Alan Pevec <apevec at redhat.com> 4.6.4-1
 - fix condrestart: on upgrade collectd is not restarted, bz# 516273
 - collectd does not re-connect to libvirtd, bz# 480997


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Sep 2009 13:45:01 -0000	1.9
+++ sources	12 Sep 2009 00:17:15 -0000	1.10
@@ -1 +1 @@
-f4a1b16c57ba946d24c0db910febb950  collectd-4.6.4.tar.bz2
+131e6fbb55f0cf6a069a98eedd21d293  collectd-4.6.5.tar.bz2

More information about the fedora-extras-commits mailing list