Imported Debian patch 0.8.1+svn149-1debian/0.8.1+svn149-1

10 files changed, 55 insertions, 311 deletions

diff --git a/debian/patches/010-make-desktop-file-valid.patch b/debian/patches/010-make-desktop-file-valid.patch
deleted file mode 100644
index 24721c8..0000000
--- a/debian/patches/010-make-desktop-file-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Make desktop file valid. See #488912 in Debian BTS.
-Index: htop/htop.desktop
-===================================================================
---- htop.orig/htop.desktop	2008-11-16 22:08:29.670673088 +0200
-+++ htop/htop.desktop	2008-11-16 22:08:32.142641313 +0200
-@@ -1,12 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
--Version=0.7
-+Version=1.0
- Name=Htop
- Type=Application
- Comment=Show System Processes
- Terminal=true
- Exec=htop
--Path=
- Icon=htop
--Categories=ConsoleOnly;System;Application;
-+Categories=ConsoleOnly;System;
- GenericName=Process Viewer
diff --git a/debian/patches/100-upstream-sort-by-processor-and-session.patch b/debian/patches/100-upstream-sort-by-processor-and-session.patch
deleted file mode 100644
index 5dbbd1c..0000000
--- a/debian/patches/100-upstream-sort-by-processor-and-session.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Allow sorting by 'processor' and 'session' columns.
-Index: htop/Process.c
-===================================================================
---- htop.orig/Process.c	2008-09-23 06:43:34.000000000 +0300
-+++ htop/Process.c	2009-03-29 19:49:22.889032486 +0300
-@@ -533,6 +533,10 @@
-       return strcmp(p1->user, p2->user);
-    case PRIORITY:
-       return (p1->priority - p2->priority);
-+   case PROCESSOR:
-+      return (p1->processor - p2->processor);
-+   case SESSION:
-+      return (p1->session - p2->session);
-    case STATE:
-       return (p1->state - p2->state);
-    case NICE:
diff --git a/debian/patches/110-upstream-fix-page-size-on-BSD.patch b/debian/patches/110-upstream-fix-page-size-on-BSD.patch
deleted file mode 100644
index 1161200..0000000
--- a/debian/patches/110-upstream-fix-page-size-on-BSD.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix page size on BSD systems.
-Index: htop/Process.c
-===================================================================
---- htop.orig/Process.c	2009-03-29 22:51:01.865040249 +0300
-+++ htop/Process.c	2009-03-29 22:51:02.933034296 +0300
-@@ -33,8 +33,9 @@
- // This works only with glibc 2.1+. On earlier versions
- // the behavior is similar to have a hardcoded page size.
- #ifndef PAGE_SIZE
--#define PAGE_SIZE ( sysconf(_SC_PAGESIZE) / 1024 )
-+#define PAGE_SIZE ( sysconf(_SC_PAGESIZE) )
- #endif
-+#define PAGE_SIZE_KB ( PAGE_SIZE / ONE_K )
- 
- #define PROCESS_COMM_LEN 300
- 
-@@ -351,13 +352,13 @@
-            : attr;
-       break;
-    }
--   case M_DRS: Process_printLargeNumber(this, str, this->m_drs * PAGE_SIZE); return;
--   case M_DT: Process_printLargeNumber(this, str, this->m_dt * PAGE_SIZE); return;
--   case M_LRS: Process_printLargeNumber(this, str, this->m_lrs * PAGE_SIZE); return;
--   case M_TRS: Process_printLargeNumber(this, str, this->m_trs * PAGE_SIZE); return;
--   case M_SIZE: Process_printLargeNumber(this, str, this->m_size * PAGE_SIZE); return;
--   case M_RESIDENT: Process_printLargeNumber(this, str, this->m_resident * PAGE_SIZE); return;
--   case M_SHARE: Process_printLargeNumber(this, str, this->m_share * PAGE_SIZE); return;
-+   case M_DRS: Process_printLargeNumber(this, str, this->m_drs * PAGE_SIZE_KB); return;
-+   case M_DT: Process_printLargeNumber(this, str, this->m_dt * PAGE_SIZE_KB); return;
-+   case M_LRS: Process_printLargeNumber(this, str, this->m_lrs * PAGE_SIZE_KB); return;
-+   case M_TRS: Process_printLargeNumber(this, str, this->m_trs * PAGE_SIZE_KB); return;
-+   case M_SIZE: Process_printLargeNumber(this, str, this->m_size * PAGE_SIZE_KB); return;
-+   case M_RESIDENT: Process_printLargeNumber(this, str, this->m_resident * PAGE_SIZE_KB); return;
-+   case M_SHARE: Process_printLargeNumber(this, str, this->m_share * PAGE_SIZE_KB); return;
-    case ST_UID: snprintf(buffer, n, "%4d ", this->st_uid); break;
-    case USER: {
-       if (Process_getuid != this->st_uid)
-Index: htop/ProcessList.c
-===================================================================
---- htop.orig/ProcessList.c	2009-03-29 22:48:20.445032821 +0300
-+++ htop/ProcessList.c	2009-03-29 22:51:02.933034296 +0300
-@@ -698,7 +698,7 @@
-             period * 100.0;
-          process->percent_cpu = MAX(MIN(percent_cpu, processors*100.0), 0.0);
- 
--         process->percent_mem = (process->m_resident * PAGE_SIZE) / 
-+         process->percent_mem = (process->m_resident * PAGE_SIZE_KB) / 
-             (float)(this->totalMem) * 
-             100.0;
- 
diff --git a/debian/patches/120-upstream-explain-cpu-bars-in-monochrome-mode.patch b/debian/patches/120-upstream-explain-cpu-bars-in-monochrome-mode.patch
deleted file mode 100644
index 6bbc344..0000000
--- a/debian/patches/120-upstream-explain-cpu-bars-in-monochrome-mode.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Explain meaning of symbols in CPU bars in monochrome mode.
-Index: htop/htop.c
-===================================================================
---- htop.orig/htop.c	2009-03-29 19:49:43.005032779 +0300
-+++ htop/htop.c	2009-03-29 20:22:27.149033000 +0300
-@@ -99,8 +99,10 @@
-    addattrstr(CRT_colors[BAR_BORDER], "]");
-    attrset(CRT_colors[DEFAULT_COLOR]);
-    mvaddstr(6,0, "Type and layout of header meters are configurable in the setup screen.");
--   mvaddstr(7, 0, "Status: R: running; S: sleeping; T: traced/stopped; Z: zombie; D: disk sleep");
--
-+   if (CRT_colorScheme == COLORSCHEME_MONOCHROME) {
-+      mvaddstr(7, 0, "In monochrome, meters are displayed through different chars, in order: |#*@$%&");
-+   }
-+   mvaddstr( 8, 0, " Status: R: running; S: sleeping; T: traced/stopped; Z: zombie; D: disk sleep");
-    mvaddstr( 9, 0, " Arrows: scroll process list             F5 t: tree view");
-    mvaddstr(10, 0, " Digits: incremental PID search             u: show processes of a single user");
-    mvaddstr(11, 0, "   F3 /: incremental name search            H: hide/show user threads");
diff --git a/debian/patches/200-filter-non-printable-characters.patch b/debian/patches/200-filter-non-printable-characters.patch
deleted file mode 100644
index 3a3867e..0000000
--- a/debian/patches/200-filter-non-printable-characters.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Filters non-printable characters from process names. See #504144 in Debian BTS.
-Index: htop/RichString.c
-===================================================================
---- htop.orig/RichString.c	2008-12-06 11:13:19.679940957 +0200
-+++ htop/RichString.c	2008-12-06 11:14:57.454712750 +0200
-@@ -89,7 +89,7 @@
- inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) {
-    int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
-    for (int i = this->len, j = 0; i < last; i++, j++)
--      this->chstr[i] = data_c[j] | attrs;
-+      this->chstr[i] = (isprint(data_c[j]) ? data_c[j] : '?') | attrs;
-    this->chstr[last] = 0;
-    this->len = last;
- }
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 f510c5d..2543c5c 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
@@ -1,10 +1,11 @@
 Fix determining OpenVZ VEID on Linux kernels >= 2.6.18.
-diff -Naur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c
---- htop-0.8.1.orig/ProcessList.c	2008-09-23 08:23:14.000000000 +0200
-+++ htop-0.8.1/ProcessList.c	2009-02-24 00:09:37.000000000 +0100
-@@ -625,20 +625,28 @@
+Index: htop/ProcessList.c
+===================================================================
+--- htop.orig/ProcessList.c	2009-04-05 11:48:46.340045591 +0300
++++ htop/ProcessList.c	2009-04-05 12:22:08.819047243 +0300
+@@ -623,20 +623,28 @@
                 process->vpid = process->pid;
-                process->veid = 0;
+                process->ctid = 0;
              } else {
 -               snprintf(statusfilename, MAX_NAME, "%s/%s/stat", dirname, name);
 +               snprintf(statusfilename, MAX_NAME, "%s/%s/status", dirname, name);
@@ -18,27 +19,27 @@ diff -Naur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.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",
--                  &process->vpid, &process->veid);
+-                  "%*u %*u %u %u",
+-                  &process->vpid, &process->ctid);
 -               fclose(status);
-+               else {
-+                  char buffer[256];
-+                  process->veid = 0;
-+                  while (!feof(status)) {
-+                     char* ok = fgets(buffer, 255, status);
-+                     if (!ok)
-+                        break;
++			   else {
++				   char buffer[256];
++				   process->ctid = 0;
++				   while (!feof(status)) {
++					   char* ok = fgets(buffer, 255, status);
++					   if (!ok)
++						   break;
 +
-+                     if (String_startsWith(buffer, "envID:")) {
-+                        int veid;
-+                        int ok = ProcessList_read(this, buffer, "envID:\t%d", &veid);
-+                        if (ok >= 1) {
-+                           process->veid = veid;
-+                        }
-+                     }
-+                  }
-+                  fclose(status);
-+               }
++					   if (String_startsWith(buffer, "envID:")) {
++						   int ctid;
++						   int ok = ProcessList_read(this, buffer, "envID:\t%d", &ctid);
++						   if (ok >= 1) {
++							   process->ctid = ctid;
++						   }
++					   }
++				   }
++				   fclose(status);
++			   }
              }
              #endif
  
diff --git a/debian/patches/610-rename-veid-to-ctid.patch b/debian/patches/610-rename-veid-to-ctid.patch
deleted file mode 100644
index d7258db..0000000
--- a/debian/patches/610-rename-veid-to-ctid.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Rename VEID->CTID.
-diff -Naur htop-0.8.1.orig/Process.c htop-0.8.1/Process.c
---- htop-0.8.1.orig/Process.c	2008-09-23 05:43:34.000000000 +0200
-+++ htop-0.8.1/Process.c	2009-02-24 00:11:35.000000000 +0100
-@@ -47,7 +47,7 @@
-    PROCESSOR, M_SIZE, M_RESIDENT, M_SHARE, M_TRS, M_DRS, M_LRS, M_DT, ST_UID, PERCENT_CPU, PERCENT_MEM,
-    USER, TIME, NLWP, TGID,
-    #ifdef HAVE_OPENVZ
--   VEID, VPID,
-+   CTID, VPID,
-    #endif
-    #ifdef HAVE_VSERVER
-    VXID,
-@@ -124,7 +124,7 @@
-    float percent_mem;
-    char* user;
-    #ifdef HAVE_OPENVZ
--   unsigned int veid;
-+   unsigned int ctid;
-    unsigned int vpid;
-    #endif
-    #ifdef HAVE_VSERVER
-@@ -163,7 +163,7 @@
-    "M_TRS", "M_DRS", "M_LRS", "M_DT", "ST_UID", "PERCENT_CPU", "PERCENT_MEM",
-    "USER", "TIME", "NLWP", "TGID", 
- #ifdef HAVE_OPENVZ
--   "VEID", "VPID",
-+   "CTID", "VPID",
- #endif
- #ifdef HAVE_VSERVER
-    "VXID",
-@@ -185,7 +185,7 @@
-    " CODE ", " DATA ", " LIB ", " DIRTY ", " UID ", "CPU% ", "MEM% ",
-    "USER     ", "  TIME+  ", "NLWP ", " TGID ",
- #ifdef HAVE_OPENVZ
--   " VEID ", " VPID ",
-+   " CTID ", " VPID ",
- #endif
- #ifdef HAVE_VSERVER
-    " VXID ",
-@@ -397,7 +397,7 @@
-       break;
-    }
-    #ifdef HAVE_OPENVZ
--   case VEID: snprintf(buffer, n, "%5u ", this->veid); break;
-+   case CTID: snprintf(buffer, n, "%5u ", this->ctid); break;
-    case VPID: snprintf(buffer, n, "%5u ", this->vpid); break;
-    #endif
-    #ifdef HAVE_VSERVER
-@@ -566,8 +566,8 @@
-    case NLWP:
-       return (p1->nlwp - p2->nlwp);
-    #ifdef HAVE_OPENVZ
--   case VEID:
--      return (p1->veid - p2->veid);
-+   case CTID:
-+      return (p1->ctid - p2->ctid);
-    case VPID:
-       return (p1->vpid - p2->vpid);
-    #endif
-diff -Naur htop-0.8.1.orig/Process.h htop-0.8.1/Process.h
---- htop-0.8.1.orig/Process.h	2008-09-23 05:43:34.000000000 +0200
-+++ htop-0.8.1/Process.h	2009-02-24 00:11:35.000000000 +0100
-@@ -49,7 +49,7 @@
-    PROCESSOR, M_SIZE, M_RESIDENT, M_SHARE, M_TRS, M_DRS, M_LRS, M_DT, ST_UID, PERCENT_CPU, PERCENT_MEM,
-    USER, TIME, NLWP, TGID,
-    #ifdef HAVE_OPENVZ
--   VEID, VPID,
-+   CTID, VPID,
-    #endif
-    #ifdef HAVE_VSERVER
-    VXID,
-@@ -126,7 +126,7 @@
-    float percent_mem;
-    char* user;
-    #ifdef HAVE_OPENVZ
--   unsigned int veid;
-+   unsigned int ctid;
-    unsigned int vpid;
-    #endif
-    #ifdef HAVE_VSERVER
-diff -Naur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c
---- htop-0.8.1.orig/ProcessList.c	2009-02-24 00:09:37.000000000 +0100
-+++ htop-0.8.1/ProcessList.c	2009-02-24 00:11:35.000000000 +0100
-@@ -623,7 +623,7 @@
-             #ifdef HAVE_OPENVZ
-             if (access("/proc/vz", R_OK) != 0) {
-                process->vpid = process->pid;
--               process->veid = 0;
-+               process->ctid = 0;
-             } else {
-                snprintf(statusfilename, MAX_NAME, "%s/%s/status", dirname, name);
-                status = ProcessList_fopen(this, statusfilename, "r");
-@@ -631,17 +631,17 @@
-                   goto errorReadingProcess;
-                else {
-                   char buffer[256];
--                  process->veid = 0;
-+                  process->ctid = 0;
-                   while (!feof(status)) {
-                      char* ok = fgets(buffer, 255, status);
-                      if (!ok)
-                         break;
- 
-                      if (String_startsWith(buffer, "envID:")) {
--                        int veid;
--                        int ok = ProcessList_read(this, buffer, "envID:\t%d", &veid);
-+                        int ctid;
-+                        int ok = ProcessList_read(this, buffer, "envID:\t%d", &ctid);
-                         if (ok >= 1) {
--                           process->veid = veid;
-+                           process->ctid = ctid;
-                         }
-                      }
-                   }
diff --git a/debian/patches/700-ltrace-support.patch b/debian/patches/700-ltrace-support.patch
index 0a6212f..6f5e71d 100644
--- a/debian/patches/700-ltrace-support.patch
+++ b/debian/patches/700-ltrace-support.patch
@@ -1,8 +1,9 @@
-diff --git a/TraceScreen.c b/TraceScreen.c
-index 072c26d..087e6cc 100644
---- a/TraceScreen.c
-+++ b/TraceScreen.c
-@@ -23,11 +23,17 @@ in the source distribution for its full text.
+Add support for 'ltrace' in addition to 'strace' support.
+Index: htop/TraceScreen.c
+===================================================================
+--- htop.orig/TraceScreen.c	2009-04-05 11:17:49.000000000 +0300
++++ htop/TraceScreen.c	2009-04-05 12:26:08.935062271 +0300
+@@ -23,11 +23,17 @@
  
  /*{
  
@@ -20,7 +21,7 @@ index 072c26d..087e6cc 100644
  } TraceScreen;
  
  }*/
-@@ -38,9 +44,10 @@ static char* tbKeys[3] = {"F4", "F5", "Esc"};
+@@ -38,9 +44,10 @@
  
  static int tbEvents[3] = {KEY_F(4), KEY_F(5), 27};
  
@@ -32,7 +33,7 @@ index 072c26d..087e6cc 100644
     this->display = Panel_new(0, 1, COLS, LINES-2, LISTITEM_CLASS, true, ListItem_compare);
     this->bar = FunctionBar_new(3, tbFunctions, tbKeys, tbEvents);
     this->tracing = true;
-@@ -56,7 +63,14 @@ void TraceScreen_delete(TraceScreen* this) {
+@@ -56,7 +63,14 @@
  static void TraceScreen_draw(TraceScreen* this) {
     attrset(CRT_colors[PANEL_HEADER_FOCUS]);
     mvhline(0, 0, ' ', COLS);
@@ -48,7 +49,7 @@ index 072c26d..087e6cc 100644
     attrset(CRT_colors[DEFAULT_COLOR]);
     FunctionBar_draw(this->bar, NULL);
  }
-@@ -73,15 +87,24 @@ void TraceScreen_run(TraceScreen* this) {
+@@ -73,15 +87,24 @@
        dup2(fdpair[1], STDERR_FILENO);
        fcntl(fdpair[1], F_SETFL, O_NONBLOCK);
        sprintf(buffer, "%d", this->process->pid);
@@ -77,7 +78,7 @@ index 072c26d..087e6cc 100644
     TraceScreen_draw(this);
     CRT_disableDelay();
     bool contLine = false;
-@@ -90,13 +113,13 @@ void TraceScreen_run(TraceScreen* this) {
+@@ -90,13 +113,13 @@
     while (looping) {
        fd_set fds;
        FD_ZERO(&fds);
@@ -94,7 +95,7 @@ index 072c26d..087e6cc 100644
        if (nread && this->tracing) {
           char* line = buffer;
           buffer[nread] = '\0';
-@@ -164,6 +187,6 @@ void TraceScreen_run(TraceScreen* this) {
+@@ -164,6 +187,6 @@
     }
     kill(child, SIGTERM);
     waitpid(child, NULL, 0);
@@ -102,11 +103,11 @@ index 072c26d..087e6cc 100644
 +   fclose(trace);
     CRT_enableDelay();
  }
-diff --git a/TraceScreen.h b/TraceScreen.h
-index d2904a7..cad4450 100644
---- a/TraceScreen.h
-+++ b/TraceScreen.h
-@@ -25,15 +25,21 @@ in the source distribution for its full text.
+Index: htop/TraceScreen.h
+===================================================================
+--- htop.orig/TraceScreen.h	2009-04-05 11:17:49.000000000 +0300
++++ htop/TraceScreen.h	2009-04-05 12:26:08.935062271 +0300
+@@ -25,15 +25,21 @@
  #include "FunctionBar.h"
  
  
@@ -129,11 +130,11 @@ index d2904a7..cad4450 100644
  
  void TraceScreen_delete(TraceScreen* this);
  
-diff --git a/htop.1 b/htop.1
-index 57c7012..27ae732 100644
---- a/htop.1
-+++ b/htop.1
-@@ -35,6 +35,11 @@ Trace process system calls: if strace(1) is installed, pressing this key
+Index: htop/htop.1
+===================================================================
+--- htop.orig/htop.1	2009-04-05 11:17:49.000000000 +0300
++++ htop/htop.1	2009-04-05 12:26:08.935062271 +0300
+@@ -35,6 +35,11 @@
  will attach it to the currently selected process, presenting a live
  update of system calls issued by the process.
  .TP
@@ -145,11 +146,11 @@ index 57c7012..27ae732 100644
  .B F1, h
  Help screen
  .TP
-diff --git a/htop.c b/htop.c
-index c74b6b3..42d1aca 100644
---- a/htop.c
-+++ b/htop.c
-@@ -117,6 +117,7 @@ static void showHelp(ProcessList* pl) {
+Index: htop/htop.c
+===================================================================
+--- htop.orig/htop.c	2009-04-05 11:48:46.352047326 +0300
++++ htop/htop.c	2009-04-05 12:26:08.935062271 +0300
+@@ -121,6 +121,7 @@
     mvaddstr(19, 0, "   F2 S: setup                           F6 >: select sort column");
     mvaddstr(20, 0, "   F1 h: show this help screen");
     mvaddstr(21, 0, "  F10 q: quit                               s: trace syscalls with strace");
@@ -157,7 +158,7 @@ index c74b6b3..42d1aca 100644
  
     attrset(CRT_colors[HELP_BOLD]);
     mvaddstr( 9, 0, " Arrows"); mvaddstr( 9,40, " F5 t");
-@@ -134,10 +135,11 @@ static void showHelp(ProcessList* pl) {
+@@ -140,10 +141,11 @@
     mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, " F6 >");
     mvaddstr(20, 0, "   F1 h");
     mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    s");
@@ -170,7 +171,7 @@ index c74b6b3..42d1aca 100644
     attrset(CRT_colors[DEFAULT_COLOR]);
     refresh();
     CRT_readKey();
-@@ -542,9 +544,20 @@ int main(int argc, char** argv) {
+@@ -551,9 +553,20 @@
           Panel_onKey(panel, KEY_DOWN);
           break;
        }
@@ -192,5 +193,3 @@ index c74b6b3..42d1aca 100644
           TraceScreen_run(ts);
           TraceScreen_delete(ts);
           clear();
-
- 	  	 
diff --git a/debian/patches/800-tree-view-without-userland-threads.patch b/debian/patches/800-tree-view-without-userland-threads.patch
deleted file mode 100644
index db8c185..0000000
--- a/debian/patches/800-tree-view-without-userland-threads.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix tree view when userland threads are hidden.
-Index: htop/ProcessList.c
-===================================================================
---- htop.orig/ProcessList.c	2009-02-25 23:08:35.396191440 +0200
-+++ htop/ProcessList.c	2009-02-25 23:10:26.525680664 +0200
-@@ -563,9 +563,7 @@
-                process->pid = pid;
-             }
-          }
--         if (parent) {
--            process->tgid = parent->pid;
--         }
-+         process->tgid = parent ? parent->pid : pid;
- 
-          if (showUserlandThreads && (!parent || pid != parent->pid)) {
-             char subdirname[MAX_NAME+1];
diff --git a/debian/patches/series b/debian/patches/series
index 19bb084..c8aa567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,2 @@
-010-make-desktop-file-valid.patch
-100-upstream-sort-by-processor-and-session.patch
-110-upstream-fix-page-size-on-BSD.patch
-120-upstream-explain-cpu-bars-in-monochrome-mode.patch
-200-filter-non-printable-characters.patch
-600-openvz-veid-on-kernels-gt-2.6.18.patch -p1
-610-rename-veid-to-ctid.patch -p1
-700-ltrace-support.patch -p1
-800-tree-view-without-userland-threads.patch
+600-openvz-veid-on-kernels-gt-2.6.18.patch 
+700-ltrace-support.patch