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: 28-Jan-2003 10:06:21 Branch: HEAD Handle: 2003012809061802 Modified files: openpkg-re/vcheck vc.rsync openpkg-src/rsync rsync.patch rsync.spec openpkg-web news.txt Log: upgrading package: rsync 2.5.5 -> 2.5.6 Summary: Revision Changes Path 1.4 +1 -1 openpkg-re/vcheck/vc.rsync 1.4 +54 -42 openpkg-src/rsync/rsync.patch 1.40 +2 -2 openpkg-src/rsync/rsync.spec 1.3074 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-re/vcheck/vc.rsync ============================================================================ $ cvs diff -u -r1.3 -r1.4 vc.rsync --- openpkg-re/vcheck/vc.rsync 3 Apr 2002 19:14:55 -0000 1.3 +++ openpkg-re/vcheck/vc.rsync 28 Jan 2003 09:06:18 -0000 1.4 @@ -2,7 +2,7 @@ } prog rsync = { - version = 2.5.5 + version = 2.5.6 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.3 -r1.4 rsync.patch --- openpkg-src/rsync/rsync.patch 27 Dec 2002 09:29:17 -0000 1.3 +++ openpkg-src/rsync/rsync.patch 28 Jan 2003 09:06:20 -0000 1.4 @@ -1,5 +1,57 @@ ---- zlib/infcodes.c.orig Tue Mar 12 02:14:58 2002 -+++ zlib/infcodes.c Sun Apr 21 21:19:46 2002 +--- main.c Tue Jan 28 06:05:53 2003 ++++ main.c Tue Jan 28 10:00:40 2003 +@@ -208,7 +208,7 @@ + if (!cmd) + cmd = getenv(RSYNC_RSH_ENV); + if (!cmd) +- cmd = RSYNC_RSH; ++ cmd = RSYNC_SSH; + cmd = strdup(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 @@ + 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," -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 @@ + #ifdef HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif ++#define RSYNC_SSH "ssh" + + #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 @@ -197,8 +197,18 @@ c->mode = COPY; case COPY: /* o: copying bytes in window, waiting for space */ @@ -19,43 +71,3 @@ while (c->len) { NEEDOUT ---- rsync.h.orig Mon Mar 25 08:29:43 2002 -+++ rsync.h Tue Apr 23 13:49:06 2002 -@@ -113,7 +113,7 @@ - #include <string.h> - #endif - --#ifdef HAVE_MALLOC_H -+#if defined(HAVE_MALLINFO) && defined(HAVE_MALLOC_H) - #include <malloc.h> - #endif - -@@ -181,10 +181,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 */ ---- main.c.orig Tue Sep 5 19:46:43 2000 -+++ main.c Sat Apr 7 23:32:25 2001 -@@ -134 +134 @@ -- cmd = RSYNC_RSH; -+ cmd = RSYNC_SSH; ---- options.c.orig Thu Mar 8 03:31:32 2001 -+++ options.c Thu Mar 8 03:31:32 2001 -@@ -141 +141 @@ -- rprintf(F," -e, --rsh=COMMAND specify rsh replacement\n"); -+ rprintf(F," -e, --rsh=COMMAND specify rsh replacement (default %s)\n", RSYNC_SSH); ---- rsync.h.orig Sat Aug 19 06:10:39 2000 -+++ rsync.h Sat Apr 7 23:31:00 2001 -@@ -75,4 +75,5 @@ - #define RSYNC_RSH "rsh" - #endif -+#define RSYNC_SSH "ssh" - - #include <sys/types.h> @@ . patch -p0 <<'@@ .' Index: openpkg-src/rsync/rsync.spec ============================================================================ $ cvs diff -u -r1.39 -r1.40 rsync.spec --- openpkg-src/rsync/rsync.spec 3 Jan 2003 10:54:37 -0000 1.39 +++ openpkg-src/rsync/rsync.spec 28 Jan 2003 09:06:20 -0000 1.40 @@ -32,8 +32,8 @@ Distribution: OpenPKG [CORE] Group: Filesystem License: GPL -Version: 2.5.5 -Release: 20021227 +Version: 2.5.6 +Release: 20030128 # 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.3073 -r1.3074 news.txt --- openpkg-web/news.txt 28 Jan 2003 09:02:56 -0000 1.3073 +++ openpkg-web/news.txt 28 Jan 2003 09:06:19 -0000 1.3074 @@ -1,3 +1,4 @@ +28-Jan-2003: Upgraded package: P<rsync-2.5.6-20030128> 28-Jan-2003: Upgraded package: P<rt-2.0.15-20030128> 28-Jan-2003: Upgraded package: P<gcc33-3.3s20030127-20030128> 28-Jan-2003: Upgraded package: P<openssh-3.5p1-20030128> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]