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.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 <bits/types.h>
-+    [#include <sys/types.h>
-      #include <sys/user.h>])
- AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
- 		struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
 --- src/fuser.c
 +++ src/fuser.c	2010-07-13 15:01:58.000000000 +0000
 @@ -1120,7 +1120,8 @@ int main(int argc, char *argv[])

psmisc-22.13-peekfd-segv.patch

@@ -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);

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
 

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