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 Date: 01-Oct-2004 09:37:54
Branch: HEAD Handle: 2004100108375400
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Log:
upgrading package: rsync 2.6.2 -> 2.6.3
Summary:
Revision Changes Path
1.11 +2 -49 openpkg-src/rsync/rsync.patch
1.69 +2 -2 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 rsync.patch
--- openpkg-src/rsync/rsync.patch 15 Aug 2004 09:53:21 -0000 1.10
+++ openpkg-src/rsync/rsync.patch 1 Oct 2004 07:37:54 -0000 1.11
@@ -1,6 +1,6 @@
Index: zlib/infcodes.c
---- zlib/infcodes.c.orig 2002-03-12 02:14:58.000000000 +0100
-+++ zlib/infcodes.c 2004-04-29 17:21:36.000000000 +0200
+--- zlib/infcodes.c.orig 2002-03-12 02:14:58 +0100
++++ zlib/infcodes.c 2004-10-01 08:58:40 +0200
@@ -197,8 +197,18 @@
c->mode = COPY;
case COPY: /* o: copying bytes in window, waiting for space */
@@ -20,50 +20,3 @@
while (c->len)
{
NEEDOUT
-Index: flist.c
---- flist.c.orig 2004-04-29 21:37:15.000000000 +0200
-+++ flist.c 2004-05-03 16:11:52.000000000 +0200
-@@ -539,6 +539,7 @@
- rdev_major = 0;
- uid = 0, gid = 0;
- *lastname = '\0';
-+ lastdir_len = -1;
- return;
- }
-
-@@ -745,7 +746,7 @@
- char *basename, *dirname, *bp;
- unsigned short flags = 0;
-
-- if (!flist) /* lastdir isn't valid if flist is NULL */
-+ if (!flist || !flist->count) /* lastdir isn't valid if flist is NULL */
- lastdir_len = -1;
-
- if (strlcpy(thisname, fname, sizeof thisname)
-
-=============================================================================
-
-Security Fix:
-
-There is a path-sanitizing bug that affects daemon mode in all recent
-rsync versions (including 2.6.2) but only if chroot is disabled. It
-does NOT affect the normal send/receive filenames that specify what
-files should be transferred (this is because these names happen to get
-sanitized twice, and thus the second call removes any lingering leading
-slash(es) that the first call left behind). It does affect certain
-option paths that cause auxilliary files to be read or written. One
-potential fix that doesn't require recompiling rsync is to set "use
-chroot = true" for all the modules in the rsyncd.conf file.
-
-Index: util.c
---- util.c.orig 2004-04-27 21:59:37 +0200
-+++ util.c 2004-08-15 11:45:47 +0200
-@@ -743,7 +743,7 @@
- allowdotdot = 1;
- } else {
- p += 2;
-- if (*p == '/')
-+ while (*p == '/')
- p++;
- if (sanp != start) {
- /* back up sanp one level */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 rsync.spec
--- openpkg-src/rsync/rsync.spec 15 Aug 2004 09:53:21 -0000 1.68
+++ openpkg-src/rsync/rsync.spec 1 Oct 2004 07:37:54 -0000 1.69
@@ -33,8 +33,8 @@
Class: CORE
Group: Filesystem
License: GPL
-Version: 2.6.2
-Release: 20040815
+Version: 2.6.3
+Release: 20041001
# package options
%option with_timelimit no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
