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: 03-Aug-2007 19:46:36
Branch: HEAD Handle: 2007080318463400
Modified files:
openpkg-src/strace strace.patch strace.spec
Log:
upgrading package: strace 4.5.15 -> 4.5.16
Summary:
Revision Changes Path
1.9 +37 -20 openpkg-src/strace/strace.patch
1.58 +4 -7 openpkg-src/strace/strace.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/strace/strace.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 strace.patch
--- openpkg-src/strace/strace.patch 15 Mar 2007 07:55:00 -0000 1.8
+++ openpkg-src/strace/strace.patch 3 Aug 2007 17:46:34 -0000 1.9
@@ -1,7 +1,7 @@
Index: file.c
---- file.c.orig 2007-01-15 21:25:52 +0100
-+++ file.c 2007-03-15 08:51:23 +0100
-@@ -1587,7 +1587,11 @@
+--- file.c.orig 2007-07-24 03:57:11 +0200
++++ file.c 2007-08-03 19:43:10 +0200
+@@ -1588,7 +1588,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, ",
-@@ -1599,7 +1603,11 @@
+@@ -1600,7 +1604,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 */
-@@ -2747,6 +2755,7 @@
+@@ -2783,6 +2791,7 @@
}
@@ -33,7 +33,7 @@
static const struct xlat advise[] = {
{ POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" },
{ POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" },
-@@ -2756,6 +2765,7 @@
+@@ -2792,6 +2801,7 @@
{ POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" },
{ 0, NULL }
};
@@ -41,7 +41,7 @@
#ifdef LINUX
-@@ -2779,6 +2789,7 @@
+@@ -2815,6 +2825,7 @@
#endif
@@ -49,7 +49,7 @@
int
sys_fadvise64_64(tcp)
struct tcb *tcp;
-@@ -2797,6 +2808,7 @@
+@@ -2833,6 +2844,7 @@
}
return 0;
}
@@ -59,7 +59,7 @@
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 2007-03-15 08:51:48 +0100
++++ freebsd/i386/syscall.h 2007-08-03 19:43:10 +0200
@@ -9,6 +9,7 @@
int sys_write();
int sys_open();
@@ -69,8 +69,8 @@
int sys_creat();
int sys_link();
Index: net.c
---- net.c.orig 2006-12-13 20:57:23 +0100
-+++ net.c 2007-03-15 08:51:23 +0100
+--- net.c.orig 2007-07-05 20:53:54 +0200
++++ net.c 2007-08-03 19:43:10 +0200
@@ -43,12 +43,8 @@
#endif
@@ -135,9 +135,9 @@
}
Index: process.c
---- process.c.orig 2007-01-11 23:08:38 +0100
-+++ process.c 2007-03-15 08:51:23 +0100
-@@ -2982,7 +2982,9 @@
+--- 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;
{
@@ -148,8 +148,8 @@
if (entering(tcp)) {
Index: sock.c
---- sock.c.orig 2005-06-01 21:02:37 +0200
-+++ sock.c 2007-03-15 08:51:23 +0100
+--- sock.c.orig 2007-05-24 08:33:11 +0200
++++ sock.c 2007-08-03 19:43:10 +0200
@@ -37,6 +37,7 @@
#include <sys/sockio.h>
#endif
@@ -190,16 +190,14 @@
static void
print_addr(tcp, addr, ifr)
struct tcb *tcp;
-@@ -82,16 +94,21 @@
+@@ -82,14 +94,19 @@
} else
printstr(tcp, addr, sizeof(ifr->ifr_addr.sa_data));
}
+#endif
int
- sock_ioctl(tcp, code, arg)
- struct tcb *tcp;
- long code, arg;
+ sock_ioctl(struct tcb *tcp, long code, long arg)
{
+#ifdef LINUX
struct ifreq ifr;
@@ -212,3 +210,22 @@
if (entering(tcp)) {
if (code == SIOCGIFCONF) {
+Index: time.c
+--- time.c.orig 2007-08-02 03:25:34 +0200
++++ time.c 2007-08-03 19:43:18 +0200
+@@ -36,6 +36,7 @@
+ #include <sys/timex.h>
+ #include <linux/ioctl.h>
+ #include <linux/rtc.h>
++#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
+ {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/strace/strace.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 strace.spec
--- openpkg-src/strace/strace.spec 15 Mar 2007 07:55:00 -0000 1.57
+++ openpkg-src/strace/strace.spec 3 Aug 2007 17:46:34 -0000 1.58
@@ -32,8 +32,8 @@
Class: EVAL
Group: Debugging
License: GPL
-Version: 4.5.15
-Release: 20070315
+Version: 4.5.16
+Release: 20070803
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/strace/strace-%{version}.tar.bz2
@@ -73,16 +73,13 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--disable-nls
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_make} %{l_mflags} install \
- DESTDIR=$RPM_BUILD_ROOT
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
