Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2019-06-19 21:07:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Wed Jun 19 21:07:39 2019 rev:31 rq:709935 version:5.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2019-01-03 18:06:47.268131843 +0100 +++ /work/SRC/openSUSE:Factory/.collectd.new.4811/collectd.changes 2019-06-19 21:09:49.998592857 +0200 @@ -1,0 +2,151 @@ +Thu Jun 13 19:54:45 UTC 2019 - Martin Hauke <mar...@gmx.de> + +- Update to 5.9.0: + * collectd: A new "UNKNOWN" state as the initial state of metrics has + been added. + * collectd: config parser: Improved error reporting on global options. + * collectd: daemon: make plugin_dispatch_multivalue() obey write queue + limits. + * collectd: Macros "STRERROR" and "STRERRNO" have been added. + * collectd: Plugin name field has been added to plugin context to + improve error reporting. + * collectd-tg: Use "CLOCK_REALTIME" for collectd-tg times. + * AMPQ1 plugin: A new plugin to write to amqp1 protocol. + * Chrony plugin: Ignoring late responses has been added. + * CPUFreq plugin: Read number of p-state transitions and time spent in + each p-state. + * cURL, cURL-XML plugins: Option "Interval" has been added. + * Exec plugin: Dynamic allocation of grname buffer has been added. + * GPU NVML plugin: New plugin to collect NVIDIA GPU stats. + * gRPC plugin: The "VerifyPeer" option for servers has been added. + * Intel RDT plugin: Support for groups of PIDs has been added. + * IPMI plugin: Config options "SELSensor" and "SELIgnoreSelected" have + been added. + * Modbus plugin: Support for 64 bit vals has been added, support for + CDAB endian 32-bit modbus polls has been added. + * Modbus plugin: The "Scale" and "Shift" metrics have been added. + * Netlink plugin: Handle new counter from Linux kernel version 4.6+. + * Network plugin: Option "BindAddress" has been added. + * Ping plugin: An "AddressFamily" configuration option has been added. + * OVS Stats plugin: Extended metrics "ovs-dpdk" have been added. + * OVS Stats plugin: Support of bond interface and a "InterfaceStats" + config option have been added. + * PCIe Errors plugin: New plugin to read "PCIe" errors. + * Processes plugin: Support for Linux Delay Accounting has been added. + * Redis plugin: Keyspace "hitratio" metric has been added, metric + "operations_per_second" has been removed, an option for connecting via + UNIX socket has been added. + * RouterOS plugin: Support for temperature and voltage data has been + added, use MAC-address when Radio-name is missing. + * RRDCacheD plugin: Time resolution has been improved to microseconds. + * Sensors plugin: Checks for upper limit of "SENSORS_API_VERSION" have + been removed, support for libsensors older than 3.0.0 has been + dropped. + * SNMP plugin: New options "PluginInstance", "TypeInstance", + "TypeInstanceOID", "PluginInstanceOID", "FilterOID", "FilterValues" + and "FilterIgnoreSelected" have been added. + * SNMP Agent plugin: Multiple key indexes to snmp table and other new + features have been added, refactoring, coverity scan issues have been + fixed. + * Swap plugin: Support for Linux 2.4 has been dropped. + * Turbostat plugin: Configuration option "RestoreAffinityPolicy" has + been added. + * Turbostat plugin: New metrics "P-states", "Turboboost", "Platform + TDP", "Uncore bus ratio" have been added. + * Turbostat plugin: Support of reporting GPU power on SKL has been + added. + * virt plugin: Allow read "Hostname" from libvirt metadata. + * virt plugin: Block info statistics for disk devices have been added. + * Wireless plugin: A "bitrate" metric has been added. + * Write Graphite, Write Kafka plugins: Support for Graphite 1.1+ tag has + been added. + * Write Prometheus plugin: Option "Host" has been added. + * Write Stackdriver plugin: New plugin to write to Google Stackdriver + Monitoring. + * Write Syslog plugin: "write_syslog" plugin writes values lists as + syslog messages. + * collectd: collectdmon cannot exit command line options parse loop has + been fixed. + * collectd: Include "kstat.h" if available to provide "kstat_ctl_t", + include "kstat.h" when available. + * collectd: Parsing option for avoiding making BaseDir has been fixed. + * collectd: Remove empty "cmd_listval_t" data structure and related + no-op code. + * collectd: src/daemon/plugin.c: Refactor plugin_load_file(), + src/utils_format_json.c: Remove chatty debug messages. + * collectd: Stop poisoning function in debug mode. + * collectd: The number of allocations when parsing types.db has been + reduced. + * AMQP1 plugin: Potential memory leaks found via scan-build have been + fixed, a typo in error log message has been fixed, cleanups. + * Barometer plugin: Support to "libi2c-4.0" has been added. + * DBI, Oracle, PostgreSQL plugins: Fixes and improvements. + * Disk plugin: In linux, reset the disk when it disappears from + "/proc/diskstats". + * DPDK Events, DPDK Stats plugins: Buffer size for parsing lcores has + been increased, a deprecation warning has been fixed, runtime config + file path has been fixed. + * GPS plugin: Build with gpsd version 3.18 has been fixed. + * LUA plugin: A memory leak has been fixed. + * MySQL plugin: Properly cleanup dropped MySQL connections. + * Netlink plugin: Truncation warnings have been fixed. + * NFS plugin: Message "Unexpected number of fields for NFSv4 server + statistics: 62" has been fixed. + * NFS plugin: Number of fields for "NFSv4" has been fixed. + * Notify Email plugin: All notification parameters have been included + into email. + * NTPd plugin: Don't treat normal peers as refclocks, skip "0.0.0.0" + hosts in ntpd plugin. + * OVS Stats plugin: A macro to populate counters list has been added, + value of "OpenFlow" has been corrected. + * OVS Stats, OVS Events plugins: utils_ovs: Avoid potential access of + freed memory, fixes. + * Processes plugin: Compilation has been fixed when ps_delay() is not + used. + * Python plugin: A compilation warning with Python 3.7 has been fixed. + * Redis plugin: Bugfixes, extended error reporting, persistent + connections and parallel polling, ability to select db for queries has + been fixed. + * RRDTool plugin: Error reporting has been extended. + * Sensors plugin: Support for humidity sensors has been added. + * Sensu, OVS Stat, Turbostat, virt, OAuth, Write Prometheus, Intel RDT + plugins: Compiler warnings have been fixed. + * virt plugin: Compiler warnings, a segfault in libvirt, typo in error + messages have been fixed. + * virt plugin: Optional "virDomainGetCPUStats()" has been removed from + main flow, cleanup. + * virt plugin: Tracking of VM state changes has been fixed. + * Write MongoDB plugin: Plugin dependencies have been fixed. + * Write Redis plugin: Bug ""max_set_duration" deletes unexpected data" + has been fixed. +- Drop patches (fixed by upstream): + * 0001-gps-plugin-fix-build-with-newer-gpsd.patch + * Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch +- Add new subpackages: + * plugin-pcie + * plugin-write_stackdriver + * plugin-write_syslog + +------------------------------------------------------------------- +Sun Apr 14 12:37:27 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.8.1: + * collectd: Fix "BaseDir" option. + * collectd: improve error handling, check return values. + * Build System: use "kstat.h", when available. + * Build System: Out-of-tree builds have been fixed. + * Configuration: Error handling in the config parsing code has been + improved. + * collectd: The core daemon is now completely licensed under the + MIT license. + * Build system: Dependency on libltdl has been removed, support for + libtool 1 has been dropped. + Check the ChangeLog file for the complete list of changes. +- Add Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch +- Add avoid-pg-config.patch to use pkg-config instead of pg_config +- Refresh patches +- Drop Patches: + * collectd-split_README.patch (merged upstream) + * collectd-javac_target.patch (doesn't applies) + +------------------------------------------------------------------- Old: ---- 0001-gps-plugin-fix-build-with-newer-gpsd.patch collectd-5.7.2.tar.bz2 collectd-javac_target.patch collectd-split_README.patch New: ---- avoid-pg-config.patch collectd-5.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:51.938594741 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:51.942594745 +0200 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2005-2013 Pascal Bleser <pascal.ble...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -42,29 +42,28 @@ %define sensors_plugin %{nil} %endif Name: collectd -Version: 5.7.2 +Version: 5.9.0 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files -License: GPL-2.0-only +License: GPL-2.0-only AND MIT Group: System/Monitoring -Url: http://collectd.org/ +URL: http://collectd.org/ Source: http://collectd.org/files/collectd-%{version}.tar.bz2 Source1: collectd.suse.init Source2: collectd.apache2.conf Source3: collectd-js.apache2.conf Source99: collectd-rpmlintrc -Patch7: collectd-fix-config.patch -Patch9: collectd-version.patch -Patch10: collectd-perl-vendor.patch +Patch1: collectd-fix-config.patch +Patch2: collectd-version.patch +Patch3: collectd-perl-vendor.patch # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072 -Patch11: collectd-fix_broken_perl-5.10.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 -Patch23: collectd-javac_target.patch -Patch24: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch -Patch25: 0001-gps-plugin-fix-build-with-newer-gpsd.patch +Patch4: collectd-fix_broken_perl-5.10.patch +Patch5: collectd-fix_collection_cgi.patch +Patch6: collectd-fix_spamassassin_doc.patch +Patch7: collectd-fix_collectd_config_path_in_snmp_probe.patch +Patch8: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch +# PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible +Patch11: avoid-pg-config.patch # for /etc/apache2/... ownership (rpmlint): BuildRequires: apache2 BuildRequires: autoconf @@ -109,7 +108,6 @@ BuildRequires: pkgconfig(libatasmart) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libevent) -#BuildRequires: pkgconfig(libgpsd) BuildRequires: pkgconfig(libgps) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(libmemcached) @@ -117,6 +115,7 @@ BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(liboping) +BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(librrd) BuildRequires: pkgconfig(libsigrok) BuildRequires: pkgconfig(libstatgrab) @@ -249,6 +248,14 @@ %description plugin-lvm This plugin collects information from lvm. +%package plugin-pcie +Summary: PCIe Monitoring Plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-pcie +Optional %{name} plugin to monitor PCIe errors. + %package plugin-postgresql Summary: PostgreSQL Monitoring Plugin for %{name} Group: System/Monitoring @@ -338,13 +345,53 @@ Optional %{name} Lua API in order to write %{name} plugins in Lua. %package plugin-gps -Summary: gpsd monitoring plugin for %{name} +Summary: GPSD monitoring plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} %description plugin-gps Optional %{name} plugin to monitor gpsd. +%package plugin-mcelog +Summary: Machine Check Exceptions plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-mcelog +Optional %{name} plugin to monitor machine check exceptions. + +%package plugin-ovs +Summary: Open vSwitch (OVS) plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-ovs +Optional %{name} plugin to monitor an OVS database. + +%package plugin-synproxy +Summary: Synproxy stats plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-synproxy +Optional %{name} plugin to monitor Synproxy stats. + +%package plugin-write_stackdriver +Summary: Write Stackdriver plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-write_stackdriver +Optional %{name} plugin to to write to Google Stackdriver. + +%package plugin-write_syslog +Summary: Write Syslog plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-write_syslog +Optional %{name} plugin to write values lists as syslog messages. + %package plugins-all Summary: All Monitoring Plugins for %{name} Group: System/Monitoring @@ -355,17 +402,23 @@ Requires: %{name}-plugin-java = %{version}-%{release} Requires: %{name}-plugin-lua = %{version}-%{release} Requires: %{name}-plugin-lvm = %{version}-%{release} +Requires: %{name}-plugin-mcelog = %{version}-%{release} Requires: %{name}-plugin-memcachec = %{version}-%{release} Requires: %{name}-plugin-mysql = %{version}-%{release} Requires: %{name}-plugin-notify-desktop = %{version}-%{release} Requires: %{name}-plugin-openldap = %{version}-%{release} +Requires: %{name}-plugin-ovs = %{version}-%{release} +Requires: %{name}-plugin-pcie = %{version}-%{release} Requires: %{name}-plugin-pinba = %{version}-%{release} Requires: %{name}-plugin-postgresql = %{version}-%{release} Requires: %{name}-plugin-python3 = %{version}-%{release} Requires: %{name}-plugin-sigrok = %{version}-%{release} Requires: %{name}-plugin-smart = %{version}-%{release} Requires: %{name}-plugin-snmp = %{version}-%{release} +Requires: %{name}-plugin-synproxy = %{version}-%{release} Requires: %{name}-plugin-virt = %{version}-%{release} +Requires: %{name}-plugin-write_stackdriver = %{version}-%{release} +Requires: %{name}-plugin-write_syslog = %{version}-%{release} Requires: %{name}-web = %{version}-%{release} Requires: %{name}-web-js = %{version}-%{release} %if 0%{?suse_version} >= 1330 @@ -408,19 +461,17 @@ %prep %setup -q -n "collectd-%{version}" -%patch7 -%patch9 -p1 -%patch10 -%patch11 -%patch18 -%patch19 -%patch20 -%patch21 -%patch23 -p1 +%patch1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 +%patch7 -p1 %if 0%{?suse_version} > 1320 -%patch24 -p1 +%patch8 -p1 %endif -%patch25 -p1 +%patch11 -p1 sed -i 's|@@VERSION@@|%{version}|g' configure.ac @@ -428,7 +479,6 @@ # unneeded files: rm -fr \ - contrib/fedora \ contrib/solaris-smf \ contrib/redhat \ contrib/sles* @@ -496,7 +546,7 @@ install -D -m 0644 contrib/collection3%{_sysconfdir}/collection.conf \ "%{buildroot}%{_sysconfdir}/collectd/collection-js.conf" -rm -fr contrib/collection3/etc +rm -fr contrib/collection3%{_sysconfdir} install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}-js.conf" # spamassassin (_must_ be installed _after_ perl_process_packlist) @@ -549,7 +599,7 @@ This package is empty but depends on all collectd plugin subpackages. EOF -install -d -m 0755 "%{buildroot}%{_prefix}/sbin" +install -d -m 0755 "%{buildroot}%{_sbindir}" install -D -m0644 contrib/systemd.collectd.service %{buildroot}%{_unitdir}/collectd.service ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} @@ -570,7 +620,8 @@ %postun -n libcollectdclient1 -p /sbin/ldconfig %files -f plugins.lst -%doc AUTHORS ChangeLog COPYING README +%license COPYING +%doc AUTHORS ChangeLog README %doc contrib %config(noreplace) %{_sysconfdir}/collectd.conf %dir %{_sysconfdir}/collectd @@ -590,19 +641,19 @@ %dir %{perl_vendorlib}/Collectd %{perl_vendorlib}/Collectd/* %{perl_vendorarch}/auto/Collectd -%{_mandir}/man1/collectd.1%{ext_man} -%{_mandir}/man1/collectdctl.1%{ext_man} -%{_mandir}/man1/collectdmon.1%{ext_man} -%{_mandir}/man1/collectd-tg.1%{ext_man} -%{_mandir}/man1/collectd-nagios.1%{ext_man} -%{_mandir}/man1/cussh.1%{ext_man} -%{_mandir}/man5/collectd.conf.5%{ext_man} -%{_mandir}/man5/collectd-email.5%{ext_man} -%{_mandir}/man5/collectd-exec.5%{ext_man} -%{_mandir}/man5/collectd-perl.5%{ext_man} -%{_mandir}/man5/collectd-threshold.5%{ext_man} -%{_mandir}/man5/collectd-unixsock.5%{ext_man} -%{_mandir}/man5/types.db.5%{ext_man} +%{_mandir}/man1/collectd.1%{?ext_man} +%{_mandir}/man1/collectdctl.1%{?ext_man} +%{_mandir}/man1/collectdmon.1%{?ext_man} +%{_mandir}/man1/collectd-tg.1%{?ext_man} +%{_mandir}/man1/collectd-nagios.1%{?ext_man} +%{_mandir}/man1/cussh.1%{?ext_man} +%{_mandir}/man5/collectd.conf.5%{?ext_man} +%{_mandir}/man5/collectd-email.5%{?ext_man} +%{_mandir}/man5/collectd-exec.5%{?ext_man} +%{_mandir}/man5/collectd-perl.5%{?ext_man} +%{_mandir}/man5/collectd-threshold.5%{?ext_man} +%{_mandir}/man5/collectd-unixsock.5%{?ext_man} +%{_mandir}/man5/types.db.5%{?ext_man} %doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man} %dir %{_localstatedir}/lib/collectd %{_unitdir}/collectd.service @@ -632,10 +683,10 @@ %files plugin-snmp %doc _rpmdoc_/snmp/* %{_bindir}/collectd-snmp-probe-host -%{_mandir}/man1/collectd-snmp-probe-host.1%{ext_man} -%{_libdir}/collectd/snmp.so -%{_libdir}/collectd/snmp.la -%{_mandir}/man5/collectd-snmp.5%{ext_man} +%{_mandir}/man1/collectd-snmp-probe-host.1%{?ext_man} +%{_libdir}/collectd/snmp*.so +%{_libdir}/collectd/snmp*.la +%{_mandir}/man5/collectd-snmp.5%{?ext_man} %files plugin-lvm %{_libdir}/collectd/lvm.so @@ -649,6 +700,10 @@ %{_libdir}/collectd/mysql.so %{_libdir}/collectd/mysql.la +%files plugin-pcie +%{_libdir}/collectd/pcie_errors.so +%{_libdir}/collectd/pcie_errors.la + %files plugin-postgresql %{_libdir}/collectd/postgresql.so %{_libdir}/collectd/postgresql.la @@ -657,14 +712,14 @@ %files plugin-python3 %{_libdir}/collectd/python.so %{_libdir}/collectd/python.la -%{_mandir}/man5/collectd-python.5%{ext_man} +%{_mandir}/man5/collectd-python.5%{?ext_man} %files plugin-java %doc _rpmdoc_/java/GenericJMX.conf %{_libdir}/collectd/java.so %{_libdir}/collectd/java.la %{_datadir}/collectd/java -%{_mandir}/man5/collectd-java.5%{ext_man} +%{_mandir}/man5/collectd-java.5%{?ext_man} %files plugin-virt %{_libdir}/collectd/virt.so @@ -689,7 +744,7 @@ %files plugin-lua %{_libdir}/collectd/lua.so %{_libdir}/collectd/lua.la -%{_mandir}/man5/collectd-lua.5%{ext_man} +%{_mandir}/man5/collectd-lua.5%{?ext_man} %files plugin-gps %{_libdir}/collectd/gps.so @@ -699,6 +754,26 @@ %{_libdir}/collectd/openldap.so %{_libdir}/collectd/openldap.la +%files plugin-mcelog +%{_libdir}/collectd/mcelog.so +%{_libdir}/collectd/mcelog.la + +%files plugin-ovs +%{_libdir}/collectd/ovs_*.so +%{_libdir}/collectd/ovs_*.la + +%files plugin-synproxy +%{_libdir}/collectd/synproxy.so +%{_libdir}/collectd/synproxy.la + +%files plugin-write_stackdriver +%{_libdir}/collectd/write_stackdriver.so +%{_libdir}/collectd/write_stackdriver.la + +%files plugin-write_syslog +%{_libdir}/collectd/write_syslog.so +%{_libdir}/collectd/write_syslog.la + %if 0%{?suse_version} >= 1330 %files plugin-nut %{_libdir}/collectd/nut.so ++++++ 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:51.962594765 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:51.962594765 +0200 @@ -14,12 +14,11 @@ configure.ac | 2 +- src/sigrok.c | 51 +++++++++++++++++++++++++++------------------------ 2 files changed, 28 insertions(+), 25 deletions(-) - diff --git a/configure.ac b/configure.ac -index f50df28a6d..6b7aad43ae 100644 +index 5738974..4032d84 100644 --- a/configure.ac +++ b/configure.ac -@@ -5084,7 +5084,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS]) +@@ -5058,7 +5058,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS]) # libsigrok {{{ AC_SUBST([LIBSIGROK_CFLAGS]) AC_SUBST([LIBSIGROK_LIBS]) @@ -29,7 +28,7 @@ [with_libsigrok="no (pkg-config could not find libsigrok)"] ) diff --git a/src/sigrok.c b/src/sigrok.c -index 8a325fe9f0..a44c95e4b8 100644 +index 8a325fe..a44c95e 100644 --- a/src/sigrok.c +++ b/src/sigrok.c @@ -127,22 +127,22 @@ static int sigrok_config(oconfig_item_t *ci) { @@ -97,13 +96,13 @@ @@ -248,21 +249,22 @@ static int sigrok_init_driver(struct config_device *cfdev, cfdev->sdi = devlist->data; g_slist_free(devlist); - ssnprintf(hwident, sizeof(hwident), "%s %s %s", -- cfdev->sdi->vendor ? cfdev->sdi->vendor : "", -- cfdev->sdi->model ? cfdev->sdi->model : "", -- cfdev->sdi->version ? cfdev->sdi->version : ""); -+ sr_dev_inst_vendor_get(cfdev->sdi), -+ sr_dev_inst_model_get(cfdev->sdi), -+ sr_dev_inst_version_get(cfdev->sdi)); + snprintf(hwident, sizeof(hwident), "%s %s %s", +- cfdev->sdi->vendor ? cfdev->sdi->vendor : "", +- cfdev->sdi->model ? cfdev->sdi->model : "", +- cfdev->sdi->version ? cfdev->sdi->version : ""); ++ sr_dev_inst_vendor_get(cfdev->sdi), ++ sr_dev_inst_model_get(cfdev->sdi), ++ sr_dev_inst_version_get(cfdev->sdi)); INFO("sigrok plugin: Device \"%s\" is a %s", cfdev->name, hwident); if (sr_dev_open(cfdev->sdi) != SR_OK) ++++++ avoid-pg-config.patch ++++++ diff --git a/configure.ac b/configure.ac index 4032d84..284192d 100644 --- a/configure.ac +++ b/configure.ac @@ -4272,18 +4272,10 @@ AC_SUBST([PERL_LIBS]) # }}} # --with-libpq {{{ -with_pg_config="pg_config" AC_ARG_WITH([libpq], - [AS_HELP_STRING([--with-libpq@<:@=PREFIX@:>@], [Path to libpq.])], + [AS_HELP_STRING([--with-libpq], [Build using pgsql])], [ - if test "x$withval" = "xno" || test "x$withval" = "xyes"; then - with_libpq="$withval" - else - if test -f "$withval" && test -x "$withval"; then - with_pg_config="$withval" - else if test -x "$withval/bin/pg_config"; then - with_pg_config="$withval/bin/pg_config" - fi; fi + if test "x$withval" != "xno" || test "x$withval" != "xyes"; then with_libpq="yes" fi ], @@ -4291,66 +4283,42 @@ AC_ARG_WITH([libpq], ) if test "x$with_libpq" = "xyes"; then - with_libpq_includedir=`$with_pg_config --includedir 2> /dev/null` - pg_config_status=$? - - if test $pg_config_status -eq 0; then - if test -n "$with_libpq_includedir"; then - for dir in $with_libpq_includedir; do - with_libpq_cppflags="$with_libpq_cppflags -I$dir" - done - fi - else - AC_MSG_WARN([$with_pg_config returned with status $pg_config_status]) + $PKG_CONFIG --exists 'libpq' 2>/dev/null + if test $? -ne 0; then + with_libpq="no (pkg-config doesn't know libpq)" fi - - SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $with_libpq_cppflags" - - AC_CHECK_HEADERS([libpq-fe.h], - [with_libpq="yes"], - [with_libpq="no (libpq-fe.h not found)"] - ) - - CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_libpq" = "xyes"; then - with_libpq_libdir=`$with_pg_config --libdir 2> /dev/null` - pg_config_status=$? - - if test $pg_config_status -eq 0 - then - if test -n "$with_libpq_libdir"; then - for dir in $with_libpq_libdir; do - with_libpq_ldflags="$with_libpq_ldflags -L$dir" - done - fi - else - AC_MSG_WARN([$with_pg_config returned with status $pg_config_status]) - fi + with_libpq_cflags="`$PKG_CONFIG --cflags libpq`" + with_libpq_ldflags="`$PKG_CONFIG --libs-only-L libpq`" + with_libpq_libs="`$PKG_CONFIG --libs libpq`" +fi - SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $with_libpq_ldflags" +if test "x$with_libpq" = "xyes"; then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_libpq_cflags" - AC_CHECK_LIB([pq], [PQserverVersion], - [with_libpq="yes"], - [with_libpq="no (symbol 'PQserverVersion' not found)"]) + # Look for libpq-fe.h + AC_CHECK_HEADERS([libpq-fe.h pgsql/libpq-fe.h], + [with_libpq="yes"], + [with_libpq="no (libpq-fe.h not found)"] + ) - LDFLAGS="$SAVE_LDFLAGS" + CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_libpq" = "xyes"; then - BUILD_WITH_LIBPQ_CPPFLAGS="$with_libpq_cppflags" + BUILD_WITH_LIBPQ_CPPFLAGS="$with_libpq_cflags" BUILD_WITH_LIBPQ_LDFLAGS="$with_libpq_ldflags" - BUILD_WITH_LIBPQ_LIBS="-lpq" + BUILD_WITH_LIBPQ_LIBS="$with_libpq_libs" fi AC_SUBST([BUILD_WITH_LIBPQ_CPPFLAGS]) -AC_SUBST([BUILD_WITH_LIBPQ_LDFLAGS]) AC_SUBST([BUILD_WITH_LIBPQ_LIBS]) # }}} + # --with-libpqos {{{ AC_ARG_WITH([libpqos], [AS_HELP_STRING([--with-libpqos@<:@=PREFIX@:>@], [Path to libpqos.])], ++++++ collectd-5.7.2.tar.bz2 -> collectd-5.9.0.tar.bz2 ++++++ ++++ 375377 lines of diff (skipped) ++++++ collectd-fix-config.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.650597376 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.654597380 +0200 @@ -1,6 +1,8 @@ ---- 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 @@ +Index: src/collectd.conf.in +=================================================================== +--- src/collectd.conf.in.orig ++++ src/collectd.conf.in +@@ -272,7 +272,7 @@ #<Plugin apache> # <Instance "local"> # URL "http://localhost/status?auto"; @@ -9,7 +11,7 @@ # Password "secret" # CACert "/etc/ssl/ca.crt" # </Instance> -@@ -225,7 +225,7 @@ +@@ -291,7 +291,7 @@ #<Plugin ascent> # URL "http://localhost/ascent/status/"; ++++++ collectd-fix_broken_perl-5.10.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.666597392 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.670597396 +0200 @@ -1,6 +1,8 @@ ---- src/perl.c.orig -+++ src/perl.c -@@ -2504,7 +2504,12 @@ static int perl_config_loadplugin(pTHX_ +diff --git a/src/perl.c b/src/perl.c +index 8df8fd4..94e21d2 100644 +--- a/src/perl.c ++++ b/src/perl.c +@@ -2516,7 +2516,12 @@ static int perl_config_loadplugin(pTHX_ oconfig_item_t *ci) { log_debug("perl_config: Loading Perl plugin \"%s\"", value); load_module(PERL_LOADMOD_NOIMPORT, newSVpv(module_name, strlen(module_name)), ++++++ collectd-fix_collectd_config_path_in_snmp_probe.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.686597411 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.686597411 +0200 @@ -1,6 +1,8 @@ ---- contrib/snmp-probe-host.px.orig 2009-10-07 22:55:23.000000000 +0200 -+++ contrib/snmp-probe-host.px 2009-10-07 22:57:45.000000000 +0200 -@@ -290,7 +290,7 @@ +diff --git a/contrib/snmp-probe-host.px b/contrib/snmp-probe-host.px +index d1a7a88..bc94e5c 100755 +--- a/contrib/snmp-probe-host.px ++++ b/contrib/snmp-probe-host.px +@@ -320,7 +320,7 @@ This is a bit a hack, but works for now. =cut my $host; ++++++ collectd-fix_collection_cgi.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.702597427 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.702597427 +0200 @@ -1,6 +1,8 @@ ---- contrib/collection.cgi.orig 2010-04-22 11:30:07.000000000 +0200 -+++ contrib/collection.cgi 2010-05-20 18:23:38.000000000 +0200 -@@ -11,7 +11,7 @@ +diff --git a/contrib/collection.cgi b/contrib/collection.cgi +index 5ff259f..e0848e0 100755 +--- a/contrib/collection.cgi ++++ b/contrib/collection.cgi +@@ -32,7 +32,7 @@ use URI::Escape ('uri_escape'); use RRDs (); use Data::Dumper (); @@ -9,8 +11,10 @@ our @DataDirs = (); our @DontShowTypes = (); our $LibDir; ---- contrib/collection.conf.orig 2010-04-22 11:29:35.000000000 +0200 -+++ contrib/collection.conf 2010-05-20 18:23:38.000000000 +0200 +diff --git a/contrib/collection.conf b/contrib/collection.conf +index e8444f5..063141f 100644 +--- a/contrib/collection.conf ++++ b/contrib/collection.conf @@ -1,3 +1,2 @@ -datadir: "/opt/collectd/var/lib/collectd/rrd/" -libdir: "/opt/collectd/lib/collectd/" ++++++ collectd-perl-vendor.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.738597462 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.742597466 +0200 @@ -1,7 +1,9 @@ ---- 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 @@ - +diff --git a/Makefile.am b/Makefile.am +index 2ef2442..145e98c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2000,7 +2000,7 @@ uninstall-hook: + all-local: @PERL_BINDINGS@ install-exec-local: - [ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install ) ++++++ collectd-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.770597493 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.770597493 +0200 @@ -7,3 +7,6 @@ #There no fsf address in that file addFilter('incorrect-fsf-address /usr/share/doc/packages/collectd/contrib/network-proxy.py') + +# Can't delete this file in the post section +addFilter('suse-filelist-forbidden-backup-file') ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.yPZ3kw/_old 2019-06-19 21:09:54.782597505 +0200 +++ /var/tmp/diff_new_pack.yPZ3kw/_new 2019-06-19 21:09:54.782597505 +0200 @@ -7,4 +7,4 @@ +AC_INIT([collectd],[@@VERSION@@]) AC_CONFIG_SRCDIR(src/target_set.c) AC_CONFIG_HEADERS(src/config.h) - AC_CONFIG_AUX_DIR([libltdl/config]) + AC_CONFIG_AUX_DIR([build-aux])
