- one more check

[packages/rsync.git] / rsync-config.patch

diff --git a/rsync-config.patch b/rsync-config.patch
index 4749e37c88ed0e1a34d40f6ccb8a49f9a25223bf..31a8118a68faeae8fac1bb0f4ac9fc4229b6c644 100644 (file)
--- a/rsync-config.patch
+++ b/rsync-config.patch
@@ -1,173 +1,100 @@
-diff -Nur rsync-2.3.2/rsync.h rsync-2.3.2.pld/rsync.h
---- rsync-2.3.2/rsync.h        Mon Mar 15 22:23:12 1999
-+++ rsync-2.3.2.pld/rsync.h    Thu Jun 17 09:27:07 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 "~"
-diff -Nur rsync-2.3.2/rsync.yo rsync-2.3.2.pld/rsync.yo
---- rsync-2.3.2/rsync.yo       Tue Apr  6 17:04:17 1999
-+++ rsync-2.3.2.pld/rsync.yo   Thu Jun 17 09:33:26 1999
-@@ -168,7 +168,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)
-@@ -592,12 +592,12 @@
- daemon. 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
-+config file (/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. 
- 
- 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
-@@ -742,7 +742,7 @@
- 
- manpagefiles()
- 
--/etc/rsyncd.conf
-+/etc/rsyncd/rsyncd.conf
- 
- manpageseealso()
+diff -ur rsync-3.0.0pre6.org/rsync.1 rsync-3.0.0pre6/rsync.1
+--- rsync-3.0.0pre6.org/rsync.1        2007-11-28 10:00:29.000000000 +0100
++++ rsync-3.0.0pre6/rsync.1    2007-12-10 22:18:49.896441464 +0100
+@@ -2398,7 +2398,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.
+-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 the super-user; in that case
+ the default is rsyncd.conf in the current directory (typically $HOME).
+ .IP 
+@@ -3302,7 +3302,7 @@
+ .SH "FILES"

  
  

-diff -Nur rsync-2.3.2/rsyncd.conf.5 rsync-2.3.2.pld/rsyncd.conf.5
---- rsync-2.3.2/rsyncd.conf.5  Tue Apr  6 17:04:17 1999
-+++ rsync-2.3.2.pld/rsyncd.conf.5      Thu Jun 17 09:35:51 1999
-@@ -59,14 +59,14 @@
- 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 
- You will then need to send inetd a HUP signal to tell it to reread its
- config file\&.

  .PP 
  .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\&.conf\fP\&. The file is re-read on each client
- connection\&. 
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf

  .PP 
  .PP 

- .SH "GLOBAL OPTIONS" 
-@@ -128,7 +128,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\&.
+ .SH "SEE ALSO"
+ 
+diff -ur rsync-3.0.0pre6.org/rsyncd.conf.5 rsync-3.0.0pre6/rsyncd.conf.5
+--- rsync-3.0.0pre6.org/rsyncd.conf.5  2007-11-28 10:00:29.000000000 +0100
++++ rsync-3.0.0pre6/rsyncd.conf.5      2007-12-10 22:19:26.808284001 +0100
+@@ -268,7 +268,7 @@
+ support the \(lqmax connections\(rq 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.
++The default is \f(CW/var/lock/rsyncd.lock\fP.

  .IP 
  .IP 

- .IP "\fBuse chroot\fP" 
- If "use chroot" is true, the rsync server will chroot
-@@ -239,7 +239,7 @@
- you may find that passwords longer than 8 characters don\'t work\&. 
+ .IP "\fBread only\fP"
+ The \(lqread only\(rq option determines whether clients
+@@ -408,7 +408,7 @@
+ you may find that passwords longer than 8 characters don\(cq\&t work.

  .IP 
  .IP 

- There is no default for the "secrets file" option, you must choose a name
--(such as \f(CW/etc/rsyncd\&.secrets\fP)\&.
-+(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&.
+ There is no default for the \(dq\&secrets file\(dq\& parameter, you must choose a name
+-(such as \f(CW/etc/rsyncd.secrets\fP).  The file must normally not be readable
++(such as \f(CW/etc/rsyncd/rsyncd.secrets\fP).  The file must normally not be readable
+ by \(dq\&other\(dq\&; see \(dq\&strict modes\(dq\&.

  .IP 
  .IP 

- .IP "\fBstrict modes\fP" 
- The "strict modes" option determines whether or not 
-@@ -429,7 +429,7 @@
- .br 
- syslog facility = local5 
- .br 
--pid file = /etc/rsyncd\&.pid
-+pid file = /var/run/rsyncd\&.pid
- .PP 
- 
- .DS 
-@@ -454,13 +454,13 @@
+ .IP "\fBstrict modes\fP"
+@@ -733,12 +733,12 @@

          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan
          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan

--        secrets file = /etc/rsyncd\&.secrets
-+        secrets file = /etc/rsyncd/rsyncd\&.secrets
+-        secrets file = /etc/rsyncd.secrets
++        secrets file = /etc/rsyncd/rsyncd.secrets

  
  

- .DE 
-  
+ .fi 

  
  .PP 
  
  .PP 

--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 
-@@ -468,7 +468,7 @@
- .PP 
- .SH "FILES" 
+-The /etc/rsyncd.secrets file would look something like this:
++The /etc/rsyncd/rsyncd.secrets file would look something like this:

  .PP 
  .PP 

--/etc/rsyncd\&.conf
-+/etc/rsyncd/rsyncd\&.conf
+ .RS 
+ \f(CWtridge:mypass\fP
+@@ -751,7 +751,7 @@
+ .SH "FILES"
+ 

  .PP 
  .PP 

- .SH "SEE ALSO" 
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf

  .PP 
  .PP 

-diff -Nur rsync-2.3.2/rsyncd.conf.yo rsync-2.3.2.pld/rsyncd.conf.yo
---- rsync-2.3.2/rsyncd.conf.yo Tue Apr  6 17:04:17 1999
-+++ rsync-2.3.2.pld/rsyncd.conf.yo     Thu Jun 17 09:44:41 1999
-@@ -56,13 +56,13 @@
- 
- 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)
+ .SH "SEE ALSO"

  
  

- You will then need to send inetd a HUP signal to tell it to reread its
- config file.
+diff -ur rsync-3.0.0pre6.org/rsyncd.conf.yo rsync-3.0.0pre6/rsyncd.conf.yo
+--- rsync-3.0.0pre6.org/rsyncd.conf.yo 2007-11-28 10:00:37.000000000 +0100
++++ rsync-3.0.0pre6/rsyncd.conf.yo     2007-12-10 22:15:49.037413489 +0100
+@@ -66,7 +66,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
- connection. 
+ 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)
  
  manpagesection(GLOBAL OPTIONS)

-@@ -121,7 +121,7 @@
+@@ -122,7 +122,7 @@

  
  

- dit(bf(path)) 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 tt(/etc/rsyncd.conf).
+ dit(bf(path)) The "path" parameter specifies the directory in the daemon's
+ filesystem to make available in this module.  You must specify this parameter
+-for each module in tt(rsyncd.conf).

 +for each module in tt(/etc/rsyncd/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
  to the "path" before starting the file transfer with the client.  This has

-@@ -219,7 +219,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
--(such as tt(/etc/rsyncd.secrets)).
-+(such as tt(/etc/rsyncd/rsyncd.secrets)).
- 
- dit(bf(strict modes)) The "strict modes" option determines whether or not 
- the permissions on the secrets file will be checked.  If "strict modes" is
-@@ -373,7 +373,7 @@
- use chroot = no nl()
- max connections = 4 nl()
- syslog facility = local5 nl()
--pid file = /etc/rsyncd.pid
-+pid file = /var/run/rsyncd.pid
- 
- verb([ftp]
-         path = /var/ftp/pub
-@@ -395,17 +395,17 @@
+@@ -360,7 +360,7 @@
+ you may find that passwords longer than 8 characters don't work.
+ 
+ There is no default for the "secrets file" parameter, you must choose a name
+-(such as tt(/etc/rsyncd.secrets)).  The file must normally not be readable
++(such as tt(/etc/rsyncd/rsyncd.secrets)).  The file must normally not be readable
+ by "other"; see "strict modes".
+ 
+ dit(bf(strict modes)) The "strict modes" parameter determines whether or not
+@@ -624,10 +624,10 @@

          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan
          path = /data/cvs
          comment = CVS repository (requires authentication)
          auth users = tridge, susan


@@ -178,25 +105,47 @@ diff -Nur rsync-2.3.2/rsyncd.conf.yo rsync-2.3.2.pld/rsyncd.conf.yo
 -The /etc/rsyncd.secrets file would look something like this:
 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
  
 -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 -ur rsync-3.0.0pre6.org/rsync.h rsync-3.0.0pre6/rsync.h
+--- rsync-3.0.0pre6.org/rsync.h        2007-11-27 16:34:59.000000000 +0100
++++ rsync-3.0.0pre6/rsync.h    2007-12-10 22:15:49.064081486 +0100
+@@ -29,7 +29,7 @@
+ /* RSYNCD_SYSCONF is now set in config.h */
+ #define RSYNCD_USERCONF "rsyncd.conf"

  
  

- manpagefiles()
+-#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
++#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
+ #define URL_PREFIX "rsync://"

  
  

--/etc/rsyncd.conf
-+/etc/rsyncd/rsyncd.conf
+ #define SYMLINK_PREFIX "/rsyncd-munged/"
+diff -ur rsync-3.0.0pre6.org/rsync.yo rsync-3.0.0pre6/rsync.yo
+--- rsync-3.0.0pre6.org/rsync.yo       2007-11-28 10:00:37.000000000 +0100
++++ rsync-3.0.0pre6/rsync.yo   2007-12-10 22:15:49.067414986 +0100
+@@ -2062,7 +2062,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 bf(rsyncd.conf)(5) man page for more
+ details.
+ 
+@@ -2080,7 +2080,7 @@

  
  

- manpageseealso()
+ 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 the super-user; in that case
+ the default is rsyncd.conf in the current directory (typically $HOME).
+ 
+@@ -2810,7 +2810,7 @@

  
  

-diff -Nur rsync-2.3.2/rsyncstats rsync-2.3.2.pld/rsyncstats
---- rsync-2.3.2/rsyncstats     Wed Nov 25 17:24:40 1998
-+++ rsync-2.3.2.pld/rsyncstats Thu Jun 17 09:29:14 1999
-@@ -23,7 +23,7 @@
- # ---------------------------------------------------------------------------
+ manpagefiles()

  
  

- # edit the next line to customize for your default log file
--$usage_file = "/var/adm/rsyncd.log";
-+$usage_file = "/var/log/rsyncd";
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf
+ 
+ manpageseealso()

  
  

- # Edit the following lines for default report settings.
- # Entries defined here will be over-ridden by the command line.