+++ /dev/null
-Add support for FreeBSD.
-
-Patch by Piego Pettenò
-
-http://bugs.gentoo.org/93657
-
---- strace-4.5.11/configure.ac
-+++ strace-4.5.11/configure.ac
-@@ -192,16 +192,24 @@
- fi
-
- AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
--AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h], [], [])
-+AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h sys/param.h], [], [])
- AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
- [], [], [#include <linux/socket.h>])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
--AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
-+AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,,
-+[#include <sys/types.h>
-+#include <netinet/in.h>])
-+
-+AC_CHECK_HEADERS([sys/mount.h],,,
-+[#include <sys/types.h>
-+#include <sys/param.h>])
-
- AC_MP_PROCFS
- AC_POLLABLE_PROCFS
-
--AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])
-+AC_CHECK_MEMBERS([struct msghdr.msg_control],,,
-+[#include <sys/types.h>
-+#include <sys/socket.h>])
- AC_STRUCT_PR_SYSCALL
-
- AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
-@@ -209,6 +217,19 @@
- [#include <sys/stream.h>
- #include <sys/tihdr.h>])
-
-+AC_CHECK_MEMBERS([struct fsid.val,
-+ struct fsid.__val],,,
-+[#include <sys/types.h>
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+#ifdef HAVE_SYS_VFS_H
-+# include <sys/vfs.h>
-+#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+# include <sys/mount.h>
-+#endif])
-+
- AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
-
- AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
---- strace-4.5.11/file.c
-+++ strace-4.5.11/file.c
-@@ -200,6 +200,10 @@
- #include <ustat.h>
- #endif
-
-+#if defined(HAVE_STRUCT_FSID_VAL) && ! defined(HAVE_STRUCT_FSID___VAL)
-+#define __val val
-+#endif
-+
- /*
- * This is a really dirty trick but it should always work. Traditional
- * Unix says r/w/rw are 0/1/2, so we make them true flags 1/2/3 by
-@@ -2495,6 +2499,8 @@
- }
-
-
-+#ifdef LINUX
-+
- static const struct xlat advise[] = {
- { POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" },
- { POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" },
-@@ -2506,7 +2512,6 @@
- };
-
-
--#ifdef LINUX
- int
- sys_fadvise64(tcp)
- struct tcb *tcp;
-@@ -2524,7 +2529,6 @@
- }
- return 0;
- }
--#endif
-
-
- int
-@@ -2545,3 +2549,5 @@
- }
- return 0;
- }
-+
-+#endif
---- strace-4.5.11/net.c
-+++ strace-4.5.11/net.c
-@@ -1112,6 +1112,7 @@
- tprintf("}}");
- return;
- }
-+#ifdef SCM_CREDENTIALS
- if (u.cmsg.cmsg_type == SCM_CREDENTIALS
- && CMSG_LEN(sizeof(struct ucred)) <= u.cmsg.cmsg_len) {
- struct ucred *uc = (struct ucred *) CMSG_DATA (&u.cmsg);
-@@ -1119,6 +1120,7 @@
- (long)uc->pid, (long)uc->uid, (long)uc->gid);
- return;
- }
-+#endif
- }
- tprintf(", ...}");
- }
---- strace-4.5.11/sock.c
-+++ strace-4.5.11/sock.c
-@@ -46,6 +46,7 @@
- #endif
- #endif
- #include <net/if.h>
-+#include <netinet/in.h>
-
- extern const struct xlat addrfams[];
-
-@@ -55,16 +56,26 @@
- { IFF_DEBUG, "IFF_DEBUG" },
- { IFF_LOOPBACK, "IFF_LOOPBACK" },
- { IFF_POINTOPOINT, "IFF_POINTOPOINT" },
-+#ifdef IFF_NOTRAILERS
- { IFF_NOTRAILERS, "IFF_NOTRAILERS" },
-+#endif
- { IFF_RUNNING, "IFF_RUNNING" },
- { IFF_NOARP, "IFF_NOARP" },
- { IFF_PROMISC, "IFF_PROMISC" },
- { IFF_ALLMULTI, "IFF_ALLMULTI" },
-+#ifdef IFF_MASTER
- { IFF_MASTER, "IFF_MASTER" },
-+#endif
-+#ifdef IFF_SLAVE
- { IFF_SLAVE, "IFF_SLAVE" },
-+#endif
- { IFF_MULTICAST, "IFF_MULTICAST" },
-+#ifdef IFF_PORTSEL
- { IFF_PORTSEL, "IFF_PORTSEL" },
-+#endif
-+#ifdef IFF_AUTOMEDIA
- { IFF_AUTOMEDIA, "IFF_AUTOMEDIA" },
-+#endif
- { 0, NULL }
- };
-
---- strace-4.5.11/strace.c
-+++ strace-4.5.11/strace.c
-@@ -617,6 +617,23 @@
- cleanup();
- exit(1);
- }
-+#ifdef FREEBSD
-+ {
-+ int status;
-+ pid_t err;
-+
-+ do {
-+ err = waitpid(pid, &status, WUNTRACED);
-+ } while (err == -1 && errno == EINTR);
-+ if (err == -1) {
-+ fprintf(stderr,
-+ "waitpid() failed: %s\n",
-+ strerror(errno));
-+ cleanup();
-+ exit(1);
-+ }
-+ }
-+#endif
- #ifdef USE_PROCFS
- if (proc_open(tcp, 0) < 0) {
- fprintf(stderr, "trouble opening proc file\n");
+++ /dev/null
-Make libaio support a proper option and update the checks to support
-both new and old versions of libaio.
-
-http://bugs.gentoo.org/103427
-
---- strace/configure.ac
-+++ strace/configure.ac
-@@ -170,6 +170,26 @@
- struct stat.st_rdev])
- AC_STAT64
-
-+AC_ARG_ENABLE(libaio,
-+ AC_HELP_STRING([--enable-libaio],[enable support for libaio @<:@default=auto@:>@]),
-+ [enable_libaio=$enableval],
-+ [enable_libaio=auto]
-+)
-+if test "x$enable_libaio" != "xno" ; then
-+ AC_CHECK_HEADER([libaio.h],[have_libaio=yes],[have_libaio=no])
-+ if test "x$enable_libaio$have_libaio" = "xyesno" ; then
-+ AC_MSG_ERROR(Could not detect libaio.h)
-+ elif test "x$have_libaio" = "xyes" ; then
-+ AC_DEFINE(HAVE_LIBAIO_H, 1, [System has libaio.h])
-+ AC_CHECK_MEMBERS([
-+ struct iocb.data,
-+ struct iocb.aio_data,
-+ struct iocb.key,
-+ struct iocb.aio_key],
-+ [], [], [#include <libaio.h>])
-+ fi
-+fi
-+
- AC_TYPE_SIGNAL
- AC_TYPE_UID_T
- AC_TYPE_MODE_T
---- strace/desc.c
-+++ strace/desc.c
-@@ -767,7 +767,11 @@
- continue;
- }
- tprintf("{%p, %u, %hu, %hu, %d}",
-+#ifdef HAVE_STRUCT_IOCB_AIO_DATA
-+ iocb.aio_data, iocb.aio_data,
-+#else
- iocb.data, iocb.key,
-+#endif
- iocb.aio_lio_opcode,
- iocb.aio_reqprio, iocb.aio_fildes);
- }
-@@ -793,7 +797,11 @@
- #ifdef HAVE_LIBAIO_H
- if (umove(tcp, tcp->u_arg[1], &iocb) == 0) {
- tprintf("{%p, %u, %hu, %hu, %d}, ",
-+#ifdef HAVE_STRUCT_IOCB_AIO_DATA
-+ iocb.aio_data, iocb.aio_data,
-+#else
- iocb.data, iocb.key,
-+#endif
- iocb.aio_lio_opcode,
- iocb.aio_reqprio, iocb.aio_fildes);
- } else
+++ /dev/null
-http://bugs.gentoo.org/186369
-
---- strace-4.5.15/file.c
-+++ strace-4.5.15/file.c
-@@ -684,9 +684,13 @@
- return buf;
- }
- tmp = localtime(&t);
-- sprintf(buf, "%02d/%02d/%02d-%02d:%02d:%02d",
-- tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-- tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-+ if (tmp == NULL)
-+ snprintf(buf, sizeof buf, "%lu",
-+ (unsigned long) t);
-+ else
-+ sprintf(buf, "%02d/%02d/%02d-%02d:%02d:%02d",
-+ tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
- return buf;
- }
-
+++ /dev/null
-if the getdents struct is corrupt, strace will loop forever
-
---- strace/file.c
-+++ strace/file.c
-@@ -2414,6 +2414,10 @@ struct tcb *tcp;
- #endif /* SUNOS4 */
- i += d->d_reclen;
- dents++;
-+ if (!d->d_reclen) {
-+ fprintf(stderr, "[error: d->d_reclen == 0] ");
-+ break;
-+ }
- }
- if (!abbrev(tcp))
- tprintf("}");
-@@ -2466,6 +2470,10 @@ struct tcb * tcp;
- }
- i += d->d_reclen;
- dents++;
-+ if (!d->d_reclen) {
-+ fprintf(stderr, "[error: d->d_reclen == 0] ");
-+ break;
-+ }
- }
- if (!abbrev(tcp))
- tprintf("}");
+++ /dev/null
-Index: linux/mips/syscallent.h
-===================================================================
-RCS file: /cvsroot/strace/strace/linux/mips/syscallent.h,v
-retrieving revision 1.28
-diff -u -p -r1.28 syscallent.h
---- linux/mips/syscallent.h 2 Aug 2007 01:44:14 -0000 1.28
-+++ linux/mips/syscallent.h 31 Oct 2007 10:12:44 -0000
-@@ -4245,14 +4245,14 @@
- { 3, 0, sys_io_submit, "io_submit" }, /* 4244 */
- { 3, 0, sys_io_cancel, "io_cancel" }, /* 4245 */
- { 1, TP, sys_exit, "exit_group" }, /* 4246 */
-- { 3, 0, printargs, "lookup_dcookie"}, /* 4247 */
-+ { 4, 0, printargs, "lookup_dcookie"}, /* 4247 */
- { 1, 0, sys_epoll_create, "epoll_create" }, /* 4248 */
- { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 4249 */
- { 3, TD, sys_epoll_wait, "epoll_wait" }, /* 4250 */
- { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 4251 */
- { 1, 0, printargs, "set_tid_address"}, /* 4252 */
- { 0, 0, sys_restart_syscall, "restart_syscall"}, /* 4253 */
-- { 7, 0, sys_fadvise64_64, "fadvise64_64" }, /* 4254 */
-+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 4254 */
- { 3, TF, sys_statfs64, "statfs64" }, /* 4255 */
- { 2, TD, sys_fstatfs64, "fstatfs64" }, /* 4256 */
- { 3, 0, sys_timer_create, "timer_create" }, /* 4257 */
+++ /dev/null
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/strace/strace/configure.ac,v
-retrieving revision 1.52
-diff -u -p -r1.52 configure.ac
---- configure.ac 3 Aug 2007 10:28:56 -0000 1.52
-+++ configure.ac 31 Oct 2007 10:13:38 -0000
-@@ -91,7 +91,7 @@ hppa*|parisc*)
- arch=hppa
- AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
- ;;
--sh)
-+sh|sh[[234]]*)
- arch=sh
- AC_DEFINE([SH], 1, [Define for the SH architecture.])
- ;;
-Index: linux/sh/syscallent.h
-===================================================================
-RCS file: /cvsroot/strace/strace/linux/sh/syscallent.h,v
-retrieving revision 1.16
-diff -u -p -r1.16 syscallent.h
---- linux/sh/syscallent.h 2 Aug 2007 01:44:14 -0000 1.16
-+++ linux/sh/syscallent.h 31 Oct 2007 10:13:39 -0000
-@@ -256,109 +256,107 @@
- { 3, TD, sys_fcntl, "fcntl64" }, /* 221 */
- { 4, 0, printargs, "SYS_222" }, /* 222 */
- { 4, 0, printargs, "SYS_223" }, /* 223 */
-- { 4, 0, printargs, "SYS_224" }, /* 224 */
-- { 5, 0, printargs, "SYS_225" }, /* 225 */
-- { 5, 0, printargs, "SYS_226" }, /* 226 */
-- { 5, 0, printargs, "SYS_227" }, /* 227 */
-- { 5, 0, printargs, "SYS_228" }, /* 228 */
-- { 5, 0, printargs, "SYS_229" }, /* 229 */
--
-- { 8, 0, printargs, "socket_subcall"}, /* 230 */
-- { 3, TN, sys_socket, "socket" }, /* 231 */
-- { 3, TN, sys_bind, "bind" }, /* 232 */
-- { 3, TN, sys_connect, "connect" }, /* 233 */
-- { 2, TN, sys_listen, "listen" }, /* 234 */
-- { 3, TN, sys_accept, "accept" }, /* 235 */
-- { 3, TN, sys_getsockname, "getsockname" }, /* 236 */
-- { 3, TN, sys_getpeername, "getpeername" }, /* 237 */
-- { 4, TN, sys_socketpair, "socketpair" }, /* 238 */
-- { 4, TN, sys_send, "send" }, /* 239 */
-- { 4, TN, sys_recv, "recv" }, /* 240 */
-- { 6, TN, sys_sendto, "sendto" }, /* 241 */
-- { 6, TN, sys_recvfrom, "recvfrom" }, /* 242 */
-- { 2, TN, sys_shutdown, "shutdown" }, /* 243 */
-- { 5, TN, sys_setsockopt, "setsockopt" }, /* 244 */
-- { 5, TN, sys_getsockopt, "getsockopt" }, /* 245 */
-- { 5, TN, sys_sendmsg, "sendmsg" }, /* 246 */
-- { 5, TN, sys_recvmsg, "recvmsg" }, /* 247 */
-- { 5, 0, printargs, "SYS_248" }, /* 248 */
-- { 5, 0, printargs, "SYS_249" }, /* 249 */
--
-- { 4, 0, printargs, "ipc_subcall" }, /* 250 */
-- { 4, TI, sys_semop, "semop" }, /* 251 */
-- { 4, TI, sys_semget, "semget" }, /* 252 */
-- { 4, TI, sys_semctl, "semctl" }, /* 253 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 254 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 255 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 256 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 257 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 258 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 259 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 260 */
-- { 4, TI, sys_msgsnd, "msgsnd" }, /* 261 */
-- { 4, TI, sys_msgrcv, "msgrcv" }, /* 262 */
-- { 4, TI, sys_msgget, "msgget" }, /* 263 */
-- { 4, TI, sys_msgctl, "msgctl" }, /* 264 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 265 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 266 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 267 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 268 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 269 */
-- { 4, 0, printargs, "ipc_subcall" }, /* 270 */
-- { 4, TI, sys_shmat, "shmat" }, /* 271 */
-- { 4, TI, sys_shmdt, "shmdt" }, /* 272 */
-- { 4, TI, sys_shmget, "shmget" }, /* 273 */
-- { 4, TI, sys_shmctl, "shmctl" }, /* 274 */
-- { 5, 0, printargs, "SYS_275" }, /* 275 */
-- { 5, 0, printargs, "SYS_276" }, /* 276 */
-- { 5, 0, printargs, "SYS_277" }, /* 277 */
-- { 5, 0, printargs, "SYS_278" }, /* 278 */
-- { 5, 0, printargs, "SYS_279" }, /* 279 */
-- { 5, 0, printargs, "SYS_280" }, /* 280 */
-- { 5, 0, printargs, "SYS_281" }, /* 281 */
-- { 5, 0, printargs, "SYS_282" }, /* 282 */
-- { 5, 0, printargs, "SYS_283" }, /* 283 */
-- { 5, 0, printargs, "SYS_284" }, /* 284 */
-- { 5, 0, printargs, "SYS_285" }, /* 285 */
-- { 5, 0, printargs, "SYS_286" }, /* 286 */
-- { 5, 0, printargs, "SYS_287" }, /* 287 */
-- { 5, 0, printargs, "SYS_288" }, /* 288 */
-- { 5, 0, printargs, "SYS_289" }, /* 289 */
-- { 5, 0, printargs, "SYS_290" }, /* 290 */
-- { 5, 0, printargs, "SYS_291" }, /* 291 */
-- { 5, 0, printargs, "SYS_292" }, /* 292 */
-+ { 4, 0, printargs, "gettid" }, /* 224 */
-+ { 5, TD, sys_readahead, "readahead" }, /* 225 */
-+ { 5, TF, sys_setxattr, "setxattr" }, /* 226 */
-+ { 5, TF, sys_setxattr, "lsetxattr" }, /* 227 */
-+ { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 228 */
-+ { 4, TF, sys_getxattr, "getxattr" }, /* 229 */
-+ { 4, TF, sys_getxattr, "lgetxattr" }, /* 230 */
-+ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 231 */
-+ { 3, TF, sys_listxattr, "listxattr" }, /* 232 */
-+ { 3, TF, sys_listxattr, "llistxattr" }, /* 233 */
-+ { 3, 0, sys_flistxattr, "flistxattr" }, /* 234 */
-+ { 2, TF, sys_removexattr, "removexattr" }, /* 235 */
-+ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */
-+ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 237 */
-+ { 2, TD, sys_kill, "tkill" }, /* 238 */
-+ { 5, TD, sys_sendfile64, "sendfile64" }, /* 239 */
-+ { 6, 0, sys_futex, "futex" }, /* 240 */
-+ { 3, 0, sys_sched_setaffinity, "sched_setaffinity"}, /* 241 */
-+ { 3, 0, sys_sched_getaffinity, "sched_getaffinity"}, /* 242 */
-+ { 0, 0, printargs, "SYS_243" }, /* 243 */
-+ { 0, 0, printargs, "SYS_244" }, /* 244 */
-+ { 2, 0, sys_io_setup, "io_setup" }, /* 245 */
-+ { 1, 0, sys_io_destroy, "io_destroy" }, /* 246 */
-+ { 5, 0, sys_io_getevents, "io_getevents" }, /* 247 */
-+ { 3, 0, sys_io_submit, "io_submit" }, /* 248 */
-+ { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */
-+ { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */
-+ { 0, 0, printargs, "SYS_251" }, /* 251 */
-+ { 1, TP, sys_exit, "exit_group" }, /* 252 */
-+ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
-+ { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
-+ { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
-+ { 3, TD, sys_epoll_wait, "epoll_wait" }, /* 256 */
-+ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 257 */
-+ { 1, 0, printargs, "set_tid_address"}, /* 258 */
-+ { 3, 0, sys_timer_create, "timer_create" }, /* 259 */
-+ { 4, 0, sys_timer_settime, "timer_settime" }, /* 260 */
-+ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 261 */
-+ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 262 */
-+ { 1, 0, sys_timer_delete, "timer_delete" }, /* 263 */
-+ { 2, 0, sys_clock_settime, "clock_settime" }, /* 264 */
-+ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 265 */
-+ { 2, 0, sys_clock_getres, "clock_getres" }, /* 266 */
-+ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 267 */
-+ { 3, TF, sys_statfs64, "statfs64" }, /* 268 */
-+ { 2, TD, sys_fstatfs64, "fstatfs64" }, /* 269 */
-+ { 3, TS, sys_tgkill, "tgkill" }, /* 270 */
-+ { 2, TF, sys_utimes, "utimes" }, /* 271 */
-+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 272 */
-+ { 0, 0, printargs, "SYS_273" }, /* 273 */
-+ { 4, 0, sys_mbind, "mbind" }, /* 274 */
-+ { 5, 0, sys_get_mempolicy, "get_mempolicy" }, /* 275 */
-+ { 3, 0, sys_set_mempolicy, "set_mempolicy" }, /* 276 */
-+ { 4, 0, sys_mq_open, "mq_open" }, /* 277 */
-+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 278 */
-+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 279 */
-+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive"}, /* 280 */
-+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 281 */
-+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 282 */
-+ { 5, 0, printargs, "kexec_load" }, /* 283 */
-+ { 5, TP, sys_waitid, "waitid" }, /* 284 */
-+ { 5, 0, printargs, "add_key" }, /* 285 */
-+ { 4, 0, printargs, "request_key" }, /* 286 */
-+ { 5, 0, printargs, "keyctl" }, /* 287 */
-+ { 3, 0, printargs, "ioprio_set" }, /* 288 */
-+ { 2, 0, printargs, "ioprio_get" }, /* 289 */
-+ { 0, TD, printargs, "inotify_init" }, /* 290 */
-+ { 3, TD, sys_inotify_add_watch, "inotify_add_watch"}, /* 291 */
-+ { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch"}, /* 292 */
- { 5, 0, printargs, "SYS_293" }, /* 293 */
-- { 5, 0, printargs, "SYS_294" }, /* 294 */
-- { 5, 0, printargs, "SYS_295" }, /* 295 */
-- { 5, 0, printargs, "SYS_296" }, /* 296 */
-- { 5, 0, printargs, "SYS_297" }, /* 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 */
-+ { 4, 0, printargs, "migrate_pages" }, /* 294 */
-+ { 4, TD|TF, sys_openat, "openat" }, /* 295 */
-+ { 3, TD|TF, sys_mkdirat, "mkdirat" }, /* 296 */
-+ { 4, TD|TF, sys_mknodat, "mknodat" }, /* 297 */
-+ { 5, TD|TF, sys_fchownat, "fchownat" }, /* 298 */
-+ { 3, TD|TF, sys_futimesat, "futimesat" }, /* 299 */
-+ { 4, TD|TD, sys_newfstatat, "newfstatat" }, /* 300 */
-+ { 3, TD|TF, sys_unlinkat, "unlinkat" }, /* 301 */
-+ { 4, TD|TF, sys_renameat, "renameat" }, /* 302 */
-+ { 5, TD|TF, sys_linkat, "linkat" }, /* 303 */
-+ { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 304 */
-+ { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 305 */
-+ { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 306 */
-+ { 3, TD|TF, sys_faccessat, "faccessat" }, /* 307 */
-+ { 6, TD, sys_pselect6, "pselect6" }, /* 308 */
-+ { 5, TD, sys_ppoll, "ppoll" }, /* 309 */
-+ { 1, TP, sys_unshare, "unshare" }, /* 310 */
-+ { 2, 0, printargs, "set_robust_list"}, /* 311 */
-+ { 3, 0, printargs, "get_robust_list"}, /* 312 */
-+ { 6, TD, printargs, "splice" }, /* 313 */
-+ { 4, TD, printargs, "sync_file_range"}, /* 314 */
-+ { 4, TD, printargs, "tee" }, /* 315 */
-+ { 5, TD, printargs, "vmsplice" }, /* 316 */
- { 6, 0, sys_move_pages, "move_pages" }, /* 317 */
- { 3, 0, sys_getcpu, "getcpu" }, /* 318 */
- { 5, TD, sys_epoll_pwait, "epoll_pwait" }, /* 319 */
-- { 5, 0, printargs, "SYS_320" }, /* 320 */
-+ { 4, TD|TF, sys_utimensat, "utimensat" }, /* 320 */
- { 3, TD|TS, sys_signalfd, "signalfd" }, /* 321 */
- { 4, TD, sys_timerfd, "timerfd" }, /* 322 */
- { 1, TD, sys_eventfd, "eventfd" }, /* 323 */
-- { 5, 0, printargs, "SYS_324" }, /* 324 */
-+ { 6, 0, printargs, "fallocate" }, /* 324 */
- { 5, 0, printargs, "SYS_325" }, /* 325 */
- { 5, 0, printargs, "SYS_326" }, /* 326 */
- { 5, 0, printargs, "SYS_327" }, /* 327 */
-@@ -435,7 +433,7 @@
- { 5, 0, printargs, "SYS_398" }, /* 398 */
- { 5, 0, printargs, "SYS_399" }, /* 399 */
-
--#if SYS_ipc_subcall != 400
-+#if SYS_socket_subcall != 400
- #error fix me
- #endif
- { 8, 0, printargs, "socket_subcall"}, /* 400 */
-@@ -460,4 +458,29 @@
- #if SYS_ipc_subcall != 418
- #error fix me
- #endif
-+
- { 4, 0, printargs, "ipc_subcall" }, /* 418 */
-+ { 4, TI, sys_semop, "semop" }, /* 419 */
-+ { 4, TI, sys_semget, "semget" }, /* 420 */
-+ { 4, TI, sys_semctl, "semctl" }, /* 421 */
-+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 423 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 424 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 425 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 426 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 427 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 428 */
-+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */
-+ { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */
-+ { 4, TI, sys_msgget, "msgget" }, /* 431 */
-+ { 4, TI, sys_msgctl, "msgctl" }, /* 432 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 433 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 434 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 435 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 436 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 437 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 438 */
-+ { 4, TI, sys_shmat, "shmat" }, /* 439 */
-+ { 4, TI, sys_shmdt, "shmdt" }, /* 440 */
-+ { 4, TI, sys_shmget, "shmget" }, /* 441 */
-+ { 4, TI, sys_shmctl, "shmctl" }, /* 442 */
-Index: linux/sh64/syscallent.h
-===================================================================
-RCS file: /cvsroot/strace/strace/linux/sh64/syscallent.h,v
-retrieving revision 1.13
-diff -u -p -r1.13 syscallent.h
---- linux/sh64/syscallent.h 2 Aug 2007 01:44:14 -0000 1.13
-+++ linux/sh64/syscallent.h 31 Oct 2007 10:13:39 -0000
-@@ -429,7 +429,7 @@
- { 5, 0, printargs, "SYS_398" }, /* 398 */
- { 5, 0, printargs, "SYS_399" }, /* 399 */
-
--#if SYS_ipc_subcall != 400
-+#if SYS_socket_subcall != 400
- #error fix me
- #endif
- { 8, 0, printargs, "socket_subcall"}, /* 400 */
+++ /dev/null
-ripped from fedora and hacked a bit
-
-http://bugs.gentoo.org/229229
-
-diff -up strace-4.5.16/linux/sparc/syscallent.h.BAD strace-4.5.16/linux/sparc/syscallent.h
---- strace-4.5.16/linux/sparc/syscallent.h.BAD 2008-03-26 10:09:47.000000000 -0500
-+++ strace-4.5.16/linux/sparc/syscallent.h 2008-03-26 11:43:34.000000000 -0500
-@@ -23,7 +23,7 @@
- { 2, 0, sys_capset, "capset" }, /* 22 */
- { 1, 0, sys_setuid, "setuid" }, /* 23 */
- { 0, 0, sys_getuid, "getuid" }, /* 24 */
-- { 1, 0, sys_time, "time" }, /* 25 */
-+ { 1, 0, printargs, "vmsplice" }, /* 25 */
- { 5, 0, sys_ptrace, "ptrace" }, /* 26 */
- { 1, 0, sys_alarm, "alarm" }, /* 27 */
- { 2, TS, sys_sigaltstack,"sigaltstack" }, /* 28 */
-@@ -65,8 +65,8 @@
- { 0, 0, sys_getpagesize,"getpagesize" }, /* 64 */
- { 3, 0, sys_msync, "msync" }, /* 65 */
- { 0, TP, sys_vfork, "vfork" }, /* 66 */
-- { 5, TD, sys_pread, "pread" }, /* 67 */
-- { 5, TD, sys_pwrite, "pwrite" }, /* 68 */
-+ { 5, TD, sys_pread, "pread64" }, /* 67 */
-+ { 5, TD, sys_pwrite, "pwrite64" }, /* 68 */
- { 0, 0, sys_geteuid, "geteuid32" }, /* 69 */
- { 0, 0, sys_getegid, "getegid32" }, /* 70 */
- { 6, 0, sys_mmap, "mmap" }, /* 71 */
-@@ -149,12 +149,12 @@
- { 5, 0, printargs, "pciconfig_read" }, /* 148 */
- { 5, 0, printargs, "pciconfig_write" }, /* 149 */
- { 3, TN, sys_getsockname,"getsockname" }, /* 150 */
-- { 4, TN, sys_getmsg, "getmsg" }, /* 151 */
-- { 4, TN, sys_putmsg, "putmsg" }, /* 152 */
-+ { 0, TD, printargs, "inotify_init" }, /* 151 */
-+ { 3, TD, sys_inotify_add_watch, "inotify_add_watch" },/* 152 */
- { 3, TD, sys_poll, "poll" }, /* 153 */
- { 4, TD, sys_getdents64, "getdents64" }, /* 154 */
- { 3, TD, sys_fcntl, "fcntl64" }, /* 155 */
-- { 4, 0, printargs, "getdirentries" }, /* 156 */
-+ { 2, TD, sys_inotify_rm_watch, "inotify_rm_watch" },/* 156 */
- { 2, TF, sys_statfs, "statfs" }, /* 157 */
- { 2, TD, sys_fstatfs, "fstatfs" }, /* 158 */
- { 1, TF, sys_umount, "oldumount" }, /* 159 */
-@@ -194,13 +194,13 @@
- { 1, 0, sys_epoll_create,"epoll_create" }, /* 193 */
- { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 194 */
- { 4, TD, sys_epoll_wait, "epoll_wait" }, /* 195 */
-- { 2, 0, sys_ulimit, "ulimit" }, /* 196 */
-+ { 3, 0, printargs, "ioprio_set"}, /* 196 */
- { 0, 0, sys_getppid, "getppid" }, /* 197 */
- { 3, TS, sys_sigaction, "sigaction" }, /* 198 */
- { 5, 0, printargs, "sgetmask" }, /* 199 */
- { 5, 0, printargs, "ssetmask" }, /* 200 */
- { 3, TS, sys_sigsuspend, "sigsuspend" }, /* 201 */
-- { 2, TF, sys_lstat, "lstat" }, /* 202 */
-+ { 2, TF, sys_oldlstat, "oldlstat" }, /* 202 */
- { 1, TF, sys_uselib, "uselib" }, /* 203 */
- { 3, TD, sys_readdir, "readdir" }, /* 204 */
- { 4, TD, sys_readahead, "readahead" }, /* 205 */
-@@ -216,7 +216,7 @@
- { 5, 0, sys_ipc, "ipc" }, /* 215 */
- { 1, TS, sys_sigreturn, "sigreturn" }, /* 216 */
- { 5, TP, sys_clone, "clone" }, /* 217 */
-- { 3, 0, sys_modify_ldt, "modify_ldt" }, /* 218 */
-+ { 2, 0, printargs, "ioprio_get" }, /* 218 */
- { 1, 0, sys_adjtimex, "adjtimex" }, /* 219 */
- { 3, TS, sys_sigprocmask,"sigprocmask" }, /* 220 */
- { 2, 0, sys_create_module,"create_module" }, /* 221 */
-@@ -228,9 +228,9 @@
- { 5, 0, sys_afs_syscall,"afs_syscall" }, /* 227 */
- { 1, 0, sys_setfsuid, "setfsuid" }, /* 228 */
- { 1, 0, sys_setfsgid, "setfsgid" }, /* 229 */
-- { 5, TD, sys_select, "select" }, /* 230 */
-+ { 5, TD, sys_select, "_newselect" }, /* 230 */
- { 1, 0, sys_time, "time" }, /* 231 */
-- { 2, TF, sys_stat, "stat" }, /* 232 */
-+ { 6, TD, printargs, "splice" }, /* 232 */
- { 1, 0, sys_stime, "stime" }, /* 233 */
- { 3, TF, sys_statfs64, "statfs64" }, /* 234 */
- { 3, TD, sys_fstatfs64, "fstatfs64" }, /* 235 */
-@@ -253,7 +253,7 @@
- { 1, 0, sys_getsid, "getsid" }, /* 252 */
- { 1, TD, sys_fdatasync, "fdatasync" }, /* 253 */
- { 3, 0, printargs, "nfsservctl" }, /* 254 */
-- { 5, 0, printargs, "aplib" }, /* 255 */
-+ { 4, TD, printargs, "sync_file_range" }, /* 255 */
- { 2, 0, sys_clock_settime,"clock_settime" }, /* 256 */
- { 2, 0, sys_clock_gettime,"clock_gettime" }, /* 257 */
- { 2, 0, sys_clock_getres,"clock_getres" }, /* 258 */
-@@ -300,18 +300,18 @@
- { 1, TP, sys_unshare, "unshare" }, /* 299 */
- { 2, 0, printargs, "set_robust_list" }, /* 300 */
- { 3, 0, printargs, "get_robust_list" }, /* 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 */
-- { 6, 0, sys_move_pages, "move_pages" }, /* 307 */
-- { 3, 0, sys_getcpu, "getcpu" }, /* 308 */
-- { 5, TD, sys_epoll_pwait,"epoll_pwait" }, /* 309 */
-- { 5, 0, printargs, "SYS_310" }, /* 310 */
-- { 3, TD|TS, sys_signalfd, "signalfd"}, /* 311 */
-- { 4, TD, sys_timerfd, "timerfd" }, /* 312 */
-- { 1, TD, sys_eventfd, "eventfd" }, /* 313 */
-+ { 4, 0, printargs, "migrate_pages" }, /* 302 */
-+ { 6, 0, sys_mbind, "mbind" }, /* 303 */
-+ { 5, 0, sys_get_mempolicy, "get_mempolicy" }, /* 304 */
-+ { 3, 0, sys_set_mempolicy, "set_mempolicy" }, /* 305 */
-+ { 5, 0, printargs, "kexec_load" }, /* 306 */
-+ { 6, 0, sys_move_pages, "move_pages" }, /* 307 */
-+ { 3, 0, sys_getcpu, "getcpu" }, /* 308 */
-+ { 5, TD, sys_epoll_pwait, "epoll_pwait" },/* 309 */
-+ { 4, TD|TF, sys_utimensat, "utimensat"}, /* 310 */
-+ { 3, TD|TS, sys_signalfd, "signalfd"}, /* 311 */
-+ { 4, TD, sys_timerfd, "timerfd" }, /* 312 */
-+ { 1, TD, sys_eventfd, "eventfd" }, /* 313 */
- { 5, 0, printargs, "SYS_314" }, /* 314 */
- { 5, 0, printargs, "SYS_315" }, /* 315 */
- { 5, 0, printargs, "SYS_316" }, /* 316 */
-diff -up strace-4.5.16/linux/sparc/syscall.h.BAD strace-4.5.16/linux/sparc/syscall.h
---- strace-4.5.16/linux/sparc/syscall.h.BAD 2008-03-26 12:00:19.000000000 -0500
-+++ strace-4.5.16/linux/sparc/syscall.h 2008-03-26 12:00:07.000000000 -0500
-@@ -203,6 +203,9 @@ int sys_fstatfs64(), sys_clock_settime()
- int sys_clock_getres(), sys_clock_nanosleep();
- int sys_timer_create(), sys_timer_settime(), sys_timer_gettime();
-
-+int sys_inotify_add_watch(), sys_inotify_rm_watch(), sys_oldlstat();
-+int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy();
-+int sys_utimensat();
- int sys_io_setup(), sys_io_destroy(), sys_io_submit(), sys_io_cancel(), sys_io_getevents();
- int sys_mq_open(), sys_mq_unlink(), sys_mq_timedsend(), sys_mq_timedreceive(), sys_mq_notify(), sys_mq_getsetattr();
- int sys_waitid();
-diff -up strace-4.5.16/defs.h.BAD strace-4.5.16/defs.h
---- strace-4.5.16/defs.h.BAD 2008-03-26 11:49:08.000000000 -0500
-+++ strace-4.5.16/defs.h 2008-03-26 11:49:30.000000000 -0500
-@@ -192,8 +192,7 @@ extern int ptrace();
- #define DEFAULT_PERSONALITY 0
-
- #ifdef LINUXSPARC
--#include <linux/a.out.h>
--#include <asm/psr.h>
-+#include <asm/a.out.h>
- #define PERSONALITY0_WORDSIZE 4
- #define PERSONALITY1_WORDSIZE 4
- #undef SUPPORTED_PERSONALITIES
-@@ -201,6 +200,7 @@ extern int ptrace();
- #define SUPPORTED_PERSONALITIES 3
- #define PERSONALITY2_WORDSIZE 8
- #else
-+#include <asm/psr.h>
- #define SUPPORTED_PERSONALITIES 2
- #endif /* SPARC64 */
- #endif /* LINUXSPARC */
+++ /dev/null
-ripped from fedora and hacked a bit
-
-http://bugs.gentoo.org/229229
-
-diff -up strace-4.5.16/linux/sparc/syscallent.h.BAD strace-4.5.16/linux/sparc/syscallent.h
---- strace-4.5.16/linux/sparc/syscallent.h.BAD 2008-05-15 16:06:36.000000000 -0500
-+++ strace-4.5.16/linux/sparc/syscallent.h 2008-05-15 18:21:01.000000000 -0500
-@@ -351,3 +351,57 @@
- { 5, 0, printargs, "SYS_350" }, /* 350 */
- { 5, 0, printargs, "SYS_351" }, /* 351 */
- { 5, 0, printargs, "SYS_352" }, /* 352 */
-+#if SYS_socket_subcall != 353
-+ #error fix me
-+#endif
-+ { 8, 0, printargs, "socket_subcall" }, /* 353 */
-+ { 3, TN, sys_socket, "socket" }, /* 354 */
-+ { 3, TN, sys_bind, "bind" }, /* 355 */
-+ { 3, TN, sys_connect, "connect" }, /* 356 */
-+ { 2, TN, sys_listen, "listen" }, /* 357 */
-+ { 3, TN, sys_accept, "accept" }, /* 358 */
-+ { 3, TN, sys_getsockname, "getsockname" }, /* 359 */
-+ { 3, TN, sys_getpeername, "getpeername" }, /* 360 */
-+ { 4, TN, sys_socketpair, "socketpair" }, /* 361 */
-+ { 4, TN, sys_send, "send" }, /* 362 */
-+ { 4, TN, sys_recv, "recv" }, /* 363 */
-+ { 6, TN, sys_sendto, "sendto" }, /* 364 */
-+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 365 */
-+ { 2, TN, sys_shutdown, "shutdown" }, /* 366 */
-+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 367 */
-+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 368 */
-+ { 5, TN, sys_sendmsg, "sendmsg" }, /* 369 */
-+ { 5, TN, sys_recvmsg, "recvmsg" }, /* 370 */
-+#if SYS_ipc_subcall != 371
-+ #error fix me
-+#endif
-+ { 4, 0, printargs, "ipc_subcall" }, /* 371 */
-+ { 4, TI, printargs, "semop" }, /* 372 */
-+ { 4, TI, sys_semget, "semget" }, /* 373 */
-+ { 4, TI, sys_semctl, "semctl" }, /* 374 */
-+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 375 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 376 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 377 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 378 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 379 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 380 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 381 */
-+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 382 */
-+ { 4, TI, sys_msgrcv, "msgrcv" }, /* 383 */
-+ { 4, TI, sys_msgget, "msgget" }, /* 384 */
-+ { 4, TI, sys_msgctl, "msgctl" }, /* 385 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 386 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 387 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 388 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 389 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 390 */
-+ { 4, 0, printargs, "ipc_subcall" }, /* 391 */
-+ { 4, TI, sys_shmat, "shmat" }, /* 392 */
-+ { 4, TI, sys_shmdt, "shmdt" }, /* 393 */
-+ { 4, TI, sys_shmget, "shmget" }, /* 394 */
-+ { 4, TI, sys_shmctl, "shmctl" }, /* 395 */
-+ { 5, 0, printargs, "SYS_343" }, /* 396 */
-+ { 5, 0, printargs, "SYS_344" }, /* 397 */
-+ { 5, 0, printargs, "SYS_345" }, /* 398 */
-+ { 5, 0, printargs, "SYS_346" }, /* 399 */
-+ { 5, 0, printargs, "SYS_347" }, /* 400 */
-diff -up strace-4.5.16/linux/sparc/syscall.h.BAD strace-4.5.16/linux/sparc/syscall.h
---- strace-4.5.16/linux/sparc/syscall.h.BAD 2008-05-15 16:02:07.000000000 -0500
-+++ strace-4.5.16/linux/sparc/syscall.h 2008-05-15 16:06:03.000000000 -0500
-@@ -213,4 +214,42 @@ int sys_fstatfs64(), sys_clock_settime()
- int sys_clock_getres(), sys_clock_nanosleep();
- int sys_timer_create(), sys_timer_settime(), sys_timer_gettime();
-
-+int sys_semtimedop();
-+# define SYS_socket_subcall 353
-+#define SYS_sub_socket (SYS_socket_subcall + 1)
-+#define SYS_sub_bind (SYS_socket_subcall + 2)
-+#define SYS_sub_connect (SYS_socket_subcall + 3)
-+#define SYS_sub_listen (SYS_socket_subcall + 4)
-+#define SYS_sub_accept (SYS_socket_subcall + 5)
-+#define SYS_sub_getsockname (SYS_socket_subcall + 6)
-+#define SYS_sub_getpeername (SYS_socket_subcall + 7)
-+#define SYS_sub_socketpair (SYS_socket_subcall + 8)
-+#define SYS_sub_send (SYS_socket_subcall + 9)
-+#define SYS_sub_recv (SYS_socket_subcall + 10)
-+#define SYS_sub_sendto (SYS_socket_subcall + 11)
-+#define SYS_sub_recvfrom (SYS_socket_subcall + 12)
-+#define SYS_sub_shutdown (SYS_socket_subcall + 13)
-+#define SYS_sub_setsockopt (SYS_socket_subcall + 14)
-+#define SYS_sub_getsockopt (SYS_socket_subcall + 15)
-+#define SYS_sub_sendmsg (SYS_socket_subcall + 16)
-+#define SYS_sub_recvmsg (SYS_socket_subcall + 17)
-+
-+#define SYS_socket_nsubcalls 18
-+
-+#define SYS_ipc_subcall ((SYS_socket_subcall)+(SYS_socket_nsubcalls))
-+#define SYS_sub_semop (SYS_ipc_subcall + 1)
-+#define SYS_sub_semget (SYS_ipc_subcall + 2)
-+#define SYS_sub_semctl (SYS_ipc_subcall + 3)
-+#define SYS_sub_semtimedop (SYS_ipc_subcall + 4)
-+#define SYS_sub_msgsnd (SYS_ipc_subcall + 11)
-+#define SYS_sub_msgrcv (SYS_ipc_subcall + 12)
-+#define SYS_sub_msgget (SYS_ipc_subcall + 13)
-+#define SYS_sub_msgctl (SYS_ipc_subcall + 14)
-+#define SYS_sub_shmat (SYS_ipc_subcall + 21)
-+#define SYS_sub_shmdt (SYS_ipc_subcall + 22)
-+#define SYS_sub_shmget (SYS_ipc_subcall + 23)
-+#define SYS_sub_shmctl (SYS_ipc_subcall + 24)
-+
-+#define SYS_ipc_nsubcalls 25
-+
- #include "syscall1.h"
-diff -up strace-4.5.16/syscall.c.BAD strace-4.5.16/syscall.c
---- strace-4.5.16/syscall.c.BAD 2008-05-15 16:01:49.000000000 -0500
-+++ strace-4.5.16/syscall.c 2008-05-15 16:01:53.000000000 -0500
-@@ -579,51 +579,6 @@ static const struct subcall subcalls_tab
- #endif /* FREEBSD */
-
- #if !(defined(LINUX) && ( defined(ALPHA) || defined(MIPS) ))
--
--static const int socket_map [] = {
-- /* SYS_SOCKET */ 97,
-- /* SYS_BIND */ 104,
-- /* SYS_CONNECT */ 98,
-- /* SYS_LISTEN */ 106,
-- /* SYS_ACCEPT */ 99,
-- /* SYS_GETSOCKNAME */ 150,
-- /* SYS_GETPEERNAME */ 141,
-- /* SYS_SOCKETPAIR */ 135,
-- /* SYS_SEND */ 101,
-- /* SYS_RECV */ 102,
-- /* SYS_SENDTO */ 133,
-- /* SYS_RECVFROM */ 125,
-- /* SYS_SHUTDOWN */ 134,
-- /* SYS_SETSOCKOPT */ 105,
-- /* SYS_GETSOCKOPT */ 118,
-- /* SYS_SENDMSG */ 114,
-- /* SYS_RECVMSG */ 113
--};
--
--#if defined (SPARC) || defined (SPARC64)
--static void
--sparc_socket_decode (tcp)
--struct tcb *tcp;
--{
-- volatile long addr;
-- volatile int i, n;
--
-- if (tcp->u_arg [0] < 1 || tcp->u_arg [0] > sizeof(socket_map)/sizeof(int)+1){
-- return;
-- }
-- tcp->scno = socket_map [tcp->u_arg [0]-1];
-- n = tcp->u_nargs = sysent [tcp->scno].nargs;
-- addr = tcp->u_arg [1];
-- for (i = 0; i < n; i++){
-- int arg;
-- if (umoven (tcp, addr, sizeof (arg), (void *) &arg) < 0)
-- arg = 0;
-- tcp->u_arg [i] = arg;
-- addr += sizeof (arg);
-- }
--}
--#endif
--
- static void
- decode_subcall(tcp, subcall, nsubcalls, style)
- struct tcb *tcp;
-@@ -2382,7 +2337,7 @@ trace_syscall(struct tcb *tcp)
-
- switch (known_scno(tcp)) {
- #ifdef LINUX
--#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
-+#if !defined (ALPHA) && !defined(MIPS) && !defined(HPPA)
- case SYS_socketcall:
- decode_subcall(tcp, SYS_socket_subcall,
- SYS_socket_nsubcalls, deref_style);
-@@ -2391,12 +2346,7 @@ trace_syscall(struct tcb *tcp)
- decode_subcall(tcp, SYS_ipc_subcall,
- SYS_ipc_nsubcalls, shift_style);
- break;
--#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
--#if defined (SPARC) || defined (SPARC64)
-- case SYS_socketcall:
-- sparc_socket_decode (tcp);
-- break;
--#endif
-+#endif /* !(ALPHA || MIPS || HPPA) */
- #endif /* LINUX */
- #ifdef SVR4
- #ifdef SYS_pgrpsys_subcall
+++ /dev/null
-http://bugs.gentoo.org/204457
-
-------- Comment #5 From SpanKY 2008-01-06 18:08:07 0000 [reply] -------
-
-i dont have any way of actually run time testing this, but the fix is probably:
-- tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-- tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-- tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
-+ tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
-+ tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
-+ tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
-
-sprinttime() takes a time_t which represents the time (in seconds). the time
-members of the solstatbuf are the time (in seconds) as well as nanosecond
-granularity. since sprinttime() doesnt include nanosecond granularity, we dont
-care about that part of the time.
-
-someone needs to find a sparc system running with the personality required and
-exercise this difference
-
---- strace-4.5.16/file.c
-+++ strace-4.5.16/file.c
-@@ -766,9 +766,9 @@
- break;
- }
- if (!abbrev(tcp)) {
-- tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-- tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-- tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
-+ tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
-+ tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
-+ tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
- }
- else
- tprintf("...}");
+++ /dev/null
-fixes from upstream cvs
-
-http://bugs.gentoo.org/162789
-
---- strace/mem.c 2007/07/24 01:52:58 1.40
-+++ strace/mem.c 2007/09/12 01:26:29 1.41
-@@ -544,7 +544,7 @@
- return 0;
- }
-
--#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4)
-+#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4) || defined(SPARC) || defined(SPARC64)
- int
- sys_getpagesize(tcp)
- struct tcb *tcp;
---- strace/linux/sparc/syscall.h 2006/01/12 22:34:50 1.11
-+++ strace/linux/sparc/syscall.h 2007/09/12 01:26:24 1.12
-@@ -107,6 +107,7 @@
- int sys_rt_sigtimedwait(), sys_prctl(), sys_poll();
- int sys_sendfile(), sys_query_module(), sys_capget(), sys_capset();
- int sys_create_module(), sys_init_module();
-+int sys_setgroups32(), sys_getgroups32();
-
- int sys_umask(); /* XXX */
-
-@@ -203,4 +204,14 @@
- int sys_clock_getres(), sys_clock_nanosleep();
- int sys_timer_create(), sys_timer_settime(), sys_timer_gettime();
-
-+int sys_io_setup(), sys_io_destroy(), sys_io_submit(), sys_io_cancel(), sys_io_getevents();
-+int sys_mq_open(), sys_mq_unlink(), sys_mq_timedsend(), sys_mq_timedreceive(), sys_mq_notify(), sys_mq_getsetattr();
-+int sys_waitid();
-+int sys_openat(), sys_mkdirat(), sys_mknodat(), sys_fchownat(), sys_futimesat(), sys_newfstatat(), sys_unlinkat(), sys_renameat(), sys_linkat(), sys_symlinkat(), sys_readlinkat(), sys_fchmodat(), sys_faccessat();
-+int sys_pselect6(), sys_ppoll();
-+int sys_unshare();
-+int sys_move_pages(), sys_getcpu();
-+int sys_epoll_pwait();
-+int sys_signalfd(), sys_timerfd(), sys_eventfd();
-+
- #include "syscall1.h"
+++ /dev/null
-# 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.16-r1.ebuild,v 1.14 2009/01/31 08:19:42 vapier Exp $
-
-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"
-IUSE="static aio"
-
-DEPEND="aio? ( dev-libs/libaio )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- #epatch "${FILESDIR}"/${PN}-4.5.11-fbsd.patch
-
- epatch "${FILESDIR}"/${PN}-4.5.15-invalid-time.patch #186369
- epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch
- epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch #103427
- epatch "${FILESDIR}"/${P}-mips-syscallent.patch
- epatch "${FILESDIR}"/${P}-sh-updates.patch
- epatch "${FILESDIR}"/${P}-sparc-updates.patch #162789
- epatch "${FILESDIR}"/${P}-sparc-times.patch #204457
- epatch "${FILESDIR}"/${P}-getdents-infinite-loop.patch
- epatch "${FILESDIR}"/${P}-sparc-{fix,socketipc}.patch #fedora, 229229
-
- eautoreconf
-}
-
-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
-}
+++ /dev/null
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.17.ebuild,v 1.1 2008/08/16 01:58:39 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
-}
-
-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
-}
projects / gentoo.git / commitdiff