OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Mar-2005 11:09:35
Branch: HEAD Handle: 2005030410093400
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Log:
apply acceptable workaround in the year 2005 with rsync 2.6.3
(protocol 28): do no longer accept antiqued protocols versions less
than 25 (from before rsync 2.5.x in 2001) because clients using some
of those protocols hang the assigned rsync server process forever
Summary:
Revision Changes Path
1.15 +31 -0 openpkg-src/rsync/rsync.patch
1.73 +1 -1 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 rsync.patch
--- openpkg-src/rsync/rsync.patch 2 Jan 2005 16:35:00 -0000 1.14
+++ openpkg-src/rsync/rsync.patch 4 Mar 2005 10:09:34 -0000 1.15
@@ -85,3 +85,34 @@
if (inplace) {
#if HAVE_FTRUNCATE
if (partial_dir) {
+Index: compat.c
+--- compat.c.orig 2004-07-22 01:59:22 +0200
++++ compat.c 2005-03-04 11:02:28 +0100
+@@ -60,8 +60,8 @@
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ if (remote_protocol < OLD_PROTOCOL_VERSION) {
+- rprintf(FINFO,"%s is very old version of rsync, upgrade
recommended.\n",
+- am_server? "Client" : "Server");
++ rprintf(FINFO,"%s is very old version (protocol %d) of rsync,
upgrade recommended.\n",
++ am_server? "Client" : "Server", remote_protocol);
+ }
+ if (protocol_version < MIN_PROTOCOL_VERSION) {
+ rprintf(FERROR, "--protocol must be at least %d on the %s.\n",
+Index: rsync.h
+--- rsync.h.orig 2004-09-22 06:10:10 +0200
++++ rsync.h 2005-03-04 11:00:58 +0100
+@@ -81,8 +81,13 @@
+ * unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
+ * MAX_PROTOCOL_VERSION. */
+
++#ifdef RSYNC_ANTIQUED_PROTOCOLS
+ #define MIN_PROTOCOL_VERSION 20
+ #define OLD_PROTOCOL_VERSION 25
++#else
++#define MIN_PROTOCOL_VERSION 25
++#define OLD_PROTOCOL_VERSION 27
++#endif
+ #define MAX_PROTOCOL_VERSION 40
+
+ #define RSYNC_PORT 873
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.72 -r1.73 rsync.spec
--- openpkg-src/rsync/rsync.spec 3 Jan 2005 14:56:28 -0000 1.72
+++ openpkg-src/rsync/rsync.spec 4 Mar 2005 10:09:34 -0000 1.73
@@ -34,7 +34,7 @@
Group: Filesystem
License: GPL
Version: 2.6.3
-Release: 20050103
+Release: 20050304
# package options
%option with_lastmatch yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
