gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-admin/conky: Remove unused patches.

Browse Source 
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
Daniel Pielmeier
2018-02-08 19:06:01 +01:00
parent 4b1e72b46a
commit 9fca48d65a
6 changed files with 0 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
View File

@@ -1,23 +0,0 @@
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),

12
app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
View File

@@ -1,12 +0,0 @@
--- a/src/conky.cc 2017-02-21 18:00:40.157275779 -0800
+++ b/src/conky.cc 2017-02-21 18:05:16.137077877 -0800
@@ -1930,7 +1930,9 @@
static void draw_stuff(void)
{
+#ifndef BUILD_X11
static int text_offset_x, text_offset_y; /* offset for start position */
+#endif
text_offset_x = text_offset_y = 0;
#ifdef BUILD_IMLIB2
cimlib_render(text_start_x, text_start_y, window.width, window.height);

11
app-admin/conky/files/conky-1.10.6-gcc-7.patch
View File

@@ -1,11 +0,0 @@
diff -Naur a/src/luamm.hh b/src/luamm.hh
--- a/src/luamm.hh 2017-07-07 15:05:28.250032963 +0200
+++ b/src/luamm.hh 2017-07-07 15:05:43.230033134 +0200
@@ -28,6 +28,7 @@
#include <exception>
#include <stdexcept>
#include <string>
+#include <functional>
#include <lua.hpp>

35
app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
View File

@@ -1,35 +0,0 @@
From 2600d01373ce04b34f698f3887e90a35c77bda61 Mon Sep 17 00:00:00 2001
From: labath <pavelo@centrum.sk>
Date: Tue, 31 Jan 2017 01:31:09 +0000
Subject: [PATCH] Fix an out-of-range error in new_graph (#356)
The code was multiplying the index with the size of the element, and
then adding it to the typed pointer (resulting in a double
multiplication and an OOB access).
Replace the buggy code with a slightly safer c++ alternative.
---
src/specials.cc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/specials.cc b/src/specials.cc
index ee941eb..73bd2a2 100644
--- a/src/specials.cc
+++ b/src/specials.cc
@@ -519,14 +519,12 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size, double val)
DBGP("reallocing graph from %d to %d", s->graph_allocated, s->graph_width);
if (!s->graph) {
/* initialize */
- memset(graph, 0, s->graph_width * sizeof(double));
+ std::fill_n(graph, s->graph_width, 0.0);
s->scale = 100;
} else {
if (s->graph_width > s->graph_allocated) {
/* initialize the new region */
- memset(graph + (s->graph_allocated * sizeof(double)), 0,
- (s->graph_width - s->graph_allocated) *
- sizeof(double));
+ std::fill(graph + s->graph_allocated, graph + s->graph_width, 0.0);
}
}
s->graph = graph;

13
app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
View File

@@ -1,13 +0,0 @@
diff -Naur conky-1.10.7_old/src/linux.cc conky-1.10.7/src/linux.cc
--- conky-1.10.7_old/src/linux.cc 2018-01-19 16:59:14.158830825 +0100
+++ conky-1.10.7/src/linux.cc 2018-01-19 16:59:44.796144615 +0100
@@ -923,6 +923,9 @@
} 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),

49
app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
View File

@@ -1,49 +0,0 @@
From 562c7375883445acb58388ff16d9eb126b7e12a1 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@diddyinc.com>
Date: Tue, 23 Jan 2018 13:52:11 -0500
Subject: [PATCH] Fix segfault when out_to_x = false. (#455)
This resolves #454.
---
src/conky.cc | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/conky.cc b/src/conky.cc
index 48256ecc..f10d08fb 100644
--- a/src/conky.cc
+++ b/src/conky.cc
@@ -2076,20 +2076,24 @@ static void main_loop(void)
sigaddset(&newmask, SIGUSR1);
#endif
+#ifdef BUILD_X11
#ifdef BUILD_XSHAPE
- /* allow only decorated windows to be given mouse input */
- int major_version, minor_version;
- if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
- NORM_ERR("Input shapes are not supported");
- } else {
- if (own_window.get(*state) &&
- (own_window_type.get(*state) != TYPE_NORMAL ||
- (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
- XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
- NULL, 0, ShapeSet, Unsorted);
+ if (out_to_x.get(*state)) {
+ /* allow only decorated windows to be given mouse input */
+ int major_version, minor_version;
+ if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
+ NORM_ERR("Input shapes are not supported");
+ } else {
+ if (own_window.get(*state) &&
+ (own_window_type.get(*state) != TYPE_NORMAL ||
+ (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
+ XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
+ NULL, 0, ShapeSet, Unsorted);
+ }
}
}
#endif /* BUILD_XSHAPE */
+#endif /* BUILD_X11 */
last_update_time = 0.0;
next_update_time = get_time() - fmod(get_time(), active_update_interval());