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: 12-Jul-2004 19:46:46
Branch: HEAD Handle: 2004071218464500
Modified files:
openpkg-src/strace strace.patch strace.spec
Log:
upgrading package: strace 4.5.5 -> 4.5.6
Summary:
Revision Changes Path
1.4 +42 -29 openpkg-src/strace/strace.patch
1.42 +2 -2 openpkg-src/strace/strace.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/strace/strace.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 strace.patch
--- openpkg-src/strace/strace.patch 25 Sep 2003 08:44:49 -0000 1.3
+++ openpkg-src/strace/strace.patch 12 Jul 2004 17:46:45 -0000 1.4
@@ -1,6 +1,33 @@
+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 @@
+ 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, ",
+@@ -1489,7 +1493,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 */
Index: net.c
---- net.c.orig 2003-06-24 01:39:59.000000000 +0200
-+++ net.c 2003-09-25 10:33:49.000000000 +0200
+--- net.c.orig 2004-07-12 09:44:08 +0200
++++ net.c 2004-07-12 19:44:16 +0200
@@ -43,12 +43,8 @@
#endif
@@ -14,7 +41,7 @@
#include <arpa/inet.h>
#include <net/if.h>
#if defined(LINUX)
-@@ -860,17 +856,12 @@
+@@ -988,17 +984,12 @@
tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen);
tprint_iov(tcp, msg.msg_iovlen, (long) msg.msg_iov);
@@ -32,30 +59,16 @@
tprintf("}");
}
-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],
+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>
+#endif
- 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 */
+ #include <sys/sockio.h>
+ #endif
+ #include <arpa/inet.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/strace/strace.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 strace.spec
--- openpkg-src/strace/strace.spec 28 Jun 2004 19:01:58 -0000 1.41
+++ openpkg-src/strace/strace.spec 12 Jul 2004 17:46:45 -0000 1.42
@@ -33,8 +33,8 @@
Class: EVAL
Group: Development
License: GPL
-Version: 4.5.5
-Release: 20040628
+Version: 4.5.6
+Release: 20040712
# 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]
