Accepting request 678308 from Base:System

- lm_sensors-3.5.0-libsensors-fix-soname.patch: Undo the
  SENSORS_API_VERSION change, to stay source-compatible with
  upstream.
- lm_sensors-3.5.0-libsensors-fix-soname.patch: Undo excessive
  libsensors version bump.
- Update to version 3.5.0:
  + soname was bumped due to commit dcf2367 which introduced an
    ABI change.
  + Fixed disappearance of certain hwmon chips with 4.19+ kernels,
    (gh#lm-sensors/lm-sensors#139, boo#1116021).
  + Add the find-driver script for debugging.
  + Various documentation and man page improvements.
  + Fix various issues found by Coverity Scan.
  + Fix compilation with the musl C library.
  + Updated links in documentation to reflect the new home of
    lm_sensors.
  + sensors.1: Add reference to sensors-detect and document -j
    option (json output).
  + sensors: Add support for json output, add support for power
    min, lcrit, min_alarm, lcrit_alarm.
  + sensors-detect:
    * Fix systemd paths.
    * Add detection of Fintek F81768.
    * Only probe I/O ports on x86.
    * Add detection of Nuvoton NCT6793D.
    * Add detection of Microchip MCP9808.
    * Mark F71868A as supported by the f71882fg driver.
    * Mark F81768D as supported by the f71882fg driver.
    * Mark F81866D as supported by the f71882fg driver.
    * Add detection of various ITE chips.
    * Add detection of Nuvoton NCT6795D.
    * Add detection of DDR4 SPD.
    * Add detection of ITE IT8987D.
    * Add detection of AMD Family 17h temperature sensors.
    * Add detection of AMD KERNCZ SMBus controller.
    * Add detection of various Intel SMBus controllers.
    * Add detection of Giantec GT30TS00.
    * Add detection of ONS CAT34TS02C and CAT34TS04.
    * Add detection of AMD Family 15h Model 60+ temperature
      sensors.
    * Add detection of Nuvoton NCT6796D.
    * Add detection of AMD Family 15h Model 70+ temperature
      sensors.
  + configs: Add sample configuration files.
  + sensors.conf.default:
    * Add hardwired inputs of NCT6795D
    * Add hardwired inputs of F71868A
    * Add hardwired NCT6796D inputs
  + vt1211_pwm: replaced deprecated sub shell syntax, run with
    bash instead of sh.
  + pwmconfig: replaced deprecated sub shell syntax.
  + fancontrol: replaced deprecated sub shell syntax, save
    original pwm values.
  + fancontrol.8: replaced deprecated sub shell syntax.
  + libsensors:
    * Add support for SENSORS_BUS_TYPE_SCSI, add support
      for power min, lcrit, min_alarm, lcrit_alarm.
    * Handle hwmon device with thermal device parent (bsc#1108468).
- Rebase lm_sensors-3.0.3-hint-at-kernel-extra-package.patch for
  new release.
- Spec file tidy up for man page extension.

OBS-URL: https://build.opensuse.org/request/show/678308
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger 2019-02-26 21:14:08 +00:00 committed by Git OBS Bridge
commit 879ff59d7d
6 changed files with 140 additions and 37 deletions

3
lm-sensors-3-5-0.tar.gz Normal file
View File

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

View File

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

View File

@ -1,14 +1,7 @@
Now that the kernel package is split into 3 parts, it is possible
that not all required hwmon drivers are installed on the system when
sensors-detect is being run. Point the user to the kernel-*-extra
package if drivers are found to be missing.
---
prog/detect/sensors-detect | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2796,13 +2796,16 @@ sub initialize_conf
diff -Naur a/prog/detect/sensors-detect b/prog/detect/sensors-detect
--- a/prog/detect/sensors-detect 2018-11-23 19:04:09.562152712 -0600
+++ b/prog/detect/sensors-detect 2018-11-23 19:08:21.037599155 -0600
@@ -3051,13 +3051,16 @@
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
@ -26,12 +19,13 @@ package if drivers are found to be missing.
chomp($kernel_arch = `uname -m`);
# We only support kernels >= 2.6.5
@@ -7022,6 +7025,8 @@ sub generate_modprobes
@@ -7303,6 +7306,9 @@
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";
+ print "You may need to install package kernel-$kernel_flavor-extra for\n".
+ "lm-sensors to work properly.\n\n" if $kernel_flavor;
+
} else {
$hwmon_modules{$driver}++
unless hwmon_is_autoloaded($driver);

View File

@ -0,0 +1,25 @@
From: Jean Delvare <jdelvare@suse.de>
Subject: libsensors: Undo gratuitous library version bump
The new library is compatible with previous versions, it only has
added symbols, no changes nor removals. So the major version number
shall stay the same.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
lib/Module.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/lib/Module.mk
+++ b/lib/Module.mk
@@ -32,8 +32,8 @@ LIBMAN5FILES := $(MODULE_DIR)/sensors.co
# 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

View File

@ -1,3 +1,76 @@
-------------------------------------------------------------------
Wed Dec 19 14:47:35 UTC 2018 - jdelvare@suse.com
- lm_sensors-3.5.0-libsensors-fix-soname.patch: Undo the
SENSORS_API_VERSION change, to stay source-compatible with
upstream.
-------------------------------------------------------------------
Sun Dec 16 12:19:48 UTC 2018 - jdelvare@suse.com
- lm_sensors-3.5.0-libsensors-fix-soname.patch: Undo excessive
libsensors version bump.
-------------------------------------------------------------------
Sat Nov 24 01:08:57 UTC 2018 - malcolmlewis@opensuse.org
- Update to version 3.5.0:
+ soname was bumped due to commit dcf2367 which introduced an
ABI change.
+ Fixed disappearance of certain hwmon chips with 4.19+ kernels,
(gh#lm-sensors/lm-sensors#139, boo#1116021).
+ Add the find-driver script for debugging.
+ Various documentation and man page improvements.
+ Fix various issues found by Coverity Scan.
+ Fix compilation with the musl C library.
+ Updated links in documentation to reflect the new home of
lm_sensors.
+ sensors.1: Add reference to sensors-detect and document -j
option (json output).
+ sensors: Add support for json output, add support for power
min, lcrit, min_alarm, lcrit_alarm.
+ sensors-detect:
* Fix systemd paths.
* Add detection of Fintek F81768.
* Only probe I/O ports on x86.
* Add detection of Nuvoton NCT6793D.
* Add detection of Microchip MCP9808.
* Mark F71868A as supported by the f71882fg driver.
* Mark F81768D as supported by the f71882fg driver.
* Mark F81866D as supported by the f71882fg driver.
* Add detection of various ITE chips.
* Add detection of Nuvoton NCT6795D.
* Add detection of DDR4 SPD.
* Add detection of ITE IT8987D.
* Add detection of AMD Family 17h temperature sensors.
* Add detection of AMD KERNCZ SMBus controller.
* Add detection of various Intel SMBus controllers.
* Add detection of Giantec GT30TS00.
* Add detection of ONS CAT34TS02C and CAT34TS04.
* Add detection of AMD Family 15h Model 60+ temperature
sensors.
* Add detection of Nuvoton NCT6796D.
* Add detection of AMD Family 15h Model 70+ temperature
sensors.
+ configs: Add sample configuration files.
+ sensors.conf.default:
* Add hardwired inputs of NCT6795D
* Add hardwired inputs of F71868A
* Add hardwired NCT6796D inputs
+ vt1211_pwm: replaced deprecated sub shell syntax, run with
bash instead of sh.
+ pwmconfig: replaced deprecated sub shell syntax.
+ fancontrol: replaced deprecated sub shell syntax, save
original pwm values.
+ fancontrol.8: replaced deprecated sub shell syntax.
+ libsensors:
* Add support for SENSORS_BUS_TYPE_SCSI, add support
for power min, lcrit, min_alarm, lcrit_alarm.
* Handle hwmon device with thermal device parent (bsc#1108468).
- Rebase lm_sensors-3.0.3-hint-at-kernel-extra-package.patch for
new release.
- Spec file tidy up for man page extension.
-------------------------------------------------------------------
Mon May 14 15:39:15 UTC 2018 - hillwood@opensuse.org

View File

@ -12,25 +12,27 @@
# 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/
#
%define commit 1c48b191c8a2b9fc747e3db3816247c666c5c3f1
%define shortcommit 1c48b19
%define _name lm_sensors
#%%define commit 1c48b191c8a2b9fc747e3db3816247c666c5c3f1
#%%define shortcommit 1c48b19
%define _name lm-sensors
%define _version 3-5-0
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: sensors
Version: 3.4.0git20180510.1c48b19
Version: 3.5.0
Release: 0
Summary: Hardware health monitoring for Linux
License: GPL-2.0-or-later
Group: System/Monitoring
URL: https://github.com/groeck/lm-sensors
Source0: https://github.com/groeck/lm-sensors/archive/%{commit}/%{_name}-%{shortcommit}.tar.gz
Url: https://github.com/lm-sensors/%{_name}
Source0: https://github.com/lm-sensors/%{_name}/archive/V%{_version}.tar.gz#/%{_name}-%{_version}.tar.gz
#Source0: https://github.com/groeck/lm-sensors/archive/%%{commit}/%%{_name}-%%{shortcommit}.tar.gz
Source1: sysconfig.sensord
Source2: baselibs.conf
Patch1: lm_sensors-3.1.1-build.patch
@ -42,6 +44,7 @@ Patch6: lm_sensors-3.4.0-sensord-service-extra-args.patch
Patch7: lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch
#PATCH-BUGFIX-UPSTREAM sensors-detect on ppc
Patch8: lm_sensors-3.4.0-sensors-detect-ppc64le.patch
Patch9: lm_sensors-3.5.0-libsensors-fix-soname.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: rrdtool-devel
@ -91,7 +94,6 @@ License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libsensors4 = %{version}
Conflicts: libsensors3-devel
Provides: sensors:%{_includedir}/sensors/sensors.h
%description -n libsensors4-devel
@ -102,8 +104,8 @@ have to be applied for the specific hardware, so that the output makes
sense to the user.
%prep
# %setup -q -n lm_sensors-%{version}
%setup -q -n lm-%{name}-%{commit}
%setup -q -n %{_name}-%{_version}
#%%setup -q -n lm-%%{name}-%%{commit}
%patch1 -p1
%patch2 -p1
%patch3 -p1
@ -111,6 +113,7 @@ sense to the user.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
RPM_OPT_FLAGS="%{optflags}"
@ -128,11 +131,14 @@ make %{?_smp_mflags} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} M
chmod 0755 %{buildroot}/%{_libdir}/libsensors.so.*
mkdir -p %{buildroot}/%{_unitdir} %{buildroot}/%{_fillupdir}
cp -a prog/init/*.service %{buildroot}/%{_unitdir}/
ln -sf /sbin/service %{buildroot}%{_sbindir}/rclm_sensors
ln -sf service %{buildroot}%{_sbindir}/rclm_sensors
ln -sf service %{buildroot}%{_sbindir}/rcfancontrol
ln -sf service %{buildroot}%{_sbindir}/rcsensord
cp -a %{SOURCE1} %{buildroot}/%{_fillupdir}
%pre
%service_add_pre lm_sensors.service
%service_add_pre fancontrol.service
%post
%service_add_post lm_sensors.service
@ -158,11 +164,14 @@ echo "HWMON_MODULES=\"$HWMON_MODULES\"" >> "$CONFIG"
if test -e %{_sysconfdir}/modprobe.d/lm_sensors -a ! -e %{_sysconfdir}/modprobe.d/lm_sensors.conf ; then
mv -f %{_sysconfdir}/modprobe.d/lm_sensors %{_sysconfdir}/modprobe.d/lm_sensors.conf
fi
%service_add_post fancontrol.service
%preun
%service_del_preun fancontrol.service
%service_del_preun lm_sensors.service
%postun
%service_del_postun fancontrol.service
%service_del_postun lm_sensors.service
%pre -n sensord
@ -187,6 +196,7 @@ fi
%{_unitdir}/lm_sensors.service
%{_sbindir}/rclm_sensors
%{_unitdir}/fancontrol.service
%{_sbindir}/rcfancontrol
%{_bindir}/*
%{_sbindir}/fancontrol
%ifarch i386 i486 i586 i686 x86_64
@ -203,24 +213,25 @@ fi
%doc %{_docdir}/sensors/temperature-sensors
%doc %{_docdir}/sensors/vid
%license %{_docdir}/sensors/COPYING
%{_mandir}/man1/*.1.gz
%{_mandir}/man8/fancontrol.8.gz
%{_mandir}/man1/*.1%{?ext_man}
%{_mandir}/man8/fancontrol.8%{?ext_man}
%ifarch i386 i486 i586 i686 x86_64
%{_mandir}/man8/isadump.8.gz
%{_mandir}/man8/isaset.8.gz
%{_mandir}/man8/isadump.8%{?ext_man}
%{_mandir}/man8/isaset.8%{?ext_man}
%endif
%{_mandir}/man8/pwmconfig.8.gz
%{_mandir}/man8/sensors-conf-convert.8.gz
%{_mandir}/man8/sensors-detect.8.gz
%{_mandir}/man8/pwmconfig.8%{?ext_man}
%{_mandir}/man8/sensors-conf-convert.8%{?ext_man}
%{_mandir}/man8/sensors-detect.8%{?ext_man}
%files -n sensord
%defattr(-,root,root)
%{_unitdir}/sensord.service
%{_sbindir}/rcsensord
%{_fillupdir}/sysconfig.sensord
%{_sbindir}/sensord
%dir %{_docdir}/sensord
%license %{_docdir}/sensord/COPYING
%{_mandir}/man8/sensord.8.gz
%{_mandir}/man8/sensord.8%{?ext_man}
%files -n libsensors4
%defattr(-,root,root)
@ -229,7 +240,7 @@ fi
%{_libdir}/libsensors.so.4*
%dir %{_docdir}/sensors
%license %{_docdir}/sensors/COPYING.LGPL
%{_mandir}/man5/*.5.gz
%{_mandir}/man5/*.5%{?ext_man}
%files -n libsensors4-devel
%defattr(-,root,root)
@ -237,6 +248,6 @@ fi
%{_libdir}/libsensors.so
%dir %{_docdir}/sensors
%doc %{_docdir}/sensors/libsensors-API.txt
%{_mandir}/man3/*.3.gz
%{_mandir}/man3/*.3%{?ext_man}
%changelog