20524211 update rsync to 3.1.1 s11-update
authorLukas Rovensky <Lukas.Rovensky@oracle.com>
Thu, 16 Apr 2015 04:52:37 -0700
changeset 4255 3c054cb83142
parent 4249 bb2990b48dfc
child 4257 f2f4561efbb1
20524211 update rsync to 3.1.1 19495794 too aggressive keep-alive messages causing a problem for older rsync
--- a/components/rsync/Makefile	Wed May 06 05:36:00 2015 -0700
+++ b/components/rsync/Makefile	Thu Apr 16 04:52:37 2015 -0700
@@ -26,16 +26,16 @@
 include ../../make-rules/shared-macros.mk
 COMPONENT_PROJECT_URL=	http://rsync.samba.org/
-    sha256:81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e
+    sha256:7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621
 COMPONENT_ARCHIVE_URL=	http://rsync.samba.org/ftp/rsync/src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/rsync
-TPNO=			16940
+TPNO=			21574
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -51,6 +51,8 @@
 # common targets
+configure:	$(CONFIGURE_64)
 build:		$(BUILD_64)
 install:	$(INSTALL_64)
--- a/components/rsync/patches/rsync.1.patch	Wed May 06 05:36:00 2015 -0700
+++ b/components/rsync/patches/rsync.1.patch	Thu Apr 16 04:52:37 2015 -0700
@@ -2,8 +2,8 @@
 character ("), "\(cq" to a single-quote character ('), and eliminates the
 use of "\&" except where it's needed at the beginning of the line.
---- rsync-3.1.0/rsync.1.orig	Sat Sep 28 20:01:03 2013
-+++ rsync-3.1.0/rsync.1	Mon Mar 17 15:51:13 2014
+--- rsync-3.1.1/rsync.1.orig	2014-06-22 10:09:56.000000000 -0700
++++ rsync-3.1.1/rsync.1	2014-08-27 11:28:09.672311426 -0700
 @@ -35,11 +35,11 @@
  destination.  Rsync is widely used for backups and mirroring and as an
  improved copy command for everyday use.
@@ -40,7 +40,7 @@
  server, but a server can be either a daemon or a remote\-shell spawned process.
[email protected]@ -129,7 +129,7 @@
[email protected]@ -132,7 +132,7 @@
  This would recursively transfer all files from the directory src/bar on the
  machine foo into the /data/tmp/bar directory on the local machine. The
@@ -49,7 +49,7 @@
  links, devices, attributes, permissions, ownerships, etc. are preserved
  in the transfer.  Additionally, compression will be used to reduce the
  size of data portions of the transfer.
[email protected]@ -141,8 +141,8 @@
[email protected]@ -144,8 +144,8 @@
  A trailing slash on the source changes this behavior to avoid creating an
  additional directory level at the destination.  You can think of a trailing
@@ -60,7 +60,7 @@
  containing directory are transferred to the containing directory on the
  destination.  In other words, each of the following commands copies the
  files in the same way, including their setting of the attributes of
[email protected]@ -156,9 +156,9 @@
[email protected]@ -159,9 +159,9 @@
@@ -72,7 +72,7 @@
  \f(CWrsync \-av host: /dest\fP
[email protected]@ -169,7 +169,7 @@
[email protected]@ -172,7 +172,7 @@
  You can also use rsync in local\-only mode, where both the source and
@@ -81,7 +81,7 @@
  an improved copy command.
  Finally, you can list all the (listable) modules available from a
[email protected]@ -202,9 +202,9 @@
[email protected]@ -205,9 +205,9 @@
@@ -93,7 +93,7 @@
[email protected]@ -212,12 +212,12 @@
[email protected]@ -215,12 +215,12 @@
  not as easy to use as the first method.
  If you need to transfer a filename that contains whitespace, you can either
@@ -108,7 +108,7 @@
[email protected]@ -237,7 +237,7 @@
[email protected]@ -240,7 +240,7 @@
  you either use a double colon :: instead of a single colon to
  separate the hostname from the path, or you use an rsync:// URL.
  .IP o 
@@ -117,7 +117,7 @@
  .IP o 
  the remote daemon may print a message of the day when you
[email protected]@ -251,7 +251,7 @@
[email protected]@ -254,7 +254,7 @@
  you must not specify the \fB\-\-rsh\fP (\fB\-e\fP) option.
@@ -126,7 +126,7 @@
      rsync \-av host::src /dest
[email protected]@ -269,18 +269,18 @@
[email protected]@ -272,18 +272,18 @@
  You may establish the connection via a web proxy by setting the
  environment variable RSYNC_PROXY to a hostname:port pair pointing to
@@ -149,7 +149,7 @@
    rsync \-av targethost1::module/src/ /dest/
    rsync \-av rsync:://targethost2/module/src/ /dest/ 
[email protected]@ -297,16 +297,16 @@
[email protected]@ -300,16 +300,16 @@
  named modules) without actually allowing any new socket connections into a
  system (other than what is already required to allow remote\-shell access).
  Rsync supports connecting to a host using a remote shell and then spawning
@@ -170,7 +170,7 @@
  connection uses nearly the same command\-line syntax as a normal
  rsync\-daemon transfer, with the only exception being that you must
  explicitly set the remote shell program on the command\-line with the
[email protected]@ -321,19 +321,23 @@
[email protected]@ -324,20 +324,24 @@
  If you need to specify a different remote\-shell user, keep in mind that the
  [email protected] prefix in front of the host is specifying the rsync\-user value (for a
  module that requires user\-based authentication).  This means that you must
@@ -191,14 +191,15 @@
+ .PP 
 +WARNING: Daemon mode does not participate in the core Solaris security
 +policies, including Authentication, limit of privileges, Audit and Audit
 +of any subprocessing.
- .PP 
  In order to connect to an rsync daemon, the remote system needs to have a
  daemon already running (or it needs to have configured something like inetd
[email protected]@ -343,7 +347,7 @@
+ to spawn an rsync daemon for incoming connections on a particular port).
[email protected]@ -346,7 +350,7 @@
  file for the daemon, and it contains the full details for how to run the
  daemon (including stand\-alone and inetd configurations).
@@ -207,7 +208,7 @@
  no need to manually start an rsync daemon.
[email protected]@ -357,7 +361,7 @@
[email protected]@ -360,7 +364,7 @@
  If you need a particular file to be transferred prior to another, either
  separate the files into different rsync calls, or consider using
@@ -216,7 +217,7 @@
  does make the final file\-updating phase happen much more rapidly).
[email protected]@ -365,7 +369,7 @@
[email protected]@ -368,7 +372,7 @@
  Here are some examples of how I use rsync.
@@ -225,7 +226,7 @@
  files and mail folders, I use a cron job that runs
[email protected]@ -374,7 +378,7 @@
[email protected]@ -377,14 +381,14 @@
  each night over a PPP connection to a duplicate directory on my machine
@@ -234,7 +235,6 @@
  To synchronize my samba source trees I use the following Makefile
[email protected]@ -381,7 +385,7 @@
@@ -243,7 +243,7 @@
              rsync \-Cavuzb . samba:samba/
      sync: get put
[email protected]@ -390,12 +394,12 @@
[email protected]@ -393,12 +397,12 @@
  this allows me to sync with a CVS directory at the other end of the
  connection. I then do CVS operations on the remote machine, which saves a
@@ -259,7 +259,7 @@
  This is launched from cron every few hours.
[email protected]@ -417,7 +421,7 @@
[email protected]@ -420,7 +424,7 @@
       \-\-no\-OPTION             turn off an implied OPTION (e.g. \-\-no\-D)
   \-r, \-\-recursive             recurse into directories
   \-R, \-\-relative              use relative path names
@@ -268,7 +268,7 @@
   \-b, \-\-backup                make backups (see \-\-suffix & \-\-backup\-dir)
       \-\-backup\-dir=DIR        make backups into hierarchy based in DIR
       \-\-suffix=SUFFIX         backup suffix (default ~ w/o \-\-backup\-dir)
[email protected]@ -428,7 +432,7 @@
[email protected]@ -431,7 +435,7 @@
   \-d, \-\-dirs                  transfer directories without recursing
   \-l, \-\-links                 copy symlinks as symlinks
   \-L, \-\-copy\-links            transform symlink into referent file/dir
@@ -277,7 +277,7 @@
       \-\-safe\-links            ignore symlinks that point outside the tree
       \-\-munge\-links           munge symlinks to make them safer
   \-k, \-\-copy\-dirlinks         transform symlink to dir into referent dir
[email protected]@ -453,7 +457,7 @@
[email protected]@ -456,7 +460,7 @@
       \-\-preallocate           allocate dest files before writing
   \-n, \-\-dry\-run               perform a trial run with no changes made
   \-W, \-\-whole\-file            copy files whole (w/o delta\-xfer algorithm)
@@ -286,7 +286,7 @@
   \-B, \-\-block\-size=SIZE       force a fixed checksum block\-size
   \-e, \-\-rsh=COMMAND           specify the remote shell to use
       \-\-rsync\-path=PROGRAM    specify the rsync to run on remote machine
[email protected]@ -471,20 +475,20 @@
[email protected]@ -474,20 +478,20 @@
       \-\-delete\-missing\-args   delete missing source args from destination
       \-\-ignore\-errors         delete even if there are I/O errors
       \-\-force                 force deletion of dirs even if not empty
@@ -312,7 +312,7 @@
       \-\-size\-only             skip files that match in size
       \-\-modify\-window=NUM     compare mod\-times with reduced accuracy
   \-T, \-\-temp\-dir=DIR          create temporary files in directory DIR
[email protected]@ -497,11 +501,11 @@
[email protected]@ -500,11 +504,11 @@
       \-\-skip\-compress=LIST    skip compressing files with suffix in LIST
   \-C, \-\-cvs\-exclude           auto\-ignore files in the same way CVS does
   \-f, \-\-filter=RULE           add a file\-filtering RULE
@@ -327,7 +327,7 @@
       \-\-include\-from=FILE     read include patterns from FILE
       \-\-files\-from=FILE       read list of source\-file names from FILE
   \-0, \-\-from0                 all *from/filter files are delimited by 0s
[email protected]@ -519,7 +523,7 @@
[email protected]@ -522,7 +526,7 @@
   \-i, \-\-itemize\-changes       output a change\-summary for all updates
   \-M, \-\-remote\-option=OPTION  send OPTION to the remote side only
       \-\-out\-format=FORMAT     output updates using the specified FORMAT
@@ -336,7 +336,7 @@
       \-\-log\-file\-format=FMT   log updates using the specified FMT
       \-\-password\-file=FILE    read daemon\-access password from FILE
       \-\-list\-only             list the files instead of copying them
[email protected]@ -548,8 +552,8 @@
[email protected]@ -551,8 +555,8 @@
   \-M, \-\-dparam=OVERRIDE       override global daemon config parameter
       \-\-no\-detach             do not detach from the parent
       \-\-port=PORT             listen on alternate port number
@@ -347,7 +347,7 @@
       \-\-sockopts=OPTIONS      specify custom TCP options
   \-v, \-\-verbose               increase verbosity
   \-4, \-\-ipv4                  prefer IPv4
[email protected]@ -567,11 +571,11 @@
[email protected]@ -570,11 +574,11 @@
  Some options only have a long variant, not a short.  If the option takes a
  parameter, the parameter is only listed after the long variant, even though it
  must also be specified for the short.  When specifying a parameter, you can
@@ -362,7 +362,21 @@
  .IP "\fB\-\-help\fP"
  Print a short help page describing the options
[email protected]@ -615,7 +619,7 @@
[email protected]@ -601,11 +605,11 @@
+ \fB\-\-info\fP and \fB\-\-debug\fP have a way to ask for help that tells you
+ exactly what flags are set for each increase in verbosity.
+ .IP 
+-However, do keep in mind that a daemon\(cq\&s \(dq\&max verbosity\(dq\& setting will limit how
++However, do keep in mind that a daemon's "max verbosity" setting will limit how
+ high of a level the various individual flags can be set on the daemon side.
+ For instance, if the max is 2, then any info and/or debug flag that is set to
+ a higher value than what would be set by \fB\-vv\fP will be downgraded to the
+-\fB\-vv\fP level in the daemon\(cq\&s logging.
++\fB\-vv\fP level in the daemon's logging.
+ .IP 
+ .IP "\fB\-\-info=FLAGS\fP"
+ This option lets you have fine\-grained control over the
[email protected]@ -624,14 +628,14 @@
@@ -371,7 +385,24 @@
  \fB\-\-itemize\-changes\fP (\fB\-i\fP) options.  See those options for more
  information on what is output and when.
[email protected]@ -670,7 +674,7 @@
+ This option was added to 3.1.0, so an older rsync on the server side might
+ reject your attempts at fine\-grained control (if one or more flags needed
+ to be send to the server and the server was too old to understand them).
+-See also the \(dq\&max verbosity\(dq\& caveat above when dealing with a daemon.
++See also the "max verbosity" caveat above when dealing with a daemon.
+ .IP 
+ .IP "\fB\-\-debug=FLAGS\fP"
+ This option lets you have fine\-grained control over the debug
[email protected]@ -655,7 +659,7 @@
+ This option was added to 3.1.0, so an older rsync on the server side might
+ reject your attempts at fine\-grained control (if one or more flags needed
+ to be send to the server and the server was too old to understand them).
+-See also the \(dq\&max verbosity\(dq\& caveat above when dealing with a daemon.
++See also the "max verbosity" caveat above when dealing with a daemon.
+ .IP 
+ .IP "\fB\-\-msgs2stderr\fP"
+ This option changes rsync to send all its output
[email protected]@ -681,18 +685,18 @@
  This option affects the information that is output
  by the client at the start of a daemon transfer.  This suppresses the
  message\-of\-the\-day (MOTD) text, but it also affects the list of modules
@@ -380,7 +411,6 @@
  a limitation in the rsync protocol), so omit this option if you want to
  request the list of modules from the daemon.
[email protected]@ -677,11 +681,11 @@
  .IP "\fB\-I, \-\-ignore\-times\fP"
  Normally rsync will skip any files that are
  already the same size and have the same modification timestamp.
@@ -394,7 +424,7 @@
  finding files that need to be transferred, changing it from the default of
  transferring files with either a changed size or a changed last\-modified
  time to just looking for files that have changed in size.  This is useful
[email protected]@ -700,7 +704,7 @@
[email protected]@ -711,7 +715,7 @@
  .IP "\fB\-c, \-\-checksum\fP"
  This changes the way rsync checks if the files have
  been changed and are in need of a transfer.  Without this option, rsync
@@ -403,7 +433,7 @@
  of last modification match between the sender and receiver.  This option
  changes this to compare a 128\-bit checksum for each file that has a
  matching size.  Generating the checksums means that both sides will expend
[email protected]@ -711,7 +715,7 @@
[email protected]@ -722,14 +726,14 @@
  The sending side generates its checksums while it is doing the file\-system
  scan that builds the list of the available files.  The receiver generates
  its checksums when it is scanning for changed files, and will checksum any
@@ -412,7 +442,6 @@
  either a changed size or a changed checksum are selected for transfer.
  Note that rsync always verifies that each \fItransferred\fP file was
[email protected]@ -718,7 +722,7 @@
  correctly reconstructed on the receiving side by checking a whole\-file
  checksum that is generated as the file is transferred, but that
  automatic after\-the\-transfer verification has nothing to do with this
@@ -421,7 +450,7 @@
  For protocol 30 and beyond (first supported in 3.0.0), the checksum used is
  MD5.  For older protocols, the checksum used is MD4.
[email protected]@ -736,14 +740,14 @@
[email protected]@ -747,14 +751,14 @@
  .IP "\-\-no\-OPTION"
  You may turn off one or more implied options by prefixing
@@ -439,7 +468,7 @@
  \fB\-o\fP (\fB\-\-owner\fP), instead of converting \fB\-a\fP into \fB\-rlptgD\fP, you
  could specify \fB\-a \-\-no\-o\fP (or \fB\-a \-\-no\-owner\fP).
[email protected]@ -799,16 +803,16 @@
[email protected]@ -810,16 +814,16 @@
  then a file named /tmp/foo/bar/baz.c would be created on the remote
  machine, preserving its full path.  These extra path elements are called
@@ -459,7 +488,7 @@
  need to use the \fB\-\-no\-implied\-dirs\fP option.
  It is also possible to limit the amount of path information that is sent as
[email protected]@ -822,7 +826,7 @@
[email protected]@ -833,7 +837,7 @@
  That would create /tmp/bar/baz.c on the remote machine.  (Note that the
@@ -468,7 +497,7 @@
  For older rsync versions, you would need to use a chdir to limit the
  source path.  For example, when pushing files:
[email protected]@ -832,12 +836,12 @@
[email protected]@ -843,12 +847,12 @@
  (Note that the parens put the two commands into a sub\-shell, so that the
@@ -484,7 +513,7 @@
  \f(CW       remote:bar/baz.c /tmp/\fP
[email protected]@ -854,13 +858,13 @@
[email protected]@ -865,13 +869,13 @@
  the receiving side.
  For instance, if a command\-line arg or a files\-from entry told rsync to
@@ -504,7 +533,7 @@
  preservation is to use the \fB\-\-keep\-dirlinks\fP option (which will also
  affect symlinks to directories in the rest of the transfer).
[email protected]@ -874,15 +878,15 @@
[email protected]@ -885,15 +889,15 @@
  backup file goes and what (if any) suffix gets appended using the
  \fB\-\-backup\-dir\fP and \fB\-\-suffix\fP options.
@@ -524,7 +553,7 @@
  rule would never be reached).
  .IP "\fB\-\-backup\-dir=DIR\fP"
[email protected]@ -895,8 +899,8 @@
[email protected]@ -906,8 +910,8 @@
  Note that if you specify a relative path, the backup directory will be
  relative to the destination directory, so you probably want to specify
@@ -535,16 +564,16 @@
  hierarchy, so take extra care not to delete it or copy into it.
  .IP "\fB\-\-suffix=SUFFIX\fP"
[email protected]@ -908,7 +912,7 @@
[email protected]@ -919,7 +923,7 @@
  This forces rsync to skip any files which exist on
  the destination and have a modified time that is newer than the source
  file.  (If an existing destination file has a modification time equal to the
 -source file\(cq\&s, it will be updated if the sizes are different.)
 +source file's, it will be updated if the sizes are different.)
- Note that this does not affect the copying of symlinks or other special
+ Note that this does not affect the copying of dirs, symlinks, or other special
  files.  Also, a difference of file format between the sender and receiver
[email protected]@ -917,8 +921,8 @@
[email protected]@ -928,8 +932,8 @@
  where the destination has a file, the transfer would occur regardless of
  the timestamps.
@@ -555,7 +584,7 @@
  It just limits the files that the receiver requests to be transferred.
  .IP "\fB\-\-inplace\fP"
[email protected]@ -934,13 +938,13 @@
[email protected]@ -945,13 +949,13 @@
  Hard links are not broken.  This means the new data will be visible
  through other hard links to the destination file.  Moreover, attempts to
  copy differing source files onto a multiply\-linked destination file will
@@ -571,7 +600,7 @@
  and will be left that way if the transfer is interrupted or if an update
  .IP o 
[email protected]@ -948,7 +952,7 @@
[email protected]@ -959,7 +963,7 @@
  can update any file, a normal user needs to be granted write permission for
  the open of the file for writing to be successful.
  .IP o 
@@ -580,7 +609,7 @@
  some data in the destination file is overwritten before it can be copied to
  a position later in the file.  This does not apply if you use \fB\-\-backup\fP,
  since rsync is smart enough to use the backup file as the basis file for the
[email protected]@ -975,12 +979,12 @@
[email protected]@ -986,12 +990,12 @@
  the receiving side is identical with the start of the file on the sending
  side.  If a file needs to be transferred and its size on the receiver is
  the same or longer than the size on the sender, the file is skipped.  This
@@ -595,7 +624,7 @@
  .IP "\fB\-\-append\-verify\fP"
  This works just like the \fB\-\-append\fP option, but
[email protected]@ -996,9 +1000,9 @@
[email protected]@ -1007,21 +1011,21 @@
  .IP "\fB\-d, \-\-dirs\fP"
  Tell the sending side to include any directories that
@@ -608,7 +637,6 @@
  \fB\-\-recursive\fP option, rsync will skip all directories it encounters (and
  output a message to that effect for each one).  If you specify both
  \fB\-\-dirs\fP and \fB\-\-recursive\fP, \fB\-\-recursive\fP takes precedence.
[email protected]@ -1005,12 +1009,12 @@
  The \fB\-\-dirs\fP option is implied by the \fB\-\-files\-from\fP option
  or the \fB\-\-list\-only\fP option (including an implied
@@ -623,7 +651,7 @@
  an older rsync to list a single directory without recursing.
  .IP "\fB\-l, \-\-links\fP"
[email protected]@ -1022,7 +1026,7 @@
[email protected]@ -1033,7 +1037,7 @@
  they point to (the referent) is copied, rather than the symlink.  In older
  versions of rsync, this option also had the side\-effect of telling the
  receiving side to follow symlinks, such as symlinks to directories.  In a
@@ -632,7 +660,7 @@
  to get this extra behavior.  The only exception is when sending files to
  an rsync that is too old to understand \fB\-K\fP \-\- in that case, the \fB\-L\fP option
  will still have the side\-effect of \fB\-K\fP on that older receiving rsync.
[email protected]@ -1044,11 +1048,11 @@
[email protected]@ -1055,11 +1059,11 @@
  This option tells rsync to (1) modify all symlinks on
  the receiving side in a way that makes them unusable but recoverable (see
  below), or (2) to unmunge symlinks on the sending side that had been stored in
@@ -646,7 +674,7 @@
  that directory does not exist.  When this option is enabled, rsync will refuse
  to run if that path is a directory or a symlink to a directory.
[email protected]@ -1057,13 +1061,13 @@
[email protected]@ -1068,13 +1072,13 @@
  transfer, the client side is the sender.)
  This option has no affect on a daemon, since the daemon configures whether it
@@ -663,7 +691,7 @@
  they would be using \fB\-\-copy\-links\fP.
  Without this option, if the sending side has replaced a directory with a
[email protected]@ -1086,20 +1090,20 @@
[email protected]@ -1097,20 +1101,20 @@
  This works because rsync calls \fBlstat\fP(2) on the source arg as given, and the
  trailing slash makes \fBlstat\fP(2) follow the symlink, giving rise to a directory
@@ -691,7 +719,7 @@
  One note of caution:  if you use \fB\-\-keep\-dirlinks\fP, you must trust all
  the symlinks in the copy!  If it is possible for an untrusted user to
[email protected]@ -1167,10 +1171,10 @@
[email protected]@ -1178,24 +1182,24 @@
  permissions, though the \fB\-\-executability\fP option might change just
  the execute permission for the file.
  .IP o 
@@ -706,7 +734,6 @@
  their special permission bits disabled except in the case where a new
  directory inherits a setgid bit from its parent directory.
[email protected]@ -1177,7 +1181,7 @@
  Thus, when \fB\-\-perms\fP and \fB\-\-executability\fP are both disabled,
@@ -715,7 +742,6 @@
  such as \fBcp\fP(1) and \fBtar\fP(1).
  In summary: to give destination files (both old and new) the source
[email protected]@ -1184,7 +1188,7 @@
  permissions, use \fB\-\-perms\fP.  To give new files the destination\-default
  permissions (while leaving existing files unchanged), make sure that the
  \fB\-\-perms\fP option is off and use \fB\-\-chmod=ugo=rwX\fP (which ensures that
@@ -724,7 +750,7 @@
  behavior easier to type, you could define a popt alias for it, such as
  putting this line in the file ~/.popt (the following defines the \fB\-Z\fP option,
  and includes \-\-no\-g to use the default group of the destination dir):
[email protected]@ -1202,13 +1206,13 @@
[email protected]@ -1213,13 +1217,13 @@
  (Caveat: make sure that \fB\-a\fP does not follow \fB\-Z\fP, or it will re\-enable
@@ -741,12 +767,12 @@
  observance was added to the ACL patch for rsync 2.6.7, so older (or
  non\-ACL\-enabled) rsyncs use the umask even if default ACLs are present.
  (Keep in mind that it is the version of the receiving rsync that affects
[email protected]@ -1218,17 +1222,17 @@
[email protected]@ -1229,17 +1233,17 @@
  This option causes rsync to preserve the
  executability (or non\-executability) of regular files when \fB\-\-perms\fP is
  not enabled.  A regular file is considered to be executable if at least one
 -\(cq\&x\(cq\& is turned on in its permissions.  When an existing destination file\(cq\&s
-+'x' is turned on in its permissions.  When an existing destination file's
++\&'x' is turned on in its permissions.  When an existing destination file's
  executability differs from that of the corresponding source file, rsync
 -modifies the destination file\(cq\&s permissions as follows:
 +modifies the destination file's permissions as follows:
@@ -764,7 +790,7 @@
[email protected]@ -1254,11 +1258,11 @@
[email protected]@ -1265,19 +1269,19 @@
  Note that this option does not copy rsyncs special xattr values (e.g. those
  used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX).  This
@@ -778,7 +804,6 @@
  transfer.  The resulting value is treated as though it were the permissions
  that the sending side supplied for the file, which means that this option
  can seem to have no effect on existing files if \fB\-\-perms\fP is not enabled.
[email protected]@ -1265,8 +1269,8 @@
  In addition to the normal parsing rules specified in the \fBchmod\fP(1)
  manpage, you can specify an item that should only apply to a directory by
@@ -789,7 +814,7 @@
  that all directories get marked set\-gid, that no files are other\-writable,
  that both are user\-writable and group\-writable, and that both have
  consistent executability across all bits:
[email protected]@ -1333,8 +1337,8 @@
[email protected]@ -1344,8 +1348,8 @@
  option is not used, the optimization that excludes files that have not been
  modified cannot be effective; in other words, a missing \fB\-t\fP or \fB\-a\fP will
  cause the next transfer to behave as if it used \fB\-I\fP, causing all files to be
@@ -800,7 +825,16 @@
  .IP "\fB\-O, \-\-omit\-dir\-times\fP"
  This tells rsync to omit directories when
[email protected]@ -1348,12 +1352,12 @@
[email protected]@ -1360,7 +1364,7 @@
+ directory right away (without having to delay that until a bunch of recursive
+ copying has finished).  This early\-create idiom is not necessary if directory
+ modify times are not being preserved, so it is skipped.  Since early\-create
+-directories don\(cq\&t have accurate mode, mtime, or ownership, the use of this
++directories don't have accurate mode, mtime, or ownership, the use of this
+ option can help when someone wants to avoid these partially\-finished
+ directories.
+ .IP 
[email protected]@ -1370,12 +1374,12 @@
  .IP "\fB\-\-super\fP"
  This tells the receiving side to attempt super\-user
@@ -816,7 +850,7 @@
  being run as the super\-user.  To turn off super\-user activities, the
  super\-user can use \fB\-\-no\-super\fP.
[email protected]@ -1361,10 +1365,10 @@
[email protected]@ -1383,10 +1387,10 @@
  When this option is enabled, rsync simulates
  super\-user activities by saving/restoring the privileged attributes via
  special extended attributes that are attached to each file (as needed).  This
@@ -830,7 +864,7 @@
  access (since the real super\-user can always access/change a file, the
  files we create can always be accessed/changed by the creating user).
  This option also handles ACLs (if \fB\-\-acls\fP was specified) and non\-user
[email protected]@ -1390,18 +1394,18 @@
[email protected]@ -1412,18 +1416,18 @@
  This option is overridden by both \fB\-\-super\fP and \fB\-\-no\-super\fP.
@@ -853,7 +887,7 @@
  glibc implementation that writes a zero byte into each block.
  Without this option, larger files may not be entirely contiguous on the
[email protected]@ -1410,7 +1414,7 @@
[email protected]@ -1432,7 +1436,7 @@
  etc.), this option may have no positive effect at all.
  .IP "\fB\-n, \-\-dry\-run\fP"
@@ -862,7 +896,7 @@
  make any changes (and produces mostly the same output as a real run).  It
  is most commonly used in combination with the \fB\-v, \-\-verbose\fP and/or
  \fB\-i, \-\-itemize\-changes\fP options to see what an rsync command is going
[email protected]@ -1418,29 +1422,29 @@
[email protected]@ -1440,29 +1444,29 @@
  The output of \fB\-\-itemize\-changes\fP is supposed to be exactly the same on a
  dry run and a subsequent real run (barring intentional trickery and system
@@ -900,7 +934,7 @@
  same filesystem.
  If this option is repeated, rsync omits all mount\-point directories from
[email protected]@ -1460,8 +1464,8 @@
[email protected]@ -1482,8 +1486,8 @@
  combined with the \fB\-\-ignore\-existing\fP option, no files will be updated
  (which can be useful if all you want to do is delete extraneous files).
@@ -911,7 +945,7 @@
  It just limits the files that the receiver requests to be transferred.
  .IP "\fB\-\-ignore\-existing\fP"
[email protected]@ -1469,8 +1473,8 @@
[email protected]@ -1491,15 +1495,15 @@
  already exist on the destination (this does \fInot\fP ignore existing
  directories, or nothing would get done).  See also \fB\-\-existing\fP.
@@ -922,7 +956,6 @@
  It just limits the files that the receiver requests to be transferred.
  This option can be useful for those doing backups using the \fB\-\-link\-dest\fP
[email protected]@ -1477,7 +1481,7 @@
  option when they need to continue a backup run that got interrupted.  Since
  a \fB\-\-link\-dest\fP run is copied into a new directory hierarchy (when it is
  used properly), using \fB\-\-ignore existing\fP will ensure that the
@@ -931,7 +964,7 @@
  permissions on the hard\-linked files).  This does mean that this option
  is only looking at the existing files in the destination hierarchy itself.
[email protected]@ -1489,24 +1493,24 @@
[email protected]@ -1511,24 +1515,24 @@
  Note that you should only use this option on source files that are quiescent.
  If you are using this to move files that show up in a particular directory over
  to another host, make sure that the finished files get renamed into the source
@@ -966,7 +999,7 @@
  also excluded from being deleted unless you use the \fB\-\-delete\-excluded\fP
  option or mark the rules as only matching on the sending side (see the
  include/exclude modifiers in the FILTER RULES section).
[email protected]@ -1563,7 +1567,7 @@
[email protected]@ -1585,7 +1589,7 @@
  computes the deletions in a separate pass after all updates are done).
  If the number of removed files overflows an internal buffer, a
  temporary file will be created on the receiving side to hold the names (it
@@ -975,7 +1008,7 @@
  the creation of the temporary file fails, rsync will try to fall back to
  using \fB\-\-delete\-after\fP (which it cannot do if \fB\-\-recursive\fP is doing an
  incremental scan).
[email protected]@ -1605,7 +1609,7 @@
[email protected]@ -1627,7 +1631,7 @@
  that, this option is independent of any other type of delete processing.
  The missing source files are represented by special file\-list entries which
@@ -984,7 +1017,7 @@
  .IP "\fB\-\-ignore\-errors\fP"
  Tells \fB\-\-delete\fP to go ahead and delete files
[email protected]@ -1629,27 +1633,27 @@
[email protected]@ -1651,27 +1655,27 @@
  Beginning with version 3.0.0, you may specify \fB\-\-max\-delete=0\fP to be warned
  about any extraneous files in the destination without removing any of them.
@@ -1022,7 +1055,7 @@
  be offset by one byte in the indicated direction.
  Examples: \-\-max\-size=1.5mb\-1 is 1499999 bytes, and \-\-max\-size=2g+1 is
[email protected]@ -1667,7 +1671,7 @@
[email protected]@ -1689,7 +1693,7 @@
  .IP "\fB\-B, \-\-block\-size=BLOCKSIZE\fP"
  This forces the block size used in
@@ -1031,7 +1064,7 @@
  the size of each file being updated.  See the technical report for details.
  .IP "\fB\-e, \-\-rsh=COMMAND\fP"
[email protected]@ -1680,8 +1684,8 @@
[email protected]@ -1702,8 +1706,8 @@
  remote shell \fICOMMAND\fP will be used to run an rsync daemon on the
  remote host, and all data will be transmitted through that remote
  shell connection, rather than through a direct socket connection to a
@@ -1042,7 +1075,7 @@
  Command\-line arguments are permitted in COMMAND provided that COMMAND is
  presented to rsync as a single argument.  You must use spaces (not tabs
[email protected]@ -1693,9 +1697,9 @@
[email protected]@ -1715,9 +1719,9 @@
  shell is parsing and which quotes rsync is parsing).  Some examples:
@@ -1054,7 +1087,7 @@
[email protected]@ -1711,9 +1715,9 @@
[email protected]@ -1733,9 +1737,9 @@
  .IP "\fB\-\-rsync\-path=PROGRAM\fP"
  Use this to specify what program is to be run
  on the remote machine to start\-up rsync.  Often used when rsync is not in
@@ -1066,7 +1099,7 @@
  not corrupt the standard\-in & standard\-out that rsync is using to
[email protected]@ -1721,7 +1725,7 @@
[email protected]@ -1743,7 +1747,7 @@
  machine for use with the \fB\-\-relative\fP option.  For instance:
@@ -1075,7 +1108,7 @@
[email protected]@ -1754,8 +1758,8 @@
[email protected]@ -1776,8 +1780,8 @@
  option.  If that option is off, any spaces in your remote options will be split
  by the remote shell unless you take steps to protect them.
@@ -1086,7 +1119,7 @@
  Note some versions of the popt option\-parsing library have a bug in them that
  prevents you from using an adjacent arg with an equal in it next to a short
[email protected]@ -1764,7 +1768,7 @@
[email protected]@ -1786,7 +1790,7 @@
  .IP "\fB\-C, \-\-cvs\-exclude\fP"
  This is a useful shorthand for excluding a
@@ -1095,7 +1128,7 @@
  systems. It uses a similar algorithm to CVS to determine if
  a file should be ignored.
[email protected]@ -1786,10 +1790,10 @@
[email protected]@ -1808,17 +1812,17 @@
  Finally, any file is ignored if it is in the same directory as a
  \&.cvsignore file and matches one of the patterns listed therein.  Unlike
@@ -1108,7 +1141,6 @@
  note that these CVS excludes are appended at the end of your own rules,
  regardless of where the \fB\-C\fP was placed on the command\-line.  This makes them
  a lower priority than any rules you specified explicitly.  If you want to
[email protected]@ -1796,7 +1800,7 @@
  control where these CVS excludes get inserted into your filter rules, you
  should omit the \fB\-C\fP as a command\-line option and use a combination of
  \fB\-\-filter=:C\fP and \fB\-\-filter=\-C\fP (either on your command\-line or by
@@ -1117,7 +1149,7 @@
  The first option turns on the per\-directory scanning for the .cvsignore
  file.  The second option does a one\-time import of the CVS excludes
  mentioned above.
[email protected]@ -1819,7 +1823,7 @@
[email protected]@ -1841,7 +1845,7 @@
  your command.  The first time it is used is a shorthand for this rule:
@@ -1126,7 +1158,7 @@
[email protected]@ -1829,7 +1833,7 @@
[email protected]@ -1851,7 +1855,7 @@
@@ -1135,7 +1167,7 @@
[email protected]@ -1848,7 +1852,7 @@
[email protected]@ -1870,7 +1874,7 @@
  .IP "\fB\-\-exclude\-from=FILE\fP"
  This option is related to the \fB\-\-exclude\fP
  option, but it specifies a FILE that contains exclude patterns (one per line).
@@ -1144,7 +1176,7 @@
  If \fIFILE\fP is \fB\-\fP, the list will be read from standard input.
  .IP "\fB\-\-include=PATTERN\fP"
[email protected]@ -1861,7 +1865,7 @@
[email protected]@ -1883,7 +1887,7 @@
  .IP "\fB\-\-include\-from=FILE\fP"
  This option is related to the \fB\-\-include\fP
  option, but it specifies a FILE that contains include patterns (one per line).
@@ -1153,7 +1185,7 @@
  If \fIFILE\fP is \fB\-\fP, the list will be read from standard input.
  .IP "\fB\-\-files\-from=FILE\fP"
[email protected]@ -1880,7 +1884,7 @@
[email protected]@ -1902,7 +1906,7 @@
  specified in the list on the destination rather than noisily skipping
  them (use \fB\-\-no\-dirs\fP or \fB\-\-no\-d\fP if you want to turn that off).
  .IP o 
@@ -1162,7 +1194,7 @@
  (\fB\-r\fP), so specify it explicitly, if you want it.
  .IP o 
  These side\-effects change the default state of rsync, so the position
[email protected]@ -1891,7 +1895,7 @@
[email protected]@ -1913,7 +1917,7 @@
  The filenames that are read from the FILE are all relative to the
@@ -1171,7 +1203,7 @@
  allowed to go higher than the source dir.  For example, take this
[email protected]@ -1900,12 +1904,12 @@
[email protected]@ -1922,12 +1926,12 @@
@@ -1187,7 +1219,7 @@
  also be transferred (keep in mind that \fB\-r\fP needs to be specified
  explicitly with \fB\-\-files\-from\fP, since it is not implied by \fB\-a\fP).
  Also note
[email protected]@ -1914,10 +1918,10 @@
[email protected]@ -1936,10 +1940,10 @@
  force the duplication of the source\-spec path (/usr in this case).
  In addition, the \fB\-\-files\-from\fP file can be read from the remote host
@@ -1201,7 +1233,7 @@
  \f(CW   rsync \-a \-\-files\-from=:/path/file\-list src:/ /tmp/copy\fP
[email protected]@ -1925,12 +1929,12 @@
[email protected]@ -1947,12 +1951,12 @@
  This would copy all the files specified in the /path/file\-list file that
@@ -1217,7 +1249,7 @@
  NOTE: sorting the list of files in the \-\-files\-from input helps rsync to be
  more efficient, as it will avoid re\-visiting the path elements that are shared
[email protected]@ -1940,7 +1944,7 @@
[email protected]@ -1962,7 +1966,7 @@
  .IP "\fB\-0, \-\-from0\fP"
  This tells rsync that the rules/filenames it reads from a
@@ -1226,7 +1258,7 @@
  This affects \fB\-\-exclude\-from\fP, \fB\-\-include\-from\fP, \fB\-\-files\-from\fP, and any
  merged files specified in a \fB\-\-filter\fP rule.
  It does not affect \fB\-\-cvs\-exclude\fP (since all names read from a .cvsignore
[email protected]@ -1963,7 +1967,7 @@
[email protected]@ -1985,7 +1989,7 @@
  by default, otherwise it will be disabled by default.  Either state is
  overridden by a manually specified positive or negative version of this option
  (note that \fB\-\-no\-s\fP and \fB\-\-no\-protect\-args\fP are the negative versions).
@@ -1235,7 +1267,7 @@
  disabled if you ever need to interact with a remote rsync that is older than
[email protected]@ -1995,9 +1999,9 @@
[email protected]@ -2020,9 +2024,9 @@
  If you are using this option for reasons other than a shortage of disk
  space, you may wish to combine it with the \fB\-\-delay\-updates\fP option,
  which will ensure that all copied files get put into subdirectories in the
@@ -1247,7 +1279,7 @@
  about disk space is to use the \fB\-\-partial\-dir\fP option with a relative
  path; because this tells rsync that it is OK to stash off a copy of a
  single file in a subdir in the destination hierarchy, rsync will use the
[email protected]@ -2025,7 +2029,7 @@
[email protected]@ -2050,7 +2054,7 @@
  the destination machine as an additional hierarchy to compare destination
  files against doing transfers (if the files are missing in the destination
  directory).  If a file is found in \fIDIR\fP that is identical to the
@@ -1256,7 +1288,7 @@
  directory.  This is useful for creating a sparse backup of just files that
  have changed from an earlier backup.
  This option is typically used to copy into an empty (or newly created)
[email protected]@ -2074,10 +2078,10 @@
[email protected]@ -2099,10 +2103,10 @@
@@ -1270,7 +1302,7 @@
  Beginning in version 2.6.4, multiple \fB\-\-link\-dest\fP directories may be
  provided, which will cause rsync to search the list in the order specified
[email protected]@ -2134,11 +2138,11 @@
[email protected]@ -2172,11 +2176,11 @@
  Simple character\-class matching is supported: each must consist of a list
  of letters inside the square brackets (e.g. no special classes, such as
@@ -1284,7 +1316,7 @@
  matches 2 suffixes):
[email protected]@ -2196,8 +2200,8 @@
[email protected]@ -2234,8 +2238,8 @@
  If a user or group has no name on the source system or it has no match
  on the destination system, then the numeric ID
  from the source system is used instead.  See also the comments on the
@@ -1295,7 +1327,7 @@
  users and groups and what you can do about it.
  .IP "\fB\-\-usermap=STRING, \-\-groupmap=STRING\fP"
[email protected]@ -2207,9 +2211,9 @@
[email protected]@ -2245,9 +2249,9 @@
  values separated by commas.  Any matching \fBFROM\fP value from the sender is
  replaced with a \fBTO\fP value from the receiver.  You may specify usernames
  or user IDs for the \fBFROM\fP and \fBTO\fP values, and the \fBFROM\fP value may
@@ -1307,7 +1339,7 @@
  numbers via an inclusive range: LOW\-HIGH.  For example:
[email protected]@ -2221,15 +2225,15 @@
[email protected]@ -2259,15 +2263,15 @@
  all your user mappings using a single \fB\-\-usermap\fP option, and/or all
  your group mappings using a single \fB\-\-groupmap\fP option.
@@ -1326,7 +1358,7 @@
    \-\-usermap=:nobody \-\-groupmap=*:nobody
[email protected]@ -2256,8 +2260,8 @@
[email protected]@ -2294,8 +2298,8 @@
  the omitted user/group will occur.  If GROUP is empty, the trailing colon may
  be omitted, but if USER is empty, a leading colon must be supplied.
@@ -1337,7 +1369,7 @@
  .IP "\fB\-\-timeout=TIMEOUT\fP"
  This option allows you to set a maximum I/O
[email protected]@ -2307,18 +2311,18 @@
[email protected]@ -2345,18 +2349,18 @@
  as a single letter for the mode, and use upper or lower case.
  The main use of this option is to change Full buffering to Line buffering
@@ -1359,7 +1391,7 @@
  format is like the string \fBYXcstpoguax\fP, where \fBY\fP is replaced by the
  type of update being done, \fBX\fP is replaced by the file\-type, and the
  other letters represent attributes that may be output if they are being
[email protected]@ -2344,7 +2348,7 @@
[email protected]@ -2382,7 +2386,7 @@
  have attributes that are being modified).
  .IP o 
  A \fB*\fP means that the rest of the itemized\-output area contains
@@ -1368,7 +1400,7 @@
[email protected]@ -2354,10 +2358,10 @@
[email protected]@ -2392,10 +2396,10 @@
  The other letters in the string above are the actual letters that
  will be output if the associated attribute for the item is being updated or
@@ -1382,7 +1414,7 @@
  The attribute that is associated with each letter is as follows:
[email protected]@ -2373,21 +2377,21 @@
[email protected]@ -2411,21 +2415,21 @@
  by the file transfer.
  .IP o 
  A \fBt\fP means the modification time is different and is being updated
@@ -1409,7 +1441,7 @@
  .IP o 
  The \fBu\fP slot is reserved for future use.
  .IP o 
[email protected]@ -2397,8 +2401,8 @@
[email protected]@ -2435,8 +2439,8 @@
@@ -1420,7 +1452,7 @@
  you are talking to a recent enough rsync that it logs deletions instead of
  outputting them as a verbose message).
[email protected]@ -2406,10 +2410,10 @@
[email protected]@ -2444,10 +2448,10 @@
  This allows you to specify exactly what the
  rsync client outputs to the user on a per\-update basis.  The format is a
  text string containing embedded single\-character escape sequences prefixed
@@ -1433,7 +1465,7 @@
  rsyncd.conf manpage.
  Specifying the \fB\-\-out\-format\fP option implies the \fB\-\-info=name\fP option,
[email protected]@ -2419,11 +2423,11 @@
[email protected]@ -2457,11 +2461,11 @@
  the string (e.g. if the \fB\-\-itemize\-changes\fP option was used), the logging
  of names increases to mention any item that is changed in any way (as long
  as the receiving side is at least 2.6.4).  See the \fB\-\-itemize\-changes\fP
@@ -1448,7 +1480,7 @@
  is in effect and \fB\-\-progress\fP is also specified, rsync will also output
  the name of the file being transferred prior to its progress information
  (followed, of course, by the out\-format output).
[email protected]@ -2433,10 +2437,10 @@
[email protected]@ -2471,10 +2475,10 @@
  to a file.  This is similar to the logging that a daemon does, but can be
  requested for the client side and/or the server side of a non\-daemon
  transfer.  If specified as a client option, transfer logging will be
@@ -1461,7 +1493,7 @@
[email protected]@ -2452,15 +2456,15 @@
[email protected]@ -2490,15 +2494,15 @@
  per\-update logging is put into the file specified by the \fB\-\-log\-file\fP option
  (which must also be specified for this option to have any effect).  If you
  specify an empty string, updated files will not be mentioned in the log file.
@@ -1480,7 +1512,7 @@
  algorithm is for your data.  This option is equivalent to \fB\-\-info=stats2\fP
  if combined with 0 or 1 \fB\-v\fP options, or \fB\-\-info=stats3\fP if combined
  with 2 or more \fB\-v\fP options.
[email protected]@ -2468,18 +2472,18 @@
[email protected]@ -2506,27 +2510,27 @@
  The current statistics are as follows: 
  .IP o 
@@ -1503,7 +1535,6 @@
  sense) were created (as opposed to updated).  The total count will be
  followed by a list of counts by filetype (if the total is non\-zero).
  Note that this line is only output if deletions are in effect, and only
[email protected]@ -2486,9 +2490,9 @@
  if protocol 31 is being used (the default for rsync 3.1.x).
  .IP o 
  \fBNumber of regular files transferred\fP is the count of normal files
@@ -1515,7 +1546,7 @@
  .IP o 
  \fBTotal file size\fP is the total sum of all file sizes in the transfer.
  This does not count any size for directories or special files, but does
[email protected]@ -2519,8 +2523,8 @@
[email protected]@ -2557,22 +2561,22 @@
  from the client side to the server side.
  .IP o 
  \fBTotal bytes received\fP is the count of all non\-message bytes that
@@ -1526,7 +1557,6 @@
  server sent to us, which makes the stats more consistent.
[email protected]@ -2527,14 +2531,14 @@
  .IP "\fB\-8, \-\-8\-bit\-output\fP"
  This tells rsync to leave all high\-bit characters
@@ -1544,7 +1574,7 @@
  escaped unless it is followed by a hash and 3 digits (0\-9).
  .IP "\fB\-h, \-\-human\-readable\fP"
[email protected]@ -2556,7 +2560,7 @@
[email protected]@ -2594,7 +2598,7 @@
  Backward compatibility note:  versions of rsync prior to 3.1.0 do not support
  human\-readable level 1, and they default to level 0.  Thus, specifying one or
  two \fB\-h\fP options will behave in a comparable manner in old and new versions
@@ -1553,7 +1583,7 @@
  options.  See the \fB\-\-list\-only\fP option for one difference.
  .IP "\fB\-\-partial\fP"
[email protected]@ -2577,12 +2581,12 @@
[email protected]@ -2615,12 +2619,12 @@
  Note that if \fB\-\-whole\-file\fP is specified (or implied), any partial\-dir
  file that is found for a file that is being updated will simply be removed
@@ -1569,7 +1599,7 @@
  remove it again when the partial file is deleted.
  If the partial\-dir value is not an absolute path, rsync will add an exclude
[email protected]@ -2590,21 +2594,21 @@
[email protected]@ -2628,21 +2632,21 @@
  sending of any partial\-dir files that may exist on the sending side, and
  will also prevent the untimely deletion of partial\-dir items on the
  receiving side.  An example: the above \fB\-\-partial\-dir\fP option would add
@@ -1597,7 +1627,7 @@
  You can also set the partial\-dir value the RSYNC_PARTIAL_DIR environment
  variable.  Setting this in the environment does not force \fB\-\-partial\fP to be
[email protected]@ -2617,7 +2621,7 @@
[email protected]@ -2655,7 +2659,7 @@
  specified (since \fB\-\-inplace\fP conflicts with \fB\-\-partial\-dir\fP), and (2) when
  \fB\-\-delay\-updates\fP was specified (see below).
@@ -1606,7 +1636,7 @@
  \fB\-\-partial\-dir\fP does \fInot\fP imply \fB\-\-partial\fP.  This is so that a
  refusal of the \fB\-\-partial\fP option can be used to disallow the overwriting
  of destination files with a partial transfer, while still allowing the
[email protected]@ -2628,12 +2632,12 @@
[email protected]@ -2666,12 +2670,12 @@
  updated file into a holding directory until the end of the
  transfer, at which time all the files are renamed into place in rapid
  succession.  This attempts to make the updating of the files a little more
@@ -1623,7 +1653,7 @@
  Conflicts with \fB\-\-inplace\fP and \fB\-\-append\fP.
  This option uses more memory on the receiving side (one bit per file
[email protected]@ -2645,9 +2649,9 @@
[email protected]@ -2683,9 +2687,9 @@
  the updated files will be put into a single directory if the path is
  and (2) there are no mount points in the hierarchy (since the
@@ -1635,7 +1665,7 @@
  update algorithm that is even more atomic (it uses \fB\-\-link\-dest\fP and a
  parallel hierarchy of files).
[email protected]@ -2671,26 +2675,26 @@
[email protected]@ -2709,26 +2713,26 @@
  You can prevent the pruning of certain empty directories from the file\-list
@@ -1669,7 +1699,7 @@
  in place of the hide\-filter (if that is more natural to you).
  .IP "\fB\-\-progress\fP"
[email protected]@ -2699,7 +2703,7 @@
[email protected]@ -2737,7 +2741,7 @@
  something to watch.
  With a modern rsync this is the same as specifying
  \fB\-\-info=flist2,name,progress\fP, but any user\-supplied settings for those
@@ -1678,7 +1708,7 @@
  While rsync is transferring a regular file, it updates a progress line that
  looks like this:
[email protected]@ -2710,12 +2714,12 @@
[email protected]@ -2748,12 +2752,12 @@
  In this example, the receiver has reconstructed 782448 bytes or 63% of the
@@ -1694,7 +1724,7 @@
  followed by additional data, the reported rate will probably drop
  dramatically when the receiver gets to the literal data, and the transfer
  will probably take much longer to finish than the receiver estimated as it
[email protected]@ -2736,12 +2740,12 @@
[email protected]@ -2774,12 +2778,12 @@
  receiver to check (to see if they are up\-to\-date or not) remaining out of
  the 396 total files in the file\-list.
@@ -1711,7 +1741,7 @@
  in the file list is still going to increase (and each time it does, the count
  of files left to check  will increase by the number of the files added to the
[email protected]@ -2755,7 +2759,7 @@
[email protected]@ -2793,7 +2797,7 @@
  on the whole transfer, rather than individual files.  Use this flag without
  outputting a filename (e.g. avoid \fB\-v\fP or specify \fB\-\-info=name0\fP if you
  want to see how the transfer is doing without scrolling the screen with a
@@ -1720,7 +1750,7 @@
  order to use \fB\-\-info=progress2\fP.)
  .IP "\fB\-\-password\-file=FILE\fP"
[email protected]@ -2766,10 +2770,10 @@
[email protected]@ -2804,10 +2808,10 @@
  readable or if a root\-run rsync command finds a non\-root\-owned file.
  This option does not supply a password to a remote shell transport such as
@@ -1733,7 +1763,7 @@
  config file).
  .IP "\fB\-\-list\-only\fP"
[email protected]@ -2799,17 +2803,17 @@
[email protected]@ -2837,17 +2841,17 @@
  Compatibility note:  when requesting a remote listing of files from an rsync
  that is version 2.6.3 or older, you may encounter an error if you ask for a
  non\-recursive listing.  This is because a file listing implies the \fB\-\-dirs\fP
@@ -1757,7 +1787,7 @@
  been appended).  See the \fB\-\-max\-size\fP option for a description of all the
  available suffixes. A value of zero specifies no limit.
[email protected]@ -2818,7 +2822,7 @@
[email protected]@ -2856,7 +2860,7 @@
  Rsync writes data over the socket in blocks, and this option both limits the
  size of the blocks that rsync writes, and tries to keep the average transfer
@@ -1766,7 +1796,7 @@
  out a block of data and then sleeps to bring the average rate into compliance.
  Due to the internal buffering of data, the \fB\-\-progress\fP option may not be an
[email protected]@ -2829,7 +2833,7 @@
[email protected]@ -2867,7 +2871,7 @@
  .IP "\fB\-\-write\-batch=FILE\fP"
  Record a file that can later be applied to
@@ -1775,7 +1805,7 @@
  section for details, and also the \fB\-\-only\-write\-batch\fP option.
  .IP "\fB\-\-only\-write\-batch=FILE\fP"
[email protected]@ -2841,7 +2845,7 @@
[email protected]@ -2879,58 +2883,58 @@
  Note that you can feel free to write the batch directly to some portable
  media: if this media fills to capacity before the end of the transfer, you
  can just apply that partial transfer to the destination and repeat the
@@ -1784,7 +1814,6 @@
  partially updated destination system while the multi\-update cycle is
[email protected]@ -2848,13 +2852,13 @@
  Also note that you only save bandwidth when pushing changes to a remote
  system because this allows the batched data to be diverted from the sender
  into the batch file without having to flow over the wire to the receiver
@@ -1800,7 +1829,6 @@
  .IP "\fB\-\-protocol=NUM\fP"
  Force an older protocol version to be used.  This
[email protected]@ -2861,25 +2865,25 @@
  is useful for creating a batch file that is compatible with an older
  version of rsync.  For instance, if rsync 2.6.4 is being used with the
  \fB\-\-write\-batch\fP option, but rsync 2.6.3 is what will be used to run the
@@ -1832,7 +1860,6 @@
  If you specify the \fB\-\-protect\-args\fP option (\fB\-s\fP), rsync will translate
  the filenames you specify on the command\-line that are being sent to the
[email protected]@ -2886,13 +2890,13 @@
  remote host.  See also the \fB\-\-files\-from\fP option.
  Note that rsync does not do any conversion of names in filter files
@@ -1848,16 +1875,21 @@
  regardless of the remote charset you actually pass.  Thus, you may feel free to
  specify just the local charset for a daemon transfer (e.g. \fB\-\-iconv=utf8\fP).
[email protected]@ -2909,7 +2913,7 @@
[email protected]@ -2947,10 +2951,10 @@
  .IP "\fB\-\-checksum\-seed=NUM\fP"
  Set the checksum seed to the integer NUM.  This 4
  byte checksum seed is included in each block and MD4 file checksum calculation
 -(the more modern MD5 file checksums don\(cq\&t use a seed).  By default the checksum
 +(the more modern MD5 file checksums don't use a seed).  By default the checksum
  seed is generated by the server and defaults to the current 
- \f(CWtime()\fP
- \&.  This
[email protected]@ -2942,7 +2946,7 @@
+-\&.  This
+ option is used to set a specific checksum seed, which is useful for
+ applications that want repeatable block checksums, or in the case where the
+ user wants a more random checksum seed.  Setting NUM to 0 causes rsync to use
[email protected]@ -2980,7 +2984,7 @@
  run as a daemon with the \fB\-\-daemon\fP option.  The \fB\-\-address\fP option
  allows you to specify a specific IP address (or hostname) to bind to.  This
  makes virtual hosting possible in conjunction with the \fB\-\-config\fP option.
@@ -1866,7 +1898,7 @@
  .IP "\fB\-\-bwlimit=RATE\fP"
  This option allows you to specify the maximum transfer
[email protected]@ -2960,7 +2964,7 @@
[email protected]@ -2998,7 +3002,7 @@
  .IP "\fB\-M, \-\-dparam=OVERRIDE\fP"
  This option can be used to set a daemon\-config
  parameter when starting up rsync in daemon mode.  It is equivalent to adding
@@ -1875,7 +1907,7 @@
  definition.  The parameter names can be specified without spaces, if you so
  desire.  For instance:
[email protected]@ -2974,7 +2978,7 @@
[email protected]@ -3012,25 +3016,25 @@
  rsync to not detach itself and become a background process.  This
  option is required when running as a service on Cygwin, and may also
  be useful when rsync is supervised by a program such as
@@ -1884,7 +1916,6 @@
  \fB\-\-no\-detach\fP is also recommended when rsync is run under a
  debugger.  This option has no effect if rsync is run from inetd or
[email protected]@ -2981,18 +2985,18 @@
  .IP "\fB\-\-port=PORT\fP"
  This specifies an alternate TCP port number for the
@@ -1907,7 +1938,7 @@
  case transfer logging is turned off.
  .IP "\fB\-\-sockopts\fP"
[email protected]@ -3002,8 +3006,8 @@
[email protected]@ -3040,15 +3044,15 @@
  .IP "\fB\-v, \-\-verbose\fP"
  This option increases the amount of information the
  daemon logs during its startup phase.  After the client connects, the
@@ -1918,7 +1949,6 @@
  .IP "\fB\-4, \-\-ipv4\fP or \fB\-6, \-\-ipv6\fP"
  Tells rsync to prefer IPv4/IPv6
[email protected]@ -3010,7 +3014,7 @@
  when creating the incoming sockets that the rsync daemon will use to
  listen for connections.  One of these options may be required in older
  versions of Linux to work around an IPv6 bug in the kernel (if you see
@@ -1927,7 +1957,7 @@
  try specifying \fB\-\-ipv6\fP or \fB\-\-ipv4\fP when starting the daemon).
  If rsync was complied without support for IPv6, the \fB\-\-ipv6\fP option
[email protected]@ -3049,7 +3053,7 @@
[email protected]@ -3087,7 +3091,7 @@
  You have your choice of using either short or long RULE names, as described
@@ -1936,7 +1966,7 @@
  MODIFIERS is optional.  The PATTERN or FILENAME that follows (when present)
  must come after either a single space or an underscore (_).
  Here are the available rule prefixes:
[email protected]@ -3077,15 +3081,15 @@
[email protected]@ -3115,15 +3119,15 @@
  When rules are being read from a file, empty lines are ignored, as are
@@ -1956,7 +1986,7 @@
  an exclude option) were prefixed to the string.  A \fB\-\-filter\fP option, on
  the other hand, must always contain either a short or long rule name at the
  start of the rule.
[email protected]@ -3098,8 +3102,8 @@
[email protected]@ -3136,8 +3140,8 @@
@@ -1967,7 +1997,7 @@
  The include/exclude rules each specify a pattern that is matched against
  the names of the files that are going to be transferred.  These patterns
  can take several forms:
[email protected]@ -3109,15 +3113,15 @@
[email protected]@ -3147,15 +3151,15 @@
  particular spot in the hierarchy of files, otherwise it is matched
  against the end of the pathname.  This is similar to a leading ^ in
  regular expressions.
@@ -1989,7 +2019,7 @@
  a full discussion of how to specify a pattern that matches at the root
  of the transfer.
  .IP o 
[email protected]@ -3126,44 +3130,44 @@
[email protected]@ -3164,48 +3168,48 @@
  .IP o 
  rsync chooses between doing a simple string match and wildcard
  matching by checking if the pattern contains one of these three wildcard
@@ -2010,6 +2040,12 @@
  .IP o 
  in a wildcard pattern, a backslash can be used to escape a wildcard
  character, but it is matched literally when no wildcards are present.
+ This means that there is an extra level of backslash removal when a
+ pattern contains wildcard characters compared to a pattern that has none.
+-e.g. if you add a wildcard to \(dq\&foo\ebar\(dq\& (which matches the backslash) you
+-would need to use \(dq\&foo\e\ebar*\(dq\& to avoid the \(dq\&\eb\(dq\& becoming just \(dq\&b\(dq\&.
++e.g. if you add a wildcard to "foo\ebar" (which matches the backslash) you
++would need to use "foo\e\ebar*" to avoid the "\eb" becoming just "b".
  .IP o 
 -if the pattern contains a / (not counting a trailing /) or a \(dq\&**\(dq\&,
 +if the pattern contains a / (not counting a trailing /) or a "**",
@@ -2050,7 +2086,7 @@
  \f(CW+ /some/path/this\-file\-will\-not\-be\-found\fP
[email protected]@ -3175,11 +3179,11 @@
[email protected]@ -3217,11 +3221,11 @@
@@ -2066,7 +2102,7 @@
  solution is to add specific include rules for all
  the parent dirs that need to be visited.  For instance, this set of rules
  works fine:
[email protected]@ -3201,44 +3205,44 @@
[email protected]@ -3243,44 +3247,44 @@
  Here are some examples of exclude/include matching:
  .IP o 
@@ -2126,7 +2162,7 @@
  .IP o 
  An \fBs\fP is used to indicate that the rule applies to the sending
[email protected]@ -3256,7 +3260,7 @@
[email protected]@ -3298,7 +3302,7 @@
  .IP o 
  A \fBp\fP indicates that a rule is perishable, meaning that it is
  ignored in directories that are being deleted.  For instance, the \fB\-C\fP
@@ -2135,7 +2171,7 @@
  marked as perishable, and will not prevent a directory that was removed
  on the source from being deleted on the destination.
[email protected]@ -3268,9 +3272,9 @@
[email protected]@ -3310,16 +3314,16 @@
  merge (.) or a dir\-merge (:) filter rule (as introduced in the FILTER RULES
  section above).
@@ -2148,7 +2184,6 @@
  rule.  For per\-directory merge files, rsync will scan every directory that
  it traverses for the named file, merging its contents when the file exists
  into the current list of inherited rules.  These per\-directory rule files
[email protected]@ -3277,7 +3281,7 @@
  must be created on the sending side because it is the sending side that is
  being scanned for the available files to transfer.  These rule files may
  also need to be transferred to the receiving side if you want them to
@@ -2157,7 +2192,7 @@
  Some examples:
[email protected]@ -3306,12 +3310,12 @@
[email protected]@ -3348,27 +3352,27 @@
  patterns, with no other rule\-parsing except for in\-file comments.
  .IP o 
  A \fBC\fP is a way to specify that the file should be read in a
@@ -2173,7 +2208,6 @@
  .IP o 
  An \fBn\fP specifies that the rules are not inherited by subdirectories.
  .IP o 
[email protected]@ -3318,15 +3322,15 @@
  A \fBw\fP specifies that the rules are word\-split on whitespace instead
  of the normal line\-splitting.  This also turns off comments.  Note: the
  space that separates the prefix from the rule is treated specially, so
@@ -2193,7 +2227,7 @@
  per\-directory rules apply only on the sending side.  If the merge rule
  specifies sides to affect (via the \fBs\fP or \fBr\fP modifier or both),
  then the rules in the file must not specify sides (via a modifier or
[email protected]@ -3334,22 +3338,22 @@
[email protected]@ -3376,22 +3380,22 @@
  Per\-directory rules are inherited in all subdirectories of the directory
@@ -2222,7 +2256,7 @@
  \f(CWmerge /home/user/.global\-filter\fP
[email protected]@ -3366,7 +3370,7 @@
[email protected]@ -3408,7 +3412,7 @@
  This will merge the contents of the /home/user/.global\-filter file at the
@@ -2231,7 +2265,7 @@
  filter file.  All rules read in prior to the start of the directory scan
  follow the global anchoring rules (i.e. a leading slash matches at the root
  of the transfer).
[email protected]@ -3377,7 +3381,7 @@
[email protected]@ -3419,7 +3423,7 @@
  per\-directory file.  For instance, here is a common filter (see \fB\-F\fP):
@@ -2240,7 +2274,7 @@
[email protected]@ -3385,7 +3389,7 @@
[email protected]@ -3427,38 +3431,38 @@
  directories from the root down through the parent directory of the
  transfer prior to the start of the normal directory scan of the file in
  the directories that are sent as a part of the transfer.  (Note: for an
@@ -2249,7 +2283,6 @@
  Some examples of this pre\-scanning for per\-directory files:
[email protected]@ -3392,31 +3396,31 @@
  \f(CWrsync \-avF /src/path/ /dest/dir\fP
@@ -2291,7 +2324,7 @@
  \f(CW+ foo.o\fP
[email protected]@ -3426,7 +3430,7 @@
[email protected]@ -3468,7 +3472,7 @@
@@ -2300,7 +2333,7 @@
[email protected]@ -3437,25 +3441,25 @@
[email protected]@ -3479,25 +3483,25 @@
  that follow the :C instead of being subservient to all your rules.  To
  affect the other CVS exclude rules (i.e. the default list of exclusions,
  the contents of $HOME/.cvsignore, and the value of $CVSIGNORE) you should
@@ -2333,7 +2366,7 @@
  a subtree of names that are being sent from sender to receiver, the
  transfer\-root is where the tree starts to be duplicated in the destination
  directory.  This root governs where patterns that start with a / match.
[email protected]@ -3466,8 +3470,8 @@
[email protected]@ -3508,8 +3512,8 @@
  changing how much of the file tree is duplicated on the destination
  host).  The following examples demonstrate this.
@@ -2344,7 +2377,7 @@
  Here is how the various command choices differ for a 2\-source transfer:
[email protected]@ -3487,9 +3491,9 @@
[email protected]@ -3529,9 +3533,9 @@
  Example cmd: rsync \-a /home/me/ /home/you/ /dest 
@@ -2356,7 +2389,7 @@
  Target file: /dest/foo/bar 
[email protected]@ -3528,7 +3532,7 @@
[email protected]@ -3570,26 +3574,26 @@
  The easiest way to see what name you should filter is to just
  look at the output when using \fB\-\-verbose\fP and put a / in front of the name
@@ -2365,7 +2398,6 @@
[email protected]@ -3535,19 +3539,19 @@
  Without a delete option, per\-directory rules are only relevant on the
  sending side, so you can feel free to exclude the merge files themselves
@@ -2389,7 +2421,7 @@
  receiving side knows what files to exclude.  The easiest way is to include
  the per\-directory merge files in the transfer and use \fB\-\-delete\-after\fP,
  because this ensures that the receiving side gets all the same exclude
[email protected]@ -3558,14 +3562,14 @@
[email protected]@ -3600,14 +3604,14 @@
@@ -2407,7 +2439,7 @@
     \-\-delete host:src/dir /dest
[email protected]@ -3578,12 +3582,12 @@
[email protected]@ -3620,12 +3624,12 @@
  In one final example, the remote side is excluding the .rsync\-filter
  files from the transfer, but we want to use our own .rsync\-filter files
  to control what gets deleted on the receiving side.  To do this we must
@@ -2422,7 +2454,7 @@
          host:src/dir /dest
      rsync \-avFF \-\-delete host:src/dir /dest
[email protected]@ -3599,7 +3603,7 @@
[email protected]@ -3641,7 +3645,7 @@
  hosts. In order to do this using batch mode, rsync is run with the
  write\-batch option to apply the changes made to the source tree to one
  of the destination trees.  The write\-batch option causes the rsync
@@ -2431,7 +2463,7 @@
  this operation against other, identical destination trees.
  Generating the batch file once saves having to perform the file
[email protected]@ -3614,7 +3618,7 @@
[email protected]@ -3656,7 +3660,7 @@
  using the information stored in the batch file.
  For your convenience, a script file is also created when the write\-batch
@@ -2440,7 +2472,7 @@
  appended.  This script file contains a command\-line suitable for updating a
  destination tree using the associated batch file. It can be executed using
  a Bourne (or Bourne\-like) shell, optionally passing in an alternate
[email protected]@ -3643,25 +3647,25 @@
[email protected]@ -3685,25 +3689,25 @@
  In these examples, rsync is used to update /adest/dir/ from /source/dir/
@@ -2472,7 +2504,7 @@
[email protected]@ -3674,7 +3678,7 @@
[email protected]@ -3716,7 +3720,7 @@
  and then, if the file fails to verify, the update discarded with an
  error.  This means that it should be safe to re\-run a read\-batch operation
  if the command got interrupted.  If you wish to force the batched\-update to
@@ -2481,7 +2513,7 @@
  option (when reading the batch).
  If an error occurs, the destination tree will probably be in a
  partially updated state. In that case, rsync can
[email protected]@ -3690,7 +3694,7 @@
[email protected]@ -3732,7 +3736,7 @@
  older than that with newer versions will not work.)
  When reading a batch file, rsync will force the value of certain options
@@ -2490,7 +2522,7 @@
  as the batch\-writing command.  Other options can (and should) be changed.
  For instance \fB\-\-write\-batch\fP changes to \fB\-\-read\-batch\fP,
  \fB\-\-files\-from\fP is dropped, and the
[email protected]@ -3698,13 +3702,13 @@
[email protected]@ -3740,13 +3744,13 @@
  one of the \fB\-\-delete\fP options is specified.
  The code that creates the BATCH.sh file transforms any filter/include/exclude
@@ -2506,7 +2538,7 @@
  version uses a new implementation.
[email protected]@ -3714,16 +3718,16 @@
[email protected]@ -3756,16 +3760,16 @@
  link in the source directory.
  By default, symbolic links are not transferred at all.  A message
@@ -2526,7 +2558,7 @@
  example where this might be used is a web site mirror that wishes to
  ensure that the rsync module that is copied does not include symbolic links to
  \fB/etc/passwd\fP in the public section of the site.  Using
[email protected]@ -3733,11 +3737,11 @@
[email protected]@ -3775,11 +3779,11 @@
  \fB\-\-links\fP for \fB\-\-safe\-links\fP to have any effect.)
  Symbolic links are considered unsafe if they are absolute symlinks
@@ -2541,7 +2573,7 @@
  use the first line that is a complete subset of your options:
  .IP "\fB\-\-copy\-links\fP"
[email protected]@ -3763,8 +3767,8 @@
[email protected]@ -3805,8 +3809,8 @@
  rsync occasionally produces error messages that may seem a little
@@ -2552,7 +2584,7 @@
  This message is usually caused by your startup scripts or remote shell
  facility producing unwanted garbage on the stream that rsync is using
[email protected]@ -3864,13 +3868,13 @@
[email protected]@ -3906,13 +3910,13 @@
  password allows you to run authenticated rsync connections to an rsync
  daemon without user intervention. Note that this does not supply a
  password to a remote shell transport such as ssh; to learn how to do that,
@@ -2569,7 +2601,7 @@
  default .cvsignore file.
[email protected]@ -3945,7 +3949,7 @@
[email protected]@ -3987,7 +3991,7 @@
  gone\-but\-not\-forgotten compadre, J.W. Schultz.
  Thanks also to Richard Brent, Brendan Mackay, Bill Waite, Stephen Rothwell
--- a/components/rsync/patches/rsyncd.conf.5.patch	Wed May 06 05:36:00 2015 -0700
+++ b/components/rsync/patches/rsyncd.conf.5.patch	Thu Apr 16 04:52:37 2015 -0700
@@ -2,8 +2,8 @@
 character ("), "\(cq" to a single-quote character ('), and eliminates the
 use of "\&" except where it's needed at the beginning of the line.
---- rsync-3.1.0/rsyncd.conf.5.orig	Sat Sep 28 19:57:23 2013
-+++ rsync-3.1.0/rsyncd.conf.5	Mon Mar 17 15:52:51 2014
+--- rsync-3.1.1/rsyncd.conf.5.orig	2014-06-22 10:07:36.000000000 -0700
++++ rsync-3.1.1/rsyncd.conf.5	2014-08-27 11:32:28.266744772 -0700
 @@ -20,7 +20,7 @@
  The file consists of modules and parameters. A module begins with the
@@ -70,7 +70,7 @@
      path = /home/%RSYNC_USER_NAME% 
[email protected]@ -178,14 +178,14 @@
[email protected]@ -178,40 +178,40 @@
  It is fine if the path includes internal spaces \-\- they will be retained
@@ -88,7 +88,6 @@
  the advantage of extra protection against possible implementation security
  holes, but it has the disadvantages of requiring super\-user privileges,
  of not being able to follow symbolic links that are either absolute or outside
[email protected]@ -192,26 +192,26 @@
  of the new root path, and of complicating the preservation of users and groups
  by name (see below).
@@ -255,7 +254,7 @@
  modules, which still allows modules to override the default setting.
  .IP "\fBsyslog facility\fP"
[email protected]@ -347,19 +347,19 @@
[email protected]@ -347,43 +347,43 @@
  defined on your system. Common names are auth, authpriv, cron, daemon,
  ftp, kern, lpr, mail, news, security, syslog, user, uucp, local0,
  local1, local2, local3, local4, local5, local6 and local7. The default
@@ -271,6 +270,15 @@
  generate (since the information goes into the log file). The default is 1,
  which allows the client to request one level of verbosity.
+-This also affects the user\(cq\&s ability to request higher levels of \fB\-\-info\fP and
++This also affects the user's ability to request higher levels of \fB\-\-info\fP and
+ \fB\-\-debug\fP logging.  If the max value is 2, then no info and/or debug value
+ that is higher than what would be set by \fB\-vv\fP will be honored by the daemon
+ in its logging.  To see how high of a verbosity level you need to accept for a
+-particular info/debug level, refer to \(dq\&rsync \-\-info=help\(dq\& and \(dq\&rsync \-\-debug=help\(dq\&.
++particular info/debug level, refer to "rsync \-\-info=help" and "rsync \-\-debug=help".
+ For instance, it takes max\-verbosity 4 to be able to output debug TIME2 and FLIST3.
+ .IP 
  .IP "\fBlock file\fP"
  This parameter specifies the file to use to
 -support the \(dq\&max connections\(dq\& parameter. The rsync daemon uses record
@@ -278,7 +286,6 @@
  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.
[email protected]@ -366,17 +366,17 @@
  .IP "\fBread only\fP"
  This parameter determines whether clients
@@ -301,7 +308,7 @@
  will be possible if file permissions on the daemon side allow them.  The
  default is for this parameter to be disabled.
[email protected]@ -384,8 +384,8 @@
[email protected]@ -391,8 +391,8 @@
  This parameter determines whether this module is
  listed when the client asks for a listing of available modules.  In addition,
  if this is false, the daemon will pretend the module does not exist
@@ -312,7 +319,7 @@
  module, the resulting reverse lookup to a potentially client\-controlled DNS
  server may still reveal to the client that it hit an existing module.
  The default is for modules to be listable.
[email protected]@ -393,10 +393,10 @@
[email protected]@ -400,10 +400,10 @@
  .IP "\fBuid\fP"
  This parameter specifies the user name or user ID that
  file transfers to and from that module should take place as when the daemon
@@ -326,7 +333,7 @@
  The RSYNC_USER_NAME environment variable may be used to request that rsync run
  as the authorizing user.  For example, if you want a rsync to run as the same
[email protected]@ -411,16 +411,16 @@
[email protected]@ -418,16 +418,16 @@
  .IP "\fBgid\fP"
  This parameter specifies one or more group names/IDs that will be
  used when accessing the module.  The first one will be the default group, and
@@ -347,7 +354,7 @@
  daemon side to behave as if the \fB\-\-fake\-super\fP command\-line option had
  been specified.  This allows the full attributes of a file to be stored
  without having to have the daemon actually running as root.
[email protected]@ -436,17 +436,17 @@
[email protected]@ -443,17 +443,17 @@
  tampering with private administrative files, such as files you may add to
  support uid/gid name translations.
@@ -372,7 +379,7 @@
  apply to a given module in the config file, so put all the rules you want in a
  single parameter.  Note that per\-directory merge\-file rules do not provide as
  much protection as global rules, but they can be used to make \fB\-\-delete\fP work
[email protected]@ -456,27 +456,27 @@
[email protected]@ -463,27 +463,27 @@
  .IP "\fBexclude\fP"
  This parameter takes a space\-separated list of daemon
  exclude patterns.  As with the client \fB\-\-exclude\fP option, patterns can be
@@ -411,7 +418,7 @@
  .IP "\fBincoming chmod\fP"
[email protected]@ -507,23 +507,23 @@
[email protected]@ -514,23 +514,23 @@
  this module. The usernames do not need to exist on the local
  system. The rules may contain shell wildcard characters that will be matched
  against the username provided by the client for authentication. If
@@ -443,7 +450,7 @@
  Be sure to put the rules in the order you want them to be matched, because the
  checking stops at the first matching user or group, and that is the only auth
[email protected]@ -535,12 +535,12 @@
[email protected]@ -542,54 +542,54 @@
  In the above rule, user joe will be denied access no matter what.  Any user
@@ -460,7 +467,6 @@
  See the description of the secrets file for how you can have per\-user passwords
  as well as per\-group passwords.  It also explains how a user can authenticate
[email protected]@ -547,8 +547,8 @@
  using their user password or (when applicable) a group password, depending on
  what rule is being authenticated.
@@ -471,7 +477,6 @@
  rsyncd.conf\-level username that differs from the remote\-shell\-level
  username when using a remote shell to connect to an rsync daemon.
[email protected]@ -555,34 +555,34 @@
  .IP "\fBsecrets file\fP"
  This parameter specifies the name of a file that contains
  the username:password and/or @groupname:password pairs used for authenticating
@@ -517,7 +522,7 @@
  false, the check is not performed.  The default is true.  This parameter
  was added to accommodate rsync running on the Windows operating system.
[email protected]@ -597,7 +597,7 @@
[email protected]@ -604,7 +604,7 @@
  .IP o 
  a dotted decimal IPv4 address of the form a.b.c.d, or an IPv6 address
@@ -526,7 +531,7 @@
  must match exactly.
  .IP o 
  an address/mask in the form ipaddr/n where ipaddr is the IP address
[email protected]@ -612,11 +612,11 @@
[email protected]@ -619,11 +619,11 @@
  a hostname pattern using wildcards. If the hostname of the connecting IP
  (as determined by a reverse lookup) matches the wildcarded name (using the
  same rules as normal unix filename matching), the client is allowed in.  This
@@ -541,7 +546,7 @@
  enabled, as it is by default).  Any match will be allowed in.
[email protected]@ -633,31 +633,31 @@
[email protected]@ -640,31 +640,31 @@
@@ -583,7 +588,7 @@
  If this parameter is enabled globally (even by default), rsync performs the
  lookup as soon as a client connects, so disabling it for a module will not
[email protected]@ -683,7 +683,7 @@
[email protected]@ -690,7 +690,7 @@
  This tells the rsync daemon to completely
  ignore files that are not readable by the user. This is useful for
  public archives that may have some non\-readable files among the
@@ -592,7 +597,7 @@
  .IP "\fBtransfer logging\fP"
  This parameter enables per\-file
[email protected]@ -691,7 +691,7 @@
[email protected]@ -698,7 +698,7 @@
  used by ftp daemons.  The daemon always logs the transfer at the end, so
  if a transfer is aborted, no mention will be made in the log file.
@@ -601,7 +606,7 @@
  .IP "\fBlog format\fP"
  This parameter allows you to specify the
[email protected]@ -699,17 +699,17 @@
[email protected]@ -706,17 +706,17 @@
  The format is a text string containing embedded single\-character escape
  sequences prefixed with a percent (%) character.  An optional numeric
  field width may also be specified between the percent and the escape
@@ -624,7 +629,7 @@
  The single\-character escapes that are understood are as follows:
[email protected]@ -726,9 +726,9 @@
[email protected]@ -733,9 +733,9 @@
  .IP o 
  %C the full\-file MD5 checksum if \fB\-\-checksum\fP is enabled or a file was transferred (only for protocol 30 or above).
  .IP o 
@@ -636,7 +641,7 @@
  .IP o 
  %h the remote host name (only available for a daemon)
  .IP o 
[email protected]@ -736,15 +736,15 @@
[email protected]@ -743,15 +743,15 @@
  .IP o 
  %l the length of the file in bytes
  .IP o 
@@ -655,7 +660,7 @@
  .IP o 
  %p the process ID of this rsync session
  .IP o 
[email protected]@ -758,7 +758,7 @@
[email protected]@ -765,7 +765,7 @@
@@ -664,7 +669,7 @@
  \fB\-\-itemize\-changes\fP option in the rsync manpage.
  Note that some of the logged output changes when talking with older
[email protected]@ -768,7 +768,7 @@
[email protected]@ -775,7 +775,7 @@
  .IP "\fBtimeout\fP"
  This parameter allows you to override the
  clients choice for I/O timeout for this module. Using this parameter you
@@ -673,7 +678,7 @@
  is specified in seconds. A value of zero means no timeout and is the
  default. A good choice for anonymous rsync daemons may be 600 (giving
  a 10 minute timeout).
[email protected]@ -789,15 +789,15 @@
[email protected]@ -796,15 +796,15 @@
  The reason the above refuses all delete options is that the options imply
  \fB\-\-delete\fP, and implied options are refused just like explicit options.
@@ -693,7 +698,7 @@
  client that requests compression.
  .IP "\fBdont compress\fP"
[email protected]@ -806,16 +806,16 @@
[email protected]@ -813,16 +813,16 @@
  when pulling files from the daemon (no analogous parameter exists to
  govern the pushing of files to a daemon).
  Compression is expensive in terms of CPU usage, so it
@@ -713,7 +718,7 @@
  the sender.
  .IP "\fBpre\-xfer exec\fP, \fBpost\-xfer exec\fP"
[email protected]@ -824,7 +824,7 @@
[email protected]@ -831,7 +831,7 @@
  transfer is aborted before it begins.  Any output from the script on stdout (up
  to several KB) will be displayed to the user when aborting, but is NOT
  displayed if the script returns success.  Any output from the script on stderr
@@ -722,7 +727,7 @@
  \-\-no\-detatch option for a way to see the stderr output, which can assist with
[email protected]@ -837,26 +837,26 @@
[email protected]@ -844,26 +844,26 @@
  .IP o 
  \fBRSYNC_MODULE_PATH\fP: The path configured for the module.
  .IP o 
@@ -756,7 +761,7 @@
  This will be 0 for a successful run, a positive value for an error that the
  server generated, or a \-1 if rsync failed to exit properly.  Note that an
  error that occurs on the client side does not currently get sent to the
[email protected]@ -870,7 +870,7 @@
[email protected]@ -877,7 +877,7 @@
  Even though the commands can be associated with a particular module, they
  are run using the permissions of the user that started the daemon (not the
@@ -765,7 +770,7 @@
[email protected]@ -878,7 +878,7 @@
[email protected]@ -885,14 +885,14 @@
  There are currently two config directives available that allow a config file to
  incorporate the contents of other files:  \fB&include\fP and \fB&merge\fP.  Both
  allow a reference to either a file or a directory.  They differ in how
@@ -774,7 +779,6 @@
  The \fB&include\fP directive treats each file as more distinct, with each one
  inheriting the defaults of the parent file, starting the parameter parsing
[email protected]@ -885,7 +885,7 @@
  as globals/defaults, and leaving the defaults unchanged for the parsing of
  the rest of the parent file.
@@ -783,7 +787,7 @@
  if it were simply inserted in place of the directive, and thus it can set
  parameters in a module started in another file, can affect the defaults for
  other files, etc.
[email protected]@ -894,8 +894,8 @@
[email protected]@ -901,8 +901,8 @@
  in all the \fB*.conf\fP or \fB*.inc\fP files (respectively) that are contained inside
  that directory (without any
  recursive scanning), with the files sorted into alpha order.  So, if you have a