SOURCES: rsync-2.6.5-2.6.6pre1.diffs.gz (NEW), rsync-config.patch, ...

arekm arekm at pld-linux.org
Sat Jul 23 16:05:38 CEST 2005 

Author: arekm                        Date: Sat Jul 23 14:05:38 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.6.6pre1 (2.6.5 segfaults in some situations)

---- Files affected:
SOURCES:
   rsync-2.6.5-2.6.6pre1.diffs.gz (NONE -> 1.1)  (NEW), rsync-config.patch (1.10 -> 1.11) , rsync-man.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/rsync-2.6.5-2.6.6pre1.diffs.gz
<<Binary file>>

================================================================
Index: SOURCES/rsync-config.patch
diff -u SOURCES/rsync-config.patch:1.10 SOURCES/rsync-config.patch:1.11
--- SOURCES/rsync-config.patch:1.10	Sat Jun 18 20:08:38 2005
+++ SOURCES/rsync-config.patch	Sat Jul 23 16:05:33 2005
@@ -1,7 +1,7 @@
-diff -burN rsync-2.6.2.orig/rsyncd.conf.5 rsync-2.6.2/rsyncd.conf.5
---- rsync-2.6.2.orig/rsyncd.conf.5	2004-05-02 10:20:23.157077408 +0200
-+++ rsync-2.6.2/rsyncd.conf.5	2004-05-02 11:11:53.624254984 +0200
-@@ -282,7 +282,7 @@
+diff -urBb rsync-2.6.5.org/rsyncd.conf.5 rsync-2.6.5/rsyncd.conf.5
+--- rsync-2.6.5.org/rsyncd.conf.5	2005-07-23 16:01:33.135106000 +0200
++++ rsync-2.6.5/rsyncd.conf.5	2005-07-23 16:01:58.800205112 +0200
+@@ -325,7 +325,7 @@
  you may find that passwords longer than 8 characters don\&'t work\&. 
  .IP 
  There is no default for the "secrets file" option, you must choose a name
@@ -10,7 +10,7 @@
  by "other"; see "strict modes"\&.
  .IP 
  .IP "\fBstrict modes\fP" 
-@@ -557,13 +557,13 @@
+@@ -623,13 +623,13 @@
          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan
@@ -24,9 +24,9 @@
 -The /etc/rsyncd\&.secrets file would look something like this:
 +The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
  .PP 
- tridge:mypass 
- .br 
-@@ -571,7 +571,7 @@
+ .RS 
+ \f(CWtridge:mypass\fP
+@@ -640,7 +640,7 @@
  .PP 
  .SH "FILES" 
  .PP 
@@ -35,9 +35,9 @@
  .PP 
  .SH "SEE ALSO" 
  .PP 
-diff -burN rsync-2.6.2.orig/rsyncd.conf.yo rsync-2.6.2/rsyncd.conf.yo
---- rsync-2.6.2.orig/rsyncd.conf.yo	2004-05-02 10:20:23.170075432 +0200
-+++ rsync-2.6.2/rsyncd.conf.yo	2004-05-02 11:13:07.881966096 +0200
+diff -urBb rsync-2.6.5.org/rsyncd.conf.yo rsync-2.6.5/rsyncd.conf.yo
+--- rsync-2.6.5.org/rsyncd.conf.yo	2005-07-23 16:01:33.136106000 +0200
++++ rsync-2.6.5/rsyncd.conf.yo	2005-07-23 16:01:58.800205112 +0200
 @@ -69,7 +69,7 @@
  reread its config file.
  
@@ -78,9 +78,9 @@
  
  quote(
  tt(tridge:mypass)nl()
-diff -burN rsync-2.6.2.orig/rsync.h rsync-2.6.2/rsync.h
---- rsync-2.6.2.orig/rsync.h	2004-05-02 10:20:23.165076192 +0200
-+++ rsync-2.6.2/rsync.h	2004-05-02 10:29:51.993601112 +0200
+diff -urBb rsync-2.6.5.org/rsync.h rsync-2.6.5/rsync.h
+--- rsync-2.6.5.org/rsync.h	2005-05-03 19:00:47.000000000 +0200
++++ rsync-2.6.5/rsync.h	2005-07-23 16:01:58.801204960 +0200
 @@ -30,7 +30,7 @@
  /* RSYNCD_SYSCONF is now set in config.h */
  #define RSYNCD_USERCONF "rsyncd.conf"
@@ -90,31 +90,19 @@
  #define URL_PREFIX "rsync://"
  
  #define BACKUP_SUFFIX "~"
-diff -burN rsync-2.6.2.orig/rsyncstats rsync-2.6.2/rsyncstats
---- rsync-2.6.2.orig/support/rsyncstats	2004-05-02 10:20:23.170075432 +0200
-+++ rsync-2.6.2/support/rsyncstats	2004-05-02 11:13:25.761248032 +0200
-@@ -12,7 +12,7 @@
- use Getopt::Long;
- 
- # You may wish to edit the next line to customize for your default log file.
--$usage_file = "/var/adm/rsyncd.log";
-+$usage_file = "/var/log/rsyncd.log";
+diff -urBb rsync-2.6.5.org/rsync.yo rsync-2.6.5/rsync.yo
+--- rsync-2.6.5.org/rsync.yo	2005-07-23 16:01:33.135106000 +0200
++++ rsync-2.6.5/rsync.yo	2005-07-23 16:02:35.743588864 +0200
+@@ -233,7 +233,7 @@
  
- # Edit the following lines for default report settings.
- # Entries defined here will be over-ridden by the command line.
-diff -burN rsync-2.6.2.orig/rsync.yo rsync-2.6.2/rsync.yo
---- rsync-2.6.2.orig/rsync.yo	2004-05-02 10:20:23.163076496 +0200
-+++ rsync-2.6.2/rsync.yo	2004-05-02 11:10:50.675824600 +0200
-@@ -219,7 +219,7 @@
- 
- An rsync server is configured using a configuration file.  Please see the 
+ An rsync daemon is configured using a configuration file.  Please see the
  rsyncd.conf(5) man page for more information.  By default the configuration
--file is called /etc/rsyncd.conf, unless rsync is running over a remote
-+file is called /etc/rsyncd/rsyncd.conf, unless rsync is running over a remote
- shell program and is not running as root; in that case, the default name
- is rsyncd.conf in the current directory on the remote computer 
- (typically $HOME).
-@@ -790,7 +790,7 @@
+-file is called /etc/rsyncd.conf (unless the daemon is spawned via a remote
++file is called /etc/rsyncd/rsyncd.conf (unless the daemon is spawned via a remote
+ shell--see below).
+ 
+ manpagesection(RUNNING AN RSYNC DAEMON OVER A REMOTE SHELL PROGRAM)
+@@ -1334,7 +1334,7 @@
  If standard input is a socket then rsync will assume that it is being
  run via inetd, otherwise it will detach from the current terminal and
  become a background daemon.  The daemon will read the config file
@@ -123,7 +111,7 @@
  requests accordingly.  See the rsyncd.conf(5) man page for more
  details.
  
-@@ -1331,7 +1331,7 @@
+@@ -1352,7 +1352,7 @@
  
  dit(bf(--config=FILE)) This specifies an alternate config file than
  the default.  This is only relevant when bf(--daemon) is specified.
@@ -132,7 +120,7 @@
  a remote shell program and the remote user is not root; in that case
  the default is rsyncd.conf in the current directory (typically $HOME).
  
-@@ -2005,7 +2005,7 @@
+@@ -2045,7 +2045,7 @@
  
  manpagefiles()
  
@@ -141,3 +129,15 @@
  
  manpageseealso()
  
+diff -urBb rsync-2.6.5.org/support/rsyncstats rsync-2.6.5/support/rsyncstats
+--- rsync-2.6.5.org/support/rsyncstats	2005-02-19 20:36:54.000000000 +0100
++++ rsync-2.6.5/support/rsyncstats	2005-07-23 16:01:58.801204960 +0200
+@@ -12,7 +12,7 @@
+ use Getopt::Long;
+ 
+ # You may wish to edit the next line to customize for your default log file.
+-$usage_file = "/var/adm/rsyncd.log";
++$usage_file = "/var/log/rsyncd.log";
+ 
+ # Edit the following lines for default report settings.
+ # Entries defined here will be over-ridden by the command line.

================================================================
Index: SOURCES/rsync-man.patch
diff -u SOURCES/rsync-man.patch:1.8 SOURCES/rsync-man.patch:1.9
--- SOURCES/rsync-man.patch:1.8	Fri Apr  8 16:29:13 2005
+++ SOURCES/rsync-man.patch	Sat Jul 23 16:05:33 2005
@@ -1,16 +1,16 @@
-diff -Naur rsync-2.5.6-orig/rsync.1 rsync-2.5.6/rsync.1
---- rsync-2.5.6-orig/rsync.1	Tue Jan 28 04:11:57 2003
-+++ rsync-2.5.6/rsync.1	Thu Jan 30 18:11:11 2003
-@@ -276,7 +276,7 @@
+diff -urBb rsync-2.6.5.org/rsync.1 rsync-2.6.5/rsync.1
+--- rsync-2.6.5.org/rsync.1	2005-07-23 16:01:33.133107000 +0200
++++ rsync-2.6.5/rsync.1	2005-07-23 16:04:22.057426704 +0200
+@@ -264,7 +264,7 @@
  .PP 
- An rsync server is configured using a configuration file\&.  Please see the
+ An rsync daemon is configured using a configuration file\&.  Please see the
  rsyncd\&.conf(5) man page for more information\&.  By default the configuration
--file is called /etc/rsyncd\&.conf, unless rsync is running over a remote
-+file is called /etc/rsyncd/rsyncd\&.conf, unless rsync is running over a remote
- shell program and is not running as root; in that case, the default name
- is rsyncd\&.conf in the current directory on the remote computer
- (typically $HOME)\&.
-@@ -1524,7 +1524,7 @@
+-file is called /etc/rsyncd\&.conf (unless the daemon is spawned via a remote
++file is called /etc/rsyncd/rsyncd\&.conf (unless the daemon is spawned via a remote
+ shell--see below)\&.
+ .PP 
+ .SH "RUNNING AN RSYNC DAEMON OVER A REMOTE SHELL PROGRAM" 
+@@ -1543,7 +1543,7 @@
  .IP "\fB--config=FILE\fP" 
  This specifies an alternate config file than
  the default\&.  This is only relevant when \fB--daemon\fP is specified\&.
@@ -19,7 +19,7 @@
  a remote shell program and the remote user is not root; in that case
  the default is rsyncd\&.conf in the current directory (typically $HOME)\&.
  .IP 
-@@ -2323,7 +2323,7 @@
+@@ -2366,7 +2366,7 @@
  .PP 
  .SH "FILES" 
  .PP 
@@ -28,11 +28,11 @@
  .PP 
  .SH "SEE ALSO" 
  .PP 
-diff -Naur rsync-2.5.6-orig/rsyncd.conf.5 rsync-2.5.6/rsyncd.conf.5
---- rsync-2.5.6-orig/rsyncd.conf.5	Thu Jan 30 17:52:53 2003
-+++ rsync-2.5.6/rsyncd.conf.5	Thu Jan 30 18:11:58 2003
-@@ -161,7 +161,7 @@
- support the "max connections" option\&. The rsync server uses record
+diff -urBb rsync-2.6.5.org/rsyncd.conf.5 rsync-2.6.5/rsyncd.conf.5
+--- rsync-2.6.5.org/rsyncd.conf.5	2005-07-23 16:01:58.800205000 +0200
++++ rsync-2.6.5/rsyncd.conf.5	2005-07-23 16:03:21.122690192 +0200
+@@ -212,7 +212,7 @@
+ support the "max connections" option\&. The rsync daemon uses record
  locking on this file to ensure that the max connections limit is not
  exceeded for the modules sharing the lock file\&. 
 -The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rsync-config.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SOURCES/rsync-man.patch?r1=1.8&r2=1.9&f=u

More information about the pld-cvs-commit mailing list