X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rsync-config.patch;h=6c7610975484d75d6fc91fff611f1db0102c9672;hb=65bac86c9c8709ae38a4f5ee63c11105f9341925;hp=ae796e9f04b99f9c795406b53392196c9dbc6297;hpb=1796664f9354ac70686d92f813fd7ff34ebe43a2;p=packages%2Frsync.git

diff --git a/rsync-config.patch b/rsync-config.patch
index ae796e9..6c76109 100644
--- a/rsync-config.patch
+++ b/rsync-config.patch
@@ -1,87 +1,8 @@
-diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
---- rsync-2.3.2/rsync.h	Mon Nov  8 14:15:02 1999
-+++ rsync-2.3.2-new/rsync.h	Fri Nov 19 17:51:35 1999
-@@ -24,9 +24,9 @@
- #define RSYNC_RSH_ENV "RSYNC_RSH"
- 
- #define RSYNC_NAME "rsync"
--#define RSYNCD_CONF "/etc/rsyncd.conf"
-+#define RSYNCD_CONF "/etc/rsyncd/rsyncd.conf"
- 
--#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
-+#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
- #define URL_PREFIX "rsync://"
- 
- #define BACKUP_SUFFIX "~"
---- rsync-2.5.3/rsync.yo.orig	Fri Jan 25 11:42:23 2002
-+++ rsync-2.5.3/rsync.yo	Sat Jan 26 07:10:18 2002
-@@ -173,7 +173,7 @@
- manpagesection(RUNNING AN RSYNC SERVER)
- 
- An rsync server is configured using a config file which by default is
--called /etc/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
-+called /etc/rsyncd/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
- information. 
- 
- manpagesection(EXAMPLES)
-@@ -628,7 +628,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
--(/etc/rsyncd.conf) on each connect made by a client and respond to
-+(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
- requests accordingly.  See the rsyncd.conf(5) man page for more
- details.
- 
-@@ -648,7 +648,7 @@
- in conjunction with the --config option.
- 
- dit(bf(--config=FILE)) This specifies an alternate config file than
--the default /etc/rsyncd.conf. This is only relevant when --daemon is
-+the default /etc/rsyncd/rsyncd.conf. This is only relevant when --daemon is
- specified. 
- 
- dit(bf(--port=PORT)) This specifies an alternate TCP port number to use
-@@ -926,7 +926,7 @@
- 
- manpagefiles()
- 
--/etc/rsyncd.conf
-+/etc/rsyncd/rsyncd.conf
- 
- manpageseealso()
- 
---- rsync-2.5.3/rsyncd.conf.5.orig	Fri Aug 31 10:12:35 2001
-+++ rsync-2.5.3/rsyncd.conf.5	Sat Jan 26 07:13:23 2002
-@@ -64,7 +64,7 @@
- and a single line something like this to /etc/inetd\&.conf:
- .PP 
- .RS 
--rsync   stream  tcp     nowait  root   /usr/bin/rsync rsyncd --daemon
-+rsync   stream  tcp     nowait  root   /usr/sbin/rsync rsyncd --daemon
- .RE 
- .PP 
- Replace "/usr/bin/rsync" with the path to where you have rsync installed on
-@@ -72,7 +72,7 @@
- reread its config file\&.
- .PP 
- Note that you should not send the rsync server a HUP signal to force
--it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
-+it to reread the \f(CW/etc/rsyncd/rsyncd\etc/rsyncd\&.conf.conf\fP\&. The file is re-read on each client
- connection\&. 
- .PP 
- .SH "GLOBAL OPTIONS" 
-@@ -134,7 +134,7 @@
- .IP "\fBpath\fP" 
- The "path" option specifies the directory in the servers
- filesystem to make available in this module\&.  You must specify this option
--for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
-+for each module in \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&.
- .IP 
- .IP "\fBuse chroot\fP" 
- If "use chroot" is true, the rsync server will chroot
-@@ -250,7 +250,7 @@
- you may find that passwords longer than 8 characters don\'t work\&. 
+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
 -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&.  The file must normally not be readable
@@ -89,7 +10,7 @@ diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
  by "other"; see "strict modes"\&.
  .IP 
  .IP "\fBstrict modes\fP" 
-@@ -481,13 +481,13 @@
+@@ -623,13 +623,13 @@
          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan
@@ -103,46 +24,39 @@ diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
 -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 
-@@ -495,7 +495,7 @@
+ .RS 
+ \f(CWtridge:mypass\fP
+@@ -640,7 +640,7 @@
  .PP 
  .SH "FILES" 
  .PP 
--/etc/rsyncd\&.conf
-+/etc/rsyncd/rsyncd\&.conf
+-/etc/rsyncd\&.conf or rsyncd\&.conf
++/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
  .PP 
  .SH "SEE ALSO" 
  .PP 
---- rsync-2.5.3/rsyncd.conf.yo.orig	Fri Aug 31 10:12:35 2001
-+++ rsync-2.5.3/rsyncd.conf.yo	Sat Jan 26 07:14:48 2002
-@@ -61,14 +61,14 @@
- 
- and a single line something like this to /etc/inetd.conf:
-     
--quote(rsync   stream  tcp     nowait  root   /usr/bin/rsync rsyncd --daemon)
-+quote(rsync   stream  tcp     nowait  root   /usr/sbin/rsync rsyncd --daemon)
- 
- Replace "/usr/bin/rsync" with the path to where you have rsync installed on
- your system.  You will then need to send inetd a HUP signal to tell it to
+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.
  
- Note that you should not send the rsync server a HUP signal to force
--it to reread the tt(/etc/rsyncd.conf). The file is re-read on each client
-+it to reread the tt(/etc/rsyncd/rsyncd.conf). The file is re-read on each client
+ Note that you should bf(not) send the rsync daemon a HUP signal to force
+-it to reread the tt(rsyncd.conf) file. The file is re-read on each client
++it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
  connection. 
  
  manpagesection(GLOBAL OPTIONS)
-@@ -127,7 +127,7 @@
+@@ -139,7 +139,7 @@
  
- dit(bf(path)) The "path" option specifies the directory in the servers
+ dit(bf(path)) The "path" option specifies the directory in the daemon's
  filesystem to make available in this module.  You must specify this option
--for each module in tt(/etc/rsyncd.conf).
+-for each module in tt(rsyncd.conf).
 +for each module in tt(/etc/rsyncd/rsyncd.conf).
  
- dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot
+ dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot
  to the "path" before starting the file transfer with the client.  This has
-@@ -230,7 +230,7 @@
+@@ -292,7 +292,7 @@
  you may find that passwords longer than 8 characters don't work. 
  
  There is no default for the "secrets file" option, you must choose a name
@@ -151,7 +65,7 @@ diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
  by "other"; see "strict modes".
  
  dit(bf(strict modes)) The "strict modes" option determines whether or not 
-@@ -420,17 +420,17 @@
+@@ -543,10 +543,10 @@
          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan
@@ -162,25 +76,68 @@ diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
 -The /etc/rsyncd.secrets file would look something like this:
 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
  
- tridge:mypass nl()
- susan:herpass
+ quote(
+ tt(tridge:mypass)nl()
+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"
+ 
+-#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
++#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
+ #define URL_PREFIX "rsync://"
+ 
+ #define BACKUP_SUFFIX "~"
+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 @@
+ 
+ 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 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
+-(rsyncd.conf) on each connect made by a client and respond to
++(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
+ requests accordingly.  See the rsyncd.conf(5) man page for more
+ details.
+ 
+@@ -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.
+-The default is /etc/rsyncd.conf unless the daemon is running over
++The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
+ 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).
+ 
+@@ -2045,7 +2045,7 @@
  
  manpagefiles()
  
--/etc/rsyncd.conf
-+/etc/rsyncd/rsyncd.conf
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf
  
  manpageseealso()
  
-diff -ruN rsync-2.3.2/rsyncstats rsync-2.3.2-new/rsyncstats
---- rsync-2.3.2/rsyncstats	Wed Nov 25 17:24:40 1998
-+++ rsync-2.3.2-new/rsyncstats	Fri Nov 19 17:51:35 1999
-@@ -23,7 +23,7 @@
- # ---------------------------------------------------------------------------
+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;
  
- # edit the next line to customize for your default log file
+ # 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";
++$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.