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: 29-Apr-2004 17:27:25
Branch: HEAD Handle: 2004042916272500
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Log:
replace rsh/ssh hack with new --with-rsh option and add a bugfix from
the rsync mailing list (see
http://lists.samba.org/archive/rsync/2004-April/009334.html)
Summary:
Revision Changes Path
1.6 +22 -36 openpkg-src/rsync/rsync.patch
1.62 +3 -2 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 rsync.patch
--- openpkg-src/rsync/rsync.patch 1 Jan 2004 19:17:57 -0000 1.5
+++ openpkg-src/rsync/rsync.patch 29 Apr 2004 15:27:25 -0000 1.6
@@ -1,41 +1,27 @@
-Index: main.c
---- main.c.orig 2003-12-20 17:57:24.000000000 +0100
-+++ main.c 2004-01-01 20:12:53.000000000 +0100
-@@ -209,7 +209,7 @@
- if (!cmd)
- cmd = rsh_env;
- if (!cmd)
-- cmd = RSYNC_RSH;
-+ cmd = RSYNC_SSH;
- cmd = strdup(cmd);
- if (!cmd)
- goto oom;
-Index: options.c
---- options.c.orig 2003-12-30 19:16:25.000000000 +0100
-+++ options.c 2004-01-01 20:14:14.000000000 +0100
-@@ -238,7 +238,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," --existing only update files that already exist\n");
- rprintf(F," --ignore-existing ignore files that already exist on
receiving side\n");
-Index: rsync.h
---- rsync.h.orig 2003-12-17 00:04:59.000000000 +0100
-+++ rsync.h 2004-01-01 20:12:53.000000000 +0100
-@@ -121,6 +121,7 @@
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
-+#define RSYNC_SSH "ssh"
-
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
+Index: uidlist.c
+--- uidlist.c.orig 2004-02-20 18:09:30.000000000 +0100
++++ uidlist.c 2004-04-29 17:22:32.000000000 +0200
+@@ -81,7 +81,7 @@
+ static int map_uid(int id, char *name)
+ {
+ uid_t uid;
+- if (uid != 0 && name_to_uid(name, &uid))
++ if (id != 0 && name_to_uid(name, &uid))
+ return uid;
+ return id;
+ }
+@@ -89,7 +89,7 @@
+ static int map_gid(int id, char *name)
+ {
+ gid_t gid;
+- if (gid != 0 && name_to_gid(name, &gid))
++ if (id != 0 && name_to_gid(name, &gid))
+ return gid;
+ return id;
+ }
Index: zlib/infcodes.c
--- zlib/infcodes.c.orig 2002-03-12 02:14:58.000000000 +0100
-+++ zlib/infcodes.c 2004-01-01 20:12:53.000000000 +0100
++++ zlib/infcodes.c 2004-04-29 17:21:36.000000000 +0200
@@ -197,8 +197,18 @@
c->mode = COPY;
case COPY: /* o: copying bytes in window, waiting for space */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 rsync.spec
--- openpkg-src/rsync/rsync.spec 28 Apr 2004 16:46:00 -0000 1.61
+++ openpkg-src/rsync/rsync.spec 29 Apr 2004 15:27:25 -0000 1.62
@@ -34,7 +34,7 @@
Group: Filesystem
License: GPL
Version: 2.6.1
-Release: 20040428
+Release: 20040429
# list of sources
Source0: http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
@@ -80,7 +80,8 @@
--prefix=%{l_prefix} \
--with-rsyncd-conf=%{l_prefix}/etc/rsync/rsync.conf \
--disable-debug \
- --with-included-popt
+ --with-included-popt \
+ --with-rsh=ssh
# build vendor sources
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
