These patches have been merged.

diff --git a/cs-progress.diff b/cs-progress.diff
deleted file mode 100644 (file)
index fdfed3f..0000000
--- a/cs-progress.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-From rsync-admin@lists.samba.org Thu Mar 14 01:33:43 2002
-Return-Path: <rsync-admin@lists.samba.org>
-Delivered-To: mbp@samba.org
-Received: from va.samba.org (localhost [127.0.0.1])
-       by lists.samba.org (Postfix) with ESMTP
-       id 25DCA4481; Thu, 14 Mar 2002 01:33:41 -0800 (PST)
-Delivered-To: rsync@samba.org
-Received: from cskk.homeip.net (c17877.carlnfd1.nsw.optusnet.com.au [210.49.140.231])
-       by lists.samba.org (Postfix) with ESMTP
-       id 49D8544F8; Thu, 14 Mar 2002 01:31:54 -0800 (PST)
-Received: (from cameron@localhost)
-       by cskk.homeip.net (8.11.6/8.11.6) id g2E9WGM22435;
-       Thu, 14 Mar 2002 20:32:16 +1100
-From: Cameron Simpson <cs@zip.com.au>
-To: rsync@samba.org
-Cc: mbp@samba.org
-Subject: PATCH: better progress reporting
-Message-ID: <20020314093215.GA18634@amadeus.home>
-Reply-To: cs@zip.com.au
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.3.27i
-Sender: rsync-admin@lists.samba.org
-Errors-To: rsync-admin@lists.samba.org
-X-BeenThere: rsync@lists.samba.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-List-Help: <mailto:rsync-request@lists.samba.org?subject=help>
-List-Post: <mailto:rsync@lists.samba.org>
-List-Subscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
-       <mailto:rsync-request@lists.samba.org?subject=subscribe>
-List-Id: rsync user list <rsync.lists.samba.org>
-List-Unsubscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
-       <mailto:rsync-request@lists.samba.org?subject=unsubscribe>
-List-Archive: <http://lists.samba.org/pipermail/rsync/>
-Date: Thu, 14 Mar 2002 20:32:16 +1100
-Status: RO
-Content-Length: 2389
-Lines: 64
-
-I've been looking at the --progress reporting, which is somewhat
-improved these days.  But look at this output of this evening rawhide
-mirror update:
-
-       [...]
-       perl-DB_File-1.75-27.i386.rpm
-              73430 100%  519.63kB/s    0:00:00
-       perl-DB_File-1.75-28.99.3.i386.rpm
-              61783 100%  533.94kB/s    0:00:00
-       [...]
-
-Now, while it's good to have the ETA ticking down as something is fetched,
-it's irritating to have this history there on the screen afterwards with
-those unhelpful zeroes.
-
-Thus the appended patch to util.c in the current CVS head, which for the
-final progress report, puts to elapsed time for that file in the report
-instead of the time remaining.
-
-Applied (clean) to 2.5.4, it says this:
-
-       ++ /home/cameron/tmp/rsy/rsync-2.5.4/rsync -rlHt -z -v -P --delete --include-from=.mirror-rsync '--exclude=xemacs*' '--exclude=kernel-source*' '--exclude=postgresql*' mirror.aarnet.edu.au::redhat/rawhide/i386/RedHat/RPMS/. ./redhat/rawhide/i386/RedHat/RPMS/.
-
-       receiving file list ... 
-       2429 files to consider
-       2305 files to consider
-       ./
-       timeconfig-3.2.5-1.i386.rpm
-             158253 100%  160.48kB/s    0:00:00
-       timidity++-2.10.4-2.i386.rpm
-            9309389 100%  397.71kB/s    0:00:22
-       tix-8.2.0b1-67.i386.rpm
-             456809 100%  437.78kB/s    0:00:01
-       tk-8.3.3-67.i386.rpm
-            1371196 100%  433.77kB/s    0:00:03
-
-Martin, can this go in for 2.5.5 please?
-Any nay sayers?
-
-Cameron Simpson, DoD#743        cs@zip.com.au    http://www.zip.com.au/~cs/
-
-Index: util.c
-===================================================================
-RCS file: /cvsroot/rsync/util.c,v
-retrieving revision 1.107
-diff -u -w -r1.107 util.c
---- util.c      23 Feb 2002 00:05:06 -0000      1.107
-+++ util.c      14 Mar 2002 09:27:16 -0000
-@@ -866,7 +866,9 @@
-     unsigned long diff = msdiff(&start_time, now);
-     double        rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
-     const char    *units;
--    double        remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
-+    double        remain = is_last
-+                        ? (double) diff / 1000.0
-+                        : rate ? (double) (size-ofs) / rate / 1000.0 : 0.0;
-     int          remain_h, remain_m, remain_s;
- 
-     if (rate > 1024*1024) {
-
-
--- 
-To unsubscribe or change options: http://lists.samba.org/mailman/listinfo/rsync
-Before posting, read: http://www.tuxedo.org/~esr/faqs/smart-questions.html
-

diff --git a/glouis-strip-plural.diff b/glouis-strip-plural.diff
deleted file mode 100644 (file)
index 5ad5003..0000000
--- a/glouis-strip-plural.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-On 20020313 (Wed) at 0652:35 -0500, Greg Louis wrote:
-> The first patch will make "make install-strip" work.  The second spends
-> a few cycles avoiding "1 files to consider."  Both are trivial but IMHO
-> useful.
-> 
-0 for 2 ... ENOTENOUGHCOFFEE ... sorry.  Let's try one more time:
-
---- Makefile.in~       Wed Mar 13 07:11:24 2002
-+++ Makefile.in        Wed Mar 13 07:10:41 2002
-@@ -12,6 +12,7 @@
- LDFLAGS=@LDFLAGS@
- 
- INSTALLCMD=@INSTALL@
-+INSTALLMAN=@INSTALL@
- 
- srcdir=@srcdir@
- VPATH=$(srcdir)
-@@ -56,8 +57,8 @@
-       ${INSTALLCMD} -m 755 rsync ${bindir}
-       -mkdir -p ${mandir}/man1
-       -mkdir -p ${mandir}/man5
--      ${INSTALLCMD} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
--      ${INSTALLCMD} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
-+      ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
-+      ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
- 
- install-strip:
-       $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
-
---- flist.c~   Wed Mar 13 06:45:36 2002
-+++ flist.c    Wed Mar 13 06:45:36 2002
-@@ -101,7 +101,8 @@
- {
-       if (do_progress) {
-               /* This overwrites the progress line */
--              rprintf(FINFO, "%d files to consider\n", flist->count);
-+              rprintf(FINFO, "%d file%sto consider\n",
-+                  flist->count, flist->count==1?" ":"s ");
-       } else
-               rprintf(FINFO, "done\n");
- }
-
-
--- 
-| G r e g  L o u i s          | gpg public key:      |
-|   http://www.bgl.nu/~glouis |   finger greg@bgl.nu |
-
-Header information for this message:
-Subject: Re: [PATCH] fix install-strip target in Makefile
-     To: rsync@samba.org
-   From: Greg Louis <glouis@dynamicro.on.ca>
-
---
-To unsubscribe or change options: http://lists.samba.org/mailman/listinfo/rsync
-Before posting, read: http://www.tuxedo.org/~esr/faqs/smart-questions.html

diff --git a/jos-solaris-sizet.diff b/jos-solaris-sizet.diff
deleted file mode 100644 (file)
index b5b46bb..0000000
--- a/jos-solaris-sizet.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-From rsync-admin@lists.samba.org Wed Mar 13 17:38:07 2002
-Return-Path: <rsync-admin@lists.samba.org>
-Delivered-To: mbp@samba.org
-Received: from va.samba.org (localhost [127.0.0.1])
-       by lists.samba.org (Postfix) with ESMTP
-       id 3CE014420; Wed, 13 Mar 2002 17:38:06 -0800 (PST)
-Delivered-To: rsync@lists.samba.org
-Received: from mercury.Sun.COM (mercury.Sun.COM [192.9.25.1])
-       by lists.samba.org (Postfix) with ESMTP id 3C43E43FE
-       for <rsync@lists.samba.org>; Wed, 13 Mar 2002 17:37:20 -0800 (PST)
-Received: from engmail3.Eng.Sun.COM ([129.144.170.5])
-       by mercury.Sun.COM (8.9.3+Sun/8.9.3) with ESMTP id RAA08864;
-       Wed, 13 Mar 2002 17:37:14 -0800 (PST)
-Received: from goodluck.Eng.Sun.COM (goodluck.Eng.Sun.COM [129.144.28.81])
-       by engmail3.Eng.Sun.COM (8.9.3+Sun/8.9.3/ENSMAIL,v2.1p1) with ESMTP id RAA25195;
-       Wed, 13 Mar 2002 17:37:14 -0800 (PST)
-Received: from goodluck (goodluck [129.144.28.81])
-       by goodluck.Eng.Sun.COM (8.9.3+Sun/8.9.1) with SMTP id RAA05041;
-       Wed, 13 Mar 2002 17:37:13 -0800 (PST)
-Message-Id: <200203140137.RAA05041@goodluck.Eng.Sun.COM>
-From: Jennifer Lu <mou@goodluck.Eng.Sun.COM>
-Reply-To: Jennifer Lu <mou@goodluck.Eng.Sun.COM>
-Subject: Re: map_ptr warning
-To: rsync@lists.samba.org, cmount@nortelnetworks.com
-MIME-Version: 1.0
-Content-Type: TEXT/plain; charset=us-ascii
-Content-MD5: pjY7k5RvgQaUX4EBLt+diQ==
-X-Mailer: dtmail 1.3.0 @(#)CDE Version 1.3.4 SunOS 5.7 sun4u sparc 
-Sender: rsync-admin@lists.samba.org
-Errors-To: rsync-admin@lists.samba.org
-X-BeenThere: rsync@lists.samba.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-List-Help: <mailto:rsync-request@lists.samba.org?subject=help>
-List-Post: <mailto:rsync@lists.samba.org>
-List-Subscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
-       <mailto:rsync-request@lists.samba.org?subject=subscribe>
-List-Id: rsync user list <rsync.lists.samba.org>
-List-Unsubscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
-       <mailto:rsync-request@lists.samba.org?subject=unsubscribe>
-List-Archive: <http://lists.samba.org/pipermail/rsync/>
-Date: Wed, 13 Mar 2002 17:37:13 -0800 (PST)
-Status: RO
-Content-Length: 2455
-Lines: 69
-
-
-
-Charles,
-
-
-> Delivered-To: rsync@lists.samba.org
-> From: "Charles Mount" <cmount@nortelnetworks.com>
-> To: rsync@lists.samba.org
-> Subject: map_ptr warning
-> MIME-Version: 1.0
-> X-BeenThere: rsync@lists.samba.org
-> X-Mailman-Version: 2.0.8
-> List-Help: <mailto:rsync-request@lists.samba.org?subject=help>
-> List-Post: <mailto:rsync@lists.samba.org>
-> List-Subscribe: <http://lists.samba.org/mailman/listinfo/rsync>, 
-<mailto:rsync-request@lists.samba.org?subject=subscribe>
-> List-Id: rsync user list <rsync.lists.samba.org>
-> List-Unsubscribe: <http://lists.samba.org/mailman/listinfo/rsync>, 
-<mailto:rsync-request@lists.samba.org?subject=unsubscribe>
-> List-Archive: <http://lists.samba.org/pipermail/rsync/>
-> Date: Wed, 13 Mar 2002 15:50:06 -0600
-> 
-> I am using rsync-2.5.2.Solaris251.sparc from your site to synchronize from
-> an old  Solaris2.5.1 server in Nashville to a new Solaris8 server in
-> Raleigh.   I will air express tapes and use rsync to update.  I am dealing
-> with several hundred thousand files and a couple hundred gigabytes of data.
-> I use "rsync -avx --delete -e ssh old:/foo/bar/ /foo/bar >>2
-> /var/log/rsynclog" run as a cronjob on the new computer.
-> Most of the files are transferred correctly.
-> With a few files I get the file name followed the two copies of the line:
-> "Warning: unexpected read size of 0 in map_ptr"  in the log file.
-> In at least most cases, the next pass gives the same message on the same
-> file.  The file size is sometimes larger on the target and may grow on
-> additional passes.  If I delete the file on the target the next pass will
-> normally work correctly.  I see no pattern of where the problem will strike.
-> In some cases, the problem files are plain text with simple path and file
-> names.
-> Any ideas?
-
-I got the same errors. Upgrade rsync to 2.5.3 with updating batch.c file 
-
-diff -u -r1.13 batch.c
---- batch.c     6 Feb 2002 21:20:48 -0000   1.13
-+++ batch.c     12 Mar 2002 06:16:49 -0000
-@@ -396,7 +396,7 @@
-                   struct sum_struct *s)
- {
-     size_t i;
--    unsigned int int_zero = 0;
-+    size_t int_zero = 0;
-     extern int csum_length;
- 
-     fdb_open = 1;
-     
-Then, re-compile it. After I compiled the new version of rsync, it works perfectly.
-
-     
-> 
-> Thanks,
-> Charles Mount
-> 
-> 
-
-Jennifer
-
-
--- 
-To unsubscribe or change options: http://lists.samba.org/mailman/listinfo/rsync
-Before posting, read: http://www.tuxedo.org/~esr/faqs/smart-questions.html
-