diff options
| -rw-r--r-- | net/rsync/Makefile | 5 | ||||
| -rw-r--r-- | net/rsync/distinfo | 8 | ||||
| -rw-r--r-- | net/rsync/patches/patch-aa | 21 |
3 files changed, 14 insertions, 20 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index c6786c82f24..c9d739a5884 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2002/02/27 04:20:59 atatat Exp $ +# $NetBSD: Makefile,v 1.40 2002/03/12 16:02:56 tron Exp $ -DISTNAME= rsync-2.5.2 -PKGREVISION= 1 +DISTNAME= rsync-2.5.3 CATEGORIES= net MASTER_SITES= ftp://rsync.samba.org/pub/rsync/ \ ftp://sunsite.auc.dk/pub/unix/rsync/ \ diff --git a/net/rsync/distinfo b/net/rsync/distinfo index f5f7f5f21a3..6bb811cc879 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/02/27 03:47:25 mycroft Exp $ +$NetBSD: distinfo,v 1.6 2002/03/12 16:02:56 tron Exp $ -SHA1 (rsync-2.5.2.tar.gz) = 53b1e43f77b17e214c8013315f3de8c08d2db0c5 -Size (rsync-2.5.2.tar.gz) = 368916 bytes -SHA1 (patch-aa) = 5619001ae653e6bc900a8b5791c8eb3e9aa5ad70 +SHA1 (rsync-2.5.3.tar.gz) = e23791d0e53d63d8452bfbb9451b137745643838 +Size (rsync-2.5.3.tar.gz) = 383692 bytes +SHA1 (patch-aa) = 27c2925b67d38132507a2e8e41ba7e406a9d9051 diff --git a/net/rsync/patches/patch-aa b/net/rsync/patches/patch-aa index 494dc9dfbd5..27ef6f5e7d3 100644 --- a/net/rsync/patches/patch-aa +++ b/net/rsync/patches/patch-aa @@ -1,18 +1,13 @@ -$NetBSD: patch-aa,v 1.7 2002/02/27 03:47:56 mycroft Exp $ +$NetBSD: patch-aa,v 1.8 2002/03/12 16:02:57 tron Exp $ ---- match.c.orig Fri Jan 25 23:07:34 2002 -+++ match.c Wed Feb 27 03:38:46 2002 -@@ -246,8 +246,11 @@ - match. The 3 reads are caused by the +--- match.c.orig Sun Feb 3 02:38:39 2002 ++++ match.c Tue Mar 12 16:55:19 2002 +@@ -247,7 +247,7 @@ running match, the checksum update and the literal send. */ -- if (offset-last_match >= CHUNK_SIZE+s->n && -- (end-offset > CHUNK_SIZE)) { -+ /* NOTE: If we just matched a block, then offset<last_match -+ (by 1). The arithmetic here must be ordered so that type -+ promotions (s->n is unsigned) do not cause a false match. */ -+ if (offset >= last_match+CHUNK_SIZE+s->n && -+ end > offset+CHUNK_SIZE) { + if (offset > last_match && +- offset-last_match >= CHUNK_SIZE+s->n && ++ offset >= last_match+CHUNK_SIZE+s->n && + (end-offset > CHUNK_SIZE)) { matched(f,s,buf,offset - s->n, -2); } - } while (++offset < end); |