diff options
author | Ciaran McCreesh <ciaranm@gentoo.org> | 2005-03-03 16:53:14 +0000 |
---|---|---|
committer | Ciaran McCreesh <ciaranm@gentoo.org> | 2005-03-03 16:53:14 +0000 |
commit | 5331dfa26da867d83c375f9882f141ef76a0e4d7 (patch) | |
tree | 534ab7d28707669f6eea5d685c11f20037a5e3d5 /sys-process/procps/files | |
parent | Added ~ppc64 to KEYWORDS (diff) | |
download | historical-5331dfa26da867d83c375f9882f141ef76a0e4d7.tar.gz historical-5331dfa26da867d83c375f9882f141ef76a0e4d7.tar.bz2 historical-5331dfa26da867d83c375f9882f141ef76a0e4d7.zip |
Moved from sys-apps/procps to sys-process/procps.
Diffstat (limited to 'sys-process/procps/files')
11 files changed, 142 insertions, 0 deletions
diff --git a/sys-process/procps/files/3.2.4-64bit-display.patch b/sys-process/procps/files/3.2.4-64bit-display.patch new file mode 100644 index 000000000000..aca21f6de8f5 --- /dev/null +++ b/sys-process/procps/files/3.2.4-64bit-display.patch @@ -0,0 +1,34 @@ +Index: proc/escape.c +=================================================================== +RCS file: /cvsroot/procps/procps/proc/escape.c,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -r1.5 -r1.6 +--- proc/escape.c 4 Nov 2004 20:50:59 -0000 1.5 ++++ proc/escape.c 5 Jan 2005 21:11:21 -0000 1.6 +@@ -159,7 +159,7 @@ + // escape an argv or environment string array + // + // bytes arg means sizeof(buf) +-int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t bytes, size_t *cells){ ++int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t bytes, int *cells){ + size_t i = 0; + + for(;;){ +Index: proc/escape.h +=================================================================== +RCS file: /cvsroot/procps/procps/proc/escape.h,v +retrieving revision 1.4 +retrieving revision 1.5 +diff -u -r1.4 -r1.5 +--- proc/escape.h 4 Nov 2004 20:50:59 -0000 1.4 ++++ proc/escape.h 5 Jan 2005 21:11:21 -0000 1.5 +@@ -12,7 +12,7 @@ + #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it + #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>" + +-extern int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t n, size_t *cells); ++extern int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t n, int *cells); + extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells); + extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags); + diff --git a/sys-process/procps/files/3.2.4-linux26-slab.patch b/sys-process/procps/files/3.2.4-linux26-slab.patch new file mode 100644 index 000000000000..d2d0ab0ceaae --- /dev/null +++ b/sys-process/procps/files/3.2.4-linux26-slab.patch @@ -0,0 +1,17 @@ +Index: proc/slab.c +=================================================================== +RCS file: /cvsroot/procps/procps/proc/slab.c,v +retrieving revision 1.4 +retrieving revision 1.5 +diff -u -r1.4 -r1.5 +--- proc/slab.c 5 Jan 2005 21:46:22 -0000 1.4 ++++ proc/slab.c 10 Jan 2005 05:59:41 -0000 1.5 +@@ -293,7 +294,7 @@ + return 1; + } + +- if (major == 2 && minor == 0) ++ if (major == 2) + ret = parse_slabinfo20(list, stats, slabfile); + else if (major == 1 && minor == 1) + ret = parse_slabinfo11(list, stats, slabfile); diff --git a/sys-process/procps/files/3.2.5-top-sort.patch b/sys-process/procps/files/3.2.5-top-sort.patch new file mode 100644 index 000000000000..b160bcc301a9 --- /dev/null +++ b/sys-process/procps/files/3.2.5-top-sort.patch @@ -0,0 +1,39 @@ +Under certain conditions, top's display can break. +This patch is by Curtis Doty, updated by Andreas Kling for 3.2.5. + +To reproduce bug: + - run top + - turn on color mode ('z') + - highlight sort column ('x') + - move sort column all the way to the left ('<') + - get drunk + +procps e-mail: http://sourceforge.net/mailarchive/forum.php?thread_id=6042978&forum_id=12454 +Redhat bug: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=140975 +Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=80296 + +--- procps-3.2.5/top.c~ 2005-01-26 06:15:18.000000000 +0100 ++++ procps-3.2.5/top.c 2005-02-01 09:23:35.000000000 +0100 +@@ -2952,12 +2952,10 @@ + for (x = 0; x < q->maxpflgs; x++) { + char cbuf[ROWBUFSIZ], _z[ROWBUFSIZ]; + FLG_t i = q->procflags[x]; // support for our field/column +- const char *f = Fieldstab[i].fmts; // macro AND sometimes the fmt ++ const char *f = Fieldstab[i].fmts + ((x==0) && !Rc.mode_altscr); + unsigned s = Fieldstab[i].scale; // string must be altered ! + unsigned w = Fieldstab[i].width; + +- int advance = (x==0) && !Rc.mode_altscr; +- + switch (i) { + case P_CMD: + { char tmp[ROWBUFSIZ]; +@@ -3069,7 +3067,7 @@ + + } /* end: switch 'procflag' */ + +- rp = scat(rp, cbuf+advance); ++ rp = scat(rp, cbuf); + } /* end: for 'maxpflgs' */ + + PUFF( diff --git a/sys-process/procps/files/digest-procps-3.2.3-r1 b/sys-process/procps/files/digest-procps-3.2.3-r1 new file mode 100644 index 000000000000..175dcab7099b --- /dev/null +++ b/sys-process/procps/files/digest-procps-3.2.3-r1 @@ -0,0 +1 @@ +MD5 5389800bf413e70365d982bac9438d31 procps-3.2.3.tar.gz 271136 diff --git a/sys-process/procps/files/digest-procps-3.2.4-r2 b/sys-process/procps/files/digest-procps-3.2.4-r2 new file mode 100644 index 000000000000..2bf5f1226db4 --- /dev/null +++ b/sys-process/procps/files/digest-procps-3.2.4-r2 @@ -0,0 +1 @@ +MD5 1bec6740b385b3f73800827437f14f85 procps-3.2.4.tar.gz 275861 diff --git a/sys-process/procps/files/digest-procps-3.2.4-r3 b/sys-process/procps/files/digest-procps-3.2.4-r3 new file mode 100644 index 000000000000..2bf5f1226db4 --- /dev/null +++ b/sys-process/procps/files/digest-procps-3.2.4-r3 @@ -0,0 +1 @@ +MD5 1bec6740b385b3f73800827437f14f85 procps-3.2.4.tar.gz 275861 diff --git a/sys-process/procps/files/digest-procps-3.2.5 b/sys-process/procps/files/digest-procps-3.2.5 new file mode 100644 index 000000000000..0f9fb90c8e34 --- /dev/null +++ b/sys-process/procps/files/digest-procps-3.2.5 @@ -0,0 +1 @@ +MD5 cde0e3612d1d7c68f404d46f01c44fb4 procps-3.2.5.tar.gz 277365 diff --git a/sys-process/procps/files/digest-procps-3.2.5-r1 b/sys-process/procps/files/digest-procps-3.2.5-r1 new file mode 100644 index 000000000000..0f9fb90c8e34 --- /dev/null +++ b/sys-process/procps/files/digest-procps-3.2.5-r1 @@ -0,0 +1 @@ +MD5 cde0e3612d1d7c68f404d46f01c44fb4 procps-3.2.5.tar.gz 277365 diff --git a/sys-process/procps/files/procps-3.2.5-proc-mount.patch b/sys-process/procps/files/procps-3.2.5-proc-mount.patch new file mode 100644 index 000000000000..958ade4d6162 --- /dev/null +++ b/sys-process/procps/files/procps-3.2.5-proc-mount.patch @@ -0,0 +1,6 @@ +--- proc/readproc.c ++++ proc/readproc.c +@@ -858,2 +858,2 @@ + if(file2str("/proc/self", "stat", sbuf, sizeof sbuf) == -1){ +- fprintf(stderr, "Error, do this: mount -t proc none /proc\n"); ++ fprintf(stderr, "Error, do this: mount -t proc proc /proc\n"); diff --git a/sys-process/procps/files/procps-mips-define-pagesize.patch b/sys-process/procps/files/procps-mips-define-pagesize.patch new file mode 100644 index 000000000000..3802f4ccecfb --- /dev/null +++ b/sys-process/procps/files/procps-mips-define-pagesize.patch @@ -0,0 +1,29 @@ +diff -Naurp procps-3.2.3.orig/minimal.c procps-3.2.3/minimal.c +--- procps-3.2.3.orig/minimal.c 2004-05-04 20:26:14.000000000 -0400 ++++ procps-3.2.3/minimal.c 2004-08-20 02:01:35.868100752 -0400 +@@ -68,8 +68,8 @@ + /////////////////////////////////////////////////////////// + + #ifndef PAGE_SIZE +-#warning PAGE_SIZE not defined, assuming it is 4096 +-#define PAGE_SIZE 4096 ++#warning PAGE_SIZE not defined, using sysconf() to determine correct value ++#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) + #endif + + +diff -Naurp procps-3.2.3.orig/ps/common.h procps-3.2.3/ps/common.h +--- procps-3.2.3.orig/ps/common.h 2004-04-25 17:03:18.000000000 -0400 ++++ procps-3.2.3/ps/common.h 2004-08-20 02:00:59.228670792 -0400 +@@ -16,6 +16,11 @@ + #include "../proc/readproc.h" + #include <asm/page.h> /* looks safe for glibc, we need PAGE_SIZE */ + ++#ifndef PAGE_SIZE ++#warning PAGE_SIZE not defined, using sysconf() to determine correct value ++#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) ++#endif ++ + #if 0 + #define trace(args...) printf(## args) + #else diff --git a/sys-process/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch b/sys-process/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch new file mode 100644 index 000000000000..472e9c0acf89 --- /dev/null +++ b/sys-process/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch @@ -0,0 +1,12 @@ +diff -Naurp procps-3.2.4.orig/proc/procps.h procps-3.2.4/proc/procps.h +--- procps-3.2.4.orig/proc/procps.h 2004-08-20 18:40:13 -0400 ++++ procps-3.2.4/proc/procps.h 2005-02-28 10:38:05 -0500 +@@ -31,7 +31,7 @@ + // + // Unknown: PA-RISC and zSeries + // +-#if defined(k64test) || defined(_ABIN32) ++#if defined(k64test) + #define KLONG long long // not typedef; want "unsigned KLONG" to work + #define KLF "L" + #define STRTOUKL strtoull |