Hello community, here is the log from the commit of package sensors for openSUSE:Factory checked in at Fri May 7 15:39:48 CEST 2010. -------- --- sensors/sensors.changes 2010-04-13 13:20:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2010-05-07 11:49:50.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 7 11:48:40 CEST 2010 - jdelvare@suse.de + +- lm_sensors-r5835-fix-sensord-regression.patch: Fix regression + in sensord (support for multiple chips was broken by release + 3.1.2). Fixes upstream ticket #2377. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lm_sensors-r5835-fix-sensord-regression.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.5MI2TJ/_old 2010-05-07 15:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.5MI2TJ/_new 2010-05-07 15:39:08.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ Version: 3.1.2 -Release: 3 +Release: 4 Summary: Hardware health monitoring for Linux License: GPLv2+ Group: System/Monitoring @@ -37,6 +37,7 @@ Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch Patch5: lm_sensors-3.1.1-no-ipmisensors-driver.patch Patch6: lm_sensors-r5832-adt7468-driver.patch +Patch7: lm_sensors-r5835-fix-sensord-regression.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -140,6 +141,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ lm_sensors-r5835-fix-sensord-regression.patch ++++++ Fix support of multiple chips. Index: lm-sensors/prog/sensord/rrd.c =================================================================== --- lm-sensors/prog/sensord/rrd.c (revision 5793) +++ lm-sensors/prog/sensord/rrd.c (revision 5835) @@ -138,7 +138,9 @@ } +/* Returns the number of features processed, or -1 on error */ static int _applyToFeatures(FeatureFN fn, void *data, const sensors_chip_name *chip, - const ChipDescriptor *desc) + const ChipDescriptor *desc, + int labelOffset) { int i; @@ -148,5 +150,5 @@ char *label; - for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) { + for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) { feature = features + i; rawLabel = feature->feature->name; @@ -159,9 +161,9 @@ } - rrdCheckLabel(rawLabel, i); - fn(data, rrdLabels[i], label, feature); + rrdCheckLabel(rawLabel, labelOffset + i); + fn(data, rrdLabels[labelOffset + i], label, feature); free(label); } - return 0; + return i; } @@ -185,5 +187,5 @@ static int applyToFeatures(FeatureFN fn, void *data) { - int i, i_detected, ret; + int i, i_detected, ret, labelOffset = 0; const sensors_chip_name *chip, *chip_arg; ChipDescriptor *desc; @@ -198,7 +200,8 @@ continue; - ret = _applyToFeatures(fn, data, chip, desc); - if (ret) + ret = _applyToFeatures(fn, data, chip, desc, labelOffset); + if (ret < 0) return ret; + labelOffset += ret; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org