head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.7.2.2 OPENPKG_E1_FP:1.7.2.2 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.7.2.2 OPENPKG_2_STABLE:1.7.0.2 OPENPKG_CW_FP:1.6 OPENPKG_1_STABLE_MP:1.2; locks; strict; comment @# @; 1.10 date 2009.10.22.07.05.02; author rse; state Exp; branches; next 1.9; commitid N5oGl0MXLyv21v8u; 1.9 date 2007.08.03.17.46.34; author rse; state Exp; branches; next 1.8; commitid SFsQVUMk71NmDkss; 1.8 date 2007.03.15.07.55.00; author rse; state Exp; branches; next 1.7; commitid j2KJpQJM0B3qT9as; 1.7 date 2005.06.25.11.48.23; author rse; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2005.02.09.20.22.28; author rse; state Exp; branches; next 1.5; 1.5 date 2004.08.31.18.09.45; author ms; state Exp; branches; next 1.4; 1.4 date 2004.07.12.17.46.45; author rse; state Exp; branches; next 1.3; 1.3 date 2003.09.25.08.44.49; author rse; state Exp; branches; next 1.2; 1.2 date 2003.01.20.11.49.52; author ps; state Exp; branches; next 1.1; 1.1 date 2002.05.29.19.56.16; author rse; state Exp; branches; next ; 1.7.2.1 date 2005.06.25.11.48.23; author rse; state dead; branches; next 1.7.2.2; commitid iZxwRSmmWscPXUQr; 1.7.2.2 date 2006.10.16.14.56.51; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.10 log @upgrading package: strace 4.5.18 -> 4.5.19 @ text @Index: file.c --- file.c.orig 2009-10-21 15:44:04 +0200 +++ file.c 2009-10-22 08:55:42 +0200 @@@@ -1642,7 +1642,11 @@@@ statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree); tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u", statbuf.f_bavail,statbuf.f_files, statbuf.f_ffree, +#ifdef LINUX statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1], +#else + statbuf.f_fsid.val[0], statbuf.f_fsid.val[1], +#endif statbuf.f_namelen); #else /* !ALPHA */ tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ", @@@@ -1654,7 +1658,11 @@@@ (unsigned long)statbuf.f_bavail, (unsigned long)statbuf.f_files, (unsigned long)statbuf.f_ffree, +#ifdef LINUX statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]); +#else + statbuf.f_fsid.val[0], statbuf.f_fsid.val[1]); +#endif #ifdef LINUX tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen); #endif /* LINUX */ @@@@ -2799,6 +2807,7 @@@@ } +#ifdef LINUX static const struct xlat advise[] = { { POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" }, { POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" }, @@@@ -2808,6 +2817,7 @@@@ { POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" }, { 0, NULL } }; +#endif #ifdef LINUX @@@@ -2830,6 +2840,7 @@@@ #endif +#ifdef LINUX int sys_fadvise64_64(struct tcb *tcp) { @@@@ -2854,6 +2865,7 @@@@ } return 0; } +#endif #ifdef LINUX static const struct xlat inotify_modes[] = { Index: freebsd/i386/syscall.h --- freebsd/i386/syscall.h.orig 2001-03-08 18:27:20 +0100 +++ freebsd/i386/syscall.h 2009-10-22 08:55:42 +0200 @@@@ -9,6 +9,7 @@@@ int sys_write(); int sys_open(); int sys_close(); +int sys_waitpid(); int sys_wait4(); int sys_creat(); int sys_link(); Index: net.c --- net.c.orig 2009-09-01 21:53:29 +0200 +++ net.c 2009-10-22 08:55:42 +0200 @@@@ -43,12 +43,8 @@@@ #endif #include -#ifdef HAVE_NETINET_TCP_H #include -#endif -#ifdef HAVE_NETINET_UDP_H #include -#endif #include #include #if defined(LINUX) @@@@ -1103,6 +1099,9 @@@@ #ifdef SCM_RIGHTS { SCM_RIGHTS, "SCM_RIGHTS" }, #endif +#ifdef SCM_CREDS + { SCM_CREDS, "SCM_CREDS" }, +#endif #ifdef SCM_CREDENTIALS { SCM_CREDENTIALS, "SCM_CREDENTIALS" }, #endif @@@@ -1146,6 +1145,13 @@@@ free(cmsg); return; } +#ifdef SCM_CREDS + if (cmsg->cmsg_type == SCM_CREDS + && CMSG_LEN(sizeof(struct cmsgcred)) <= cmsg_len) { + struct cmsgcred *uc = (struct cmsgcred *) CMSG_DATA (cmsg); + tprintf("{pid=%ld, uid=%ld, gid=%ld}}", + (long)uc->cmcred_pid, (long)uc->cmcred_uid, (long)uc->cmcred_gid); +#else if (cmsg->cmsg_type == SCM_CREDENTIALS && CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) { struct ucred *uc = (struct ucred *) CMSG_DATA (cmsg); @@@@ -1153,6 +1159,7 @@@@ tprintf("{pid=%ld, uid=%ld, gid=%ld}}", (long)uc->pid, (long)uc->uid, (long)uc->gid); free(cmsg); +#endif return; } } @@@@ -1178,17 +1185,12 @@@@ tprint_iov(tcp, (unsigned long)msg.msg_iovlen, (unsigned long)msg.msg_iov); -#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL tprintf(", msg_controllen=%lu", (unsigned long)msg.msg_controllen); if (msg.msg_controllen) printcmsghdr(tcp, (unsigned long) msg.msg_control, msg.msg_controllen); tprintf(", msg_flags="); printflags(msg_flags, msg.msg_flags, "MSG_???"); -#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */ - tprintf("msg_accrights=%#lx, msg_accrightslen=%u", - (unsigned long) msg.msg_accrights, msg.msg_accrightslen); -#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */ tprintf("}"); } Index: process.c --- process.c.orig 2009-10-12 21:54:21 +0200 +++ process.c 2009-10-22 08:55:42 +0200 @@@@ -3280,7 +3280,9 @@@@ int sys_ptrace(struct tcb *tcp) { +#ifndef FREEBSD const struct xlat *x; +#endif long addr; if (entering(tcp)) { Index: sock.c --- sock.c.orig 2009-01-13 19:30:55 +0100 +++ sock.c 2009-10-22 08:55:42 +0200 @@@@ -37,6 +37,7 @@@@ #include #endif #include +#include #if defined (ALPHA) || defined(SH) || defined(SH64) #ifdef HAVE_SYS_IOCTL_H @@@@ -53,20 +54,31 @@@@ { 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 } }; +#ifdef LINUX static void print_addr(tcp, addr, ifr) struct tcb *tcp; @@@@ -80,14 +92,19 @@@@ } else printstr(tcp, addr, sizeof(ifr->ifr_addr.sa_data)); } +#endif int sock_ioctl(struct tcb *tcp, long code, long arg) { +#ifdef LINUX struct ifreq ifr; +#endif struct ifconf ifc; +#ifdef LINUX const char *str = NULL; unsigned char *bytes; +#endif if (entering(tcp)) { if (code == SIOCGIFCONF) { Index: time.c --- time.c.orig 2009-04-14 14:51:00 +0200 +++ time.c 2009-10-22 08:55:42 +0200 @@@@ -36,6 +36,7 @@@@ #include #include #include +#endif /* LINUX */ #ifndef UTIME_NOW #define UTIME_NOW ((1l << 30) - 1l) @@@@ -43,7 +44,6 @@@@ #ifndef UTIME_OMIT #define UTIME_OMIT ((1l << 30) - 2l) #endif -#endif /* LINUX */ struct timeval32 { Index: util.c --- util.c.orig 2009-10-12 21:54:21 +0200 +++ util.c 2009-10-22 09:01:31 +0200 @@@@ -231,10 +231,14 @@@@ tcp->ptrace_errno = err; msg = "SYSCALL"; +#ifdef PTRACE_CONT if (op == PTRACE_CONT) msg = "CONT"; +#endif +#ifdef PTRACE_DETACH if (op == PTRACE_DETACH) msg = "DETACH"; +#endif fprintf(stderr, "strace: ptrace(PTRACE_%s,1,%d): %s\n", msg, sig, strerror(err)); return -1; @ 1.9 log @upgrading package: strace 4.5.15 -> 4.5.16 @ text @d2 3 a4 3 --- file.c.orig 2007-07-24 03:57:11 +0200 +++ file.c 2007-08-03 19:43:10 +0200 @@@@ -1588,7 +1588,11 @@@@ d16 1 a16 1 @@@@ -1600,7 +1604,11 @@@@ d28 1 a28 1 @@@@ -2783,6 +2791,7 @@@@ d36 1 a36 1 @@@@ -2792,6 +2801,7 @@@@ d44 1 a44 1 @@@@ -2815,6 +2825,7 @@@@ d50 5 a54 5 sys_fadvise64_64(tcp) struct tcb *tcp; @@@@ -2833,6 +2844,7 @@@@ } return 0; d62 1 a62 1 +++ freebsd/i386/syscall.h 2007-08-03 19:43:10 +0200 d72 2 a73 2 --- net.c.orig 2007-07-05 20:53:54 +0200 +++ net.c 2007-08-03 19:43:10 +0200 d87 1 a87 1 @@@@ -1079,6 +1075,9 @@@@ d97 1 a97 1 @@@@ -1125,6 +1124,13 @@@@ d111 1 a111 1 @@@@ -1132,6 +1138,7 @@@@ d119 1 a119 1 @@@@ -1157,17 +1164,12 @@@@ d138 5 a142 5 --- process.c.orig 2007-08-02 04:13:05 +0200 +++ process.c 2007-08-03 19:43:10 +0200 @@@@ -2988,7 +2988,9 @@@@ sys_ptrace(tcp) struct tcb *tcp; d151 2 a152 2 --- sock.c.orig 2007-05-24 08:33:11 +0200 +++ sock.c 2007-08-03 19:43:10 +0200 d161 1 a161 1 @@@@ -55,20 +56,31 @@@@ d193 1 a193 1 @@@@ -82,14 +94,19 @@@@ d214 2 a215 2 --- time.c.orig 2007-08-02 03:25:34 +0200 +++ time.c 2007-08-03 19:43:18 +0200 d232 18 @ 1.8 log @upgrading package: strace 4.5.14 -> 4.5.15 @ text @d2 3 a4 3 --- file.c.orig 2007-01-15 21:25:52 +0100 +++ file.c 2007-03-15 08:51:23 +0100 @@@@ -1587,7 +1587,11 @@@@ d16 1 a16 1 @@@@ -1599,7 +1603,11 @@@@ d28 1 a28 1 @@@@ -2747,6 +2755,7 @@@@ d36 1 a36 1 @@@@ -2756,6 +2765,7 @@@@ d44 1 a44 1 @@@@ -2779,6 +2789,7 @@@@ d52 1 a52 1 @@@@ -2797,6 +2808,7 @@@@ d62 1 a62 1 +++ freebsd/i386/syscall.h 2007-03-15 08:51:48 +0100 d72 2 a73 2 --- net.c.orig 2006-12-13 20:57:23 +0100 +++ net.c 2007-03-15 08:51:23 +0100 d138 3 a140 3 --- process.c.orig 2007-01-11 23:08:38 +0100 +++ process.c 2007-03-15 08:51:23 +0100 @@@@ -2982,7 +2982,9 @@@@ d151 2 a152 2 --- sock.c.orig 2005-06-01 21:02:37 +0200 +++ sock.c 2007-03-15 08:51:23 +0100 d193 1 a193 1 @@@@ -82,16 +94,21 @@@@ d200 1 a200 3 sock_ioctl(tcp, code, arg) struct tcb *tcp; long code, arg; d213 19 @ 1.7 log @upgrading package: strace 4.5.11 -> 4.5.12 @ text @d2 3 a4 3 --- file.c.orig 2005-06-08 22:45:28 +0200 +++ file.c 2005-06-25 13:07:36 +0200 @@@@ -1481,7 +1481,11 @@@@ d16 1 a16 1 @@@@ -1493,7 +1497,11 @@@@ d28 1 a28 1 @@@@ -2479,6 +2487,7 @@@@ d36 1 a36 1 @@@@ -2488,6 +2497,7 @@@@ d44 1 a44 1 @@@@ -2511,6 +2521,7 @@@@ d52 1 a52 1 @@@@ -2529,3 +2540,4 @@@@ d57 14 d72 2 a73 2 --- net.c.orig 2005-06-01 21:22:07 +0200 +++ net.c 2005-06-25 13:45:39 +0200 d87 1 a87 1 @@@@ -1070,6 +1066,9 @@@@ d97 1 a97 1 @@@@ -1116,6 +1115,13 @@@@ d111 1 a111 1 @@@@ -1123,6 +1129,7 @@@@ d119 1 a119 1 @@@@ -1148,17 +1155,12 @@@@ d138 3 a140 3 --- process.c.orig 2005-06-08 22:45:28 +0200 +++ process.c 2005-06-25 13:07:36 +0200 @@@@ -2965,7 +2965,9 @@@@ d152 1 a152 1 +++ sock.c 2005-06-25 13:07:36 +0200 @ 1.7.2.1 log @file strace.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:51 +0000 @ text @d1 200 @ 1.7.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 200 Index: file.c --- file.c.orig 2005-06-08 22:45:28 +0200 +++ file.c 2005-06-25 13:07:36 +0200 @@@@ -1481,7 +1481,11 @@@@ statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree); tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u", statbuf.f_bavail,statbuf.f_files, statbuf.f_ffree, +#ifdef LINUX statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1], +#else + statbuf.f_fsid.val[0], statbuf.f_fsid.val[1], +#endif statbuf.f_namelen); #else /* !ALPHA */ tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ", @@@@ -1493,7 +1497,11 @@@@ (unsigned long)statbuf.f_bavail, (unsigned long)statbuf.f_files, (unsigned long)statbuf.f_ffree, +#ifdef LINUX statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]); +#else + statbuf.f_fsid.val[0], statbuf.f_fsid.val[1]); +#endif #ifdef LINUX tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen); #endif /* LINUX */ @@@@ -2479,6 +2487,7 @@@@ } +#ifdef LINUX static const struct xlat advise[] = { { POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" }, { POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" }, @@@@ -2488,6 +2497,7 @@@@ { POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" }, { 0, NULL } }; +#endif #ifdef LINUX @@@@ -2511,6 +2521,7 @@@@ #endif +#ifdef LINUX int sys_fadvise64_64(tcp) struct tcb *tcp; @@@@ -2529,3 +2540,4 @@@@ } return 0; } +#endif Index: net.c --- net.c.orig 2005-06-01 21:22:07 +0200 +++ net.c 2005-06-25 13:45:39 +0200 @@@@ -43,12 +43,8 @@@@ #endif #include -#ifdef HAVE_NETINET_TCP_H #include -#endif -#ifdef HAVE_NETINET_UDP_H #include -#endif #include #include #if defined(LINUX) @@@@ -1070,6 +1066,9 @@@@ #ifdef SCM_RIGHTS { SCM_RIGHTS, "SCM_RIGHTS" }, #endif +#ifdef SCM_CREDS + { SCM_CREDS, "SCM_CREDS" }, +#endif #ifdef SCM_CREDENTIALS { SCM_CREDENTIALS, "SCM_CREDENTIALS" }, #endif @@@@ -1116,6 +1115,13 @@@@ free(cmsg); return; } +#ifdef SCM_CREDS + if (cmsg->cmsg_type == SCM_CREDS + && CMSG_LEN(sizeof(struct cmsgcred)) <= cmsg_len) { + struct cmsgcred *uc = (struct cmsgcred *) CMSG_DATA (cmsg); + tprintf("{pid=%ld, uid=%ld, gid=%ld}}", + (long)uc->cmcred_pid, (long)uc->cmcred_uid, (long)uc->cmcred_gid); +#else if (cmsg->cmsg_type == SCM_CREDENTIALS && CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) { struct ucred *uc = (struct ucred *) CMSG_DATA (cmsg); @@@@ -1123,6 +1129,7 @@@@ tprintf("{pid=%ld, uid=%ld, gid=%ld}}", (long)uc->pid, (long)uc->uid, (long)uc->gid); free(cmsg); +#endif return; } } @@@@ -1148,17 +1155,12 @@@@ tprint_iov(tcp, (unsigned long)msg.msg_iovlen, (unsigned long)msg.msg_iov); -#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL tprintf(", msg_controllen=%lu", (unsigned long)msg.msg_controllen); if (msg.msg_controllen) printcmsghdr(tcp, (unsigned long) msg.msg_control, msg.msg_controllen); tprintf(", msg_flags="); printflags(msg_flags, msg.msg_flags, "MSG_???"); -#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */ - tprintf("msg_accrights=%#lx, msg_accrightslen=%u", - (unsigned long) msg.msg_accrights, msg.msg_accrightslen); -#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */ tprintf("}"); } Index: process.c --- process.c.orig 2005-06-08 22:45:28 +0200 +++ process.c 2005-06-25 13:07:36 +0200 @@@@ -2965,7 +2965,9 @@@@ sys_ptrace(tcp) struct tcb *tcp; { +#ifndef FREEBSD const struct xlat *x; +#endif long addr; if (entering(tcp)) { Index: sock.c --- sock.c.orig 2005-06-01 21:02:37 +0200 +++ sock.c 2005-06-25 13:07:36 +0200 @@@@ -37,6 +37,7 @@@@ #include #endif #include +#include #if defined (ALPHA) || defined(SH) || defined(SH64) #ifdef HAVE_SYS_IOCTL_H @@@@ -55,20 +56,31 @@@@ { 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 } }; +#ifdef LINUX static void print_addr(tcp, addr, ifr) struct tcb *tcp; @@@@ -82,16 +94,21 @@@@ } else printstr(tcp, addr, sizeof(ifr->ifr_addr.sa_data)); } +#endif int sock_ioctl(tcp, code, arg) struct tcb *tcp; long code, arg; { +#ifdef LINUX struct ifreq ifr; +#endif struct ifconf ifc; +#ifdef LINUX const char *str = NULL; unsigned char *bytes; +#endif if (entering(tcp)) { if (code == SIOCGIFCONF) { @ 1.6 log @upgrading package: strace 4.5.7 -> 4.5.9 @ text @d2 3 a4 3 --- file.c.orig 2005-02-04 10:49:56 +0100 +++ file.c 2005-02-09 20:10:49 +0100 @@@@ -1490,7 +1490,11 @@@@ d16 1 a16 1 @@@@ -1502,7 +1506,11 @@@@ d28 1 a28 1 @@@@ -2495,6 +2503,7 @@@@ d36 1 a36 1 @@@@ -2504,6 +2513,7 @@@@ d44 1 a44 1 @@@@ -2527,6 +2537,7 @@@@ d52 1 a52 1 @@@@ -2545,3 +2556,4 @@@@ d58 2 a59 2 --- net.c.orig 2005-02-02 04:11:32 +0100 +++ net.c 2005-02-09 21:16:35 +0100 d83 2 a84 2 @@@@ -1112,11 +1111,19 @@@@ tprintf("}}"); d88 3 a90 3 + if (u.cmsg.cmsg_type == SCM_CREDS + && CMSG_LEN(sizeof(struct cmsgcred)) <= u.cmsg.cmsg_len) { + struct cmsgcred *uc = (struct cmsgcred *) CMSG_DATA (&u.cmsg); d94 4 a97 3 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); d100 1 d105 3 a107 3 @@@@ -1140,7 +1147,6 @@@@ tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen); tprint_iov(tcp, msg.msg_iovlen, (long) msg.msg_iov); d113 1 a113 1 @@@@ -1148,10 +1154,6 @@@@ d115 1 a115 2 if (printflags(msg_flags, msg.msg_flags)==0) tprintf("0"); d124 3 a126 3 --- process.c.orig 2005-02-02 05:16:56 +0100 +++ process.c 2005-02-09 21:17:09 +0100 @@@@ -2911,7 +2911,9 @@@@ d137 2 a138 2 --- sock.c.orig 2005-02-02 21:25:17 +0100 +++ sock.c 2005-02-09 21:21:01 +0100 @ 1.5 log @correct patch hunk alignment @ text @d2 3 a4 3 --- file.c.orig 2004-07-12 09:44:08 +0200 +++ file.c 2004-07-12 19:44:16 +0200 @@@@ -1477,7 +1477,11 @@@@ d16 1 a16 1 @@@@ -1489,7 +1493,11 @@@@ d28 29 d58 2 a59 2 --- net.c.orig 2004-07-12 09:44:08 +0200 +++ net.c 2004-07-12 19:44:16 +0200 d73 31 a103 1 @@@@ -1084,17 +1080,12 @@@@ d110 2 a111 1 tprintf(", msg_control=%#lx, ", (unsigned long) msg.msg_control); d122 13 d136 3 a138 9 --- sock.c.orig 2004-07-12 09:13:07 +0200 +++ sock.c 2004-07-12 19:45:44 +0200 @@@@ -33,6 +33,9 @@@@ #include #include #else +#ifdef __FreeBSD__ +#include +#endif d142 58 @ 1.4 log @upgrading package: strace 4.5.5 -> 4.5.6 @ text @d44 1 a44 1 @@@@ -988,17 +984,12 @@@@ @ 1.3 log @upgrading package: strace 4.4.98 -> 4.5 @ text @d1 27 d29 2 a30 2 --- net.c.orig 2003-06-24 01:39:59.000000000 +0200 +++ net.c 2003-09-25 10:33:49.000000000 +0200 d44 1 a44 1 @@@@ -860,17 +856,12 @@@@ d62 9 a70 11 Index: file.c --- file.c.orig 2003-07-17 11:03:02.000000000 +0200 +++ file.c 2003-09-25 10:42:40.000000000 +0200 @@@@ -1387,7 +1387,11 @@@@ statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree); tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u", statbuf.f_bavail,statbuf.f_files, statbuf.f_ffree, +#ifdef LINUX statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1], +#else + statbuf.f_fsid.val[0], statbuf.f_fsid.val[1], d72 3 a74 15 statbuf.f_namelen); #else /* !ALPHA */ tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ", @@@@ -1399,7 +1403,11 @@@@ (unsigned long)statbuf.f_bavail, (unsigned long)statbuf.f_files, (unsigned long)statbuf.f_ffree, +#ifdef LINUX statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]); +#else + statbuf.f_fsid.val[0], statbuf.f_fsid.val[1]); +#endif #ifdef LINUX tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen); #endif /* LINUX */ @ 1.2 log @upgrading package: strace 4.4 -> 4.4.92 @ text @d1 3 a3 2 --- net.c.orig Mon Jan 20 12:42:42 2003 +++ net.c Mon Jan 20 12:45:46 2003 d35 27 @ 1.1 log @Finally rename all foo-X.Y.patch files to foo.patch in order to allow us to preserve history in CVS for patch files. @ text @d1 33 a33 13 --- process.c.orig Fri Aug 3 13:51:28 2001 +++ process.c Sat Nov 24 19:40:05 2001 @@@@ -1771,7 +1771,9 @@@@ { PT_READ_D, "PT_READ_D" }, { PT_WRITE_I, "PT_WRITE_I" }, { PT_WRITE_D, "PT_WRITE_D" }, - { PT_READ_U, "PT_WRITE_U" }, +#ifdef PT_READ_U + { PT_READ_U, "PT_READ_U" }, +#endif { PT_CONTINUE, "PT_CONTINUE" }, { PT_KILL, "PT_KILL" }, { PT_STEP, "PT_STEP" }, @