app-admin/conky: Fix bug 556480.

Thanks to devsk for the patch and report.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/app-admin/conky/conky-1.10.6-r3.ebuild b/app-admin/conky/conky-1.10.6-r4.ebuild
similarity index 99%
rename from app-admin/conky/conky-1.10.6-r3.ebuild
rename to app-admin/conky/conky-1.10.6-r4.ebuild
index 2f866b4272854f4aec1f2ce5956d30e0c7cf7f78..0f6c02c40c02f967dc8db309fc1ba118ae3f92d5 100644 (file)
--- a/app-admin/conky/conky-1.10.6-r3.ebuild
+++ b/app-admin/conky/conky-1.10.6-r4.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-new_graph-oor.patch
        "${FILESDIR}"/${P}-gcc-7.patch
        "${FILESDIR}"/${P}-fix-text-shades.patch
+       "${FILESDIR}"/${P}-cpu-hotplug.patch
 )
 
 DISABLE_AUTOFORMATTING="yes"

diff --git a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
new file mode 100644 (file)
index 0000000..16adbd8
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
@@ -0,0 +1,23 @@
+From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001
+From: Daniel Pielmeier <billie80@users.noreply.github.com>
+Date: Sat, 18 Feb 2017 16:55:35 +0100
+Subject: [PATCH] Fix SEGV in a CPU hotplug environment #127
+
+---
+ src/linux.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/linux.cc b/src/linux.cc
+index 664ddf5e..63b3ea40 100644
+--- a/src/linux.cc
++++ b/src/linux.cc
+@@ -900,6 +900,9 @@ int update_stat(void)
+                       } else {
+                               idx = 0;
+                       }
++                      if (idx >= info.cpu_count) {
++                              continue;
++                      }
+                       sscanf(buf, stat_template, &(cpu[idx].cpu_user),
+                               &(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
+                               &(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),