reroll the patch because of CRs and patch-2.5.9 sucking, also upstream trac sucks

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 6a3b00eaf8fe7b22a9616591824ceb88de5ed8f3..2e936ad52ae1cdd265ab58cb1db68f69a329bc06 100644 (file)
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -2,7 +2,7 @@ AUX fancontrol-init.d 726 RMD160 444eedc0044a61e0a79d79565e6399156b8f9b9c SHA1 a
 AUX lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350 RMD160 962c2ddcd5b59926d2ccaa0ba0b65bd05d758d45 SHA1 3ba0c151f1dbecfed52444561c73897902270574 SHA256 1ace0bb0f88c0f6f235ca47317fddf723d4e8900f9ba66aae432b44274ca192b
 AUX lm_sensors-2.10.7-sensors-detect-gentoo.patch 4016 RMD160 27cbc052b65e903fe01360e8cde4c4a1c8bdf7eb SHA1 dfe0916e0d063b447131e2e0a1cb8751c091df16 SHA256 aa29dbddec4947f4fa645a9af70b58c6fbfeaf815fdf28d4cf6ff46d775d9025
 AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA1 6250e4e28cd936efa6d05846b16175e85fe821c5 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3
-AUX lm_sensors-3.1.2-changeset_r5835.patch 1404 RMD160 37f6d88752c91c767f63ae71c68349cb6a342cf3 SHA1 2b280dec53495810f5f33d94694ca05d51bea1ed SHA256 d022b4666965a922cd526379c5b47d0dc075089d0f83d3c82017524c0d38f00f
+AUX lm_sensors-3.1.2-changeset_r5835.patch 1486 RMD160 ae5d8141d157a41b11fe212bf7a9a1d797a8039e SHA1 81297fbf114000935dce0c71578636d58522b1fb SHA256 daf1f6cdc96abf7139a73be1e230dfa221c4da5f1a31251da5bbea4d4e08453a
 AUX lm_sensors-3.1.2-sensors-detect-gentoo.patch 4502 RMD160 8d5f528e654ee8422de3d4190531b22a841d7acf SHA1 9b21848fc22866721ca6e9fed4b9039abe954a82 SHA256 c9686202da0529e695c3ea872961870884c0474526fee3e3053f3e5d3bd0949e
 AUX lm_sensors-init.d 2457 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 SHA1 b2fdb2d08da3491f4128714bb7ba6006420dcc07 SHA256 2271f55d96946ee15d907715ec59d55724a0bb9f81e1b25beef399bc18579b4a
 AUX sensord-3-init.d 712 RMD160 7f5be22a8e1e0b7adb56d4ba74e685eb3789cbf2 SHA1 05f4ed45896e708accab73057719ec866e9351af SHA256 8a3debf0b84af9944a467e377b0e4b0db67d428083675f0fcf33ec55a8b2a709

diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
index d7d9d3cf4176a248481aebafe11348c9a3c1852e..d0fb9c15ddcfabce8ce73c9d1fa95d655603d688 100644 (file)
--- a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
+++ b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
@@ -1,54 +1,61 @@
-http://bugs.gentoo.org/325083\r
-http://www.lm-sensors.org/changeset/5835\r
-\r
---- prog/sensord/rrd.c\r
-+++ prog/sensord/rrd.c\r
-@@ -138,7 +138,9 @@\r
- }\r
- \r
-+/* Returns the number of features processed, or -1 on error */\r
- static int _applyToFeatures(FeatureFN fn, void *data,\r
-                           const sensors_chip_name *chip,\r
--                          const ChipDescriptor *desc)\r
-+                          const ChipDescriptor *desc,\r
-+                          int labelOffset)\r
- {\r
-       int i;\r
-@@ -148,5 +150,5 @@\r
-       char *label;\r
- \r
--      for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {\r
-+      for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {\r
-               feature = features + i;\r
-               rawLabel = feature->feature->name;\r
-@@ -159,9 +161,9 @@\r
-               }\r
- \r
--              rrdCheckLabel(rawLabel, i);\r
--              fn(data, rrdLabels[i], label, feature);\r
-+              rrdCheckLabel(rawLabel, labelOffset + i);\r
-+              fn(data, rrdLabels[labelOffset + i], label, feature);\r
-               free(label);\r
-       }\r
--      return 0;\r
-+      return i;\r
- }\r
- \r
-@@ -185,5 +187,5 @@\r
- static int applyToFeatures(FeatureFN fn, void *data)\r
- {\r
--      int i, i_detected, ret;\r
-+      int i, i_detected, ret, labelOffset = 0;\r
-       const sensors_chip_name *chip, *chip_arg;\r
-       ChipDescriptor *desc;\r
-@@ -198,7 +200,8 @@\r
-                               continue;\r
- \r
--                      ret = _applyToFeatures(fn, data, chip, desc);\r
--                      if (ret)\r
-+                      ret = _applyToFeatures(fn, data, chip, desc, labelOffset);\r
-+                      if (ret < 0)\r
-                               return ret;\r
-+                      labelOffset += ret;\r
-               }\r
-       }\r
+--- prog/sensord/rrd.c
++++ prog/sensord/rrd.c
+@@ -137,9 +137,11 @@
+       }
+ }
+ 
++/* 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;
+       const FeatureDescriptor *features = desc->features;
+@@ -147,7 +149,7 @@
+       const char *rawLabel;
+       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;
+ 
+@@ -158,11 +160,11 @@
+                       return -1;
+               }
+ 
+-              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;
+ }
+ 
+ static ChipDescriptor *lookup_known_chips(const sensors_chip_name *chip)
+@@ -184,7 +186,7 @@
+ 
+ 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;
+ 
+@@ -197,9 +199,10 @@
+                       if (!desc)
+                               continue;
+ 
+-                      ret = _applyToFeatures(fn, data, chip, desc);
+-                      if (ret)
++                      ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
++                      if (ret < 0)
+                               return ret;
++                      labelOffset += ret;
+               }
+       }
+       return 0;