From 207ca0830a4d4d4ae405a4b1d504bcb555dcc4de Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:07:24 +0000 Subject: [PATCH] import UBI lm_sensors-3.6.0-20.el10 --- .gitignore | 2 +- .lm_sensors.metadata | 1 - ...nge-PIDFile-path-from-var-run-to-run.patch | 40 ++ 0001-Revert-unnecessary-soname-bump.patch | 33 ++ ...01-Fix-stale-links-and-outdated-info.patch | 486 ------------------ ...dd-detection-of-AMD-Family-17h-model.patch | 31 -- ...t-Add-support-for-AMD-CPU-Family-19h.patch | 26 - ...Fix-printing-CPU-info-on-ppc-and-arm.patch | 54 -- SOURCES/fix-unexpanded-revision-strings.patch | 85 --- SOURCES/lm_sensors-wrapper | 8 - ...=> lm_sensors-3.6.0-allow_no_sensors.patch | 0 lm_sensors-3.6.0-rrd-const-argv.patch | 26 + ...t-Add-support-for-AMD-CPU-Family-19h.patch | 15 + ...r-wrapper => lm_sensors-modprobe-r-wrapper | 0 ...obe-wrapper => lm_sensors-modprobe-wrapper | 0 lm_sensors-wrapper | 8 + .../lm_sensors.service => lm_sensors.service | 0 SPECS/lm_sensors.spec => lm_sensors.spec | 170 +++--- ..._sensors.sysconfig => lm_sensors.sysconfig | 0 ...service-wrapper => sensord-service-wrapper | 0 SOURCES/sensord.service => sensord.service | 0 .../sensord.sysconfig => sensord.sysconfig | 0 sources | 1 + 23 files changed, 235 insertions(+), 751 deletions(-) delete mode 100644 .lm_sensors.metadata create mode 100644 0001-Change-PIDFile-path-from-var-run-to-run.patch create mode 100644 0001-Revert-unnecessary-soname-bump.patch delete mode 100644 SOURCES/0001-Fix-stale-links-and-outdated-info.patch delete mode 100644 SOURCES/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch delete mode 100644 SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch delete mode 100644 SOURCES/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch delete mode 100644 SOURCES/fix-unexpanded-revision-strings.patch delete mode 100644 SOURCES/lm_sensors-wrapper rename SOURCES/lm_sensors-3.4.0-allow_no_sensors.patch => lm_sensors-3.6.0-allow_no_sensors.patch (100%) create mode 100644 lm_sensors-3.6.0-rrd-const-argv.patch create mode 100644 lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch rename SOURCES/lm_sensors-modprobe-r-wrapper => lm_sensors-modprobe-r-wrapper (100%) rename SOURCES/lm_sensors-modprobe-wrapper => lm_sensors-modprobe-wrapper (100%) create mode 100755 lm_sensors-wrapper rename SOURCES/lm_sensors.service => lm_sensors.service (100%) rename SPECS/lm_sensors.spec => lm_sensors.spec (82%) rename SOURCES/lm_sensors.sysconfig => lm_sensors.sysconfig (100%) rename SOURCES/sensord-service-wrapper => sensord-service-wrapper (100%) rename SOURCES/sensord.service => sensord.service (100%) rename SOURCES/sensord.sysconfig => sensord.sysconfig (100%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 7f71af5..2d22cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz +lm-sensors-3-6-0.tar.gz diff --git a/.lm_sensors.metadata b/.lm_sensors.metadata deleted file mode 100644 index 8844104..0000000 --- a/.lm_sensors.metadata +++ /dev/null @@ -1 +0,0 @@ -df343bfa52a9fd5cd9763a363e2e60c0dc637117 SOURCES/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz diff --git a/0001-Change-PIDFile-path-from-var-run-to-run.patch b/0001-Change-PIDFile-path-from-var-run-to-run.patch new file mode 100644 index 0000000..e90afb7 --- /dev/null +++ b/0001-Change-PIDFile-path-from-var-run-to-run.patch @@ -0,0 +1,40 @@ +From 25f4f8793730ef3d170f1f2bd729a82fd61a4784 Mon Sep 17 00:00:00 2001 +From: puneetse <22071208+puneetse@users.noreply.github.com> +Date: Wed, 11 Mar 2020 09:36:51 -0700 +Subject: [PATCH] Change PIDFile path from /var/run to /run + +/var/run is considered a legacy directory by systemd 239+ and having it in unit files causes a warning to be emitted to the journal. +--- + prog/init/fancontrol.service | 2 +- + prog/init/sensord.service | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/prog/init/fancontrol.service b/prog/init/fancontrol.service +index 3ac1ed02..43293141 100644 +--- a/prog/init/fancontrol.service ++++ b/prog/init/fancontrol.service +@@ -5,7 +5,7 @@ After=lm_sensors.service + + [Service] + Type=simple +-PIDFile=/var/run/fancontrol.pid ++PIDFile=/run/fancontrol.pid + ExecStart=/usr/sbin/fancontrol + + [Install] +diff --git a/prog/init/sensord.service b/prog/init/sensord.service +index 2448beeb..af2f0ae9 100644 +--- a/prog/init/sensord.service ++++ b/prog/init/sensord.service +@@ -5,7 +5,7 @@ After=lm_sensors.service + [Service] + EnvironmentFile=/etc/sysconfig/sensord + Type=forking +-PIDFile=/var/run/sensord.pid ++PIDFile=/run/sensord.pid + ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon + + [Install] +-- +2.25.4 + diff --git a/0001-Revert-unnecessary-soname-bump.patch b/0001-Revert-unnecessary-soname-bump.patch new file mode 100644 index 0000000..b5d9cc9 --- /dev/null +++ b/0001-Revert-unnecessary-soname-bump.patch @@ -0,0 +1,33 @@ +From bc827e6d45f31f20a4f6d27bfc41747900faf60c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +Date: Wed, 2 Jan 2019 12:38:31 +0100 +Subject: [PATCH] Revert unnecessary soname bump + +The soname bump in lm-sensors 3.5.0 was unnecessary - there was no +API/ABI change. I'm reverting it so that we can update lm-sensors +in released Fedoras as well as Rawhide. + +Related: +https://marc.info/?l=lm-sensors&m=154515276523720&w=2 +--- + lib/Module.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Module.mk b/lib/Module.mk +index 7732242..299b7d3 100644 +--- a/lib/Module.mk ++++ b/lib/Module.mk +@@ -32,8 +32,8 @@ LIBMAN5FILES := $(MODULE_DIR)/sensors.conf.5 + # The library soname (major number) must be changed if and only if the interface is + # changed in a backward incompatible way. The interface is defined by + # the public header files - in this case they are error.h and sensors.h. +-LIBMAINVER := 5 +-LIBMINORVER := 0.0 ++LIBMAINVER := 4 ++LIBMINORVER := 5.0 + LIBVER := $(LIBMAINVER).$(LIBMINORVER) + + # The static lib name, the shared lib name, and the internal ('so') name of +-- +2.17.2 + diff --git a/SOURCES/0001-Fix-stale-links-and-outdated-info.patch b/SOURCES/0001-Fix-stale-links-and-outdated-info.patch deleted file mode 100644 index 6f448f5..0000000 --- a/SOURCES/0001-Fix-stale-links-and-outdated-info.patch +++ /dev/null @@ -1,486 +0,0 @@ -From 90b9168cd44f8c641fcf10def830bcd7c53a30e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Sat, 1 Sep 2018 08:12:59 +0200 -Subject: [PATCH] Fix stale links and outdated info -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This combines several upstream commits, see below. - -(cherry picked from commit 6413b80847ec54792d026191c01cdb985441a28b) -(cherry picked from commit be3679ae06b622b1d868271ddeb6ae8d12196d1f) -(cherry picked from commit 17d62bd3180d01676834d8a901d9bb1216b2f979) -(cherry picked from commit 8f54fe85e8c9015190a2c80b8297ea69b5111728) -(cherry picked from commit 807f9b1529892c0ac89bca0c7ae781c59f9c8393) -(cherry picked from commit 255804953e039a725df47c596e47f68554118ca5) -(cherry picked from commit 012d76b9785b467cf219bf134d6610861de58a97) -(cherry picked from commit 84f773b3ec8b75f377a68fd1436ea3ac6d11b170) - -Resolves: rhbz#1693347 - -Signed-off-by: Ondřej Lysoněk ---- - CHANGES | 4 +++- - Makefile | 2 +- - README | 18 ++++++++++++----- - configs/Asus/P3-PH4C.conf | 3 ++- - configs/Asus/P5B-E.conf | 2 +- - configs/Asus/P5N32-E_SLI_Plus.conf | 2 +- - configs/Biostar/N68S+.conf | 2 +- - configs/Gigabyte/Z38MX-UD2H-B3.conf | 2 +- - doc/developers/lm_sensors.lsm | 10 ++++------ - doc/developers/release_checklist | 30 ++++++++--------------------- - doc/donations | 2 +- - doc/git | 2 +- - doc/progs | 2 +- - etc/sensors.conf.eg | 4 ++-- - lib/libsensors.3 | 3 +-- - lib/sensors.conf.5 | 5 +---- - prog/detect/sensors-detect | 6 +++--- - prog/dump/isadump.8 | 2 +- - prog/dump/isaset.8 | 2 +- - prog/init/lm_sensors.init | 2 +- - prog/rrd/sens_day.in | 2 +- - prog/rrd/sens_week.in | 2 +- - prog/rrd/summ_week.in | 2 +- - prog/sensord/rrd.c | 3 ++- - prog/sensors/sensors.1 | 2 +- - prog/tellerstats/index.shtml | 2 +- - version.h | 2 +- - 27 files changed, 56 insertions(+), 64 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 6efba0fd..d2e7e8d4 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -1,7 +1,9 @@ - lm-sensors CHANGES file - ----------------------- - --SVN HEAD -+git HEAD -+ Development version string now contains "+git" instead of "+SVN" -+ Updated links in documentation to reflect the new home of lm_sensors - sensors.1: Add reference to sensors-detect - Document -j option (json output) - sensors: Add support for json output -diff --git a/Makefile b/Makefile -index d6f2192c..2f5859f0 100644 ---- a/Makefile -+++ b/Makefile -@@ -226,7 +226,7 @@ manhtml: - cp $(MANPAGES) html - cd html ; \ - export LOGNAME=sensors ; \ -- export HOSTNAME=www.lm-sensors.org ; \ -+ export HOSTNAME=hwmon.wiki.kernel.org ; \ - man2html *.[1-8] ; \ - $(RM) *.[1-8] - -diff --git a/README b/README -index acd3c6e4..9ce510b9 100644 ---- a/README -+++ b/README -@@ -101,14 +101,22 @@ for such programs. - OTHER INFORMATION - ----------------- - --The developers of this package can be reached through github. --(see https://github.com/groeck/lm-sensors). Do not hesitate to contact --us if you have questions, suggestions, problems, want to contribute, --or just want to report it works for you. But please try to -+The lm_sensors website can be found at -+https://hwmon.wiki.kernel.org/lm_sensors -+ -+The developers of this package can be reached using -+* a mailing list lm-sensors vger kernel org -+ (you can get information on how to subscribe, unsubscribe, and the list -+ of archives at http://vger.kernel.org/vger-lists.html#lm-sensors; -+ you do not need to be subscribed to post to the list) -+* GitHub (see https://github.com/lm-sensors/lm-sensors) -+ -+Do not hesitate to contact us if you have questions, suggestions, problems, -+want to contribute, or just want to report it works for you. But please try to - read the documentation before you ask any questions! It's all under doc/. - - The latest version of this package can always be found at: --https://github.com/groeck/lm-sensors. -+https://github.com/lm-sensors/lm-sensors. - - LICENSE - ------- -diff --git a/configs/Asus/P3-PH4C.conf b/configs/Asus/P3-PH4C.conf -index 00e5dab8..28b32578 100644 ---- a/configs/Asus/P3-PH4C.conf -+++ b/configs/Asus/P3-PH4C.conf -@@ -5,7 +5,8 @@ chip "w83627ehf-*" "w83627dhg-*" - label in0 "VCore" - label in1 "+12V" - label in2 "AVCC" --# ACPI says nothing about AVCC, so you might want to uncomment: -+# ACPI says nothing -+# about AVCC, so you might want to uncomment: - #ignore in2 - label in3 "+3.3V" - ignore in4 -diff --git a/configs/Asus/P5B-E.conf b/configs/Asus/P5B-E.conf -index bf62b6e9..5aa506c7 100644 ---- a/configs/Asus/P5B-E.conf -+++ b/configs/Asus/P5B-E.conf -@@ -2,7 +2,7 @@ - - - # This is the sensors.conf configuration file for ASUS P5B-E (and maybe it's different versions) --# Everythings based on the guide at http://www.lm-sensors.org/wiki/AsusFormulaHacking. The formulas -+# Everythings based on the guide at https://hwmon.wiki.kernel.org/asusformulahacking. The formulas - # and ranges are based on the /proc/acpi/dsdt readings of a P5B-E board with a E6600 CPU. - - chip "w83627dhg-*" -diff --git a/configs/Asus/P5N32-E_SLI_Plus.conf b/configs/Asus/P5N32-E_SLI_Plus.conf -index 8632e099..31ced1e4 100644 ---- a/configs/Asus/P5N32-E_SLI_Plus.conf -+++ b/configs/Asus/P5N32-E_SLI_Plus.conf -@@ -3,7 +3,7 @@ - - # Linux sensor configuration for an Asus P5N32-E SLI Plus - # 5/2007 s.urbanovski#ac-nancy-metz.fr --# (see http://www.lm-sensors.org/wiki/AsusFormulaHacking) -+# (see https://hwmon.wiki.kernel.org/asusformulahacking) - - chip "w83791d-*" - -diff --git a/configs/Biostar/N68S+.conf b/configs/Biostar/N68S+.conf -index be340df4..ddace3ce 100644 ---- a/configs/Biostar/N68S+.conf -+++ b/configs/Biostar/N68S+.conf -@@ -8,7 +8,7 @@ - # This custom configuration file should be copied to /etc/sensors.d/Biostar-N68S+.conf. - # - # Custom configuration files for some specific mainboards can be found at --# http://www.lm-sensors.org/wiki/Configurations -+# https://github.com/lm-sensors/lm-sensors/tree/master/configs - - # READ THE MAN PAGE DOCUMENTATION OF 'sensors.conf' FOR MORE - # COMPLETE INFORMATION. ie: -diff --git a/configs/Gigabyte/Z38MX-UD2H-B3.conf b/configs/Gigabyte/Z38MX-UD2H-B3.conf -index 53a23764..5f8d36c5 100644 ---- a/configs/Gigabyte/Z38MX-UD2H-B3.conf -+++ b/configs/Gigabyte/Z38MX-UD2H-B3.conf -@@ -10,7 +10,7 @@ - # from the lm-sensors mailinglist. - - # Questions, comments or additions? Please share on the lm-sensors mailinglist. --# More info at http://www.lm-sensors.org/wiki/FeedbackAndSupport -+# More info at https://hwmon.wiki.kernel.org/feedbackandsupport - - # Hint: Use sensors -u to list all variables. - http://lists.lm-sensors.org/pipermail/lm-sensors/2014-January/040952.html -diff --git a/doc/developers/lm_sensors.lsm b/doc/developers/lm_sensors.lsm -index fd9495a4..cf239557 100644 ---- a/doc/developers/lm_sensors.lsm -+++ b/doc/developers/lm_sensors.lsm -@@ -6,13 +6,11 @@ Description: Hardware health monitoring package for Linux. It consists of - a library to allow applications to read sensors data more - easily, and of an example program to pretty print this data. - Also included is a fan speed control script. -- http://www.lm-sensors.org/ -+ https://hwmon.wiki.kernel.org/lm_sensors - Keywords: sensors health hardware-monitoring fan-speed - Author: jdelvare@suse.de (Jean Delvare) --Maintained-by: jdelvare@suse.de (Jean Delvare) --Primary-site: http://dl.lm-sensors.org/lm-sensors/releases/ -- lm_sensors-3.4.0.tar.bz2 -- lm_sensors-3.4.0.tar.bz2.sig --Alternate-site: ftp://ftp.netroedge.com/pub/lm-sensors/ -+Maintained-by: olysonek@redhat.com (Ondřej Lysoněk) -+Primary-site: https://github.com -+ /lm-sensors/lm-sensors/archive/V3-4-0/lm-sensors-3-4-0.tar.gz - Copying-policy: GPL/LGPL - End -diff --git a/doc/developers/release_checklist b/doc/developers/release_checklist -index 9ea1ddf2..b84256b5 100644 ---- a/doc/developers/release_checklist -+++ b/doc/developers/release_checklist -@@ -12,30 +12,16 @@ Release steps: - - Update doc/libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h - - Update version.h - - Commit --- Tag the release using SVN: -- svn copy http://lm-sensors.org/svn/lm-sensors/trunk http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x -m "3.x.x release" -- --- Move to a temporary directory and get a copy of the freshly tagged code: -- svn export http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x lm_sensors-3.x.x --- Tar it up: -- tar -jcf lm_sensors-3.x.x.tar.bz2 lm_sensors-3.x.x --- Sign it: -- gpg -b lm_sensors-3.x.x.tar.bz2 --- Post it: -- scp lm_sensors-3.x.x.tar.bz2{,.sig} devel.atrpms.net:/srv/lm-sensors.org/dl/lm-sensors/releases --- Set correct permissions: -- ssh devel.atrpms.net chmod 664 '/srv/lm-sensors.org/dl/lm-sensors/releases/lm_sensors-3.x.x.tar.bz2{,.sig}' -+- Tag the release using git: -+ git tag V3-x-x -+ git push origin V3-x-x - - After release, remember to: --- Update the Download page on lm-sensors.org, then add a news item -+- Update the Download page on https://hwmon.wiki.kernel.org/download - use -+ a URL in the following format: -+ https://github.com/lm-sensors/lm-sensors/archive/V3-x-x/lm-sensors-3-x-x.tar.gz -+- Add a news item to https://hwmon.wiki.kernel.org/lm_sensors - - Announce on the lm-sensors mailing list --- Add "+SVN" to version.h and commit --- Mark the corresponding release milestone as complete using trac-admin -- e.g. 'trac-admin /srv/lm-sensors.org/trac milestone completed 3.x.x now' --- Create a new version for the bug tracking system using trac-admin -- e.g. 'trac-admin /srv/lm-sensors.org/trac version add 3.x.x now' --- Create a new release milestone using trac-admin -- e.g. 'trac-admin /srv/lm-sensors.org/trac milestone add 3.x.x+1 2012-05-10' -+- Add "+git" to version.h and commit - - Send lm_sensors.lsm to the LSM by mailing it to lsm@qqx.org with the - subject `add' (no quotes) --- Copy to mirrors -diff --git a/doc/donations b/doc/donations -index 92eea578..4a30c2d0 100644 ---- a/doc/donations -+++ b/doc/donations -@@ -12,7 +12,7 @@ so hardware which isn't directly related to the development of a hardware - monitoring driver, but can be used to build test systems, is welcome too. - - If you would like to make a donation, please contact us. See --http://www.lm-sensors.org/wiki/AuthorsAndContributors. Thanks! -+https://hwmon.wiki.kernel.org/authorsandcontributors. Thanks! - - - Donations are listed in chronological order. Note that the person mentioned -diff --git a/doc/git b/doc/git -index 1c433d2f..beeaedd8 100644 ---- a/doc/git -+++ b/doc/git -@@ -9,7 +9,7 @@ using git. The git repository is only used for user-space tools. - We presume that you have git installed on your machine. To check out a - working copy of the code for this project use the following command: - --git clone https://github.com/groeck/lm-sensors.git -+git clone https://github.com/lm-sensors/lm-sensors.git - - To update the code, do a git pull from within the lm-sensors directory. - Please read the README and INSTALL files of your working copy for how -diff --git a/doc/progs b/doc/progs -index e9e997ac..0c5464df 100644 ---- a/doc/progs -+++ b/doc/progs -@@ -6,7 +6,7 @@ These programs are generally small utilities used for debugging, - and installation of the lm_sensors package, and for demonstrating - the use of the drivers and libraries in this package. - For more elaborate programs (for example, GUI sensor displays), --see https://github.com/groeck/lm-sensors/ -+see https://github.com/lm-sensors/lm-sensors/ - http://sensors-applet.sourceforge.net/ - https://01.org/powertop/ - https://wpitchoune.net/psensor/ -diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg -index 1bd39356..15bc26f0 100644 ---- a/etc/sensors.conf.eg -+++ b/etc/sensors.conf.eg -@@ -2003,7 +2003,7 @@ chip "f71805f-*" "f71872f-*" - # The configuration below is for the Kv8Pro and AV8 this is the default as this - # driver is developed and tested on a Kv8Pro. - # Configurations for many other Abit boards can be found at: --# http://www.lm-sensors.org/trac/wiki/Configurations/Abit -+# https://github.com/lm-sensors/lm-sensors/tree/master/configs/Abit - # If your motherboard isn't listed there and you create a configuration for it - # please add it there. - -@@ -2111,7 +2111,7 @@ chip "dme1737-*" - # driver is developed and tested on an Epox EP-9U1697 GLI board. - # - # Premade configurations for other boards can be found at: --# http://www.lm-sensors.org/trac/wiki/Configurations/ -+# https://github.com/lm-sensors/lm-sensors/tree/master/configs - # If your motherboard isn't listed there and you create a configuration for it - # please add it there. - # -diff --git a/lib/libsensors.3 b/lib/libsensors.3 -index bfb67c47..995c8305 100644 ---- a/lib/libsensors.3 -+++ b/lib/libsensors.3 -@@ -286,5 +286,4 @@ sensors.conf(5) - - .SH AUTHOR - Frodo Looijaard, Jean Delvare and others --http://www.lm-sensors.org/ -- -+https://hwmon.wiki.kernel.org/lm_sensors -diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5 -index d8695239..843a2113 100644 ---- a/lib/sensors.conf.5 -+++ b/lib/sensors.conf.5 -@@ -567,7 +567,4 @@ libsensors(3) - - .SH AUTHOR - Frodo Looijaard and the lm_sensors group --http://www.lm-sensors.org/ -- -- -- -+https://hwmon.wiki.kernel.org/lm_sensors -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index b1b4b20b..0b3b0ff2 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -7285,7 +7285,7 @@ sub generate_modprobes - next if not @{$chips_detected{$driver}}; - if ($driver eq "to-be-written") { - print "Note: there is no driver for ${$chips_detected{$driver}}[0]{chipname} yet.\n". -- "Check http://www.lm-sensors.org/wiki/Devices for updates.\n\n"; -+ "Check https://hwmon.wiki.kernel.org/device_support_status for updates.\n\n"; - } elsif (!is_module_builtin($driver)) { - open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |"); - local $_; -@@ -7301,7 +7301,7 @@ sub generate_modprobes - # isn't supported - if ((($? >> 8) == 0) && ! $modulefound) { - print "Warning: the required module $driver is not currently installed\n". -- "on your system. Check http://www.lm-sensors.org/wiki/Devices for\n". -+ "on your system. Check https://hwmon.wiki.kernel.org/device_support_status for\n". - "driver availability.\n\n"; - } else { - $hwmon_modules{$driver}++ -@@ -7591,7 +7591,7 @@ sub main - print "Either your system has no sensors, or they are not supported, or\n". - "they are connected to an I2C or SMBus adapter that is not\n". - "supported. If you find out what chips are on your board, check\n". -- "http://www.lm-sensors.org/wiki/Devices for driver status.\n"; -+ "https://hwmon.wiki.kernel.org/device_support_status for driver status.\n"; - } - exit; - } -diff --git a/prog/dump/isadump.8 b/prog/dump/isadump.8 -index 6bf5ea4a..1fa09fd0 100644 ---- a/prog/dump/isadump.8 -+++ b/prog/dump/isadump.8 -@@ -107,7 +107,7 @@ i2cdump(8), isaset(8) - - .SH AUTHOR - Frodo Looijaard, Mark D. Studebaker, and the lm_sensors group --(http://www.lm-sensors.org/) -+(https://hwmon.wiki.kernel.org/lm_sensors) - .PP - This manual page was originally written by David Z Maze for - the Debian GNU/Linux system. It was then reviewed and augmented by the lm_sensors -diff --git a/prog/dump/isaset.8 b/prog/dump/isaset.8 -index e7bcd5db..4051af9e 100644 ---- a/prog/dump/isaset.8 -+++ b/prog/dump/isaset.8 -@@ -77,7 +77,7 @@ i2cset(8), isadump(8) - - .SH AUTHOR - Mark D. Studebaker, and the lm_sensors group --(http://www.lm-sensors.org/) -+(https://hwmon.wiki.kernel.org/lm_sensors) - .PP - This manual page was shamelessly ripped from the i2cset and isadump manual - pages by Jean Delvare. -diff --git a/prog/init/lm_sensors.init b/prog/init/lm_sensors.init -index 77172d24..2ad58abc 100755 ---- a/prog/init/lm_sensors.init -+++ b/prog/init/lm_sensors.init -@@ -20,7 +20,7 @@ - # MA 02110-1301 USA. - - # See also the lm_sensors homepage at: --# http://www.lm-sensors.org -+# https://hwmon.wiki.kernel.org/lm_sensors - - # It uses a config file /etc/sysconfig/lm_sensors that contains the modules - # to be loaded/unloaded. That file is sourced into this one. -diff --git a/prog/rrd/sens_day.in b/prog/rrd/sens_day.in -index 75dc13bd..15412f2b 100644 ---- a/prog/rrd/sens_day.in -+++ b/prog/rrd/sens_day.in -@@ -217,7 +217,7 @@ See also:
-

- - This page generated with data and scripts from --the lm_sensors project; -+the lm_sensors project; - the data are stored in a Round Robin Database and - the graphs are generated by - -diff --git a/prog/rrd/sens_week.in b/prog/rrd/sens_week.in -index cce50555..2b92f655 100644 ---- a/prog/rrd/sens_week.in -+++ b/prog/rrd/sens_week.in -@@ -217,7 +217,7 @@ See also:
-

- - This page generated with data and scripts from --the lm_sensors project; -+the lm_sensors project; - the data are stored in a Round Robin Database and - the graphs are generated by - -diff --git a/prog/rrd/summ_week.in b/prog/rrd/summ_week.in -index 713197dc..7051d5f0 100644 ---- a/prog/rrd/summ_week.in -+++ b/prog/rrd/summ_week.in -@@ -89,7 +89,7 @@ See also:
-

- - This page generated with data and scripts from --the lm_sensors project; -+the lm_sensors project; - the data are stored in a Round Robin Database and - the graphs are generated by - -diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c -index 3cde7f18..a531362b 100644 ---- a/prog/sensord/rrd.c -+++ b/prog/sensord/rrd.c -@@ -498,7 +498,8 @@ int rrdCGI(void) - printf("

\nsensord by " - "Merlin Hughes" - ", all credit to the " -- "lm_sensors " -+ "" -+ "lm_sensors " - "crew.\n

\n"); - - printf("\n\n"); -diff --git a/prog/sensors/sensors.1 b/prog/sensors/sensors.1 -index ea0e238e..7d66e4b3 100644 ---- a/prog/sensors/sensors.1 -+++ b/prog/sensors/sensors.1 -@@ -93,6 +93,6 @@ sensors.conf(5), sensors-detect(8). - - .SH AUTHOR - Frodo Looijaard and the lm_sensors group --http://www.lm-sensors.org/ -+https://hwmon.wiki.kernel.org/lm_sensors - - -diff --git a/prog/tellerstats/index.shtml b/prog/tellerstats/index.shtml -index 60c8ca14..1b71376e 100644 ---- a/prog/tellerstats/index.shtml -+++ b/prog/tellerstats/index.shtml -@@ -40,7 +40,7 @@ These plots were generated -

- - This page generated with drivers and the tellerstats scripts from --The lm_sensors drivers. -+The lm_sensors drivers. - -

- -diff --git a/version.h b/version.h -index ad74e71b..bbdc04d9 100644 ---- a/version.h -+++ b/version.h -@@ -1 +1 @@ --#define LM_VERSION "3.4.0+SVN" -+#define LM_VERSION "3.4.0+git" --- -2.20.1 - diff --git a/SOURCES/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch b/SOURCES/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch deleted file mode 100644 index 8b1d318..0000000 --- a/SOURCES/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 782a2124b60837c981b61c2f6a5d4501d4e0f964 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Thu, 10 Jan 2019 15:09:24 +0100 -Subject: [PATCH] sensors-detect: Add detection of AMD Family 17h model 30h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Kernel support was added in mainline commit 210ba1201ff95. - -Signed-off-by: Ondřej Lysoněk ---- - prog/detect/sensors-detect | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 0b3b0ff2..4fa4c03e 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -2773,7 +2773,7 @@ use vars qw(@cpu_ids); - }, { - name => "AMD Family 17h thermal sensors", - driver => "k10temp", -- detect => sub { amd_pci_detect('1463', '15d0') }, -+ detect => sub { amd_pci_detect('1463', '15d0', '1493') }, - }, { - name => "AMD Family 15h power sensors", - driver => "fam15h_power", --- -2.20.1 - diff --git a/SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch b/SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch deleted file mode 100644 index dea46fa..0000000 --- a/SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0ed0dcd43556598c657dc527e3a8e5c04621e64b Mon Sep 17 00:00:00 2001 -From: a b -Date: Thu, 29 Oct 2020 17:25:38 +0100 -Subject: [PATCH] Add support for AMD CPU Family 19h - ---- - prog/detect/sensors-detect | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 8ee1c1b..3bcb547 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -2779,6 +2779,10 @@ use vars qw(@cpu_ids); - name => "AMD Family 16h power sensors", - driver => "fam15h_power", - detect => sub { amd_pci_detect('1534') }, -+ }, { -+ name => "AMD Family 19h thermal sensors", -+ driver => "k10temp", -+ detect => sub { amd_pci_detect('1653') }, - }, { - name => "Intel digital thermal sensor", - driver => "coretemp", --- -2.26.2 diff --git a/SOURCES/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch b/SOURCES/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch deleted file mode 100644 index f3a5850..0000000 --- a/SOURCES/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c28d20d19d620f42d239ed4b35139683035f11dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Thu, 17 Oct 2019 10:07:21 +0200 -Subject: [PATCH] sensors-detect: Fix printing CPU info on ppc and arm - -The format of /proc/cpuinfo on other arches is different from the -format on x86. Modify the print_cpu_info function to handle arm and -ppc. - -This change also eliminates Perl warnings caused by non-existent -elements in the %cpu hash: -Use of uninitialized value in concatenation (.) or string at -./prog/detect/sensors-detect line 3124. - -Based on a patch from Changqing Li , -GitHub PR: https://github.com/lm-sensors/lm-sensors/pull/168 ---- - prog/detect/sensors-detect | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index c2cbe9b9..78b0b5a1 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -3130,7 +3130,7 @@ sub initialize_cpu_list - }; - next; - } -- if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) { -+ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\s*:\s*(.+)$/) { - my $k = $1; - my $v = $2; - $v =~ s/\s+/ /g; # Merge multiple spaces -@@ -3146,7 +3146,16 @@ sub initialize_cpu_list - sub print_cpu_info - { - my $cpu = $cpu[0]; -- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ if ($kernel_arch =~ m/^ppc(64(le)?)?$/) { -+ print "# Processor: $cpu->{cpu} ($cpu->{revision})\n"; -+ } elsif ($kernel_arch =~ m/^arm/) { -+ print "# Processor: $cpu->{'model name'}\n"; -+ } elsif (exists $cpu->{'model name'} && exists $cpu->{'cpu family'} -+ && exists $cpu->{'model'} && exists $cpu->{'stepping'}) { -+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ } else { -+ print "# Cannot show processor info on $kernel_arch architecture.\n"; -+ } - } - - # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus --- -2.20.1 - diff --git a/SOURCES/fix-unexpanded-revision-strings.patch b/SOURCES/fix-unexpanded-revision-strings.patch deleted file mode 100644 index ec07c3e..0000000 --- a/SOURCES/fix-unexpanded-revision-strings.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/doc/developers/release_checklist b/doc/developers/release_checklist -index b84256b5..a97745e1 100644 ---- a/doc/developers/release_checklist -+++ b/doc/developers/release_checklist -@@ -10,7 +10,7 @@ Release steps: - - Update the CHANGES file (set version and release date) - - Update doc/developers/lm_sensors.lsm (Version, Entered-date and Primary-site) - - Update doc/libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h --- Update version.h -+- grep for LM_VERSION and update values of the constants - - Commit - - Tag the release using git: - git tag V3-x-x -@@ -22,6 +22,7 @@ After release, remember to: - https://github.com/lm-sensors/lm-sensors/archive/V3-x-x/lm-sensors-3-x-x.tar.gz - - Add a news item to https://hwmon.wiki.kernel.org/lm_sensors - - Announce on the lm-sensors mailing list --- Add "+git" to version.h and commit -+- grep for LM_VERSION and add "+git" to the values of the constants -+- Commit - - Send lm_sensors.lsm to the LSM by mailing it to lsm@qqx.org with the - subject `add' (no quotes) -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 78b0b5a1..07df0fbe 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -38,12 +38,9 @@ foreach ('/usr/sbin', '/usr/local/sbin', '/sbin') { - ######################### - - use constant NO_CACHE => 1; -+use constant LM_VERSION => '3.4.0+git'; - use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids -- $i2c_addresses_to_scan $revision @i2c_byte_cache %opt); -- --$revision = '$Revision$ ($Date$)'; --$revision =~ s/\$\w+: (.*?) \$/$1/g; --$revision =~ s/ \([^()]*\)//; -+ $i2c_addresses_to_scan @i2c_byte_cache %opt); - - # This is the list of SMBus or I2C adapters we recognize by their PCI - # signature. This is an easy and fast way to determine which SMBus or I2C -@@ -7511,7 +7508,7 @@ sub main - system("/sbin/service", "lm_sensors", "stop"); - } - -- print "# sensors-detect revision $revision\n"; -+ print "# sensors-detect version ".LM_VERSION."\n"; - initialize_dmi_data(); - print_dmi_summary(); - print_kernel_version(); -diff --git a/prog/init/fancontrol.init b/prog/init/fancontrol.init -index eabe734c..8ab2c929 100755 ---- a/prog/init/fancontrol.init -+++ b/prog/init/fancontrol.init -@@ -1,7 +1,5 @@ - #!/bin/sh - # --# $Id$ --# - # fancontrol - # - # chkconfig: 2345 90 01 -diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig -index a40acd5c..3ecdca5b 100755 ---- a/prog/pwm/pwmconfig -+++ b/prog/pwm/pwmconfig -@@ -29,8 +29,7 @@ - # - # - --REVISION=$(echo '$Revision$' | cut -d' ' -f2) --REVDATE=$(echo '$Date$' | cut -d' ' -f2) -+LM_VERSION='3.4.0+git' - PIDFILE="/var/run/fancontrol.pid" - - if [ -f "$PIDFILE" ] -@@ -48,7 +47,7 @@ then - exit 1 - fi - --echo "# pwmconfig revision $REVISION ($REVDATE)" -+echo "# pwmconfig version $LM_VERSION" - echo 'This program will search your sensors for pulse width modulation (pwm)' - echo 'controls, and test each one to see if it controls a fan on' - echo 'your motherboard. Note that many motherboards do not have pwm' diff --git a/SOURCES/lm_sensors-wrapper b/SOURCES/lm_sensors-wrapper deleted file mode 100644 index 8eb32a4..0000000 --- a/SOURCES/lm_sensors-wrapper +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -if /usr/bin/systemd-detect-virt 2>/dev/null 1>&2; then - SENSORS_FLAGS_VM='-n'; -else - SENSORS_FLAGS_VM=''; -fi; - -/usr/bin/sensors -s $SENSORS_FLAGS_VM diff --git a/SOURCES/lm_sensors-3.4.0-allow_no_sensors.patch b/lm_sensors-3.6.0-allow_no_sensors.patch similarity index 100% rename from SOURCES/lm_sensors-3.4.0-allow_no_sensors.patch rename to lm_sensors-3.6.0-allow_no_sensors.patch diff --git a/lm_sensors-3.6.0-rrd-const-argv.patch b/lm_sensors-3.6.0-rrd-const-argv.patch new file mode 100644 index 0000000..730c499 --- /dev/null +++ b/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()); + } diff --git a/lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch b/lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch new file mode 100644 index 0000000..b3c251a --- /dev/null +++ b/lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch @@ -0,0 +1,15 @@ +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index 32fd29f..49feecb 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -2792,6 +2792,10 @@ use vars qw(@cpu_ids); + name => "AMD Family 17h thermal sensors", + driver => "k10temp", + detect => sub { amd_pci_detect('1463', '15d0', '1493', '1443') }, ++ }, { ++ name => "AMD Family 19h thermal sensors", ++ driver => "k10temp", ++ detect => sub { amd_pci_detect('1653') }, + }, { + name => "AMD Family 15h power sensors", + driver => "fam15h_power", diff --git a/SOURCES/lm_sensors-modprobe-r-wrapper b/lm_sensors-modprobe-r-wrapper similarity index 100% rename from SOURCES/lm_sensors-modprobe-r-wrapper rename to lm_sensors-modprobe-r-wrapper diff --git a/SOURCES/lm_sensors-modprobe-wrapper b/lm_sensors-modprobe-wrapper similarity index 100% rename from SOURCES/lm_sensors-modprobe-wrapper rename to lm_sensors-modprobe-wrapper diff --git a/lm_sensors-wrapper b/lm_sensors-wrapper new file mode 100755 index 0000000..7c5b3d2 --- /dev/null +++ b/lm_sensors-wrapper @@ -0,0 +1,8 @@ +#!/bin/sh +if /usr/bin/systemd-detect-virt 2>/dev/null 1>&2; then + SENSORS_FLAGS_VM='-n'; +else + SENSORS_FLAGS_VM=''; +fi; + +/usr/bin/sensors -s $SENSORS_FLAGS_VM diff --git a/SOURCES/lm_sensors.service b/lm_sensors.service similarity index 100% rename from SOURCES/lm_sensors.service rename to lm_sensors.service diff --git a/SPECS/lm_sensors.spec b/lm_sensors.spec similarity index 82% rename from SPECS/lm_sensors.spec rename to lm_sensors.spec index b4523c3..8d582f1 100644 --- a/SPECS/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,26 +1,21 @@ -%global commit 70f7e0848410b9ca4dde7abff669bbbecbf137e0 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global year 2018 -%global month 05 -%global day 22 -%global date %{year}%{month}%{day} - Name: lm_sensors -Version: 3.4.0 -Release: 23.%{date}git%{shortcommit}%{?dist} +Version: 3.6.0 +Release: 20%{?dist} Summary: Hardware monitoring tools -Group: Applications/System -# Some man pages are licensed Verbatim (lib/sensors.conf.5, +%define upstream_version %(echo %{version} | sed -e 's/\\./-/g') + +# 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). -# The rest is GPLv2+. -License: GPLv2+ and Verbatim and MIT +# https://docs.fedoraproject.org/en-US/legal/fedora-linux-license/). +# lib/* are LGPL-2.1-or-later (in subpackage) +# 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/ -Source0: http://github.com/lm-sensors/lm-sensors/archive/%{commit}/lm-sensors-%{commit}.tar.gz +Source0: https://github.com/lm-sensors/lm-sensors/archive/V%{upstream_version}/lm-sensors-%{upstream_version}.tar.gz Source1: lm_sensors.sysconfig # This one was taken from PLD-linux, Thanks! Source2: sensord.sysconfig @@ -31,20 +26,16 @@ Source6: sensord-service-wrapper Source7: lm_sensors.service Source8: lm_sensors-wrapper +# Downstream-only: +Patch0: 0001-Revert-unnecessary-soname-bump.patch + # Upstream patch: -Patch1: 0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch -# Patch that combines several upstream patches: -Patch2: 0001-Fix-stale-links-and-outdated-info.patch -# Upstream commit c28d20d19d620f42d: -Patch3: 0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch -# Patch that combines upstream commits 5c900c7e851cc and f1e1a7607caa96b, -# with the version string modified from 3.5.0+git to 3.4.0+git. Drop/modify -# this patch on rebase. -Patch4: fix-unexpanded-revision-strings.patch +Patch1: 0001-Change-PIDFile-path-from-var-run-to-run.patch +Patch2: lm_sensors-3.6.0-allow_no_sensors.patch # Upstream commit 5deee7d0c301df779: -Patch5: 0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch -# Upstream commit a0ef84f6583dbf427ff5a3534528e1e72bd00137: -Patch6: lm_sensors-3.4.0-allow_no_sensors.patch +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 @@ -52,10 +43,11 @@ Requires: /usr/sbin/dmidecode %endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires(post): systemd-units -BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk +BuildRequires: kernel-headers >= 2.2.16, bison, flex, gawk BuildRequires: perl-generators BuildRequires: rrdtool-devel BuildRequires: gcc +BuildRequires: make %description @@ -65,8 +57,7 @@ access and hardware monitoring. %package libs Summary: Lm_sensors core libraries -Group: System Environment/Libraries -License: LGPLv2+ +License: LGPL-2.1-or-later %description libs Core libraries for lm_sensors applications @@ -74,10 +65,9 @@ Core libraries for lm_sensors applications %package devel Summary: Development files for programs which will use lm_sensors -Group: Development/System Requires: %{name}-libs = %{version}-%{release} -# One manual page is licensed Verbatim (lib/libsensors.3). The rest is LGPLv2+. -License: LGPLv2+ and Verbatim +# One manual page is licensed Linux-man-pages-copyleft (lib/libsensors.3). The rest is LGPLv2+. +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 @@ -86,12 +76,11 @@ when building applications that make use of sensor data. %package sensord Summary: Daemon that periodically logs sensor readings -Group: System Environment/Daemons 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 @@ -99,13 +88,14 @@ database, and warns of sensor alarms. %prep -%setup -q -n lm-sensors-%{commit} +%setup -q -n lm-sensors-%{upstream_version} +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -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 @@ -122,7 +112,7 @@ sed -i "s|\@WRAPPER_DIR\@|%{_libexecdir}/%{name}|" lm_sensors.service %build %set_build_flags -make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} \ +%{make_build} PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} \ EXLDFLAGS="$LDFLAGS" PROG_EXTRA=sensord BUILD_STATIC_LIB=0 user @@ -186,8 +176,7 @@ fi # ===== libs ===== -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files @@ -229,31 +218,94 @@ fi %changelog -* Thu Feb 25 2021 Artem Egorenkov - 3.4.0-23 +* Tue Oct 29 2024 Troy Dawson - 3.6.0-20 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 3.6.0-19 +- Bump release for June 2024 mass rebuild + +* Thu Mar 21 2024 Pavol Žáčik - 3.6.0-18 +- SPDX migration (Miroslav Suchý) + Resolves: RHEL-29907 + +* Sun Feb 11 2024 Yaakov Selkowitz - 3.6.0-17 +- Adapt to constification of argv parameters in rrdtool + +* Thu Jan 25 2024 Fedora Release Engineering - 3.6.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.6.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 3.6.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.6.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 3.6.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.6.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 9 2021 Artem Egorenkov - 3.6.0-9 +- Add support for AMD CPU Family 19h + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.6.0-8 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Sun Feb 14 2021 Artem Egorenkov - 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. -* Fri Oct 30 2020 Artem Egorenkov - 3.4.0-22.20180522git70f7e08 -- Add support for AMD CPU Family 19h -- Resolves: rhbz#1846847 +* Tue Jan 26 2021 Fedora Release Engineering - 3.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Fri Oct 18 2019 Ondřej Lysoněk - 3.4.0-21.20180522git70f7e08 -- Fix printing CPU info on non-x86 architectures in sensors-detect -- Resolves: rhbz#1752854 -- Fix printing lm_sensors version in sensors-detect and pwmconfig -- Resolves: rhbz#1677414 +* Tue Aug 18 2020 Ondřej Lysoněk - 3.6.0-5 +- Fix systemd warning about use of /var/run +- Resolves: rhbz#1869421 -* Mon May 06 2019 Ondřej Lysoněk - 3.4.0-20.20180522git70f7e08 +* Tue Jul 28 2020 Fedora Release Engineering - 3.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 3.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Tom Stellard - 3.6.0-2 +- Use make_build macro + +* Fri Oct 18 2019 Ondřej Lysoněk - 3.6.0-1 +- New version + +* Thu Aug 15 2019 Ondřej Lysoněk - 3.5.0-6 +- Add detection support for AMD family 17h model 70h +- Add detection support for Nuvoton NCT6797D +- Resolves: rhbz#1740735 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon May 06 2019 Ondřej Lysoněk - 3.5.0-4 - Added explicit Requires on lm_sensors-libs -- Resolves: rhbz#1706145 -* Fri May 03 2019 Ondřej Lysoněk - 3.4.0-19.20180522git70f7e08 -- Fixed stale links and outdated info -- Resolves: rhbz#1693347 +* Fri Feb 01 2019 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Wed Apr 24 2019 Ondřej Lysoněk - 3.4.0-18.20180522git70f7e08 +* Tue Jan 15 2019 Ondřej Lysoněk - 3.5.0-2 - Detect AMD Rome - Family 17h model 30h -- Resolves: rhbz#1650191 + +* Wed Jan 02 2019 Ondřej Lysoněk - 3.5.0-1 +- New version +- Resolves: rhbz#1653259 + +* Fri Sep 28 2018 Ondřej Lysoněk - 3.4.0-18.20180522git70f7e08 +- Drop unneeded build dependency on libsysfs-devel * Tue Jul 17 2018 Ondřej Lysoněk - 3.4.0-17.20180522git70f7e08 - Corrected the License tag diff --git a/SOURCES/lm_sensors.sysconfig b/lm_sensors.sysconfig similarity index 100% rename from SOURCES/lm_sensors.sysconfig rename to lm_sensors.sysconfig diff --git a/SOURCES/sensord-service-wrapper b/sensord-service-wrapper similarity index 100% rename from SOURCES/sensord-service-wrapper rename to sensord-service-wrapper diff --git a/SOURCES/sensord.service b/sensord.service similarity index 100% rename from SOURCES/sensord.service rename to sensord.service diff --git a/SOURCES/sensord.sysconfig b/sensord.sysconfig similarity index 100% rename from SOURCES/sensord.sysconfig rename to sensord.sysconfig diff --git a/sources b/sources new file mode 100644 index 0000000..1c0f437 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lm-sensors-3-6-0.tar.gz) = 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf