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:   03-May-2004 16:13:26
  Branch: HEAD                             Handle: 2004050315132500

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

  Log:
    Fix --delete SEGV
    See also: http://lists.samba.org/archive/rsync/2004-May/009380.html

  Summary:
    Revision    Changes     Path
    1.9         +20 -0      openpkg-src/rsync/rsync.patch
    1.66        +1  -1      openpkg-src/rsync/rsync.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rsync.patch
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 rsync.patch
  --- openpkg-src/rsync/rsync.patch     1 May 2004 06:56:19 -0000       1.8
  +++ openpkg-src/rsync/rsync.patch     3 May 2004 14:13:25 -0000       1.9
  @@ -20,3 +20,23 @@
          while (c->len)
          {
            NEEDOUT
  +Index: flist.c
  +--- flist.c.orig     2004-04-29 21:37:15.000000000 +0200
  ++++ flist.c  2004-05-03 16:11:52.000000000 +0200
  +@@ -539,6 +539,7 @@
  +             rdev_major = 0;
  +             uid = 0, gid = 0;
  +             *lastname = '\0';
  ++            lastdir_len = -1;
  +             return;
  +     }
  + 
  +@@ -745,7 +746,7 @@
  +     char *basename, *dirname, *bp;
  +     unsigned short flags = 0;
  + 
  +-    if (!flist)     /* lastdir isn't valid if flist is NULL */
  ++    if (!flist || !flist->count)    /* lastdir isn't valid if flist is NULL */
  +             lastdir_len = -1;
  + 
  +     if (strlcpy(thisname, fname, sizeof thisname)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rsync.spec
  ============================================================================
  $ cvs diff -u -r1.65 -r1.66 rsync.spec
  --- openpkg-src/rsync/rsync.spec      1 May 2004 06:56:19 -0000       1.65
  +++ openpkg-src/rsync/rsync.spec      3 May 2004 14:13:25 -0000       1.66
  @@ -34,7 +34,7 @@
   Group:        Filesystem
   License:      GPL
   Version:      2.6.2
  -Release:      20040501
  +Release:      20040503
   
   #   package options
   %option       with_timelimit  no
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to