OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2005 13:48:23
Branch: HEAD Handle: 2005062512482300
Modified files:
openpkg-src/strace strace.patch strace.spec
Log:
upgrading package: strace 4.5.11 -> 4.5.12
Summary:
Revision Changes Path
1.7 +30 -29 openpkg-src/strace/strace.patch
1.50 +2 -2 openpkg-src/strace/strace.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/strace/strace.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 strace.patch
--- openpkg-src/strace/strace.patch 9 Feb 2005 20:22:28 -0000 1.6
+++ openpkg-src/strace/strace.patch 25 Jun 2005 11:48:23 -0000 1.7
@@ -1,7 +1,7 @@
Index: file.c
---- file.c.orig 2005-02-04 10:49:56 +0100
-+++ file.c 2005-02-09 20:10:49 +0100
-@@ -1490,7 +1490,11 @@
+--- 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,
@@ -13,7 +13,7 @@
statbuf.f_namelen);
#else /* !ALPHA */
tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ",
-@@ -1502,7 +1506,11 @@
+@@ -1493,7 +1497,11 @@
(unsigned long)statbuf.f_bavail,
(unsigned long)statbuf.f_files,
(unsigned long)statbuf.f_ffree,
@@ -25,7 +25,7 @@
#ifdef LINUX
tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen);
#endif /* LINUX */
-@@ -2495,6 +2503,7 @@
+@@ -2479,6 +2487,7 @@
}
@@ -33,7 +33,7 @@
static const struct xlat advise[] = {
{ POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" },
{ POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" },
-@@ -2504,6 +2513,7 @@
+@@ -2488,6 +2497,7 @@
{ POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" },
{ 0, NULL }
};
@@ -41,7 +41,7 @@
#ifdef LINUX
-@@ -2527,6 +2537,7 @@
+@@ -2511,6 +2521,7 @@
#endif
@@ -49,14 +49,14 @@
int
sys_fadvise64_64(tcp)
struct tcb *tcp;
-@@ -2545,3 +2556,4 @@
+@@ -2529,3 +2540,4 @@
}
return 0;
}
+#endif
Index: net.c
---- net.c.orig 2005-02-02 04:11:32 +0100
-+++ net.c 2005-02-09 21:16:35 +0100
+--- net.c.orig 2005-06-01 21:22:07 +0200
++++ net.c 2005-06-25 13:45:39 +0200
@@ -43,12 +43,8 @@
#endif
@@ -80,38 +80,39 @@
#ifdef SCM_CREDENTIALS
{ SCM_CREDENTIALS, "SCM_CREDENTIALS" },
#endif
-@@ -1112,11 +1111,19 @@
- tprintf("}}");
+@@ -1116,6 +1115,13 @@
+ free(cmsg);
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);
++ 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 (u.cmsg.cmsg_type == SCM_CREDENTIALS
- && CMSG_LEN(sizeof(struct ucred)) <= u.cmsg.cmsg_len) {
- struct ucred *uc = (struct ucred *) CMSG_DATA (&u.cmsg);
+ 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;
}
}
-@@ -1140,7 +1147,6 @@
- tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen);
- tprint_iov(tcp, msg.msg_iovlen, (long) msg.msg_iov);
+@@ -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,
-@@ -1148,10 +1154,6 @@
+ msg.msg_controllen);
tprintf(", msg_flags=");
- if (printflags(msg_flags, msg.msg_flags)==0)
- tprintf("0");
+ 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);
@@ -120,9 +121,9 @@
}
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 @@
+--- 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;
{
@@ -133,8 +134,8 @@
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
+--- sock.c.orig 2005-06-01 21:02:37 +0200
++++ sock.c 2005-06-25 13:07:36 +0200
@@ -37,6 +37,7 @@
#include <sys/sockio.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/strace/strace.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 strace.spec
--- openpkg-src/strace/strace.spec 24 Mar 2005 11:20:25 -0000 1.49
+++ openpkg-src/strace/strace.spec 25 Jun 2005 11:48:23 -0000 1.50
@@ -32,8 +32,8 @@
Class: EVAL
Group: Development
License: GPL
-Version: 4.5.11
-Release: 20050323
+Version: 4.5.12
+Release: 20050625
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/strace/strace-%{version}.tar.bz2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
