Accepting request 42162 from home:jengelh:smp

Copy from home:jengelh:smp/psmisc via accept of submit request 42162 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/42162
OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=19

psmisc-22.7-pstree_overflow.patch

@@ -0,0 +1,11 @@
+--- 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;

psmisc.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
+
+- use %_smp_mflags
+
+-------------------------------------------------------------------
+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
 

psmisc.spec

@@ -27,7 +27,7 @@ Group:          System/Monitoring
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        22.7
-Release:        8
+Release:        9
 Provides:       ps:/usr/bin/killall
 Summary:        Utilities for managing processes on your system
 Source:         http://switch.dl.sourceforge.net/sourceforge/psmisc/psmisc-%{version}.tar.bz2
@@ -40,6 +40,7 @@ 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
 
@@ -68,6 +69,7 @@ Authors:
 %patch7 -p0 -b .memleaks
 %patch0 -p0
 %patch8 -p0
+%patch9 -p0
 
 %build
 autoreconf -fi
@@ -77,7 +79,7 @@ CC=gcc
 CXX=g++
 export CFLAGS CXXFLAGS CC CXX
 sh ./configure --prefix=%{_prefix} --mandir=%{_mandir} --enable-selinux
-make %{?jobs:-j%jobs} CFLAGS="$CFLAGS" "CC=$CC"
+make %{?_smp_mflags} CFLAGS="$CFLAGS" "CC=$CC"
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install