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 openpkg-web openpkg$ Date:   01-Jan-2004 20:17:58
  Branch: HEAD                             Handle: 2004010119175502

  Modified files:
    openpkg-re/vcheck       vc.rsync
    openpkg-src/rsync       rsync.patch rsync.spec
    openpkg-web             news.txt

  Log:
    upgrading package: rsync 2.5.7 -> 2.6.0

  Summary:
    Revision    Changes     Path
    1.6         +1  -1      openpkg-re/vcheck/vc.rsync
    1.5         +19 -35     openpkg-src/rsync/rsync.patch
    1.54        +2  -2      openpkg-src/rsync/rsync.spec
    1.7938      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.rsync
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 vc.rsync
  --- openpkg-re/vcheck/vc.rsync        4 Dec 2003 12:15:07 -0000       1.5
  +++ openpkg-re/vcheck/vc.rsync        1 Jan 2004 19:17:55 -0000       1.6
  @@ -2,7 +2,7 @@
   }
   
   prog rsync = {
  -  version   = 2.5.7
  +  version   = 2.6.0
     url       = http://rsync.samba.org/ftp/rsync/
     regex     = rsync-(\d+\.\d+\.\d+)\.tar\.gz
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rsync.patch
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 rsync.patch
  --- openpkg-src/rsync/rsync.patch     28 Jan 2003 09:06:20 -0000      1.4
  +++ openpkg-src/rsync/rsync.patch     1 Jan 2004 19:17:57 -0000       1.5
  @@ -1,28 +1,31 @@
  ---- main.c   Tue Jan 28 06:05:53 2003
  -+++ main.c   Tue Jan 28 10:00:40 2003
  -@@ -208,7 +208,7 @@
  +Index: main.c
  +--- main.c.orig      2003-12-20 17:57:24.000000000 +0100
  ++++ main.c   2004-01-01 20:12:53.000000000 +0100
  +@@ -209,7 +209,7 @@
                if (!cmd)
  -                     cmd = getenv(RSYNC_RSH_ENV);
  +                     cmd = rsh_env;
                if (!cmd)
   -                    cmd = RSYNC_RSH;
   +                    cmd = RSYNC_SSH;
                cmd = strdup(cmd);
  -             if (!cmd) 
  +             if (!cmd)
                        goto oom;
  ---- options.c        Tue Jan 28 04:11:57 2003
  -+++ options.c        Tue Jan 28 10:01:13 2003
  -@@ -230,7 +230,7 @@
  +Index: options.c
  +--- options.c.orig   2003-12-30 19:16:25.000000000 +0100
  ++++ options.c        2004-01-01 20:14:14.000000000 +0100
  +@@ -238,7 +238,7 @@
      rprintf(F,"     --no-whole-file         turn off --whole-file\n");
      rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
  -   rprintf(F," -B, --block-size=SIZE       checksum blocking size (default 
%d)\n",BLOCK_SIZE);  
  +   rprintf(F," -B, --block-size=SIZE       checksum blocking size (default 
%d)\n",BLOCK_SIZE);
   -  rprintf(F," -e, --rsh=COMMAND           specify the remote shell\n");
   +  rprintf(F," -e, --rsh=COMMAND           specify rsh replacement (default %s)\n", 
RSYNC_SSH);
      rprintf(F,"     --rsync-path=PATH       specify path to rsync on the remote 
machine\n");
  -   rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS 
does\n");
      rprintf(F,"     --existing              only update files that already exist\n");
  ---- rsync.h  Sun Jan 26 21:11:16 2003
  -+++ rsync.h  Tue Jan 28 10:00:40 2003
  -@@ -101,6 +101,7 @@
  +   rprintf(F,"     --ignore-existing       ignore files that already exist on 
receiving side\n");
  +Index: rsync.h
  +--- rsync.h.orig     2003-12-17 00:04:59.000000000 +0100
  ++++ rsync.h  2004-01-01 20:12:53.000000000 +0100
  +@@ -121,6 +121,7 @@
    #ifdef HAVE_SYS_PARAM_H
    #include <sys/param.h>
    #endif
  @@ -30,28 +33,9 @@
    
    #ifdef HAVE_STDLIB_H
    #include <stdlib.h>
  -@@ -114,7 +115,7 @@
  - #include <string.h>
  - #endif
  - 
  --#ifdef HAVE_MALLOC_H
  -+#if defined(HAVE_MALLINFO) && defined(HAVE_MALLOC_H)
  - #include <malloc.h>
  - #endif
  - 
  -@@ -182,10 +183,6 @@
  - 
  - #ifdef HAVE_GLOB_H
  - #include <glob.h>
  --#endif
  --
  --#ifdef HAVE_MALLOC_H
  --#  include <malloc.h>
  - #endif
  - 
  - /* these are needed for the uid/gid mapping code */
  ---- zlib/infcodes.c  Tue Mar 12 02:14:58 2002
  -+++ zlib/infcodes.c  Tue Jan 28 10:00:40 2003
  +Index: zlib/infcodes.c
  +--- zlib/infcodes.c.orig     2002-03-12 02:14:58.000000000 +0100
  ++++ zlib/infcodes.c  2004-01-01 20:12:53.000000000 +0100
   @@ -197,8 +197,18 @@
          c->mode = COPY;
        case COPY:          /* o: copying bytes in window, waiting for space */
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rsync.spec
  ============================================================================
  $ cvs diff -u -r1.53 -r1.54 rsync.spec
  --- openpkg-src/rsync/rsync.spec      4 Dec 2003 12:15:10 -0000       1.53
  +++ openpkg-src/rsync/rsync.spec      1 Jan 2004 19:17:57 -0000       1.54
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [CORE]
   Group:        Filesystem
   License:      GPL
  -Version:      2.5.7
  -Release:      20031204
  +Version:      2.6.0
  +Release:      20040101
   
   #   list of sources
   Source0:      http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7937 -r1.7938 news.txt
  --- openpkg-web/news.txt      1 Jan 2004 19:08:42 -0000       1.7937
  +++ openpkg-web/news.txt      1 Jan 2004 19:17:56 -0000       1.7938
  @@ -1,3 +1,4 @@
  +01-Jan-2004: Upgraded package: P<rsync-2.6.0-20040101>
   01-Jan-2004: Upgraded package: P<perl-ldap-20040101-20040101>
   01-Jan-2004: Upgraded package: P<openssh-3.7.1p2-20040101>
   01-Jan-2004: Upgraded package: P<gcc34-3.4s20031231-20040101>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to