SOURCES/lm_sensors-3.6.0-rrd-const-argv.patch

@@ -0,0 +1,26 @@
+All uses of argv in rrdtool have been constified upstream:
+
+https://github.com/oetiker/rrdtool-1.x/pull/1242
+https://github.com/lm-sensors/lm-sensors/pull/483
+
+diff -up ./prog/sensord/rrd.c.orig ./prog/sensord/rrd.c
+--- ./prog/sensord/rrd.c.orig	2024-02-05 14:53:34.885969256 -0500
++++ ./prog/sensord/rrd.c	2024-02-05 14:55:09.337587596 -0500
+@@ -299,7 +299,7 @@ int rrdInit(void)
+ 		argv[argc++] = rraBuff;
+ 		argv[argc] = NULL;
+ 
+-		ret = rrd_create(argc, (char**) argv);
++		ret = rrd_create(argc, argv);
+ 		if (ret == -1) {
+ 			sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
+ 				  sensord_args.rrdFile, rrd_get_error());
+@@ -455,7 +455,7 @@ int rrdUpdate(void)
+ 		const char *argv[] = {
+ 			"sensord", sensord_args.rrdFile, rrdBuff, NULL
+ 		};
+-		if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
++		if ((ret = rrd_update(3, /* WEAK */ argv))) {
+ 			sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
+ 				  sensord_args.rrdFile, rrd_get_error());
+ 		}

SOURCES/lm_sensors-wrapper

@@ -1,8 +1,8 @@
 #!/bin/sh
 if /usr/bin/systemd-detect-virt 2>/dev/null 1>&2; then
-    SENSORS_FLAGS_VM='-n';
+	SENSORS_FLAGS_VM='-n';
 else
-    SENSORS_FLAGS_VM='';
+	SENSORS_FLAGS_VM='';
 fi;
 
 /usr/bin/sensors -s $SENSORS_FLAGS_VM

SPECS/lm_sensors.spec

@@ -1,16 +1,17 @@
 Name: lm_sensors
 Version: 3.6.0
-Release: 10%{?dist}
+Release: 20%{?dist}
 Summary: Hardware monitoring tools
 
 %define upstream_version %(echo %{version} | sed -e 's/\\./-/g')
 
-# Some man pages are licensed Verbatim (lib/sensors.conf.5,
+# Some man pages are licensed Linux-man-pages-copyleft-var and Linux-man-pages-copyleft (lib/sensors.conf.5,
 # prog/sensors/sensors.1). Files from dist-git are licensed
 # MIT (according to the Fedora Project Contributor Agreement
-# https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files).
+# https://docs.fedoraproject.org/en-US/legal/fedora-linux-license/).
-# The rest is GPLv2+.
+# lib/* are LGPL-2.1-or-later (in subpackage)
-License: GPLv2+ and Verbatim and MIT
+# The rest is GPL-2.0-or-later.
+License: GPL-2.0-or-later AND Linux-man-pages-copyleft-var AND Linux-man-pages-copyleft AND MIT
 
 URL: http://github.com/lm-sensors/lm-sensors/
 
@@ -33,6 +34,8 @@ Patch1: 0001-Change-PIDFile-path-from-var-run-to-run.patch
 Patch2: lm_sensors-3.6.0-allow_no_sensors.patch
 # Upstream commit 5deee7d0c301df779:
 Patch3: lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
+# rrdtool has constified all argv
+Patch4: lm_sensors-3.6.0-rrd-const-argv.patch
 
 Requires: /usr/sbin/modprobe
 %ifarch %{ix86} x86_64
@@ -54,7 +57,7 @@ access and hardware monitoring.
 
 %package libs
 Summary: Lm_sensors core libraries
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description libs
 Core libraries for lm_sensors applications
@@ -63,8 +66,8 @@ Core libraries for lm_sensors applications
 %package devel
 Summary: Development files for programs which will use lm_sensors
 Requires: %{name}-libs = %{version}-%{release}
-# One manual page is licensed Verbatim (lib/libsensors.3). The rest is LGPLv2+.
+# One manual page is licensed Linux-man-pages-copyleft (lib/libsensors.3). The rest is LGPLv2+.
-License: LGPLv2+ and Verbatim
+License: LGPL-2.1-or-later AND Linux-man-pages-copyleft
 
 %description devel
 The lm_sensors-devel package includes a header files and libraries for use
@@ -75,9 +78,9 @@ when building applications that make use of sensor data.
 Summary: Daemon that periodically logs sensor readings
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# One man page is licensed Verbatim (prog/sensord/sensord.8). Files from
+# One man page is licensed Linux-man-pages-copyleft (prog/sensord/sensord.8). Files from
 # dist-git are licensed MIT according to the FPCA. The rest is GPLv2+.
-License: GPLv2+ and Verbatim and MIT
+License: GPL-2.0-or-later AND Linux-man-pages-copyleft AND MIT
 
 %description sensord
 Daemon that periodically logs sensor readings to syslog or a round-robin
@@ -90,6 +93,9 @@ database, and warns of sensor alarms.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+%patch -P4 -p1
+%endif
 
 # Remove currently unused files to make sure we've got the license right
 rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus
@@ -212,17 +218,52 @@ fi
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.6.0-10
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.6.0-20
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for October 2024 mass rebuild:
-  Related: rhbz#1991688
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.6.0-19
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.6.0-19
+- Bump release for June 2024 mass rebuild
+
+* Thu Mar 21 2024 Pavol Žáčik <pzacik@redhat.com> - 3.6.0-18
+- SPDX migration (Miroslav Suchý)
+  Resolves: RHEL-29907
+
+* Sun Feb 11 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 3.6.0-17
+- Adapt to constification of argv parameters in rrdtool
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.6.0-9
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-15
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Tue Mar 09 2021 Artem Egorenkov <aegorenk@redhat.com> - 3.6.0-8
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 9 2021 Artem Egorenkov <aegorenk@redhat.com> - 3.6.0-9
 - Add support for AMD CPU Family 19h
 
-* Wed Mar 03 2021 Artem Egorenkov <aegorenk@redhat.com> - 3.6.0-7
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.6.0-8
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Sun Feb 14 2021 Artem Egorenkov <aegorenk@redhat.com> - 3.6.0-7
 - New flag for no sensors added. This flag is used in VM environment
   to make sensors binaries not fail if no sensors was detected.