diff --git a/psmisc-22.7-pstree_overflow.patch b/psmisc-22.7-pstree_overflow.patch deleted file mode 100644 index 6c38d50..0000000 --- a/psmisc-22.7-pstree_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pstree.c -+++ src/pstree.c -@@ -70,7 +70,7 @@ - - typedef struct _proc - { -- char comm[COMM_LEN + 1]; -+ char comm[COMM_LEN + 2 + 1]; /* add another 2 for thread brackets */ - char **argv; /* only used : argv[0] is 1st arg; undef if argc < 1 */ - int argc; /* with -a : number of arguments, -1 if swapped */ - pid_t pid; diff --git a/psmisc.changes b/psmisc.changes index 5d2c723..d0a740c 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 4 02:24:15 CET 2010 - ro@suse.de - -- fix overflow crash in pstree: add 2 to COMM_LEN for {...} - brackets for threads - ------------------------------------------------------------------- Sun Dec 6 15:07:16 CET 2009 - jengelh@medozas.de diff --git a/psmisc.spec b/psmisc.spec index d1560b6..a55d268 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -40,7 +40,6 @@ Patch5: %name-22.6-fdleak.patch Patch6: %name-22.6-tigetstr.patch Patch7: %name-22.7-memleaks.patch Patch8: %name-22.8-to-22.7-backport.patch -Patch9: psmisc-22.7-pstree_overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %arm %sparc @@ -69,7 +68,6 @@ Authors: %patch7 -p0 -b .memleaks %patch0 -p0 %patch8 -p0 -%patch9 -p0 %build autoreconf -fi