OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-Feb-2005 21:22:29 Branch: HEAD Handle: 2005020920222800 Modified files: openpkg-src/strace strace.patch strace.spec Log: upgrading package: strace 4.5.7 -> 4.5.9 Summary: Revision Changes Path 1.6 +142 -17 openpkg-src/strace/strace.patch 1.46 +2 -3 openpkg-src/strace/strace.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/strace/strace.patch ============================================================================ $ cvs diff -u -r1.5 -r1.6 strace.patch --- openpkg-src/strace/strace.patch 31 Aug 2004 18:09:45 -0000 1.5 +++ openpkg-src/strace/strace.patch 9 Feb 2005 20:22:28 -0000 1.6 @@ -1,7 +1,7 @@ Index: file.c ---- file.c.orig 2004-07-12 09:44:08 +0200 -+++ file.c 2004-07-12 19:44:16 +0200 -@@ -1477,7 +1477,11 @@ +--- file.c.orig 2005-02-04 10:49:56 +0100 ++++ file.c 2005-02-09 20:10:49 +0100 +@@ -1490,7 +1490,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, @@ -13,7 +13,7 @@ statbuf.f_namelen); #else /* !ALPHA */ tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ", -@@ -1489,7 +1493,11 @@ +@@ -1502,7 +1506,11 @@ (unsigned long)statbuf.f_bavail, (unsigned long)statbuf.f_files, (unsigned long)statbuf.f_ffree, @@ -25,9 +25,38 @@ #ifdef LINUX tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen); #endif /* LINUX */ +@@ -2495,6 +2503,7 @@ + } + + ++#ifdef LINUX + static const struct xlat advise[] = { + { POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" }, + { POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" }, +@@ -2504,6 +2513,7 @@ + { POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" }, + { 0, NULL } + }; ++#endif + + + #ifdef LINUX +@@ -2527,6 +2537,7 @@ + #endif + + ++#ifdef LINUX + int + sys_fadvise64_64(tcp) + struct tcb *tcp; +@@ -2545,3 +2556,4 @@ + } + return 0; + } ++#endif Index: net.c ---- net.c.orig 2004-07-12 09:44:08 +0200 -+++ net.c 2004-07-12 19:44:16 +0200 +--- net.c.orig 2005-02-02 04:11:32 +0100 ++++ net.c 2005-02-09 21:16:35 +0100 @@ -43,12 +43,8 @@ #endif @@ -41,14 +70,45 @@ #include <arpa/inet.h> #include <net/if.h> #if defined(LINUX) -@@ -1084,17 +1080,12 @@ +@@ -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 +@@ -1112,11 +1111,19 @@ + tprintf("}}"); + return; + } ++#ifdef SCM_CREDS ++ 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); ++ tprintf("{pid=%ld, uid=%ld, gid=%ld}}", ++ (long)uc->cmcred_pid, (long)uc->cmcred_uid, (long)uc->cmcred_gid); ++#else + 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); + tprintf("{pid=%ld, uid=%ld, gid=%ld}}", + (long)uc->pid, (long)uc->uid, (long)uc->gid); ++#endif + return; + } + } +@@ -1140,7 +1147,6 @@ tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen); tprint_iov(tcp, msg.msg_iovlen, (long) msg.msg_iov); -#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL tprintf(", msg_controllen=%lu", (unsigned long)msg.msg_controllen); if (msg.msg_controllen) - tprintf(", msg_control=%#lx, ", (unsigned long) msg.msg_control); + printcmsghdr(tcp, (unsigned long) msg.msg_control, +@@ -1148,10 +1154,6 @@ tprintf(", msg_flags="); if (printflags(msg_flags, msg.msg_flags)==0) tprintf("0"); @@ -59,16 +119,81 @@ tprintf("}"); } -Index: sock.c ---- sock.c.orig 2004-07-12 09:13:07 +0200 -+++ sock.c 2004-07-12 19:45:44 +0200 -@@ -33,6 +33,9 @@ - #include <sys/socket.h> - #include <linux/sockios.h> - #else -+#ifdef __FreeBSD__ -+#include <sys/socket.h> +Index: process.c +--- process.c.orig 2005-02-02 05:16:56 +0100 ++++ process.c 2005-02-09 21:17:09 +0100 +@@ -2911,7 +2911,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-02-02 21:25:17 +0100 ++++ sock.c 2005-02-09 21:21:01 +0100 +@@ -37,6 +37,7 @@ #include <sys/sockio.h> #endif #include <arpa/inet.h> ++#include <netinet/in.h> + + #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) { @@ . patch -p0 <<'@@ .' Index: openpkg-src/strace/strace.spec ============================================================================ $ cvs diff -u -r1.45 -r1.46 strace.spec --- openpkg-src/strace/strace.spec 1 Jan 2005 10:55:02 -0000 1.45 +++ openpkg-src/strace/strace.spec 9 Feb 2005 20:22:28 -0000 1.46 @@ -33,8 +33,8 @@ Class: EVAL Group: Development License: GPL -Version: 4.5.7 -Release: 20041020 +Version: 4.5.9 +Release: 20050209 # list of sources Source0: http://osdn.dl.sourceforge.net/sourceforge/strace/strace-%{version}.tar.bz2 @@ -60,7 +60,6 @@ %track prog strace = { - comment = "ms: 4.5.8 POSIX_FADV_NORMAL not defined (taken from Linux)" version = %{version} url = http://prdownloads.sourceforge.net/strace/ regex = strace-(__VER__)\.tar\.bz2 @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org