Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2013-09-11 11:27:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-01 15:22:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2013-09-11 11:27:30.000000000 +0200 @@ -1,0 +2,105 @@ +Thu Sep 5 17:19:25 CEST 2013 - [email protected] + +- add libperl_requires, as we link against libperl and thus + need a specific version of perl + +------------------------------------------------------------------- +Fri Aug 23 05:33:18 UTC 2013 - [email protected] + +- update to 5.4.0: + * collectd: The "LoadPlugin" config option no longer attempts to load + plugins twice. If more than one "LoadPlugin" statement or block is + encountered, only the first will have any effect. + * collectd: The "AutoLoadPlugin" option allows to automatically load + plugins for which a configuration is found. + * collectd: The "WriteQueueLimitHigh" and "WriteQueueLimitLow" options + allow collectd to drop values when under stress, to avoid running out + of memory. + * amqp plugin: The "GraphiteSeparateInstances" and + "GraphiteAlwaysAppendDS" options have been added. + * aquaero plugin: This new plugin reads various metrics, e.g. fan + speeds and temperatures, from Aquaero 5, a fan and water cooling + control panel. + * curl plugin: The "MeasureResponseCode" option has been added. + * curl_json plugin: Support for UNIX domain sockets and array wildcards + has been added. + * curl_xml plugin: Support for long URLs has been improved. + * cgroups plugin: This new plugin collects CPU accounting information + for processes in a cgroup. + * df plugin: The "ValuesAbsolute" and "ValuesPercentage" options have + been added. + * exec plugin: Do UID / GID lookups before forking. This should prevent + a race condition in the NSS library. + * lvm plugin: This new plugin collects size information from Linux' + Logical Volume Manager (LVM). + * memcached plugin: Support for increment and decrement counts has been + added. + * mic plugin: This new plugin collects CPU and memory usage, power + consumption and temperatures of Intel's Many-Integrated-Core (MIC) + architecture, such as Xeon Phi cards. + * netlink plugin: This plugin has been converted to use the supported + "libmnl" library. + * nginx plugin: Collection of accepted and handled connections has been + added. + * sigrok plugin: This new plugin collects metrics from sigrok, a signal + processing framework reading various hardware devices, from light + meters to spectrum analyzers. + * statsd plugin: This new plugin listens to a UDP socket and reads + metrics in the StatsD format. + * varnish plugin: Many additional metrics have been added. + * write_graphite plugin: Support for "UDP" has been added. + * write_riemann plugin: The "TTLFactor" option has been added. + +- changes from 5.3.1: + * Configuration: Fix error handling: Errors in included files were + ignored, causing configuration mistakes to go unnoticed. + * dns plugin: Don't abort when PCAP returns an error. + * modbus plugin: The reconnection strategy was improved, fixing a + segfault in the libmodbud library. + * mysql plugin: The notification about a newly running MySQL slave + thread has been fixed. + * snmp plugin: A build issue has been fixed (C99 mixed declaration). + * threshold plugin: Handling of the "Interesting" configuration option + has been fixed. + * write_riemann plugin: A memory leak has been fixed. + +- dropped collectd-fix-warnings.patch, as it only fixed warnings in the + netlink plugin, which has been rewritten +- disable dns plugin on SLE_11_SP2, libpcap too old there + +------------------------------------------------------------------- +Fri Aug 23 05:26:54 UTC 2013 - [email protected] + +- update to 5.3.0: + * collectd: The "Include" statements can now be limited to include + only matching files in a directory + * collectd: Dispatches / writes are now handled by a thread pool. This + improves reliability and throughput for instances configured to act + as a "server" + * aggregation plugin: Selection of value lists is now possible using + regular expressions. Parts of the identifier of the resulting metric + can now be set via the configuration file. + * apcups plugin: The "ReportSeconds" option has been implemented. + * curl* plugins: Support for POST requests and custom request headers + has been added + * curl_xml plugin: Support for XML namespaces has been added. + * dbi plugin: Support for numeric options has been added. The + "Host" option has been added. + * disk plugin: Support for systems with >256 has been fixed + * libvirt plugin: Support for memory allocation has been added. + * netapp plugin: Support for "SnapVault", "VFiler" and deduplication / + compression and quota metrics. + * postgresql plugin: The reconnection logic has been improved. + * rrdtool, rrdcached plugins: The "CreateFilesAsync" option has been + implemented. When enabled, new RRD files will be created + asynchronously, which improved throughput of "server" instances. + * tail_csv plugin: This new plugins allows to read metrics from CSV + files, such as Snort's statistics file. + * write_mongodb plugin: Authentication options have been added. + * write_riemann plugin: This new plugin allows sending metrics to + Riemann, a stream processing and alerting tool. + +- dropped own copy of iproute2, builds properly with the one provided + by the system + +------------------------------------------------------------------- Old: ---- collectd-5.0.4.tar.bz2 collectd-collection3.patch collectd-fix-warnings.patch collectd-fix_own_iptc.patch collectd-iproute2-HZ.patch iproute2-2.6.37.tar.bz2 iproute2-optflags.patch New: ---- collectd-5.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:31.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:31.000000000 +0200 @@ -3,7 +3,7 @@ # spec file for package collectd # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2005-2012 Pascal Bleser <[email protected]> +# Copyright (c) 2005-2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,6 @@ # -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - %if 0%{?_with_xmms:1}0 %define xmms 1 %else @@ -81,6 +78,15 @@ %define rrdcached_plugin %{nil} %endif +%define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | %__awk -F. '{print $1*10000+$2*100+$3}') +%if %pcap_version >= 10000 +%define dns 1 +%define dns_plugin dns +%else +%define dns 0 +%define dns_plugin %{nil} +%endif + %define snmp 1 %define with_esmtp 1 @@ -110,13 +116,10 @@ %define ipvs_plugin ipvs -%define libnetlink_version 2.6.37 -%define intree_netlink 1 - -%define plugins apache apcups battery %{expand:%bind_plugin} curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk dns 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 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} +%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.0.4 +Version: 5.4.0 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files License: GPL-2.0 @@ -125,10 +128,6 @@ Source1: collectd.suse.init Source2: collectd.apache2.conf Source3: collectd-js.apache2.conf -# bundled/in-tree libnetlink.a, see http://mailman.verplant.org/pipermail/collectd/2007-October/001210.html -# Can't use download url as upstream changed download layout and provide only versions 3.0 and newer. -# https://www.kernel.org/pub/linux/utils/net/iproute2/ -Source10: iproute2-%{libnetlink_version}.tar.bz2 # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc # see https://bugzilla.novell.com/show_bug.cgi?id=388026 Source20: collectd-pthread.pc @@ -140,31 +139,28 @@ Patch10: collectd-perl-vendor.patch # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072 Patch11: collectd-fix_broken_perl-5.10.patch -Patch12: collectd-fix-warnings.patch -Patch14: collectd-iproute2-HZ.patch -Patch16: iproute2-optflags.patch Patch17: collectd-fix_libltdl_autoreconf.patch Patch18: collectd-fix_collection_cgi.patch Patch19: collectd-fix_spamassassin_doc.patch Patch20: collectd-split_README.patch Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch -Patch22: collectd-collection3.patch Patch23: collectd-javac_target.patch Patch24: collectd-pkgconfig_libnotify_add_gtk.patch Patch25: collectd-df-remove-duplicates.patch -Patch26: collectd-fix_own_iptc.patch Url: http://collectd.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: rrdtool Requires: sensors -BuildConflicts: libnetlink-devel BuildRequires: bind-devel BuildRequires: bison BuildRequires: flex BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: intltool +BuildRequires: libevent-devel +BuildRequires: libnetlink-devel #BuildRequires: libmodbus-devel +BuildRequires: libmnl-devel BuildRequires: libpng-devel BuildRequires: libstatgrab-devel BuildRequires: perl @@ -265,6 +261,7 @@ %endif %if %suse_version >= 1210 %{perl_requires} +%{?libperl_requires} BuildRequires: systemd %{?systemd_requires} %define has_systemd 1 @@ -512,19 +509,19 @@ Plugin for filling %{name} with statistics from the SpamAsssassin anti-spam engine. -%package -n libcollectdclient0 +%package -n libcollectdclient1 Summary: Library for %{name} clients Group: System/Monitoring Provides: libcollectdclient = %{version}-%{release} -%description -n libcollectdclient0 +%description -n libcollectdclient1 Library which abstracts communication with the %{name} unixsock plugin for clients. %package -n libcollectdclient-devel Summary: Development Environment for %{name} clients Group: Development/Libraries/C and C++ -Requires: libcollectdclient0 = %{version}-%{release} +Requires: libcollectdclient1 = %{version}-%{release} %description -n libcollectdclient-devel Library which abstracts communication with the %{name} @@ -533,7 +530,7 @@ to write %{name} unixsock clients. %prep -%setup -q -n "collectd-%{version}" -a 10 +%setup -q -n "collectd-%{version}" %if "%{_lib}"=="lib64" %patch4 %endif @@ -541,21 +538,14 @@ %patch9 %patch10 %patch11 -%patch12 %patch17 -pushd "iproute2-%{libnetlink_version}" -%patch14 -%patch16 -popd #iproute2 %patch18 %patch19 %patch20 %patch21 -%patch22 %patch23 %patch24 %patch25 -%patch26 %__sed -i 's|@@VERSION@@|%{version}|g' configure.in @@ -578,23 +568,6 @@ %build export SUSE_ASNEEDED=0 -%if %intree_netlink -# build in-tree libnetlink.a -pushd "iproute2-%{libnetlink_version}" -LIBNETLINK_CFLAGS="%{optflags}" -%ifarch x86_64 ia64 ppc64 ppc64 s390x -# only add -fPIC on 64bit, to avoid performance drawback on non-64bit archs: -LIBNETLINK_CFLAGS="$LIBNETLINK_CFLAGS -fPIC" -%endif -%__make %{?jobs:-j%{jobs}} \ - SUBDIRS="lib" \ - CC="%__cc" \ - OPTFLAGS="$LIBNETLINK_CFLAGS" -%__rm -f lib/*.so.* lib/*.so -%__ln_s lib lib64 -popd #iproute2 -%endif #%intree_netlink - autoreconf -fiv # set JAVA_HOME properly @@ -603,8 +576,6 @@ [ -n "$JRE_HOME" -a -d "$JRE_HOME" ] || export JRE_HOME="$JAVA_HOME" export PATH="$JDK_HOME/bin:$JRE_HOME/bin:$JAVA_HOME/bin:$PATH" -# add /usr/src/linux to include path to find net/ip_vs.h: -#export CFLAGS="%{optflags} -I$PWD/iproute2-%{libnetlink_version}/include/ -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc @@ -614,14 +585,17 @@ --with-libstatgrab \ --with-rrdtool \ --disable-static \ +%if %dns --enable-dns \ +%else + --disable-dns \ +%endif --disable-nut \ --enable-netlink \ --enable-python \ --with-librrd \ %if %iptables --enable-iptables \ - --with-libiptc=shipped \ %else --disable-iptables \ --without-iptc \ @@ -652,9 +626,6 @@ %else --disable-memcached \ %endif #memcachec -%if %intree_netlink - --with-libnetlink="$PWD/iproute2-%{libnetlink_version}/" \ -%endif %if %suse_version < 930 --disable-mysql \ %endif @@ -690,13 +661,6 @@ %__mkdir_p _rpmdoc_/java %__mv contrib/GenericJMX.conf _rpmdoc_/java/ -# fix bogus dependency in netlink.la, as it has been built against -# a static netlink library: -%if %intree_netlink -%__sed -i "/^dependency_libs=/s/=.*/=''/" \ - "%{buildroot}%{_libdir}/collectd/netlink.la" -%endif - # fix permissions: %__chmod 0755 "%{buildroot}%{_libdir}/collectd"/*.so %__chmod 0644 "%{buildroot}%{_libdir}/collectd"/*.la @@ -827,9 +791,9 @@ %service_add_post %{name}.service %endif -%post -n libcollectdclient0 -p /sbin/ldconfig +%post -n libcollectdclient1 -p /sbin/ldconfig -%postun -n libcollectdclient0 -p /sbin/ldconfig +%postun -n libcollectdclient1 -p /sbin/ldconfig %clean %{?buildroot:%__rm -rf "%{buildroot}"} @@ -840,6 +804,7 @@ %doc contrib %config(noreplace) %{_sysconfdir}/collectd.conf %dir %{_sysconfdir}/collectd +%{_bindir}/collectd-tg %{_bindir}/collectd-nagios %{_bindir}/collectdctl %{_bindir}/cussh @@ -859,6 +824,7 @@ %doc %{_mandir}/man1/collectd.1%{ext_man} %doc %{_mandir}/man1/collectdctl.1%{ext_man} %doc %{_mandir}/man1/collectdmon.1%{ext_man} +%doc %{_mandir}/man1/collectd-tg.1%{ext_man} %doc %{_mandir}/man1/collectd-nagios.1%{ext_man} %doc %{_mandir}/man1/cussh.1%{ext_man} %doc %{_mandir}/man5/collectd.conf.5%{ext_man} @@ -1010,10 +976,10 @@ %defattr(-,root,root) %doc README.plugins-all -%files -n libcollectdclient0 +%files -n libcollectdclient1 %defattr(-,root,root) -%{_libdir}/libcollectdclient.so.0 -%{_libdir}/libcollectdclient.so.0.*.* +%{_libdir}/libcollectdclient.so.1 +%{_libdir}/libcollectdclient.so.1.*.* %files -n libcollectdclient-devel %defattr(-,root,root) ++++++ collectd-5.0.4.tar.bz2 -> collectd-5.4.0.tar.bz2 ++++++ ++++ 92674 lines of diff (skipped) ++++++ collectd-fix-config.patch ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:32.000000000 +0200 @@ -1,21 +1,6 @@ ---- src/collectd.conf.in.orig 2012-01-26 01:12:16.191115559 +0100 -+++ src/collectd.conf.in 2012-01-26 01:13:39.662112590 +0100 -@@ -12,10 +12,10 @@ - - #Hostname "localhost" - #FQDNLookup true --#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@" --#PIDFile "@prefix@/var/run/@[email protected]" --#PluginDir "@prefix@/lib/@PACKAGE_NAME@" --#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db" -+#BaseDir "/var/lib/@PACKAGE_NAME@" -+#PIDFile "/var/run/@[email protected]" -+#PluginDir "@libdir@/@PACKAGE_NAME@" -+#TypesDB "@libdir@/@PACKAGE_NAME@/types.db" - #Interval 10 - #Timeout 2 - #ReadThreads 5 -@@ -173,7 +173,7 @@ +--- src/collectd.conf.in.orig 2013-06-04 02:22:35.386712789 +0200 ++++ src/collectd.conf.in 2013-06-04 02:24:33.579744915 +0200 +@@ -211,7 +211,7 @@ #<Plugin apache> # <Instance "local"> # URL "http://localhost/status?auto"; @@ -24,7 +9,7 @@ # Password "secret" # CACert "/etc/ssl/ca.crt" # </Instance> -@@ -186,7 +186,7 @@ +@@ -225,7 +225,7 @@ #<Plugin ascent> # URL "http://localhost/ascent/status/"; @@ -33,46 +18,3 @@ # Password "secret" # CACert "/etc/ssl/ca.crt" #</Plugin> -@@ -211,7 +211,7 @@ - #</Plugin> - - #<Plugin csv> --# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv" -+# DataDir "/var/lib/@PACKAGE_NAME@/csv" - # StoreRates false - #</Plugin> - -@@ -324,7 +324,7 @@ - #</Plugin> - - #<Plugin email> --# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email" -+# SocketFile "/var/run/@PACKAGE_NAME@-email" - # SocketGroup "collectd" - # SocketPerms "0770" - # MaxConns 5 -@@ -786,13 +786,13 @@ - - #<Plugin rrdcached> - # DaemonAddress "unix:/tmp/rrdcached.sock" --# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd" -+# DataDir "/var/lib/@PACKAGE_NAME@/rrd" - # CreateFiles true - # CollectStatistics true - #</Plugin> - - #<Plugin rrdtool> --# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd" -+# DataDir "/var/lib/@PACKAGE_NAME@/rrd" - # CacheTimeout 120 - # CacheFlush 900 - #</Plugin> -@@ -913,7 +913,7 @@ - #</Plugin> - - #<Plugin unixsock> --# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock" -+# SocketFile "/var/run/@PACKAGE_NAME@-unixsock" - # SocketGroup "collectd" - # SocketPerms "0660" - # DeleteSocket false ++++++ collectd-fix_libltdl_autoreconf.patch ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:32.000000000 +0200 @@ -1,19 +1,19 @@ ---- Makefile.in.orig 2012-01-26 01:15:11.357109327 +0100 -+++ Makefile.in 2012-01-26 01:15:34.625108499 +0100 -@@ -342,7 +342,7 @@ +--- Makefile.in.orig 2013-06-04 02:28:14.547813510 +0200 ++++ Makefile.in 2013-06-04 02:28:22.270816101 +0200 +@@ -346,7 +346,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I libltdl/m4 +ACLOCAL_AMFLAGS = -I libltdl - SUBDIRS = libltdl src bindings + SUBDIRS = libltdl src bindings . INCLUDES = $(LTDLINCL) EXTRA_DIST = contrib version-gen.sh ---- Makefile.am.orig 2012-01-26 01:15:36.301108441 +0100 -+++ Makefile.am 2012-01-26 01:15:41.577108253 +0100 +--- Makefile.am.orig 2013-06-04 02:28:28.047818050 +0200 ++++ Makefile.am 2013-06-04 02:28:32.101819418 +0200 @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I libltdl/m4 +ACLOCAL_AMFLAGS = -I libltdl - SUBDIRS = libltdl src bindings + SUBDIRS = libltdl src bindings . ++++++ collectd-perl-vendor.patch ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:32.000000000 +0200 @@ -1,11 +1,11 @@ ---- bindings/Makefile.am.orig 2008-01-22 09:16:05.000000000 +0100 -+++ bindings/Makefile.am 2008-01-22 09:16:18.000000000 +0100 -@@ -3,7 +3,7 @@ - all-local: @PERL_BINDINGS@ +--- bindings/Makefile.am.orig 2013-06-04 02:26:20.688776802 +0200 ++++ bindings/Makefile.am 2013-06-04 02:26:33.551780804 +0200 +@@ -29,7 +29,7 @@ + install-exec-local: -- [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install ) -+ [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install_vendor ) +- [ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install ) ++ [ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install_vendor ) - clean-local: - [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean ) + # Perl 'make uninstall' does not work as well as wanted. + # So we do the work here. ++++++ collectd-pkgconfig_libnotify_add_gtk.patch ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:32.000000000 +0200 @@ -1,6 +1,6 @@ ---- configure.orig 2012-01-26 01:16:29.955106532 +0100 -+++ configure 2012-01-26 01:17:57.822103406 +0100 -@@ -23690,11 +23690,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 @@ -11,10 +11,10 @@ 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 - fi -@@ -23706,11 +23706,11 @@ +@@ -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 @@ -25,24 +25,24 @@ 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 - fi -@@ -23730,9 +23730,9 @@ +@@ -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 "libnotify" 2>&1` -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" "gtk+-2.0" 2>&1` +- 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 "libnotify" 2>&1` -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" "gtk+-2.0" 2>&1` +- 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 2012-01-26 01:16:14.664107075 +0100 -+++ configure.in 2012-01-26 01:16:28.342106589 +0100 -@@ -4184,7 +4184,7 @@ +--- 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 @@ fi # }}} ++++++ collectd-split_README.patch ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:32.000000000 +0200 @@ -1,5 +1,5 @@ ---- contrib/README.orig 2009-10-07 22:17:58.000000000 +0200 -+++ contrib/README 2009-10-07 22:45:41.000000000 +0200 +--- contrib/README.orig 2013-06-04 02:29:18.736835454 +0200 ++++ contrib/README 2013-06-04 02:29:59.160849717 +0200 @@ -28,22 +28,6 @@ `/var/lib/collectd/' and generate an HTML file and a directory containing several PNG files which are graphs of the RRD files found. @@ -51,7 +51,7 @@ snmp-data.conf -------------- Sample configuration for the SNMP plugin. This config includes a few standard -@@ -97,7 +67,3 @@ +@@ -97,11 +67,6 @@ whatever people have send in. If you have some more definitions please send them in, so others can profit from it. @@ -59,3 +59,7 @@ ------------ - Manifest file for the Solaris SMF system and detailed information on how to -register collectd as a service with this system. +- + collectd.service + ---------------- + Service file for systemd. Please ship this file as ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.JWm5I2/_old 2013-09-11 11:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.JWm5I2/_new 2013-09-11 11:27:32.000000000 +0200 @@ -1,9 +1,9 @@ ---- configure.in.orig 2012-01-26 01:14:21.392111105 +0100 -+++ configure.in 2012-01-26 01:14:41.350110395 +0100 +--- configure.in.orig 2013-06-04 02:25:25.850760151 +0200 ++++ configure.in 2013-06-04 02:25:50.593767582 +0200 @@ -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]
