Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2023-02-01 16:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Wed Feb 1 16:39:10 2023 rev:44 rq:1062319 version:5.12.0.130.g2f3c12e Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2022-03-07 17:47:19.303113248 +0100 +++ /work/SRC/openSUSE:Factory/.collectd.new.32243/collectd.changes 2023-02-01 16:43:18.879225908 +0100 @@ -1,0 +2,22 @@ +Tue Jan 31 13:51:08 UTC 2023 - tr...@suse.de + +- Update to version 5.12.0.130.g2f3c12e: + * Fix formatting in mdadm events table + * Add new exec-borg script to contrib/ + * ChangeLog: v5.12 milestone: Fix issue #3127 + * use derive_t instead of int inside ovs_stats_get_port_stat_value + * In macOS 12, `IOMasterPort` is deprecated in favor of `IOMainPort` + * - allow alertmanager correlation and resolve - fix meta names with ':' + * fix drop probability + * add config option to write metadata +- Fix build issue if net-snmp has NETSNMP_DISABLE_MD5 set: +A Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch +- Use autosetup and adopt patches from -p0 to -p1: +M collectd-fix-config.patch +M collectd-fix_spamassassin_doc.patch +- Use obs_scm and others in _service file: +A _service +A _servicedata +A collectd.obsinfo + +------------------------------------------------------------------- Old: ---- collectd-5.12.0.tar.bz2 New: ---- Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch _service _servicedata collectd-5.12.0.130.g2f3c12e.obscpio collectd.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.IA5VSS/_old 2023-02-01 16:43:19.371228652 +0100 +++ /var/tmp/diff_new_pack.IA5VSS/_new 2023-02-01 16:43:19.375228673 +0100 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2005-2013 Pascal Bleser <pascal.ble...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -24,7 +24,7 @@ infiniband %{expand:%{rdt_plugin}} interface ipc iptables ipvs irq \\\ load logfile log_logstash \\\ madwifi match_empty_counter match_hashed match_regex match_timediff match_value \\\ - mdevents mbmon md memcached memory multimeter \\\ + mdevents mbmon md memcached memory mmc multimeter \\\ netlink network nfs nginx notify_nagios ntpd numa olsrd openvpn \\\ perl ping protocols powerdns processes \\\ rrdcached rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog \\\ @@ -33,7 +33,6 @@ unixsock uptime users uuid vmem vserver \\\ wireless write_graphite write_http write_log write_sensu write_tsdb \\\ write_prometheus zfs_arc zookeeper - %ifnarch s390 s390x %define sensors 1 %define sensors_plugin sensors @@ -41,14 +40,12 @@ %define sensors 0 %define sensors_plugin %{nil} %endif - # dpdk exclusive build arch requirements copied: %ifarch aarch64 x86_64 ppc64le %define dpdk 1 %else %define dpdk 0 %endif - %ifarch x86_64 %{ix86} %define intel_rdt 1 %define rdt_plugin intel_rdt @@ -56,15 +53,15 @@ %define intel_rdt 0 %define rdt_plugin %{nil} %endif - Name: collectd -Version: 5.12.0 +Version: 5.12.0.130.g2f3c12e Release: 0 Summary: Statistics Collection Daemon for filling RRD Files License: GPL-2.0-only AND MIT Group: System/Monitoring URL: http://collectd.org/ -Source: http://collectd.org/files/collectd-%{version}.tar.bz2 +# Source: http://collectd.org/files/collectd-%%{version}.tar.bz2 +Source: collectd-%{version}.tar.bz2 Source1: collectd.suse.init Source2: collectd.apache2.conf Source3: collectd-js.apache2.conf @@ -81,24 +78,17 @@ # PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible Patch11: avoid-pg-config.patch Patch12: harden_collectd.service.patch +Patch13: Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch # for /etc/apache2/... ownership (rpmlint): BuildRequires: apache2 BuildRequires: autoconf BuildRequires: automake BuildRequires: bison -%if %{dpdk} -BuildRequires: dpdk-devel >= 19.08 -%endif BuildRequires: flex BuildRequires: gcc BuildRequires: gdbm-devel BuildRequires: gettext-devel BuildRequires: intltool -# intel_rdt -> pqos.h -# intel-cmt-cat exclusive build arch requirements copied: -%if %{intel_rdt} -BuildRequires: libpqos-devel -%endif BuildRequires: java-devel BuildRequires: libesmtp-devel BuildRequires: libgcrypt-devel @@ -122,31 +112,17 @@ BuildRequires: xfsprogs-devel BuildRequires: pkgconfig(OpenIPMI) BuildRequires: pkgconfig(OpenIPMIpthread) -%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} -BuildRequires: pkgconfig(Qgpsmm) -BuildRequires: pkgconfig(libgps) -BuildRequires: pkgconfig(libsigrok) -%endif BuildRequires: pkgconfig(dbi) BuildRequires: pkgconfig(libatasmart) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(libmemcached) BuildRequires: pkgconfig(libmicrohttpd) BuildRequires: pkgconfig(libmnl) -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 -BuildRequires: pkgconfig(libmodbus) -%endif -%if 0%{?is_opensuse} -BuildRequires: pkgconfig(libmosquitto) -%endif -BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(liboping) BuildRequires: pkgconfig(libpq) -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 -BuildRequires: pkgconfig(librabbitmq) -%endif BuildRequires: pkgconfig(librrd) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libupsclient) @@ -162,6 +138,28 @@ Obsoletes: collectd-beta < %{version} Provides: collectd-beta = %{version}-%{release} %{?systemd_requires} +%if %{dpdk} +BuildRequires: dpdk-devel >= 19.08 +%endif +# intel_rdt -> pqos.h +# intel-cmt-cat exclusive build arch requirements copied: +%if %{intel_rdt} +BuildRequires: libpqos-devel +%endif +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} +BuildRequires: pkgconfig(Qgpsmm) +BuildRequires: pkgconfig(libgps) +BuildRequires: pkgconfig(libsigrok) +%endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 +BuildRequires: pkgconfig(libmodbus) +%endif +%if 0%{?is_opensuse} +BuildRequires: pkgconfig(libmosquitto) +%endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +BuildRequires: pkgconfig(librabbitmq) +%endif %if 0%{?suse_version} >= 1330 BuildRequires: pkgconfig(libnutclient) %endif @@ -497,7 +495,7 @@ Optional %{name} plugin for filtering and parsing logs. %package plugin-ubi -Summary: ubifs plugin for %{name} +Summary: UBIFS plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -516,27 +514,15 @@ Summary: All Monitoring Plugins for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 -Requires: %{name}-plugin-amqp = %{version}-%{release} -%endif Requires: %{name}-plugin-buddyinfo = %{version}-%{release} Requires: %{name}-plugin-connectivity = %{version}-%{release} Requires: %{name}-plugin-dbi = %{version}-%{release} -%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} -Requires: %{name}-plugin-gps = %{version}-%{release} -%endif Requires: %{name}-plugin-ipmi = %{version}-%{release} Requires: %{name}-plugin-java = %{version}-%{release} Requires: %{name}-plugin-logparser = %{version}-%{release} Requires: %{name}-plugin-lua = %{version}-%{release} Requires: %{name}-plugin-mcelog = %{version}-%{release} Requires: %{name}-plugin-memcachec = %{version}-%{release} -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 -Requires: %{name}-plugin-modbus = %{version}-%{release} -%endif -%if 0%{?is_opensuse} -Requires: %{name}-plugin-mqtt = %{version}-%{release} -%endif Requires: %{name}-plugin-mysql = %{version}-%{release} Requires: %{name}-plugin-notify-desktop = %{version}-%{release} Requires: %{name}-plugin-openldap = %{version}-%{release} @@ -546,9 +532,6 @@ Requires: %{name}-plugin-postgresql = %{version}-%{release} Requires: %{name}-plugin-procevent = %{version}-%{release} Requires: %{name}-plugin-python3 = %{version}-%{release} -%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} -Requires: %{name}-plugin-sigrok = %{version}-%{release} -%endif Requires: %{name}-plugin-smart = %{version}-%{release} Requires: %{name}-plugin-snmp = %{version}-%{release} Requires: %{name}-plugin-synproxy = %{version}-%{release} @@ -561,6 +544,21 @@ Requires: %{name}-plugin-write_syslog = %{version}-%{release} Requires: %{name}-web = %{version}-%{release} Requires: %{name}-web-js = %{version}-%{release} +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +Requires: %{name}-plugin-amqp = %{version}-%{release} +%endif +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} +Requires: %{name}-plugin-gps = %{version}-%{release} +%endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 +Requires: %{name}-plugin-modbus = %{version}-%{release} +%endif +%if 0%{?is_opensuse} +Requires: %{name}-plugin-mqtt = %{version}-%{release} +%endif +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} +Requires: %{name}-plugin-sigrok = %{version}-%{release} +%endif %if 0%{?suse_version} >= 1330 Requires: %{name}-plugin-nut = %{version}-%{release} %endif @@ -611,19 +609,7 @@ to write %{name} unixsock clients. %prep -%setup -q -n "collectd-%{version}" -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -%patch7 -p1 -%if 0%{?suse_version} > 1320 -%patch8 -p1 -%endif -%patch11 -p1 -%patch12 -p1 +%autosetup -p1 sed -i 's|@@VERSION@@|%{version}|g' configure.ac @@ -899,7 +885,6 @@ %endif %if 0%{?sle_version} < 150000 || 0%{?is_opensuse} - %files plugin-sigrok %{_libdir}/collectd/sigrok.so %{_libdir}/collectd/sigrok.la ++++++ Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch ++++++ From: Thomas Renninger <tr...@suse.com> Subject: Fix compile issue if net-snmp has NETSNMP_DISABLE_MD5 set References: Patch-Mainline: Git-commit: be1a9d5975e4568774a46711d1366086978e9347 Git-repo: g...@github.com:watologo1/collectd.git.git Otherwise one gets: src/snmp.c: In function 'csnmp_config_add_host_auth_protocol': src/snmp.c:678:25: error: 'usmHMACMD5AuthProtocol' undeclared (first use in this function); did you mean 'usmHMACSHA1AuthProtocol'? 678 | hd->auth_protocol = usmHMACMD5AuthProtocol; | ^~~~~~~~~~~~~~~~~~~~~~ | usmHMACSHA1AuthProtocol Signed-off-by: <tr...@suse.com> diff --git a/src/snmp.c b/src/snmp.c index 827d62eb..078ef3ee 100644 --- a/src/snmp.c +++ b/src/snmp.c @@ -677,7 +677,7 @@ static int csnmp_config_add_host_auth_protocol(host_definition_t *hd, if (status != 0) return status; -#ifdef NETSNMP_USMAUTH_HMACMD5 +#ifndef NETSNMP_DISABLE_MD5 if (strcasecmp("MD5", buffer) == 0) { hd->auth_protocol = usmHMACMD5AuthProtocol; hd->auth_protocol_len = sizeof(usmHMACMD5AuthProtocol) / sizeof(oid); ++++++ _service ++++++ <services> <service name="obs_scm" mode="localonly"> <param name="scm">git</param> <param name="url">https://github.com/collectd/collectd.git</param> <param name="revision">HEAD</param> <param name="versionrewrite-pattern">collectd-(.*)</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.g%h</param> <param name="changesgenerate">enable</param> <param name="submodules">disable</param> </service> <service name="set_version" mode="localonly"/> <service name="tar" mode="buildtime"/> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/collectd/collectd.git</param> <param name="changesrevision">2f3c12ea57eb74c4d7c5e13aca6c50ca0dd75ba8</param></service></servicedata> (No newline at EOF) ++++++ collectd-fix-config.patch ++++++ --- /var/tmp/diff_new_pack.IA5VSS/_old 2023-02-01 16:43:19.455229109 +0100 +++ /var/tmp/diff_new_pack.IA5VSS/_new 2023-02-01 16:43:19.459229131 +0100 @@ -1,7 +1,7 @@ Index: src/collectd.conf.in =================================================================== ---- src/collectd.conf.in.orig -+++ src/collectd.conf.in +--- a/src/collectd.conf.in.orig ++++ b/src/collectd.conf.in @@ -272,7 +272,7 @@ #<Plugin apache> # <Instance "local"> ++++++ collectd-fix_spamassassin_doc.patch ++++++ --- /var/tmp/diff_new_pack.IA5VSS/_old 2023-02-01 16:43:19.479229239 +0100 +++ /var/tmp/diff_new_pack.IA5VSS/_new 2023-02-01 16:43:19.479229239 +0100 @@ -1,7 +1,7 @@ Index: contrib/SpamAssassin/Collectd.pm =================================================================== ---- contrib/SpamAssassin/Collectd.pm.orig -+++ contrib/SpamAssassin/Collectd.pm +--- a/contrib/SpamAssassin/Collectd.pm.orig ++++ b/contrib/SpamAssassin/Collectd.pm @@ -4,12 +4,6 @@ Collectd - plugin for filling collectd with stats ++++++ collectd-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.IA5VSS/_old 2023-02-01 16:43:19.523229479 +0100 +++ /var/tmp/diff_new_pack.IA5VSS/_new 2023-02-01 16:43:19.523229479 +0100 @@ -1,13 +1,6 @@ -addFilter('perl5-naming-policy-not-applied') - addFilter('non-etc-or-var-file-marked-as-conffile .*/spamassassin/99_collectd.cf') addFilter('non-etc-or-var-file-marked-as-conffile .*/collectd/postgresql_default.conf') addFilter('macro-in-comment') -#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.obsinfo ++++++ name: collectd version: 5.12.0.130.g2f3c12e mtime: 1674807698 commit: 2f3c12ea57eb74c4d7c5e13aca6c50ca0dd75ba8