diff --git a/lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch b/lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch new file mode 100644 index 0000000..96202c7 --- /dev/null +++ b/lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch @@ -0,0 +1,9 @@ +--- lm-sensors-3.0.0/prog/sensord/rrd.c (revision 5252) ++++ lm-sensors-3.0.0/prog/sensord/rrd.c (revision 5473) +@@ -202,5 +202,5 @@ + break; + case DataType_temperature: +- min = "0"; ++ min = "-100"; + max = "250"; + break; diff --git a/lm_sensors-r5580-sensord-survive-transient-errors.patch b/lm_sensors-r5580-sensord-survive-transient-errors.patch new file mode 100644 index 0000000..7fd540d --- /dev/null +++ b/lm_sensors-r5580-sensord-survive-transient-errors.patch @@ -0,0 +1,54 @@ +--- lm-sensors-3.0.0/prog/sensord/sensord.c (revision 5163) ++++ lm-sensors-3.0.0/prog/sensord/sensord.c (revision 5580) +@@ -91,20 +91,24 @@ + sensorLog (LOG_INFO, "sensord started"); + +- while (!done && (ret == 0)) { ++ while (!done) { + if (reload) { + ret = reloadLib (sensorsCfgFile); ++ if (ret) ++ sensorLog (LOG_NOTICE, "config reload error (%d)", ret); + reload = 0; + } +- if ((ret == 0) && scanTime) { /* should I scan on the read cycle? */ +- ret = scanChips (); +- if (scanValue <= 0) +- scanValue += scanTime; +- } +- if ((ret == 0) && logTime && (logValue <= 0)) { +- ret = readChips (); ++ if (scanTime && (scanValue <= 0)) { ++ if ((ret = scanChips ())) ++ sensorLog (LOG_NOTICE, "sensor scan error (%d)", ret); ++ scanValue += scanTime; ++ } ++ if (logTime && (logValue <= 0)) { ++ if ((ret = readChips ())) ++ sensorLog (LOG_NOTICE, "sensor read error (%d)", ret); + logValue += logTime; + } +- if ((ret == 0) && rrdTime && rrdFile && (rrdValue <= 0)) { +- ret = rrdUpdate (); ++ if (rrdTime && rrdFile && (rrdValue <= 0)) { ++ if ((ret = rrdUpdate ())) ++ sensorLog (LOG_NOTICE, "rrd update error (%d)", ret); + /* + * The amount of time to wait is computed using the same method as +@@ -113,5 +117,5 @@ + rrdValue = rrdTime - time(NULL) % rrdTime; + } +- if (!done && (ret == 0)) { ++ if (!done) { + int a = logTime ? logValue : INT_MAX; + int b = scanTime ? scanValue : INT_MAX; +@@ -125,8 +129,5 @@ + } + +- if (ret) +- sensorLog (LOG_INFO, "sensord failed (%d)", ret); +- else +- sensorLog (LOG_INFO, "sensord stopped"); ++ sensorLog (LOG_INFO, "sensord stopped"); + + return ret; diff --git a/lm_sensors-r5581-fix-libsensors-error-propagation.patch b/lm_sensors-r5581-fix-libsensors-error-propagation.patch new file mode 100644 index 0000000..885ea9e --- /dev/null +++ b/lm_sensors-r5581-fix-libsensors-error-propagation.patch @@ -0,0 +1,13 @@ +--- lm-sensors-3.0.0/lib/access.c (revision 5176) ++++ lm-sensors-3.0.0/lib/access.c (revision 5581) +@@ -438,8 +438,6 @@ + expr->data.var))) + return -SENSORS_ERR_NO_ENTRY; +- if (!(res = sensors_get_value(&chip_features->chip, +- subfeature->number, result))) +- return res; +- return 0; ++ return sensors_get_value(&chip_features->chip, ++ subfeature->number, result); + } + if ((res = sensors_eval_expr(chip_features, expr->data.subexpr.sub1, diff --git a/sensors.changes b/sensors.changes index 23d6b4d..7d59ca3 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jan 11 13:46:09 CET 2009 - jdelvare@suse.de + +- lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch: + Accept negative temperatures in RRD database. +- lm_sensors-r5580-sensord-survive-transient-errors.patch: Don't + bail out on transient errors. +- lm_sensors-r5581-fix-libsensors-error-propagation.patch: Fix + error propagation during expression evaluation. +- Add %stop_on_removal to the %preun script (fixes an RPMlint + warning.) + ------------------------------------------------------------------- Wed Oct 22 15:54:17 CEST 2008 - jdelvare@suse.de diff --git a/sensors.spec b/sensors.spec index 431d741..9b1bc6c 100644 --- a/sensors.spec +++ b/sensors.spec @@ -1,7 +1,7 @@ # # spec file for package sensors (Version 3.0.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: sensors BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ Version: 3.0.3 -Release: 3 +Release: 4 Summary: Hardware health monitoring for Linux License: GPL v2 or later Group: System/Monitoring @@ -35,6 +35,9 @@ Patch2: lm_sensors-3.0.0-sysconfig_metadata.patch Patch3: lm_sensors-r5352-fix-detection-of-ADT7463-and-LM96000.patch Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch Patch5: lm_sensors-r5366-fix-detection-of-Intel-AMB.patch +Patch6: lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch +Patch7: lm_sensors-r5580-sensord-survive-transient-errors.patch +Patch8: lm_sensors-r5581-fix-libsensors-error-propagation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -137,7 +140,10 @@ Authors: %patch2 %patch3 -p1 %patch4 -p1 -%patch5 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" @@ -165,6 +171,9 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h %clean rm -rf $RPM_BUILD_ROOT +%preun +%{stop_on_removal lm_sensors} + %postun %{insserv_cleanup} @@ -213,6 +222,15 @@ rm -rf $RPM_BUILD_ROOT %doc /usr/share/man/man3/*.3.gz %changelog +* Sun Jan 11 2009 jdelvare@suse.de +- lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch: + Accept negative temperatures in RRD database. +- lm_sensors-r5580-sensord-survive-transient-errors.patch: Don't + bail out on transient errors. +- lm_sensors-r5581-fix-libsensors-error-propagation.patch: Fix + error propagation during expression evaluation. +- Add %%stop_on_removal to the %%preun script (fixes an RPMlint + warning.) * Wed Oct 22 2008 jdelvare@suse.de - lm_sensors-r5366-fix-detection-of-Intel-AMB.patch: Fix detection of Intel 5000 series FB-DIMM AMB. @@ -330,7 +348,7 @@ rm -rf $RPM_BUILD_ROOT that this was missing. * Tue Aug 28 2007 werner@suse.de - Remove hard coded modules introduced by last change -* Wed Aug 15 2007 hvogel@suse.de +* Tue Aug 14 2007 hvogel@suse.de - Add sysconfig metadata [#300069] * Mon Aug 13 2007 jdelvare@suse.de - Don't probe i2c-isa as a regular i2c bus. This regression was @@ -349,7 +367,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Jun 27 2007 jdelvare@suse.de - Don't package the decode-edid.pl script. It requires parse-edid from the read-edid package, which isn't included in Suse. -* Fri Jun 22 2007 dmueller@suse.de +* Thu Jun 21 2007 dmueller@suse.de - adjust buildrequires * Mon Jun 04 2007 jdelvare@suse.de - Don't build on s390 nor s390x. @@ -377,7 +395,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 05 2007 werner@suse.de - Update to lm_sensors version 2.10.3 which added support for recent devices and support for kernel 2.6.22. -* Fri Mar 30 2007 ro@suse.de +* Thu Mar 29 2007 ro@suse.de - added bison,flex to buildreq * Mon Feb 19 2007 werner@suse.de - Make README.SuSE encoding independend (bug #246130) @@ -471,7 +489,7 @@ rm -rf $RPM_BUILD_ROOT - removed lx_suse from neededforbuild * Thu Dec 14 2000 werner@suse.de - Group tag -* Mon Jun 19 2000 ro@suse.de +* Sun Jun 18 2000 ro@suse.de - update to 2.5.0 * Wed Jun 07 2000 uli@suse.de - moved docs to %%{_docdir}