diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-07 01:10:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-07 01:10:30 +0000 |
| commit | f585fb39897271286b9bca9600152c561f75e7e0 (patch) | |
| tree | 440cb95a07d26c6b1223a98a1d1738d2a7cb67f8 | |
| parent | trim whitespace (diff) | |
| download | historical-f585fb39897271286b9bca9600152c561f75e7e0.tar.gz historical-f585fb39897271286b9bca9600152c561f75e7e0.tar.bz2 historical-f585fb39897271286b9bca9600152c561f75e7e0.zip | |
Add a patch to follow fake arm syscalls.
Package-Manager: portage-2.1_pre3-r1
| -rw-r--r-- | dev-util/strace/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/strace/Manifest | 11 | ||||
| -rw-r--r-- | dev-util/strace/files/strace-fix-arm-bad-syscall.patch | 20 | ||||
| -rw-r--r-- | dev-util/strace/strace-4.5.12.ebuild | 3 |
4 files changed, 34 insertions, 8 deletions
diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog index d4fd638f5300..e55024402886 100644 --- a/dev-util/strace/ChangeLog +++ b/dev-util/strace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/strace -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.69 2005/11/20 07:34:16 vapier Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.70 2006/01/07 01:10:30 vapier Exp $ + + 07 Jan 2006; Mike Frysinger <vapier@gentoo.org> + +files/strace-fix-arm-bad-syscall.patch, strace-4.5.12.ebuild: + Add a patch to follow fake arm syscalls. 20 Nov 2005; Mike Frysinger <vapier@gentoo.org> files/strace-4.5.12-libaio.patch, strace-4.5.12.ebuild: diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index a42eb5d51414..162124851c79 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 afdcc17c6bbaa8053962511c70e45989 ChangeLog 8457 +MD5 6a6267edcec5a19a8bb91eb41228e1aa ChangeLog 8616 MD5 38e4a65d3a6a6e39695752ba68b2db78 files/digest-strace-4.5.1 65 MD5 fdb191f71c367e18de7f236b17d51401 files/digest-strace-4.5.11 66 MD5 9b1d73be67c2e1359d1490b62a2bb84e files/digest-strace-4.5.12 66 @@ -17,19 +17,20 @@ MD5 d35971fd734b9597cc50db1060fd2b8f files/strace-4.5.12-superh-update.patch 540 MD5 3d30271a2e23ac6401b2b54f99b91e5c files/strace-4.5.2-s390-april2004.diff 11986 MD5 335622a1648a690be4e5eddba97f3034 files/strace-4.5.8-ia64.patch 2271 MD5 df94e08f4b2b33edc62a8e700bdb37ca files/strace-dont-use-REG_SYSCALL-for-sh.patch 630 +MD5 ee93a7bc6c247bdc094c2d9f932bfb5a files/strace-fix-arm-bad-syscall.patch 560 MD5 ff683dfacf57a09947ca5e6c4406249d files/strace-superh-update.patch 300 MD5 661ca5a1974846c6f778c6c47d8b382e files/strace-undef-syscall.patch 656 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 85f383eadb2ed8c50c1a494e679bd2a2 strace-4.5.1.ebuild 1294 MD5 0ad191371a52a40b85dfb14db954593a strace-4.5.11.ebuild 1675 -MD5 9bc5539a76e23c055795e43d425a8097 strace-4.5.12.ebuild 2065 +MD5 34ac133ba38e0bfca1a22f792dc98a61 strace-4.5.12.ebuild 2120 MD5 4474209bd9ff4ef6827bc37e512e6885 strace-4.5.2.ebuild 1311 MD5 7a45d471b2608afbcfac7b22f86726ce strace-4.5.7.ebuild 1139 MD5 c9d8ca6c43099729a9c981ed49e94ce3 strace-4.5.9.ebuild 1429 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDvcKY2+ySkm8kpY0RAoYFAJwO7G4/jx00rRcLSWx4cGiQv9mYDgCfe0bT -H4+vKwD86UZbFhdggHydmAY= -=HJ0g +iD8DBQFDvxVO2+ySkm8kpY0RAtnuAJ9FpiE10ZiNCgoTw2+0djmN1DrTxwCgxHr2 +RGHcLAyP5+1cVMDIgnWNq+E= +=EwPr -----END PGP SIGNATURE----- diff --git a/dev-util/strace/files/strace-fix-arm-bad-syscall.patch b/dev-util/strace/files/strace-fix-arm-bad-syscall.patch new file mode 100644 index 000000000000..125440dd81e4 --- /dev/null +++ b/dev-util/strace/files/strace-fix-arm-bad-syscall.patch @@ -0,0 +1,20 @@ +http://www.fluff.org/ben/patches/strace/ + +--- strace-4.5.12-orig/syscall.c 2005-06-08 21:45:28.000000000 +0100 ++++ strace-4.5.12/syscall.c 2005-10-25 19:26:39.000000000 +0100 +@@ -1013,6 +1013,15 @@ struct tcb *tcp; + /* + * Note: we only deal with only 32-bit CPUs here. + */ ++ ++ if (!(tcp->flags & TCB_INSYSCALL) && ++ (tcp->flags & TCB_WAITEXECVE)) { ++ /* caught a fake syscall from the execve's exit */ ++ tcp->flags &= ~TCB_WAITEXECVE; ++ return 0; ++ } ++ ++ + if (regs.ARM_cpsr & 0x20) { + /* + * Get the Thumb-mode system call number diff --git a/dev-util/strace/strace-4.5.12.ebuild b/dev-util/strace/strace-4.5.12.ebuild index 7c3c1edaebae..4578814f8ad9 100644 --- a/dev-util/strace/strace-4.5.12.ebuild +++ b/dev-util/strace/strace-4.5.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.6 2006/01/06 01:05:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.7 2006/01/07 01:10:30 vapier Exp $ inherit flag-o-matic @@ -29,6 +29,7 @@ src_unpack() { # Fix building on older ARM machines epatch "${FILESDIR}"/strace-undef-syscall.patch + epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch # Fix libaio support #103427 epatch "${FILESDIR}"/${P}-libaio.patch |