OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   22-Oct-2009 09:05:03
  Branch: HEAD                             Handle: 2009102208050200

  Modified files:
    openpkg-src/strace      strace.patch strace.spec

  Log:
    upgrading package: strace 4.5.18 -> 4.5.19

  Summary:
    Revision    Changes     Path
    1.10        +48 -30     openpkg-src/strace/strace.patch
    1.64        +2  -2      openpkg-src/strace/strace.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/strace/strace.patch
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 strace.patch
  --- openpkg-src/strace/strace.patch   3 Aug 2007 17:46:34 -0000       1.9
  +++ openpkg-src/strace/strace.patch   22 Oct 2009 07:05:02 -0000      1.10
  @@ -1,7 +1,7 @@
   Index: file.c
  ---- file.c.orig      2007-07-24 03:57:11 +0200
  -+++ file.c   2007-08-03 19:43:10 +0200
  -@@ -1588,7 +1588,11 @@
  +--- 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,
  @@ -13,7 +13,7 @@
                statbuf.f_namelen);
    #else /* !ALPHA */
        tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ",
  -@@ -1600,7 +1604,11 @@
  +@@ -1654,7 +1658,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 */
  -@@ -2783,6 +2791,7 @@
  +@@ -2799,6 +2807,7 @@
    }
    
    
  @@ -33,7 +33,7 @@
    static const struct xlat advise[] = {
      { POSIX_FADV_NORMAL,              "POSIX_FADV_NORMAL"     },
      { POSIX_FADV_RANDOM,              "POSIX_FADV_RANDOM"     },
  -@@ -2792,6 +2801,7 @@
  +@@ -2808,6 +2817,7 @@
      { POSIX_FADV_NOREUSE,             "POSIX_FADV_NOREUSE"    },
      { 0,                              NULL                    }
    };
  @@ -41,17 +41,17 @@
    
    
    #ifdef LINUX
  -@@ -2815,6 +2825,7 @@
  +@@ -2830,6 +2840,7 @@
    #endif
    
    
   +#ifdef LINUX
    int
  - sys_fadvise64_64(tcp)
  - struct tcb *tcp;
  -@@ -2833,6 +2844,7 @@
  -     }
  -     return 0;
  + sys_fadvise64_64(struct tcb *tcp)
  + {
  +@@ -2854,6 +2865,7 @@
  +     }
  +     return 0;
    }
   +#endif
    
  @@ -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-08-03 19:43:10 +0200
  ++++ freebsd/i386/syscall.h   2009-10-22 08:55:42 +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       2007-07-05 20:53:54 +0200
  -+++ net.c    2007-08-03 19:43:10 +0200
  +--- net.c.orig       2009-09-01 21:53:29 +0200
  ++++ net.c    2009-10-22 08:55:42 +0200
   @@ -43,12 +43,8 @@
    #endif
    
  @@ -84,7 +84,7 @@
    #include <arpa/inet.h>
    #include <net/if.h>
    #if defined(LINUX)
  -@@ -1079,6 +1075,9 @@
  +@@ -1103,6 +1099,9 @@
    #ifdef SCM_RIGHTS
        { SCM_RIGHTS,           "SCM_RIGHTS"            },
    #endif
  @@ -94,7 +94,7 @@
    #ifdef SCM_CREDENTIALS
        { SCM_CREDENTIALS,      "SCM_CREDENTIALS"       },
    #endif
  -@@ -1125,6 +1124,13 @@
  +@@ -1146,6 +1145,13 @@
                        free(cmsg);
                        return;
                }
  @@ -108,7 +108,7 @@
                if (cmsg->cmsg_type == SCM_CREDENTIALS
                    && CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) {
                        struct ucred *uc = (struct ucred *) CMSG_DATA (cmsg);
  -@@ -1132,6 +1138,7 @@
  +@@ -1153,6 +1159,7 @@
                        tprintf("{pid=%ld, uid=%ld, gid=%ld}}",
                                (long)uc->pid, (long)uc->uid, (long)uc->gid);
                        free(cmsg);
  @@ -116,7 +116,7 @@
                        return;
                }
        }
  -@@ -1157,17 +1164,12 @@
  +@@ -1178,17 +1185,12 @@
        tprint_iov(tcp, (unsigned long)msg.msg_iovlen,
                   (unsigned long)msg.msg_iov);
    
  @@ -135,11 +135,11 @@
    }
    
   Index: process.c
  ---- 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;
  +--- 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;
  @@ -148,8 +148,8 @@
    
        if (entering(tcp)) {
   Index: sock.c
  ---- sock.c.orig      2007-05-24 08:33:11 +0200
  -+++ sock.c   2007-08-03 19:43:10 +0200
  +--- sock.c.orig      2009-01-13 19:30:55 +0100
  ++++ sock.c   2009-10-22 08:55:42 +0200
   @@ -37,6 +37,7 @@
    #include <sys/sockio.h>
    #endif
  @@ -158,7 +158,7 @@
    
    #if defined (ALPHA) || defined(SH) || defined(SH64)
    #ifdef HAVE_SYS_IOCTL_H
  -@@ -55,20 +56,31 @@
  +@@ -53,20 +54,31 @@
        { IFF_DEBUG,            "IFF_DEBUG"             },
        { IFF_LOOPBACK,         "IFF_LOOPBACK"          },
        { IFF_POINTOPOINT,      "IFF_POINTOPOINT"       },
  @@ -190,7 +190,7 @@
    static void
    print_addr(tcp, addr, ifr)
    struct tcb *tcp;
  -@@ -82,14 +94,19 @@
  +@@ -80,14 +92,19 @@
        } else
                printstr(tcp, addr, sizeof(ifr->ifr_addr.sa_data));
    }
  @@ -211,8 +211,8 @@
        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
  +--- time.c.orig      2009-04-14 14:51:00 +0200
  ++++ time.c   2009-10-22 08:55:42 +0200
   @@ -36,6 +36,7 @@
    #include <sys/timex.h>
    #include <linux/ioctl.h>
  @@ -229,3 +229,21 @@
    
    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;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/strace/strace.spec
  ============================================================================
  $ cvs diff -u -r1.63 -r1.64 strace.spec
  --- openpkg-src/strace/strace.spec    30 Jun 2009 20:21:32 -0000      1.63
  +++ openpkg-src/strace/strace.spec    22 Oct 2009 07:05:02 -0000      1.64
  @@ -31,8 +31,8 @@
   Class:        EVAL
   Group:        Debugging
   License:      GPL
  -Version:      4.5.18
  -Release:      20081228
  +Version:      4.5.19
  +Release:      20091022
   
   #   list of sources
   Source0:      
http://switch.dl.sourceforge.net/sourceforge/strace/strace-%{version}.tar.bz2
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to