pool/psmisc
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/psmisc revision 32.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=f272edd9b07cbee347188bf8da3c37ec
This commit is contained in:
OBS User buildservice-autocommit 2010-10-15 14:44:11 +00:00 committed by Git OBS Bridge
parent b7b7e66d64
commit e9c9399aaf
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
psmisc-22.13-peekfd-segv.patch Normal file
View File

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

11
psmisc-22.12.dif → psmisc-22.13.dif
View File

@ -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 <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[])

5
psmisc.changes
View File

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

6
psmisc.spec
View File

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