pool/htop
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 397323 from home:develop7:branches:Base:System

Browse Source 
- added upstream patch fixing ESCDELAY-related build failure on modern ncurses
- updated configure script parameters
- Update to v2.0.1
  * OpenBSD: Various fixes and improvements (thanks to Michael McConville and 
    Juan Francisco Cantero Hurtado)
  * FreeBSD: fix CPU and memory readings (thanks to Tim Creech, Hung-Yi Chen, 
    Bernard Spil, Greg V)
  * FreeBSD: add battery support (thanks to Greg V)
  * Linux: Retain last-obtained name of a zombie process
  * Mac OS X: Improve portability for OS X versions (thanks to Michael Klein)
  * Mac OS X: Fix reading command-line arguments and basename
  * Mac OS X: Fix process state information
  * Mac OS X: Fix tree view collapsing/expanding
  * Mac OS X: Fix tree organization
  * Mac OS X: Fix memory accounting
  * Fix crash when emptying a column of meters
  * Make Esc key more responsive
- removed htop-2.0.0-fix-buffer-reuse.patch and htop-stdgnu.patch

OBS-URL: https://build.opensuse.org/request/show/397323
OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=35
This commit is contained in:
Dirk Mueller 2016-05-23 10:27:07 +00:00 committed by Git OBS Bridge
parent 276b3ac020
commit beeda113c2
7 changed files with 71 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htop-2.0.0-fix-buffer-reuse.patch
View File

@ -1,22 +0,0 @@
From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
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);

3
htop-2.0.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d15ca2a0abd6d91d6d17fd685043929cfe7aa91199a9f4b3ebbb370a2c2424b5
size 473765

37
htop-2.0.1-fix-escdelay-usage.patch Normal file
View File

@ -0,0 +1,37 @@
From 645057d81aa619f4f9704cd221e63b357ac7f749 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Thu, 19 May 2016 16:09:47 -0300
Subject: [PATCH] Use set_escdelay() to avoid problems with ESCDELAY as a
macro.
---
InfoScreen.c | 2 +-
ScreenManager.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/InfoScreen.c b/InfoScreen.c
index a6dd55a..085b860 100644
--- a/InfoScreen.c
+++ b/InfoScreen.c
@@ -116,7 +116,7 @@ void InfoScreen_run(InfoScreen* this) {
if (this->inc->active)
move(LINES-1, CRT_cursorX);
- ESCDELAY = 25;
+ set_escdelay(25);
int ch = getch();
if (ch == ERR) {
diff --git a/ScreenManager.c b/ScreenManager.c
index db3fdee..44e74e0 100644
--- a/ScreenManager.c
+++ b/ScreenManager.c
@@ -189,7 +189,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
}
int prevCh = ch;
- ESCDELAY = 25;
+ set_escdelay(25);
ch = getch();
HandlerResult result = IGNORED;

3
htop-2.0.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666
size 477196

101
htop-stdgnu.patch
View File

@ -1,101 +0,0 @@
From 9b5a3912ca328885dee99f3a8aa786738a37a8c8 Mon Sep 17 00:00:00 2001
From: boombatower <jimmy@boombatower.com>
Date: Thu, 11 Feb 2016 12:48:39 -0600
Subject: [PATCH] Makefile/Configure cleanups.
---
Makefile.am | 4 ++--
configure.ac | 24 ++++++------------------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8b31627..33711ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,9 @@ applications_DATA = htop.desktop
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = htop.png
-htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
+htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
htop_LDFLAGS =
-AM_CPPFLAGS = -DNDEBUG
+AM_CPPFLAGS = -include config.h -DNDEBUG
myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.c \
diff --git a/configure.ac b/configure.ac
index 3bd58bc..0a54968 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,14 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.65)
+AC_PREREQ([2.65])
AC_INIT([htop],[2.0.0],[hisham@gobolinux.org])
year=$(date +%Y)
# The following two lines are required by hwloc scripts
AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.11])
@@ -17,13 +18,9 @@ AC_CONFIG_MACRO_DIR([m4])
# Checks for programs.
# ----------------------------------------------------------------------
-AC_PROG_CC
+AC_PROG_CC_STDC
AM_PROG_CC_C_O
-AC_DISABLE_SHARED
-AC_ENABLE_STATIC
-AC_PROG_LIBTOOL
-
# Checks for platform.
# ----------------------------------------------------------------------
case "$target" in
@@ -46,7 +43,7 @@ esac
# Checks for libraries.
# ----------------------------------------------------------------------
-AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
+AC_SEARCH_LIBS([ceil], [m])
# Checks for header files.
# ----------------------------------------------------------------------
@@ -55,7 +52,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
-AC_CHECK_HEADERS([execinfo.h],[:],[:])
+AC_CHECK_HEADERS_ONCE([execinfo.h])
# Checks for typedefs, structures, and compiler characteristics.
# ----------------------------------------------------------------------
@@ -67,17 +64,8 @@ AC_TYPE_UID_T
# Checks for library functions and compiler features.
# ----------------------------------------------------------------------
AC_FUNC_CLOSEDIR_VOID
-AC_TYPE_SIGNAL
AC_FUNC_STAT
-AC_CHECK_FUNCS([memmove strncasecmp strstr strdup])
-
-save_cflags="${CFLAGS}"
-CFLAGS="${CFLAGS} -std=c99"
-AC_MSG_CHECKING([whether gcc -std=c99 option works])
-AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [char *a; a = strdup("foo"); int i = 0; i++; // C99],
- AC_MSG_RESULT([yes]),
- AC_MSG_ERROR([htop is written in C99. A newer version of gcc is required.]))
-CFLAGS="$save_cflags"
+AC_CHECK_FUNCS_ONCE([memmove strncasecmp strstr strdup])
save_cflags="${CFLAGS}"
CFLAGS="$CFLAGS -Wextra"
--
2.7.0

26
htop.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Sun May 22 15:23:24 UTC 2016 - develop7@develop7.info
- added upstream patch fixing ESCDELAY-related build failure on modern ncurses
- updated configure script parameters
-------------------------------------------------------------------
Fri May 13 18:15:43 UTC 2016 - develop7@develop7.info
- Update to v2.0.1
* OpenBSD: Various fixes and improvements (thanks to Michael McConville and
Juan Francisco Cantero Hurtado)
* FreeBSD: fix CPU and memory readings (thanks to Tim Creech, Hung-Yi Chen,
Bernard Spil, Greg V)
* FreeBSD: add battery support (thanks to Greg V)
* Linux: Retain last-obtained name of a zombie process
* Mac OS X: Improve portability for OS X versions (thanks to Michael Klein)
* Mac OS X: Fix reading command-line arguments and basename
* Mac OS X: Fix process state information
* Mac OS X: Fix tree view collapsing/expanding
* Mac OS X: Fix tree organization
* Mac OS X: Fix memory accounting
* Fix crash when emptying a column of meters
* Make Esc key more responsive
- removed htop-2.0.0-fix-buffer-reuse.patch and htop-stdgnu.patch
-------------------------------------------------------------------
Thu Mar 3 17:25:17 UTC 2016 - develop7@develop7.info

13
htop.spec
View File

@ -17,7 +17,7 @@
Name: htop
Version: 2.0.0
Version: 2.0.1
Release: 0
Summary: An Interactive text-mode Process Viewer for Linux
License: GPL-2.0+
@ -25,11 +25,10 @@ Group: System/Monitoring
Url: http://hisham.hm/htop
Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz
Patch0: htop-desktop-file-fix-thoenig-01.patch
Patch1: htop-stdgnu.patch
# PATCH-FIX-UPSTREAM htop-2.0.0-fix-buffer-reuse.patch
Patch2: htop-2.0.0-fix-buffer-reuse.patch
Patch1: htop-2.0.1-fix-escdelay-usage.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: update-desktop-files
@ -49,16 +48,14 @@ but is also reported to work (and was originally developed) with the
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -fiv
%configure \
--enable-taskstats \
--enable-unicode \
--enable-native-affinity \
--enable-cgroup \
--enable-oom
--enable-linux-affinity \
--enable-cgroup
# forcefully exclude -L/usr/lib(64)/ncurses5 from being added on systems with
# version 6 of ncurses. probably a cleaner way to fix this.
%if 0%{?suse_version} > 1320