Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2014-03-21 13:29:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2013-09-11 11:27:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2014-03-21 13:29:42.000000000 +0100 @@ -1,0 +2,33 @@ +Sat Mar 15 15:21:46 UTC 2014 - [email protected] + +- update to version 5.4.1, a new bugfix release Changes include: + * AMQP plugin: Add support for RabbitMQ 0.4.x to avoid compiler warnings. + Thanks to Sebastian Harl for implementing this. + * Apache / Network plugins: Improved initialization order hopefully resolved + gcrypt initialization problems. + * Aquaero plugin: The type used to submit fan utilization was fixed. Thanks + to Alex Deymo for the patch. + * cgroups plugin: A small memory leak was fixed. Checking the existence of a + mount option without a value was fixed. More permissive parsing of the + cpuacct.stats file fixes support for some versions of Linux. Thanks to Marc + Fournier for bug reports and patches. + * cURL plugin: Fix <Match> blocks without an instance. Thanks to Alexander + Golovko for reporting and Sebastian Harl for fixing this. + * cURL-JSON plugin: Potentially invalid memory access has been sanitized. + Thanks to Jim Radford for his patch. + * Interface plugin: Fix behavior under FreeBSD 10: Reporting of per-address + statistics caused duplicate updates to the same metric. Thanks to demon + / @trtrmitya for the patch. + * Write Graphite plugin: Use TCP to connect to Graphite by default. The + default changed from TCP to UDP between 5.3.1 and 5.4.0, which is a + regression. Thanks to Marc Fournier for fixing this. Reconnect behavior + was improved. Thanks to Michael Hart for his patch. + * ZFS ARC plugin: Collect "allocated" and "stolen" on FreeBSD only. - + +- Packaging : + * rework of patch collectd-version.patch against 5.4.1 source + * rework collectd-pkgconfig_libnotify_add_gtk.patch against 5.4.1 + As it should not be used since 2012. (gtk-2.0) if now only applied for + 11.4 Evergreen + +------------------------------------------------------------------- Old: ---- collectd-5.4.0.tar.bz2 New: ---- collectd-5.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.6TkCpl/_old 2014-03-21 13:29:43.000000000 +0100 +++ /var/tmp/diff_new_pack.6TkCpl/_new 2014-03-21 13:29:43.000000000 +0100 @@ -2,7 +2,7 @@ # # spec file for package collectd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2005-2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -119,7 +119,7 @@ %define plugins apache apcups battery %{expand:%bind_plugin} cgroups curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk %{expand:%dns_plugin} email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin} aggregation ethstat md numa tail_csv write_graphite write_riemann Name: collectd -Version: 5.4.0 +Version: 5.4.1 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files License: GPL-2.0 @@ -145,7 +145,13 @@ Patch20: collectd-split_README.patch Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch Patch23: collectd-javac_target.patch + +# Should not be used - since Mon Apr 23 10:56:57 UTC 2012 +# except for 11.4 +%if 0%{?suse_version} <= 1140 && !0%{sles_version} Patch24: collectd-pkgconfig_libnotify_add_gtk.patch +%endif + Patch25: collectd-df-remove-duplicates.patch Url: http://collectd.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -535,7 +541,7 @@ %patch4 %endif %patch7 -%patch9 +%patch9 -p1 %patch10 %patch11 %patch17 @@ -544,16 +550,18 @@ %patch20 %patch21 %patch23 -%patch24 +%if 0%{?suse_version} <= 1140 && !0%{sles_version} +%patch24 -p1 +%endif %patch25 -%__sed -i 's|@@VERSION@@|%{version}|g' configure.in +%__sed -i 's|@@VERSION@@|%{version}|g' configure.ac # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc %__install -D -m0644 "%{SOURCE20}" pkgconfig/pthread.pc %__sed 's|@@LIB@@|%{_lib}|g' pkgconfig/pthread.pc -%__perl -p -i -e 's|(-L\$withval/lib)\b|${1}64|g' configure.in configure +%__perl -p -i -e 's|(-L\$withval/lib)\b|${1}64|g' configure.ac configure # unneeded files: %__rm -fr \ ++++++ collectd-5.4.0.tar.bz2 -> collectd-5.4.1.tar.bz2 ++++++ ++++ 16834 lines of diff (skipped) ++++++ collectd-pkgconfig_libnotify_add_gtk.patch ++++++ --- /var/tmp/diff_new_pack.6TkCpl/_old 2014-03-21 13:29:44.000000000 +0100 +++ /var/tmp/diff_new_pack.6TkCpl/_new 2014-03-21 13:29:44.000000000 +0100 @@ -1,53 +1,11 @@ ---- configure.orig 2013-08-23 07:39:03.431280602 +0200 -+++ configure 2013-08-23 07:40:51.242303290 +0200 -@@ -26052,11 +26052,11 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` -+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -26069,11 +26069,11 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` -+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -26094,9 +26094,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" 2>&1` -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" "gtk+-2.0" 2>&1` - else -- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" 2>&1` -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" "gtk+-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBNOTIFY_PKG_ERRORS" >&5 ---- configure.in.orig 2013-08-23 07:40:53.933303888 +0200 -+++ configure.in 2013-08-23 07:41:03.963306130 +0200 -@@ -4612,7 +4612,7 @@ +--- a/configure.ac 2014-03-15 15:48:45.278001132 +0100 ++++ b/configure.ac 2014-03-15 15:54:06.574995791 +0100 +@@ -4666,7 +4666,7 @@ fi # }}} -PKG_CHECK_MODULES([LIBNOTIFY], [libnotify], -+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify gtk+-2.0], ++PKG_CHECK_MODULES([LIBNOTIFY], [libnotify gtk+-2.0], [with_libnotify="yes"], [if test "x$LIBNOTIFY_PKG_ERRORS" = "x"; then with_libnotify="no" ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.6TkCpl/_old 2014-03-21 13:29:44.000000000 +0100 +++ /var/tmp/diff_new_pack.6TkCpl/_new 2014-03-21 13:29:44.000000000 +0100 @@ -1,9 +1,9 @@ ---- configure.in.orig 2013-06-04 02:25:25.850760151 +0200 -+++ configure.in 2013-06-04 02:25:50.593767582 +0200 +--- a/configure.ac 2014-01-26 09:09:23.000000000 +0100 ++++ b/configure.ac 2014-03-11 07:41:44.326748635 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. --AC_INIT(collectd, [m4_esyscmd(./version-gen.sh)]) -+AC_INIT(collectd, [@@VERSION@@]) +-AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) ++AC_INIT([collectd],[@@VERSION@@]) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_AUX_DIR([libltdl/config]) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
