diff options
| author | Eugene V. Lyubimkin <jackyf@debian.org> | 2011-11-26 15:58:33 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:30 +0200 |
| commit | c65eb8be811f59b55d64d9e7654c33708de79ad9 (patch) | |
| tree | ee6e542b988263c49f0e1200d6aa5aa635667fe8 /debian/patches | |
| parent | 38174fffd79f54a8be7642bf170a2320b29e8063 (diff) | |
| parent | eaf11cc12a1aa4b050a8a1e7ea3770d3d9c81e95 (diff) | |
| download | debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.tar.gz debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.tar.bz2 debian_htop-c65eb8be811f59b55d64d9e7654c33708de79ad9.zip | |
Imported Debian patch 1.0-1debian/1.0-1
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/100-fix-cgroups-crash.patch | 18 | ||||
| -rw-r--r-- | debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch | 14 | ||||
| -rw-r--r-- | debian/patches/700-ltrace-support.patch | 10 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 12 insertions, 31 deletions
diff --git a/debian/patches/100-fix-cgroups-crash.patch b/debian/patches/100-fix-cgroups-crash.patch deleted file mode 100644 index 4ba95cb..0000000 --- a/debian/patches/100-fix-cgroups-crash.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/ProcessList.c b/ProcessList.c -index c234357..3bb1b81 100644 ---- a/ProcessList.c -+++ b/ProcessList.c -@@ -473,7 +473,12 @@ static void ProcessList_readCGroupFile(Process* process, const char* dirname, co - char** fields = String_split(trimmed, ':'); - free(trimmed); - -- process->cgroup = strndup(fields[2] + 1, 10); -+ if (!fields[1] || !fields[2]) { -+ process->cgroup = strdup(""); // cgroups do not work -+ } -+ else { -+ process->cgroup = strndup(fields[2] + 1, 10); -+ } - String_freeArray(fields); - } - fclose(file); diff --git a/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch b/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch index 57e687e..c1f5247 100644 --- a/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch +++ b/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch @@ -13,13 +13,13 @@ Index: htop/ProcessList.c if (!file) return; - fscanf(file, -- "%*u %*s %*c %*u %*u %*u %*u %*u %*u %*u " -- "%*u %*u %*u %*u %*u %*u %*u %*u " -- "%*u %*u %*u %*u %*u %*u %*u %*u " -- "%*u %*u %*u %*u %*u %*u %*u %*u " -- "%*u %*u %*u %*u %*u %*u %*u %*u " -- "%*u %*u %*u %*u %*u %*u %*u " -- "%*u %*u %u %u", +- "%*32u %*32s %*1c %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %*32u %*32u %*32u %*32u %*32u " +- "%*32u %*32u %32u %32u", - &process->vpid, &process->ctid); + + char buffer[256]; diff --git a/debian/patches/700-ltrace-support.patch b/debian/patches/700-ltrace-support.patch index b44b025..f126e5f 100644 --- a/debian/patches/700-ltrace-support.patch +++ b/debian/patches/700-ltrace-support.patch @@ -132,19 +132,19 @@ Index: htop/TraceScreen.h Index: htop/htop.1 =================================================================== ---- htop.orig/htop.1 2011-01-16 17:02:59.000000000 +0200 -+++ htop/htop.1 2011-01-16 18:15:07.000000000 +0200 +--- htop.orig/htop.1.in 2011-01-16 17:02:59.000000000 +0200 ++++ htop/htop.1.in 2011-01-16 18:15:07.000000000 +0200 @@ -54,6 +54,11 @@ Display open files for a process: if lsof(1) is installed, pressing this key will display the list of file descriptors opened by the process. .TP -+.B l ++.B L +Trace process library calls: if ltrace(1) is installed, pressing this key +will attach it to the currently selected process, presenting a live +update of library calls issued by the process. +.TP - .B F1, h - Help screen + .B F1, h, ? + Go to the help screen .TP Index: htop/htop.c =================================================================== diff --git a/debian/patches/series b/debian/patches/series index 7204157..c8aa567 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -100-fix-cgroups-crash.patch 600-openvz-veid-on-kernels-gt-2.6.18.patch 700-ltrace-support.patch |