From 7f7bb928c67e32dbcacc8a93dd1b920a977d83fa9be638cf985512ef988cb01a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 15 Oct 2010 10:41:05 +0000 Subject: [PATCH 1/4] . OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=26 --- psmisc-22.13-peekfd-segv.patch | 13 +++++++++++++ psmisc-22.12.dif => psmisc-22.13.dif | 11 +++++++++++ psmisc.changes | 5 +++++ psmisc.spec | 3 +++ 4 files changed, 32 insertions(+) create mode 100644 psmisc-22.13-peekfd-segv.patch rename psmisc-22.12.dif => psmisc-22.13.dif (71%) diff --git a/psmisc-22.13-peekfd-segv.patch b/psmisc-22.13-peekfd-segv.patch new file mode 100644 index 0000000..8e7049d --- /dev/null +++ b/psmisc-22.13-peekfd-segv.patch @@ -0,0 +1,13 @@ +diff --git a/src/peekfd.c b/src/peekfd.c +index 2c30f25..6d759b9 100644 +--- a/src/peekfd.c ++++ b/src/peekfd.c +@@ -199,7 +199,7 @@ int main(int argc, char **argv) + numfds = argc - optind; + fds = malloc(sizeof(int) * numfds); + for (i = 0; i < numfds; i++) +- fds[i] = atoi(argv[optind + i + 1]); ++ fds[i] = atoi(argv[optind + i]); + } + + attach(target_pid); diff --git a/psmisc-22.12.dif b/psmisc-22.13.dif similarity index 71% rename from psmisc-22.12.dif rename to psmisc-22.13.dif index 0d524b5..29064a3 100644 --- a/psmisc-22.12.dif +++ b/psmisc-22.13.dif @@ -1,3 +1,14 @@ +--- configure.ac ++++ configure.ac 2010-10-15 09:00:32.915927054 +0000 +@@ -72,7 +72,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc + struct user_regs_struct.rdi, + struct user_regs_struct.rsi, + struct user_regs_struct.rdx], [],[], +- [#include ++ [#include + #include ]) + AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, + struct pt_regs.gpr], [],[], [#include ]) --- src/fuser.c +++ src/fuser.c 2010-07-13 15:01:58.000000000 +0000 @@ -1120,7 +1120,8 @@ int main(int argc, char *argv[]) diff --git a/psmisc.changes b/psmisc.changes index 5a789ce..68f3186 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 15 12:36:16 CEST 2010 - werner@suse.de + +- Add fix from upstream for a crash in peekfd + ------------------------------------------------------------------- Sun Sep 19 10:36:02 CEST 2010 - vuntz@opensuse.org diff --git a/psmisc.spec b/psmisc.spec index 1c1ab97..67e477c 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -31,12 +31,14 @@ Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/%{name}-%{version}.tar.bz2 Patch0: %name-22.12.dif +Patch0: %name-22.13.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree_overflow.patch Patch3: %name-22.12-pstree.patch Patch4: %name-22.12-leaks.patch Patch5: %name-22.12-nfs4fuser.patch Patch6: %name-22.12-writeonly.patch +Patch7: %name-22.13-peekfd-segv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %sparc hppa @@ -57,6 +59,7 @@ processes that are using specified files or filesystems. %patch4 -p0 -b .leaks %patch5 -p0 -b .nfs4fuser %patch6 -p0 -b .wrtonly +%patch7 -p1 -b .peekfd %patch0 -p0 %build From 24eb448b18093338b8e8bcc17d1ebdf562513e360d383e482965771c8903a263 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 15 Oct 2010 10:47:36 +0000 Subject: [PATCH 2/4] . OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=27 --- psmisc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/psmisc.spec b/psmisc.spec index 67e477c..fa6735c 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -30,7 +30,6 @@ Release: 1 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/%{name}-%{version}.tar.bz2 -Patch0: %name-22.12.dif Patch0: %name-22.13.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree_overflow.patch From 68c511a73f05bf340519510990f8feda9f71636db36af36f544c9c89f8e98772 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 14:44:10 +0000 Subject: [PATCH 3/4] Accepting request 50811 from Base:System checked in (request 50811) OBS-URL: https://build.opensuse.org/request/show/50811 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=28 --- psmisc-22.13.dif => psmisc-22.12.dif | 11 ----------- psmisc-22.13-peekfd-segv.patch | 13 ------------- psmisc.changes | 5 ----- psmisc.spec | 4 +--- 4 files changed, 1 insertion(+), 32 deletions(-) rename psmisc-22.13.dif => psmisc-22.12.dif (71%) delete mode 100644 psmisc-22.13-peekfd-segv.patch diff --git a/psmisc-22.13.dif b/psmisc-22.12.dif similarity index 71% rename from psmisc-22.13.dif rename to psmisc-22.12.dif index 29064a3..0d524b5 100644 --- a/psmisc-22.13.dif +++ b/psmisc-22.12.dif @@ -1,14 +1,3 @@ ---- configure.ac -+++ configure.ac 2010-10-15 09:00:32.915927054 +0000 -@@ -72,7 +72,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc - struct user_regs_struct.rdi, - struct user_regs_struct.rsi, - struct user_regs_struct.rdx], [],[], -- [#include -+ [#include - #include ]) - AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, - struct pt_regs.gpr], [],[], [#include ]) --- src/fuser.c +++ src/fuser.c 2010-07-13 15:01:58.000000000 +0000 @@ -1120,7 +1120,8 @@ int main(int argc, char *argv[]) diff --git a/psmisc-22.13-peekfd-segv.patch b/psmisc-22.13-peekfd-segv.patch deleted file mode 100644 index 8e7049d..0000000 --- a/psmisc-22.13-peekfd-segv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/peekfd.c b/src/peekfd.c -index 2c30f25..6d759b9 100644 ---- a/src/peekfd.c -+++ b/src/peekfd.c -@@ -199,7 +199,7 @@ int main(int argc, char **argv) - numfds = argc - optind; - fds = malloc(sizeof(int) * numfds); - for (i = 0; i < numfds; i++) -- fds[i] = atoi(argv[optind + i + 1]); -+ fds[i] = atoi(argv[optind + i]); - } - - attach(target_pid); diff --git a/psmisc.changes b/psmisc.changes index 68f3186..5a789ce 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 15 12:36:16 CEST 2010 - werner@suse.de - -- Add fix from upstream for a crash in peekfd - ------------------------------------------------------------------- Sun Sep 19 10:36:02 CEST 2010 - vuntz@opensuse.org diff --git a/psmisc.spec b/psmisc.spec index fa6735c..1c1ab97 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -30,14 +30,13 @@ Release: 1 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/%{name}-%{version}.tar.bz2 -Patch0: %name-22.13.dif +Patch0: %name-22.12.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree_overflow.patch Patch3: %name-22.12-pstree.patch Patch4: %name-22.12-leaks.patch Patch5: %name-22.12-nfs4fuser.patch Patch6: %name-22.12-writeonly.patch -Patch7: %name-22.13-peekfd-segv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %sparc hppa @@ -58,7 +57,6 @@ processes that are using specified files or filesystems. %patch4 -p0 -b .leaks %patch5 -p0 -b .nfs4fuser %patch6 -p0 -b .wrtonly -%patch7 -p1 -b .peekfd %patch0 -p0 %build From d1b417ce409780264f1776becb81825bd629b1603fc11aac7f19ad6da1fe51df Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 15 Oct 2010 14:44:11 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/psmisc revision 32.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=f272edd9b07cbee347188bf8da3c37ec --- psmisc-22.13-peekfd-segv.patch | 13 +++++++++++++ psmisc-22.12.dif => psmisc-22.13.dif | 11 +++++++++++ psmisc.changes | 5 +++++ psmisc.spec | 6 ++++-- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 psmisc-22.13-peekfd-segv.patch rename psmisc-22.12.dif => psmisc-22.13.dif (71%) diff --git a/psmisc-22.13-peekfd-segv.patch b/psmisc-22.13-peekfd-segv.patch new file mode 100644 index 0000000..8e7049d --- /dev/null +++ b/psmisc-22.13-peekfd-segv.patch @@ -0,0 +1,13 @@ +diff --git a/src/peekfd.c b/src/peekfd.c +index 2c30f25..6d759b9 100644 +--- a/src/peekfd.c ++++ b/src/peekfd.c +@@ -199,7 +199,7 @@ int main(int argc, char **argv) + numfds = argc - optind; + fds = malloc(sizeof(int) * numfds); + for (i = 0; i < numfds; i++) +- fds[i] = atoi(argv[optind + i + 1]); ++ fds[i] = atoi(argv[optind + i]); + } + + attach(target_pid); diff --git a/psmisc-22.12.dif b/psmisc-22.13.dif similarity index 71% rename from psmisc-22.12.dif rename to psmisc-22.13.dif index 0d524b5..29064a3 100644 --- a/psmisc-22.12.dif +++ b/psmisc-22.13.dif @@ -1,3 +1,14 @@ +--- configure.ac ++++ configure.ac 2010-10-15 09:00:32.915927054 +0000 +@@ -72,7 +72,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc + struct user_regs_struct.rdi, + struct user_regs_struct.rsi, + struct user_regs_struct.rdx], [],[], +- [#include ++ [#include + #include ]) + AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, + struct pt_regs.gpr], [],[], [#include ]) --- src/fuser.c +++ src/fuser.c 2010-07-13 15:01:58.000000000 +0000 @@ -1120,7 +1120,8 @@ int main(int argc, char *argv[]) diff --git a/psmisc.changes b/psmisc.changes index 5a789ce..68f3186 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 15 12:36:16 CEST 2010 - werner@suse.de + +- Add fix from upstream for a crash in peekfd + ------------------------------------------------------------------- Sun Sep 19 10:36:02 CEST 2010 - vuntz@opensuse.org diff --git a/psmisc.spec b/psmisc.spec index 1c1ab97..cba43d3 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -26,17 +26,18 @@ License: GPLv2+ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq Version: 22.13 -Release: 1 +Release: 2 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/%{name}-%{version}.tar.bz2 -Patch0: %name-22.12.dif +Patch0: %name-22.13.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree_overflow.patch Patch3: %name-22.12-pstree.patch Patch4: %name-22.12-leaks.patch Patch5: %name-22.12-nfs4fuser.patch Patch6: %name-22.12-writeonly.patch +Patch7: %name-22.13-peekfd-segv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %sparc hppa @@ -57,6 +58,7 @@ processes that are using specified files or filesystems. %patch4 -p0 -b .leaks %patch5 -p0 -b .nfs4fuser %patch6 -p0 -b .wrtonly +%patch7 -p1 -b .peekfd %patch0 -p0 %build