From 9a71c7230c43640562ca3a45efb689f211f4d0ca9cfac7e09301f8a502de6572 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 9 Oct 2009 09:33:52 +0000 Subject: [PATCH] Accepting request 22149 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/psmisc via accept of submit request 22149 revision 4. OBS-URL: https://build.opensuse.org/request/show/22149 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=8 --- psmisc-22.8-to-22.7-backport.patch | 12 ++++++++++++ psmisc.changes | 6 ++++++ psmisc.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 psmisc-22.8-to-22.7-backport.patch diff --git a/psmisc-22.8-to-22.7-backport.patch b/psmisc-22.8-to-22.7-backport.patch new file mode 100644 index 0000000..e9e9115 --- /dev/null +++ b/psmisc-22.8-to-22.7-backport.patch @@ -0,0 +1,12 @@ +--- src/pstree.c.orig 2008-12-16 11:13:35.000000000 +0100 ++++ src/pstree.c 2009-10-08 19:37:59.000000000 +0200 +@@ -749,6 +749,9 @@ + exit (1); + } + (void) close (fd); ++ /* If we have read the maximum screen length of args, bring it back by one to stop overflow */ ++ if (size >= buffer_size) ++ size--; + if (size) + buffer[size++] = 0; + #ifdef WITH_SELINUX diff --git a/psmisc.changes b/psmisc.changes index 1376b98..6a5ac6d 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 9 08:20:29 UTC 2009 - aj@suse.de + +- fix pstree -a crash (bnc#545265) with patch backported from 22.8 + by Björn Voigt . + ------------------------------------------------------------------- Thu Sep 10 10:21:09 CEST 2009 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index 2720cc2..ab74762 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -39,6 +39,7 @@ Patch4: %name-22.7-writeonly.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %arm @@ -66,6 +67,7 @@ Authors: %patch6 -p0 -b .tigetstr %patch7 -p0 -b .memleaks %patch0 -p0 +%patch8 -p0 %build autoreconf -fi