From 566ade47d69fd79673740efbcfd59a4e2a64bcc8 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sun, 24 Jul 2016 11:57:34 +0200 Subject: [PATCH] Update to 2.0.2 --- .gitignore | 1 + htop-2.0.0-fix-buffer-reuse.patch | 22 ---------------------- htop-2.0.0-fix-emptying-column.patch | 25 ------------------------- htop.spec | 5 ++++- sources | 2 +- 5 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 htop-2.0.0-fix-buffer-reuse.patch delete mode 100644 htop-2.0.0-fix-emptying-column.patch diff --git a/.gitignore b/.gitignore index d7c7169..3ffc672 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ htop-0.8.3.tar.gz /htop-1.0.3.tar.gz /htop-2.0.0.tar.gz /htop-2.0.1.tar.gz +/htop-2.0.2.tar.gz diff --git a/htop-2.0.0-fix-buffer-reuse.patch b/htop-2.0.0-fix-buffer-reuse.patch deleted file mode 100644 index f44e43e..0000000 --- a/htop-2.0.0-fix-buffer-reuse.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001 -From: Hisham -Date: Sat, 13 Feb 2016 02:18:28 -0200 -Subject: [PATCH] Fix buffer reuse. - ---- - linux/LinuxProcessList.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c -index 591210e..ec643ab 100644 ---- a/linux/LinuxProcessList.c -+++ b/linux/LinuxProcessList.c -@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn - } - - static void setCommand(Process* process, const char* command, int len) { -- if (process->comm && process->commLen <= len) { -+ if (process->comm && process->commLen >= len) { - strncpy(process->comm, command, len + 1); - } else { - free(process->comm); diff --git a/htop-2.0.0-fix-emptying-column.patch b/htop-2.0.0-fix-emptying-column.patch deleted file mode 100644 index 1b39bef..0000000 --- a/htop-2.0.0-fix-emptying-column.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0e3cf6975f96291fa203332aad9e44086ff8f2f2 Mon Sep 17 00:00:00 2001 -From: Hisham -Date: Fri, 12 Feb 2016 23:33:53 -0200 -Subject: [PATCH] Fix crash when emptying column. Closes #381. - ---- - MetersPanel.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/MetersPanel.c b/MetersPanel.c -index bdbe83e..302b6d1 100644 ---- a/MetersPanel.c -+++ b/MetersPanel.c -@@ -50,7 +50,10 @@ static void MetersPanel_delete(Object* object) { - void MetersPanel_setMoving(MetersPanel* this, bool moving) { - Panel* super = (Panel*) this; - this->moving = moving; -- ((ListItem*)Panel_getSelected(super))->moving = moving; -+ ListItem* selected = (ListItem*)Panel_getSelected(super); -+ if (selected) { -+ selected->moving = moving; -+ } - if (!moving) { - Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]); - Panel_setDefaultBar(super); diff --git a/htop.spec b/htop.spec index 20a86f4..052ea43 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Sun Jul 24 2016 Morten Stevens - 2.0.2-1 +- Update to 2.0.2 (#1359437) + * Tue Mar 08 2016 Morten Stevens - 2.0.1-1 - Update to 2.0.1 (#1315522) diff --git a/sources b/sources index 8b66973..93229a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f75fe92b4defaa80d99109830f34b5e2 htop-2.0.1.tar.gz +7d354d904bad591a931ad57e99fea84a htop-2.0.2.tar.gz