summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/strace/ChangeLog12
-rw-r--r--dev-util/strace/files/strace-4.5.18-arm-cache.patch15
-rw-r--r--dev-util/strace/files/strace-4.5.18-arm-syscalls.patch162
-rw-r--r--dev-util/strace/files/strace-4.5.20-ioctlent.patch16
-rw-r--r--dev-util/strace/files/strace-fix-arm-bad-syscall.patch20
-rw-r--r--dev-util/strace/metadata.xml7
-rw-r--r--dev-util/strace/strace-4.5.18.ebuild41
-rw-r--r--dev-util/strace/strace-4.5.20-r1.ebuild49
8 files changed, 82 insertions, 240 deletions
diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index d52300eeff01..8fb826accfba 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for dev-util/strace
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.148 2010/09/12 19:41:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.149 2010/10/12 12:34:06 flameeyes Exp $
+
+*strace-4.5.20-r1 (12 Oct 2010)
+
+ 12 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ -strace-4.5.18.ebuild, -files/strace-4.5.18-arm-cache.patch,
+ -files/strace-4.5.18-arm-syscalls.patch, +strace-4.5.20-r1.ebuild,
+ +files/strace-4.5.20-ioctlent.patch,
+ -files/strace-fix-arm-bad-syscall.patch, metadata.xml:
+ Remove old version and cleanup files; add new revision with an alsa USE
+ flag and with updated ioctl() list (regenerated at build time).
12 Sep 2010; Mike Frysinger <vapier@gentoo.org> strace-4.5.20.ebuild,
+files/strace-4.5.20-sparc.patch:
diff --git a/dev-util/strace/files/strace-4.5.18-arm-cache.patch b/dev-util/strace/files/strace-4.5.18-arm-cache.patch
deleted file mode 100644
index 9aed43c554fd..000000000000
--- a/dev-util/strace/files/strace-4.5.18-arm-cache.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/266014
-
-ARM defines SYS_cacheflush but does not have asm/cachectl.h
-
---- a/system.c
-+++ b/system.c
-@@ -70,7 +70,7 @@
- #include <linux/capability.h>
- #endif
-
--#ifdef SYS_cacheflush
-+#if defined(SYS_cacheflush) && !defined(ARM)
- #include <asm/cachectl.h>
- #endif
-
diff --git a/dev-util/strace/files/strace-4.5.18-arm-syscalls.patch b/dev-util/strace/files/strace-4.5.18-arm-syscalls.patch
deleted file mode 100644
index a2f50fd152f1..000000000000
--- a/dev-util/strace/files/strace-4.5.18-arm-syscalls.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From f5da8d0c38ea0eb660cb17de7aa62cda6899eb75 Mon Sep 17 00:00:00 2001
-From: ldv <ldv>
-Date: Thu, 1 Jan 2009 23:20:38 +0000
-Subject: [PATCH] 2008-11-13 Kirill A. Shutemov <kirill@shutemov.name>
-
- * linux/arm/syscallent.h: Fix build on ARM EABI which does not
- provide syscalls socketcall and ipc.
----
- ChangeLog | 5 +++++
- linux/arm/syscallent.h | 4 +++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
-index 5ccef2f..edc3641 100644
---- a/linux/arm/syscallent.h
-+++ b/linux/arm/syscallent.h
-@@ -431,6 +431,7 @@
- { 5, 0, printargs, "SYS_398" }, /* 398 */
- { 5, 0, printargs, "SYS_399" }, /* 399 */
-
-+#ifndef __ARM_EABI__
- #if SYS_socket_subcall != 400
- #error fix me
- #endif
-@@ -481,3 +482,4 @@
- { 4, TI, sys_shmdt, "shmdt" }, /* 440 */
- { 4, TI, sys_shmget, "shmget" }, /* 441 */
- { 4, TI, sys_shmctl, "shmctl" }, /* 442 */
-+#endif
---
-1.6.1.3
-
-From 885d06bc92bae2f6aad85ef2fe0b806a06f60712 Mon Sep 17 00:00:00 2001
-From: ldv <ldv>
-Date: Thu, 1 Jan 2009 23:23:47 +0000
-Subject: [PATCH] 2008-11-13 Kirill A. Shutemov <kirill@shutemov.name>
-
- * linux/arm/syscallent.h: Update syscalls.
- Based on patch by Enrico Scholz.
----
- ChangeLog | 3 +
- linux/arm/syscallent.h | 98 ++++++++++++++++++++++++------------------------
- 2 files changed, 52 insertions(+), 49 deletions(-)
-
-diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
-index edc3641..6dd783a 100644
---- a/linux/arm/syscallent.h
-+++ b/linux/arm/syscallent.h
-@@ -328,63 +328,63 @@
- { 5, TN, sys_getsockopt, "getsockopt" }, /* 295 */
- { 3, TN, sys_sendmsg, "sendmsg" }, /* 296 */
- { 3, TN, sys_recvmsg, "recvmsg" }, /* 297 */
-- { 5, 0, printargs, "SYS_298" }, /* 298 */
-- { 5, 0, printargs, "SYS_299" }, /* 299 */
-- { 5, 0, printargs, "SYS_300" }, /* 300 */
-- { 5, 0, printargs, "SYS_301" }, /* 301 */
-- { 5, 0, printargs, "SYS_302" }, /* 302 */
-- { 5, 0, printargs, "SYS_303" }, /* 303 */
-- { 5, 0, printargs, "SYS_304" }, /* 304 */
-- { 5, 0, printargs, "SYS_305" }, /* 305 */
-- { 5, 0, printargs, "SYS_306" }, /* 306 */
-- { 5, 0, printargs, "SYS_307" }, /* 307 */
-- { 5, 0, printargs, "SYS_308" }, /* 308 */
-- { 5, 0, printargs, "SYS_309" }, /* 309 */
-- { 5, 0, printargs, "SYS_310" }, /* 310 */
-- { 5, 0, printargs, "SYS_311" }, /* 311 */
-- { 5, 0, printargs, "SYS_312" }, /* 312 */
-- { 5, 0, printargs, "SYS_313" }, /* 313 */
-- { 5, 0, printargs, "SYS_314" }, /* 314 */
-- { 5, 0, printargs, "SYS_315" }, /* 315 */
-- { 5, 0, printargs, "SYS_316" }, /* 316 */
-- { 5, 0, printargs, "SYS_317" }, /* 317 */
-- { 5, 0, printargs, "SYS_318" }, /* 318 */
-- { 5, 0, printargs, "SYS_319" }, /* 319 */
-- { 5, 0, printargs, "SYS_320" }, /* 320 */
-- { 5, 0, printargs, "SYS_321" }, /* 321 */
-- { 5, 0, printargs, "SYS_322" }, /* 322 */
-- { 5, 0, printargs, "SYS_323" }, /* 323 */
-- { 5, 0, printargs, "SYS_324" }, /* 324 */
-- { 5, 0, printargs, "SYS_325" }, /* 325 */
-- { 5, 0, printargs, "SYS_326" }, /* 326 */
-- { 5, 0, printargs, "SYS_327" }, /* 327 */
-- { 5, 0, printargs, "SYS_328" }, /* 328 */
-- { 5, 0, printargs, "SYS_329" }, /* 329 */
-- { 5, 0, printargs, "SYS_330" }, /* 330 */
-- { 5, 0, printargs, "SYS_331" }, /* 331 */
-- { 5, 0, printargs, "SYS_332" }, /* 332 */
-- { 5, 0, printargs, "SYS_333" }, /* 333 */
-- { 5, 0, printargs, "SYS_334" }, /* 334 */
-+ { 4, TI, sys_semop, "semop" }, /* 298 */
-+ { 4, TI, sys_semget, "semget" }, /* 299 */
-+ { 4, TI, sys_semctl, "semctl" }, /* 300 */
-+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 301 */
-+ { 4, TI, sys_msgrcv, "msgrcv" }, /* 302 */
-+ { 4, TI, sys_msgget, "msgget" }, /* 303 */
-+ { 4, TI, sys_msgctl, "msgctl" }, /* 304 */
-+ { 4, TI, sys_shmat, "shmat" }, /* 305 */
-+ { 4, TI, sys_shmdt, "shmdt" }, /* 306 */
-+ { 4, TI, sys_shmget, "shmget" }, /* 307 */
-+ { 4, TI, sys_shmctl, "shmctl" }, /* 308 */
-+ { 5, 0, printargs, "add_key" }, /* 309 */
-+ { 4, 0, printargs, "request_key" }, /* 310 */
-+ { 5, 0, printargs, "keyctl" }, /* 311 */
-+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 312 */
-+ { 5, 0, printargs, "vserver" }, /* 313 */
-+ { 3, 0, printargs, "ioprio_set" }, /* 314 */
-+ { 2, 0, printargs, "ioprio_get" }, /* 315 */
-+ { 0, TD, printargs, "inotify_init" }, /* 316 */
-+ { 3, TD, sys_inotify_add_watch, "inotify_add_watch" }, /* 317 */
-+ { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 318 */
-+ { 6, 0, sys_mbind, "mbind" }, /* 319 */
-+ { 3, 0, sys_set_mempolicy, "set_mempolicy" }, /* 320 */
-+ { 5, 0, sys_get_mempolicy, "get_mempolicy" }, /* 321 */
-+ { 4, TD|TF, sys_openat, "openat" }, /* 322 */
-+ { 3, TD|TF, sys_mkdirat, "mkdirat" }, /* 323 */
-+ { 4, TD|TF, sys_mknodat, "mknodat" }, /* 324 */
-+ { 5, TD|TF, sys_fchownat, "fchownat" }, /* 325 */
-+ { 3, TD|TF, sys_futimesat, "futimesat" }, /* 326 */
-+ { 4, TD|TD, sys_newfstatat, "newfstatat" }, /* 327 */
-+ { 3, TD|TF, sys_unlinkat, "unlinkat" }, /* 328 */
-+ { 4, TD|TF, sys_renameat, "renameat" }, /* 329 */
-+ { 5, TD|TF, sys_linkat, "linkat" }, /* 330 */
-+ { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 331 */
-+ { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 332 */
-+ { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 333 */
-+ { 3, TD|TF, sys_faccessat, "faccessat" }, /* 334 */
- { 5, 0, printargs, "SYS_335" }, /* 335 */
- { 5, 0, printargs, "SYS_336" }, /* 336 */
-- { 5, 0, printargs, "SYS_337" }, /* 337 */
-- { 5, 0, printargs, "SYS_338" }, /* 338 */
-- { 5, 0, printargs, "SYS_339" }, /* 339 */
-- { 5, 0, printargs, "SYS_340" }, /* 340 */
-+ { 1, TP, sys_unshare, "unshare" }, /* 337 */
-+ { 2, 0, printargs, "set_robust_list" }, /* 338 */
-+ { 3, 0, printargs, "get_robust_list" }, /* 339 */
-+ { 6, TD, printargs, "splice" }, /* 340 */
- { 5, 0, printargs, "SYS_341" }, /* 341 */
-- { 5, 0, printargs, "SYS_342" }, /* 342 */
-- { 5, 0, printargs, "SYS_343" }, /* 343 */
-+ { 4, TD, printargs, "tee" }, /* 342 */
-+ { 4, TD, printargs, "vmsplice" }, /* 343 */
- { 6, 0, sys_move_pages, "move_pages" }, /* 344 */
- { 3, 0, sys_getcpu, "getcpu" }, /* 345 */
- { 5, 0, printargs, "SYS_346" }, /* 346 */
-- { 5, 0, printargs, "SYS_347" }, /* 347 */
-- { 5, 0, printargs, "SYS_348" }, /* 348 */
-+ { 5, 0, printargs, "kexec_load" }, /* 347 */
-+ { 4, TD|TF, sys_utimensat, "utimensat" }, /* 348 */
- { 3, TD|TS, sys_signalfd, "signalfd" }, /* 349 */
- { 4, TD, sys_timerfd, "timerfd" }, /* 350 */
- { 1, TD, sys_eventfd, "eventfd" }, /* 351 */
-- { 5, 0, printargs, "SYS_352" }, /* 352 */
-- { 5, 0, printargs, "SYS_353" }, /* 353 */
-- { 5, 0, printargs, "SYS_354" }, /* 354 */
-+ { 6, TF, sys_fallocate, "fallocate" }, /* 352 */
-+ { 4, TD, sys_timerfd_settime, "timerfd_settime"}, /* 353 */
-+ { 2, TD, sys_timerfd_gettime, "timerfd_gettime"}, /* 354 */
- { 5, 0, printargs, "SYS_355" }, /* 355 */
- { 5, 0, printargs, "SYS_356" }, /* 356 */
- { 5, 0, printargs, "SYS_357" }, /* 357 */
---
-1.6.1.3
diff --git a/dev-util/strace/files/strace-4.5.20-ioctlent.patch b/dev-util/strace/files/strace-4.5.20-ioctlent.patch
new file mode 100644
index 000000000000..941f83962a20
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.20-ioctlent.patch
@@ -0,0 +1,16 @@
+Index: strace-4.5.20/Makefile.am
+===================================================================
+--- strace-4.5.20.orig/Makefile.am
++++ strace-4.5.20/Makefile.am
+@@ -109,11 +109,7 @@ if LINUX
+ IOCTLDIR = /usr/include
+ IOCTLASM = asm
+
+-if I386
+ ioctlent_h = linux/ioctlent.h
+-else
+-ioctlent_h = linux/$(ARCH)/ioctlent.h
+-endif
+
+ BUILT_SOURCES = $(ioctlent_h)
+
diff --git a/dev-util/strace/files/strace-fix-arm-bad-syscall.patch b/dev-util/strace/files/strace-fix-arm-bad-syscall.patch
deleted file mode 100644
index 125440dd81e4..000000000000
--- a/dev-util/strace/files/strace-fix-arm-bad-syscall.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/metadata.xml b/dev-util/strace/metadata.xml
index 605ea01d1bc3..cf87b1e0b150 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/metadata.xml
@@ -3,6 +3,11 @@
<pkgmetadata>
<herd>base-system</herd>
<use>
- <flag name="aio">Enable libaio support</flag>
+ <flag name="aio">
+ Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
+ </flag>
+ <flag name="alsa">
+ Read ioctl() values from <pkg>media-sound/alsa-headers</pkg> for ALSA device.
+ </flag>
</use>
</pkgmetadata>
diff --git a/dev-util/strace/strace-4.5.18.ebuild b/dev-util/strace/strace-4.5.18.ebuild
deleted file mode 100644
index ac1183a488ff..000000000000
--- a/dev-util/strace/strace-4.5.18.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.18.ebuild,v 1.14 2009/05/30 00:17:44 vapier Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="http://sourceforge.net/projects/strace/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static aio"
-
-DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- #epatch "${FILESDIR}"/${PN}-4.5.11-fbsd.patch
-
- epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch
- epatch "${FILESDIR}"/${PN}-4.5.18-arm-syscalls.patch #241168
- epatch "${FILESDIR}"/${PN}-4.5.18-arm-cache.patch #266014
-}
-
-src_compile() {
- filter-lfs-flags
-
- use static && append-ldflags -static
-
- econf $(use_enable aio libaio) || die
- emake || die
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc ChangeLog CREDITS NEWS PORTING README* TODO
-}
diff --git a/dev-util/strace/strace-4.5.20-r1.ebuild b/dev-util/strace/strace-4.5.20-r1.ebuild
new file mode 100644
index 000000000000..d2d185225d43
--- /dev/null
+++ b/dev-util/strace/strace-4.5.20-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.20-r1.ebuild,v 1.1 2010/10/12 12:34:06 flameeyes Exp $
+
+EAPI="2"
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static aio alsa"
+
+# strace only uses the header from libaio
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+ alsa? ( media-sound/alsa-headers )
+ sys-kernel/linux-headers"
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sparc.patch #336939
+ epatch "${FILESDIR}"/${P}-ioctlent.patch
+
+ # Force rebuild of the list
+ rm linux/ioctlent.h || die
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-lfs-flags # configure handles this sanely
+ use static && append-ldflags -static
+
+ use aio || export ac_cv_header_libaio_h=no
+
+ # Without maintainer mode the list won't be rebuilt
+ econf \
+ --enable-maintainer-mode \
+ || die
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc ChangeLog CREDITS NEWS PORTING README* TODO || die
+}