summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2002-03-13 11:42:30 +0000
committertron <tron@pkgsrc.org>2002-03-13 11:42:30 +0000
commit5e7ee1e887038d77fcfdebc5bbc682a88b31ee5a (patch)
treed746afa8e8abfa5b79d52ce06155f6d33bc57975 /net
parente6d164fbc9777c43103228dfd6e01ac35d312597 (diff)
downloadpkgsrc-5e7ee1e887038d77fcfdebc5bbc682a88b31ee5a.tar.gz
Update "rsync" package to version 2.5.3. Changes since version 2.5.4:
- Additional fix for zlib double-free bug. (Martin Pool, Andrew Tridgell) (CVE CAN-2002-0059) - Merge in changes from zlib 1.1.3 to zlib 1.1.4. (Jos Backus) (Note that rsync still uses a custom version of zlib; you can not just link against a system library. See zlib/README.rsync) - Additional test cases for --compress. (Martin Pool)
Diffstat (limited to 'net')
-rw-r--r--net/rsync/Makefile4
-rw-r--r--net/rsync/distinfo7
-rw-r--r--net/rsync/patches/patch-ab28
3 files changed, 5 insertions, 34 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index c9d739a5884..e3faa0de11c 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2002/03/12 16:02:56 tron Exp $
+# $NetBSD: Makefile,v 1.41 2002/03/13 11:42:30 tron Exp $
-DISTNAME= rsync-2.5.3
+DISTNAME= rsync-2.5.4
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 afc05bab9e9..6b0148e51fe 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/03/12 17:35:31 tron Exp $
+$NetBSD: distinfo,v 1.8 2002/03/13 11:42:30 tron Exp $
-SHA1 (rsync-2.5.3.tar.gz) = e23791d0e53d63d8452bfbb9451b137745643838
-Size (rsync-2.5.3.tar.gz) = 383692 bytes
+SHA1 (rsync-2.5.4.tar.gz) = 8bf1815a0e3549086036e4c029a583602a9fbf05
+Size (rsync-2.5.4.tar.gz) = 385672 bytes
SHA1 (patch-aa) = 27c2925b67d38132507a2e8e41ba7e406a9d9051
-SHA1 (patch-ab) = 7c74750f761de607ee50f5c4a6e06bfb07851ae8
diff --git a/net/rsync/patches/patch-ab b/net/rsync/patches/patch-ab
deleted file mode 100644
index 5c3590aec47..00000000000
--- a/net/rsync/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/03/12 17:35:31 tron Exp $
-
---- zlib/infblock.c.orig Mon Mar 11 06:55:33 2002
-+++ zlib/infblock.c Tue Mar 12 18:31:47 2002
-@@ -315,7 +315,6 @@
- t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
- s->sub.trees.blens, &bl, &bd, &tl, &td,
- s->hufts, z);
-- ZFREE(z, s->sub.trees.blens);
- if (t != Z_OK)
- {
- if (t == (uInt)Z_DATA_ERROR)
-@@ -326,7 +325,6 @@
- r = t;
- LEAVE
- }
-- ZFREE(z, s->sub.trees.blens);
- Tracev((stderr, "inflate: trees ok\n"));
- if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
- {
-@@ -335,6 +333,7 @@
- }
- s->sub.decode.codes = c;
- }
-+ ZFREE(z, s->sub.trees.blens);
- s->mode = CODES;
- case CODES:
- UPDATE