diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-05-02 20:47:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-05-02 20:47:54 +0000 |
| commit | 8a55466880bf418b75b7cf25d4a9cce0507ed5b5 (patch) | |
| tree | 8d8d6f41e324276591141f7f14350f6c2fed102c /sys-process | |
| parent | Really stable on x86 this time, thanks to gustavoz (diff) | |
| download | gentoo-2-8a55466880bf418b75b7cf25d4a9cce0507ed5b5.tar.gz gentoo-2-8a55466880bf418b75b7cf25d4a9cce0507ed5b5.tar.bz2 gentoo-2-8a55466880bf418b75b7cf25d4a9cce0507ed5b5.zip | |
Touchup peekfd handling #175776 by Harald van Dijk.
(Portage version: 2.1.2.5)
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/psmisc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.5-user-header.patch | 11 | ||||
| -rw-r--r-- | sys-process/psmisc/psmisc-22.5.ebuild | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog index f6ecaa0262d7..3facc4fb5c50 100644 --- a/sys-process/psmisc/ChangeLog +++ b/sys-process/psmisc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-process/psmisc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.56 2007/04/25 02:31:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.57 2007/05/02 20:47:54 vapier Exp $ + + 02 May 2007; Mike Frysinger <vapier@gentoo.org> + +files/psmisc-22.5-user-header.patch, psmisc-22.5.ebuild: + Touchup peekfd handling #175776 by Harald van Dijk. *psmisc-22.5 (25 Apr 2007) diff --git a/sys-process/psmisc/files/psmisc-22.5-user-header.patch b/sys-process/psmisc/files/psmisc-22.5-user-header.patch new file mode 100644 index 000000000000..c982dde795fa --- /dev/null +++ b/sys-process/psmisc/files/psmisc-22.5-user-header.patch @@ -0,0 +1,11 @@ +--- src/peekfd.c ++++ src/peekfd.c +@@ -26,7 +26,7 @@ + #include <sys/ptrace.h> + #include <sys/types.h> + #include <sys/wait.h> +-#include <linux/user.h> ++#include <sys/user.h> + #include <stdlib.h> + #include <getopt.h> + #include <ctype.h> diff --git a/sys-process/psmisc/psmisc-22.5.ebuild b/sys-process/psmisc/psmisc-22.5.ebuild index fca127ffe44d..f9dd116ae4c0 100644 --- a/sys-process/psmisc/psmisc-22.5.ebuild +++ b/sys-process/psmisc/psmisc-22.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5.ebuild,v 1.1 2007/04/25 02:31:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5.ebuild,v 1.2 2007/05/02 20:47:54 vapier Exp $ inherit eutils @@ -23,6 +23,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PN}-22.2-gcc2.patch + epatch "${FILESDIR}"/${P}-user-header.patch } src_compile() { @@ -39,4 +40,6 @@ src_install() { emake install DESTDIR="${D}" || die dodoc AUTHORS ChangeLog NEWS README use X || rm "${D}"/bi/pstree.x11 + # easier to do this than forcing regen of autotools + [[ -e ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/share/man/man1/peekfd.1 } |