[packages/collectd] - up to 5.4.1 - removed -Werror from CFLAGS
baggins
baggins at pld-linux.org
Sat Oct 4 22:41:11 CEST 2014
commit cc9450c3523131bd5037fcf16c4446abb5392736
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Oct 4 22:40:51 2014 +0200
- up to 5.4.1
- removed -Werror from CFLAGS
collectd-netlink.patch | 22 ----------------------
collectd.spec | 27 ++++++++++++++++++++------
no-Werror.patch | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+), 28 deletions(-)
---
diff --git a/collectd.spec b/collectd.spec
index adc98f9..bd0fd29 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,4 +1,19 @@
# TODO:
+#warning: Installed (but unpackaged) file(s) found:
+# /etc/collectd.d/aggregation.conf
+# /etc/collectd.d/cgroups.conf
+# /etc/collectd.d/lvm.conf
+# /etc/collectd.d/statsd.conf
+# /etc/collectd.d/tail_csv.conf
+# /etc/collectd.d/target_v5upgrade.conf
+# /usr/bin/collectd-tg
+# /usr/lib64/collectd/aggregation.so
+# /usr/lib64/collectd/cgroups.so
+# /usr/lib64/collectd/lvm.so
+# /usr/lib64/collectd/statsd.so
+# /usr/lib64/collectd/tail_csv.so
+# /usr/share/man/man1/collectd-tg.1.gz
+#
# - package contrib scripts as %doc
# - perl modules with Collectd classes package to separate package
# - Bundled libraries - check if its not changed ones and if it can be
@@ -66,12 +81,12 @@
Summary: Collects system information in RRD files
Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD
Name: collectd
-Version: 5.1.0
-Release: 8
+Version: 5.4.1
+Release: 1
License: GPL v2
Group: Daemons
Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 141570150b4608c0c567330f6f146e0f
+# Source0-md5: 6f56c71c96573a7f4f7fb3bfab185974
Source1: %{name}.conf
Source2: %{name}.init
Source3: %{name}-http.conf
@@ -84,7 +99,7 @@ Patch1: compile.patch
Patch2: noquote.patch
Patch3: libiptc.patch
Patch4: pld.patch
-Patch5: %{name}-netlink.patch
+Patch5: no-Werror.patch
Patch6: %{name}-modbus.patch
URL: http://collectd.org/
%{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3}
@@ -97,7 +112,7 @@ BuildRequires: libdbi-devel
BuildRequires: libltdl-devel
BuildRequires: libmemcached-devel
%{?with_modbus:BuildRequires: libmodbus-devel}
-%{?with_netlink:BuildRequires: libnetlink-devel >= 3.0.0}
+%{?with_netlink:BuildRequires: libmnl-devel}
%{?with_libvirt:BuildRequires: libnl1-devel}
%{?with_notify:BuildRequires: libnotify-devel}
%{?with_ping:BuildRequires: liboping-devel}
@@ -1517,7 +1532,7 @@ fi
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcollectdclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.1
%files devel
%defattr(644,root,root,755)
diff --git a/collectd-netlink.patch b/collectd-netlink.patch
deleted file mode 100644
index be25c2f..0000000
--- a/collectd-netlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- collectd-5.0.2/src/netlink.c~ 2012-01-22 12:10:04.000000000 +0100
-+++ collectd-5.0.2/src/netlink.c 2012-01-23 14:59:51.180465183 +0100
-@@ -570,8 +570,7 @@
- return (-1);
- }
-
-- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
-- NULL, NULL) != 0)
-+ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0)
- {
- ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
- return (-1);
-@@ -608,8 +607,7 @@
- continue;
- }
-
-- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
-- NULL, NULL) != 0)
-+ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0)
- {
- ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
- continue;
diff --git a/no-Werror.patch b/no-Werror.patch
new file mode 100644
index 0000000..00e9ce4
--- /dev/null
+++ b/no-Werror.patch
@@ -0,0 +1,51 @@
+--- collectd-5.4.1/configure.ac~ 2014-01-26 09:09:23.000000000 +0100
++++ collectd-5.4.1/configure.ac 2014-10-04 22:35:37.727704935 +0200
+@@ -589,7 +589,7 @@
+ # Emulate behavior of src/Makefile.am
+ if test "x$GCC" = "xyes"
+ then
+- CFLAGS="$CFLAGS -Wall -Werror"
++ CFLAGS="$CFLAGS -Wall"
+ fi
+
+ AC_CACHE_CHECK([for strtok_r],
+@@ -718,7 +718,7 @@
+ if test "x$GCC" = "xyes"
+ then
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -Wall -Wextra -Werror"
++ CFLAGS="$CFLAGS -Wall -Wextra"
+ fi
+
+ AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
+@@ -3205,7 +3205,7 @@
+ SAVE_LDFLAGS="$LDFLAGS"
+ # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
+ # (see issues #41 and #42)
+- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
++ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall"
+ LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+
+ AC_CACHE_CHECK([for broken Perl_load_module()],
+--- collectd-5.4.1/src/Makefile.am~ 2014-10-04 22:34:10.000000000 +0200
++++ collectd-5.4.1/src/Makefile.am 2014-10-04 22:36:06.087706122 +0200
+@@ -4,7 +4,7 @@
+ endif
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"'
+--- collectd-5.4.1/src/libcollectdclient/Makefile.am~ 2014-01-26 09:09:14.000000000 +0100
++++ collectd-5.4.1/src/libcollectdclient/Makefile.am 2014-10-04 22:36:28.911040409 +0200
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ pkginclude_HEADERS = collectd/client.h collectd/network.h collectd/network_buffer.h collectd/lcc_features.h
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/collectd.git/commitdiff/cc9450c3523131bd5037fcf16c4446abb5392736
More information about the pld-cvs-commit
mailing list