From cd70b8d943c9ae11a2dbd829a7025d83c51efc2ec105cdf42fa1e919707f35d9 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 7 May 2010 09:49:51 +0000 Subject: [PATCH 1/4] - 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. OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=20 --- sensors.changes | 7 +++++++ sensors.spec | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sensors.changes b/sensors.changes index ac9a8f9..4b23d42 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Tue Apr 13 13:08:07 CEST 2010 - jdelvare@suse.de diff --git a/sensors.spec b/sensors.spec index 95a1a66..ded5679 100644 --- a/sensors.spec +++ b/sensors.spec @@ -37,6 +37,7 @@ Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch 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 @@ Authors: %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" From 06ea52ede7f019665165949ead7148eb5ae4a8e0c88945f9365e42c794be196a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 7 May 2010 12:30:43 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=21 --- lm_sensors-r5835-fix-sensord-regression.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 lm_sensors-r5835-fix-sensord-regression.patch diff --git a/lm_sensors-r5835-fix-sensord-regression.patch b/lm_sensors-r5835-fix-sensord-regression.patch new file mode 100644 index 0000000..6eac49d --- /dev/null +++ b/lm_sensors-r5835-fix-sensord-regression.patch @@ -0,0 +1,55 @@ +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; + } + } From 2561ca7181a4e42a407608a8924369044114f7e8419078a61ade610119c93cb9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 7 May 2010 13:39:49 +0000 Subject: [PATCH 3/4] Accepting request 39642 from Base:System checked in (request 39642) OBS-URL: https://build.opensuse.org/request/show/39642 OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=22 --- lm_sensors-r5835-fix-sensord-regression.patch | 55 ------------------- sensors.changes | 7 --- sensors.spec | 2 - 3 files changed, 64 deletions(-) delete mode 100644 lm_sensors-r5835-fix-sensord-regression.patch diff --git a/lm_sensors-r5835-fix-sensord-regression.patch b/lm_sensors-r5835-fix-sensord-regression.patch deleted file mode 100644 index 6eac49d..0000000 --- a/lm_sensors-r5835-fix-sensord-regression.patch +++ /dev/null @@ -1,55 +0,0 @@ -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; - } - } diff --git a/sensors.changes b/sensors.changes index 4b23d42..ac9a8f9 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -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. - ------------------------------------------------------------------- Tue Apr 13 13:08:07 CEST 2010 - jdelvare@suse.de diff --git a/sensors.spec b/sensors.spec index ded5679..95a1a66 100644 --- a/sensors.spec +++ b/sensors.spec @@ -37,7 +37,6 @@ Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch 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 @@ -141,7 +140,6 @@ Authors: %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" From 308cc38b5456f5e261ac3f53776cb283e12a48696a1e79baaf86ff6b891084e9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 7 May 2010 13:39:50 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/sensors revision 54.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=aff477002372e4afea5d91b841d6f713 --- lm_sensors-r5835-fix-sensord-regression.patch | 55 +++++++++++++++++++ sensors.changes | 7 +++ sensors.spec | 4 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 lm_sensors-r5835-fix-sensord-regression.patch diff --git a/lm_sensors-r5835-fix-sensord-regression.patch b/lm_sensors-r5835-fix-sensord-regression.patch new file mode 100644 index 0000000..6eac49d --- /dev/null +++ b/lm_sensors-r5835-fix-sensord-regression.patch @@ -0,0 +1,55 @@ +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; + } + } diff --git a/sensors.changes b/sensors.changes index ac9a8f9..4b23d42 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Tue Apr 13 13:08:07 CEST 2010 - jdelvare@suse.de diff --git a/sensors.spec b/sensors.spec index 95a1a66..35ba592 100644 --- a/sensors.spec +++ b/sensors.spec @@ -22,7 +22,7 @@ Name: sensors 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 @@ Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch 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 @@ Authors: %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS"