Accepting request 1070953 from home:adkorte:branches:server:monitoring

- Update to version 5.12.0.134.g4cebbfc:
  * Hugepages plugin skips reading write-only file
  * Update the format of contrib/snmp-data.conf
  * [cleanup] Fix typo in comment and remove executable bits of config file
  * Remove upstreamed patch
    - Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch
- Change to %bcond style conditional builds
- Disable building NUT plugin in Tumbleweed (fails to build due to changes
  in NUT-2.8.0)
- Minor spec file fixes

OBS-URL: https://build.opensuse.org/request/show/1070953
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=180

Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch

@@ -1,29 +0,0 @@
-From: Thomas Renninger <trenn@suse.com>
-Subject: Fix compile issue if net-snmp has NETSNMP_DISABLE_MD5 set
-References: 
-Patch-Mainline: 
-Git-commit: be1a9d5975e4568774a46711d1366086978e9347
-Git-repo: git@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:  <trenn@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);

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/collectd/collectd.git</param>
-              <param name="changesrevision">2f3c12ea57eb74c4d7c5e13aca6c50ca0dd75ba8</param></service></servicedata>
+              <param name="changesrevision">4cebbfc1ed4b44644d981df996a8ca941e38e8a1</param></service></servicedata>

collectd-5.12.0.134.g4cebbfc.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea4f29a1f7a2a38a0ea96c0d3e6de5c5d83cc239620a484441e54e53c50816b3
+size 7818765

collectd.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Mar 11 15:43:03 UTC 2023 - suse+build@de-korte.org
+
+- Update to version 5.12.0.134.g4cebbfc:
+  * Hugepages plugin skips reading write-only file
+  * Update the format of contrib/snmp-data.conf
+  * [cleanup] Fix typo in comment and remove executable bits of config file
+  * Remove upstreamed patch
+    - Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch
+- Change to %bcond style conditional builds
+- Disable building NUT plugin in Tumbleweed (fails to build due to changes
+  in NUT-2.8.0)
+- Minor spec file fixes
+
 -------------------------------------------------------------------
 Tue Jan 31 13:51:08 UTC 2023 - trenn@suse.de
 

collectd.obsinfo

@@ -1,4 +1,4 @@
 name: collectd
-version: 5.12.0.130.g2f3c12e
+version: 5.12.0.134.g4cebbfc
-mtime: 1674807698
+mtime: 1677501884
-commit: 2f3c12ea57eb74c4d7c5e13aca6c50ca0dd75ba8
+commit: 4cebbfc1ed4b44644d981df996a8ca941e38e8a1

collectd.spec

@@ -34,27 +34,32 @@
   wireless write_graphite write_http write_log write_sensu write_tsdb \\\
   write_prometheus zfs_arc zookeeper
 %ifnarch s390 s390x
-%define sensors    1
+%bcond_without sensors
 %define sensors_plugin sensors
 %else
-%define sensors    0
+%bcond_with sensors
 %define sensors_plugin %{nil}
 %endif
 # dpdk exclusive build arch requirements copied:
 %ifarch aarch64 x86_64 ppc64le
-%define dpdk       1
+%bcond_without dpdk
 %else
-%define dpdk       0
+%bcond_with dpdk
 %endif
 %ifarch x86_64 %{ix86}
-%define intel_rdt    1
+%bcond_without intel_rdt
 %define rdt_plugin intel_rdt
 %else
-%define intel_rdt    0
+%bcond_with intel_rdt
 %define rdt_plugin %{nil}
 %endif
+%if 0%{?suse_version} >= 1330 && 0%{?suse_version} <= 1500
+%bcond_without nut
+%else
+%bcond_with nut
+%endif
 Name:           collectd
-Version:        5.12.0.130.g2f3c12e
+Version:        5.12.0.134.g4cebbfc
 Release:        0
 Summary:        Statistics Collection Daemon for filling RRD Files
 License:        GPL-2.0-only AND MIT
@@ -78,7 +83,6 @@ 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
 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
@@ -96,6 +100,7 @@ BuildRequires:  libjansson-devel
 BuildRequires:  libnetlink-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libprotobuf-c-devel
 BuildRequires:  libtool
 BuildRequires:  libyajl-devel
 BuildRequires:  linux-kernel-headers
@@ -106,7 +111,6 @@ BuildRequires:  openldap2-devel
 BuildRequires:  perl
 BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
-BuildRequires:  protobuf-c
 BuildRequires:  rrdtool
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xfsprogs-devel
@@ -125,7 +129,6 @@ BuildRequires:  pkgconfig(liboping)
 BuildRequires:  pkgconfig(libpq)
 BuildRequires:  pkgconfig(librrd)
 BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libupsclient)
 BuildRequires:  pkgconfig(libvirt)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(lua)
@@ -138,12 +141,12 @@ Requires(post): %fillup_prereq
 Obsoletes:      collectd-beta < %{version}
 Provides:       collectd-beta = %{version}-%{release}
 %{?systemd_requires}
-%if %{dpdk}
+%if %{with dpdk}
 BuildRequires:  dpdk-devel >= 19.08
 %endif
 # intel_rdt -> pqos.h
 # intel-cmt-cat exclusive build arch requirements copied:
-%if %{intel_rdt}
+%if %{with intel_rdt}
 BuildRequires:  libpqos-devel
 %endif
 %if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
@@ -160,10 +163,10 @@ BuildRequires:  pkgconfig(libmosquitto)
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
 BuildRequires:  pkgconfig(librabbitmq)
 %endif
-%if 0%{?suse_version} >= 1330
+%if %{with nut}
 BuildRequires:  pkgconfig(libnutclient)
 %endif
-%if %{sensors}
+%if %{with sensors}
 BuildRequires:  sensors
 Requires:       sensors
 %endif
@@ -184,6 +187,7 @@ Requires:       perl(Data::Dumper)
 Requires:       perl(HTML::Entities)
 Requires:       perl(RRDs)
 Requires:       perl(URI::Escape)
+BuildArch:      noarch
 
 %description web
 Web frontend CGI for watching %{name} statistics from a browser.
@@ -202,6 +206,7 @@ Requires:       perl(Data::Dumper)
 Requires:       perl(HTML::Entities)
 Requires:       perl(JSON)
 Requires:       perl(RRDs)
+BuildArch:      noarch
 
 %description web-js
 Web/JavaScript frontend CGI for watching %{name} statistics from
@@ -267,7 +272,7 @@ Requires:       %{name} = %{version}-%{release}
 This plugin for collectd reads monitoring information
 from OpenLDAP's cn=Monitor subtree.
 
-%if 0%{?suse_version} >= 1330
+%if %{with nut}
 %package plugin-nut
 Summary:        Network UPS Tools plugin for collectd
 Group:          System/Monitoring
@@ -559,9 +564,10 @@ Requires:       %{name}-plugin-mqtt = %{version}-%{release}
 %if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
 Requires:       %{name}-plugin-sigrok = %{version}-%{release}
 %endif
-%if 0%{?suse_version} >= 1330
+%if %{with nut}
 Requires:       %{name}-plugin-nut = %{version}-%{release}
 %endif
+BuildArch:      noarch
 
 %description plugins-all
 Metapackage that installs %{name} and all the available
@@ -572,6 +578,7 @@ Summary:        Spamassassin Monitoring for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl-spamassassin
+BuildArch:      noarch
 
 %description spamassassin
 Plugin for filling %{name} with statistics from the
@@ -723,6 +730,8 @@ rm contrib/snmp-probe-host.px
 install -d "%{buildroot}%{_mandir}/man1"
 
 find contrib/ -name '*.orig' -delete
+find contrib/ -name .gitignore -delete
+sed -i 's/env //1' contrib/exec-borg
 
 # plugin list:
 echo -n > plugins.lst
@@ -960,7 +969,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/write_influxdb_udp.la
 %{_libdir}/collectd/write_influxdb_udp.so
 
-%if 0%{?suse_version} >= 1330
+%if %{with nut}
 %files plugin-nut
 %{_libdir}/collectd/nut.so
 %{_libdir}/collectd/nut.la
@@ -976,7 +985,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}%{ext_man}
 
 %files plugin-dpdk
-%if %{dpdk}
+%if %{with dpdk}
 %{_libdir}/collectd/dpdkevents.la
 %{_libdir}/collectd/dpdkevents.so
 %{_libdir}/collectd/dpdkstat.la