--- a/components/rsync/patches/rsync.1.patch Thu Feb 19 13:08:31 2015 -0800
+++ b/components/rsync/patches/rsync.1.patch Thu Feb 19 14:16:39 2015 -0800
@@ -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.
.PP
.SH "SETUP"
-@@ -129,7 +129,7 @@
+@@ -132,7 +132,7 @@
.PP
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.
-@@ -141,8 +141,8 @@
+@@ -144,8 +144,8 @@
.PP
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
-@@ -156,9 +156,9 @@
+@@ -159,9 +159,9 @@
.RE
.PP
@@ -72,7 +72,7 @@
.PP
.RS
\f(CWrsync \-av host: /dest\fP
-@@ -169,7 +169,7 @@
+@@ -172,7 +172,7 @@
.PP
You can also use rsync in local\-only mode, where both the source and
@@ -81,7 +81,7 @@
an improved copy command.
.PP
Finally, you can list all the (listable) modules available from a
-@@ -202,9 +202,9 @@
+@@ -205,9 +205,9 @@
examples:
.PP
.RS
@@ -93,7 +93,7 @@
.RE
.PP
-@@ -212,12 +212,12 @@
+@@ -215,12 +215,12 @@
not as easy to use as the first method.
.PP
If you need to transfer a filename that contains whitespace, you can either
@@ -108,7 +108,7 @@
.RE
.PP
-@@ -237,7 +237,7 @@
+@@ -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
connect.
-@@ -251,7 +251,7 @@
+@@ -254,7 +254,7 @@
you must not specify the \fB\-\-rsh\fP (\fB\-e\fP) option.
.PP
@@ -126,7 +126,7 @@
.PP
.nf
rsync \-av host::src /dest
-@@ -269,18 +269,18 @@
+@@ -272,18 +272,18 @@
.PP
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/
.fi
-@@ -297,16 +297,16 @@
+@@ -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
-@@ -321,19 +321,23 @@
+@@ -324,20 +324,24 @@
If you need to specify a different remote\-shell user, keep in mind that the
user@ 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
.SH "STARTING AN RSYNC DAEMON TO ACCEPT CONNECTIONS"
-+.PP
+ .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
++.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
-@@ -343,7 +347,7 @@
+ to spawn an rsync daemon for incoming connections on a particular port).
+@@ -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).
.PP
@@ -207,7 +208,7 @@
no need to manually start an rsync daemon.
.PP
.SH "SORTED TRANSFER ORDER"
-@@ -357,7 +361,7 @@
+@@ -360,7 +364,7 @@
.PP
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).
.PP
.SH "EXAMPLES"
-@@ -365,7 +369,7 @@
+@@ -368,7 +372,7 @@
.PP
Here are some examples of how I use rsync.
.PP
@@ -225,7 +226,7 @@
files and mail folders, I use a cron job that runs
.PP
.RS
-@@ -374,7 +378,7 @@
+@@ -377,14 +381,14 @@
.PP
each night over a PPP connection to a duplicate directory on my machine
@@ -234,7 +235,6 @@
.PP
To synchronize my samba source trees I use the following Makefile
targets:
-@@ -381,7 +385,7 @@
.PP
.nf
get:
@@ -243,7 +243,7 @@
put:
rsync \-Cavuzb . samba:samba/
sync: get put
-@@ -390,12 +394,12 @@
+@@ -393,12 +397,12 @@
.PP
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 @@
.PP
This is launched from cron every few hours.
.PP
-@@ -417,7 +421,7 @@
+@@ -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)
-@@ -428,7 +432,7 @@
+@@ -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
-@@ -453,7 +457,7 @@
+@@ -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
-@@ -471,20 +475,20 @@
+@@ -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
-@@ -497,11 +501,11 @@
+@@ -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
-@@ -519,7 +523,7 @@
+@@ -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
-@@ -548,8 +552,8 @@
+@@ -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
-@@ -567,11 +571,11 @@
+@@ -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 @@
.PP
.IP "\fB\-\-help\fP"
Print a short help page describing the options
-@@ -615,7 +619,7 @@
+@@ -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
+@@ -624,14 +628,14 @@
.fi
.IP
@@ -371,7 +385,24 @@
\fB\-\-itemize\-changes\fP (\fB\-i\fP) options. See those options for more
information on what is output and when.
.IP
-@@ -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
+@@ -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
+@@ -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.
.IP
-@@ -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
-@@ -700,7 +704,7 @@
+@@ -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
-@@ -711,7 +715,7 @@
+@@ -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.
.IP
Note that rsync always verifies that each \fItransferred\fP file was
-@@ -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 @@
.IP
For protocol 30 and beyond (first supported in 3.0.0), the checksum used is
MD5. For older protocols, the checksum used is MD4.
-@@ -736,14 +740,14 @@
+@@ -747,14 +751,14 @@
.IP
.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).
.IP
-@@ -799,16 +803,16 @@
+@@ -810,16 +814,16 @@
.IP
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.
.IP
It is also possible to limit the amount of path information that is sent as
-@@ -822,7 +826,7 @@
+@@ -833,7 +837,7 @@
.IP
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:
.IP
-@@ -832,12 +836,12 @@
+@@ -843,12 +847,12 @@
.IP
(Note that the parens put the two commands into a sub\-shell, so that the
@@ -484,7 +513,7 @@
.br
\f(CW remote:bar/baz.c /tmp/\fP
.RE
-@@ -854,13 +858,13 @@
+@@ -865,13 +869,13 @@
the receiving side.
.IP
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).
.IP
-@@ -874,15 +878,15 @@
+@@ -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.
.IP
@@ -524,7 +553,7 @@
rule would never be reached).
.IP
.IP "\fB\-\-backup\-dir=DIR\fP"
-@@ -895,8 +899,8 @@
+@@ -906,8 +910,8 @@
.IP
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
.IP "\fB\-\-suffix=SUFFIX\fP"
-@@ -908,7 +912,7 @@
+@@ -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.)
.IP
- 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
-@@ -917,8 +921,8 @@
+@@ -928,8 +932,8 @@
where the destination has a file, the transfer would occur regardless of
the timestamps.
.IP
@@ -555,7 +584,7 @@
It just limits the files that the receiver requests to be transferred.
.IP
.IP "\fB\-\-inplace\fP"
-@@ -934,13 +938,13 @@
+@@ -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
fails.
.IP o
-@@ -948,7 +952,7 @@
+@@ -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
-@@ -975,12 +979,12 @@
+@@ -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
.IP "\fB\-\-append\-verify\fP"
This works just like the \fB\-\-append\fP option, but
-@@ -996,9 +1000,9 @@
+@@ -1007,21 +1011,21 @@
.IP
.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.
-@@ -1005,12 +1009,12 @@
.IP
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
.IP "\fB\-l, \-\-links\fP"
-@@ -1022,7 +1026,7 @@
+@@ -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.
-@@ -1044,11 +1048,11 @@
+@@ -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.
.IP
-@@ -1057,13 +1061,13 @@
+@@ -1068,13 +1072,13 @@
transfer, the client side is the sender.)
.IP
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.
.IP
Without this option, if the sending side has replaced a directory with a
-@@ -1086,20 +1090,20 @@
+@@ -1097,20 +1101,20 @@
.IP
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 @@
.IP
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
-@@ -1167,10 +1171,10 @@
+@@ -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.
.RE
-@@ -1177,7 +1181,7 @@
.IP
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).
.IP
In summary: to give destination files (both old and new) the source
-@@ -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):
-@@ -1202,13 +1206,13 @@
+@@ -1213,13 +1217,13 @@
.IP
(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
-@@ -1218,17 +1222,17 @@
+@@ -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 @@
.RE
.IP
-@@ -1254,11 +1258,11 @@
+@@ -1265,19 +1269,19 @@
.IP
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.
-@@ -1265,8 +1269,8 @@
.IP
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:
-@@ -1333,8 +1337,8 @@
+@@ -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
.IP "\fB\-O, \-\-omit\-dir\-times\fP"
This tells rsync to omit directories when
-@@ -1348,12 +1352,12 @@
+@@ -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
+@@ -1370,12 +1374,12 @@
.IP
.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.
.IP
-@@ -1361,10 +1365,10 @@
+@@ -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
-@@ -1390,18 +1394,18 @@
+@@ -1412,18 +1416,18 @@
.IP
This option is overridden by both \fB\-\-super\fP and \fB\-\-no\-super\fP.
.IP
@@ -853,7 +887,7 @@
glibc implementation that writes a zero byte into each block.
.IP
Without this option, larger files may not be entirely contiguous on the
-@@ -1410,7 +1414,7 @@
+@@ -1432,7 +1436,7 @@
etc.), this option may have no positive effect at all.
.IP
.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
-@@ -1418,29 +1422,29 @@
+@@ -1440,29 +1444,29 @@
.IP
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.
.IP
If this option is repeated, rsync omits all mount\-point directories from
-@@ -1460,8 +1464,8 @@
+@@ -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).
.IP
@@ -911,7 +945,7 @@
It just limits the files that the receiver requests to be transferred.
.IP
.IP "\fB\-\-ignore\-existing\fP"
-@@ -1469,8 +1473,8 @@
+@@ -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.
.IP
@@ -922,7 +956,6 @@
It just limits the files that the receiver requests to be transferred.
.IP
This option can be useful for those doing backups using the \fB\-\-link\-dest\fP
-@@ -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.
.IP
-@@ -1489,24 +1493,24 @@
+@@ -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).
-@@ -1563,7 +1567,7 @@
+@@ -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).
-@@ -1605,7 +1609,7 @@
+@@ -1627,7 +1631,7 @@
that, this option is independent of any other type of delete processing.
.IP
The missing source files are represented by special file\-list entries which
@@ -984,7 +1017,7 @@
.IP
.IP "\fB\-\-ignore\-errors\fP"
Tells \fB\-\-delete\fP to go ahead and delete files
-@@ -1629,27 +1633,27 @@
+@@ -1651,27 +1655,27 @@
.IP
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.
.IP
Examples: \-\-max\-size=1.5mb\-1 is 1499999 bytes, and \-\-max\-size=2g+1 is
-@@ -1667,7 +1671,7 @@
+@@ -1689,7 +1693,7 @@
.IP
.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
.IP "\fB\-e, \-\-rsh=COMMAND\fP"
-@@ -1680,8 +1684,8 @@
+@@ -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 @@
.IP
Command\-line arguments are permitted in COMMAND provided that COMMAND is
presented to rsync as a single argument. You must use spaces (not tabs
-@@ -1693,9 +1697,9 @@
+@@ -1715,9 +1719,9 @@
shell is parsing and which quotes rsync is parsing). Some examples:
.IP
.RS
@@ -1054,7 +1087,7 @@
.br
.RE
-@@ -1711,9 +1715,9 @@
+@@ -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
communicate.
.IP
-@@ -1721,7 +1725,7 @@
+@@ -1743,7 +1747,7 @@
machine for use with the \fB\-\-relative\fP option. For instance:
.IP
.RS
@@ -1075,7 +1108,7 @@
.RE
.IP
-@@ -1754,8 +1758,8 @@
+@@ -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.
.IP
@@ -1086,7 +1119,7 @@
.IP
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
-@@ -1764,7 +1768,7 @@
+@@ -1786,7 +1790,7 @@
.IP
.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.
.IP
-@@ -1786,10 +1790,10 @@
+@@ -1808,17 +1812,17 @@
.IP
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
-@@ -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.
-@@ -1819,7 +1823,7 @@
+@@ -1841,7 +1845,7 @@
your command. The first time it is used is a shorthand for this rule:
.IP
.RS
@@ -1126,7 +1158,7 @@
.RE
.IP
-@@ -1829,7 +1833,7 @@
+@@ -1851,7 +1855,7 @@
rule:
.IP
.RS
@@ -1135,7 +1167,7 @@
.RE
.IP
-@@ -1848,7 +1852,7 @@
+@@ -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
.IP "\fB\-\-include=PATTERN\fP"
-@@ -1861,7 +1865,7 @@
+@@ -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
.IP "\fB\-\-files\-from=FILE\fP"
-@@ -1880,7 +1884,7 @@
+@@ -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
-@@ -1891,7 +1895,7 @@
+@@ -1913,7 +1917,7 @@
.IP
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
command:
.IP
-@@ -1900,12 +1904,12 @@
+@@ -1922,12 +1926,12 @@
.RE
.IP
@@ -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
-@@ -1914,10 +1918,10 @@
+@@ -1936,10 +1940,10 @@
force the duplication of the source\-spec path (/usr in this case).
.IP
In addition, the \fB\-\-files\-from\fP file can be read from the remote host
@@ -1201,7 +1233,7 @@
.IP
.RS
\f(CW rsync \-a \-\-files\-from=:/path/file\-list src:/ /tmp/copy\fP
-@@ -1925,12 +1929,12 @@
+@@ -1947,12 +1951,12 @@
.IP
This would copy all the files specified in the /path/file\-list file that
@@ -1217,7 +1249,7 @@
.IP
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
-@@ -1940,7 +1944,7 @@
+@@ -1962,7 +1966,7 @@
.IP
.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
-@@ -1963,7 +1967,7 @@
+@@ -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
that.
.IP
-@@ -1995,9 +1999,9 @@
+@@ -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
-@@ -2025,7 +2029,7 @@
+@@ -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)
-@@ -2074,10 +2078,10 @@
+@@ -2099,10 +2103,10 @@
.RE
.IP
@@ -1270,7 +1302,7 @@
.IP
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
-@@ -2134,11 +2138,11 @@
+@@ -2172,11 +2176,11 @@
.IP
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):
.IP
.nf
-@@ -2196,8 +2200,8 @@
+@@ -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
.IP "\fB\-\-usermap=STRING, \-\-groupmap=STRING\fP"
-@@ -2207,9 +2211,9 @@
+@@ -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:
.IP
.nf
-@@ -2221,15 +2225,15 @@
+@@ -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.
.IP
@@ -1326,7 +1358,7 @@
.IP
.nf
\-\-usermap=:nobody \-\-groupmap=*:nobody
-@@ -2256,8 +2260,8 @@
+@@ -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.
.IP
@@ -1337,7 +1369,7 @@
.IP
.IP "\fB\-\-timeout=TIMEOUT\fP"
This option allows you to set a maximum I/O
-@@ -2307,18 +2311,18 @@
+@@ -2345,18 +2349,18 @@
as a single letter for the mode, and use upper or lower case.
.IP
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
-@@ -2344,7 +2348,7 @@
+@@ -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 @@
.RE
.IP
-@@ -2354,10 +2358,10 @@
+@@ -2392,10 +2396,10 @@
.IP
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 @@
.IP
The attribute that is associated with each letter is as follows:
.IP
-@@ -2373,21 +2377,21 @@
+@@ -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
-@@ -2397,8 +2401,8 @@
+@@ -2435,8 +2439,8 @@
.RE
.IP
@@ -1420,7 +1452,7 @@
you are talking to a recent enough rsync that it logs deletions instead of
outputting them as a verbose message).
.IP
-@@ -2406,10 +2410,10 @@
+@@ -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.
.IP
Specifying the \fB\-\-out\-format\fP option implies the \fB\-\-info=name\fP option,
-@@ -2419,11 +2423,11 @@
+@@ -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).
-@@ -2433,10 +2437,10 @@
+@@ -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 @@
happening:
.IP
.nf
-@@ -2452,15 +2456,15 @@
+@@ -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.
-@@ -2468,18 +2472,18 @@
+@@ -2506,27 +2510,27 @@
The current statistics are as follows:
.RS
.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
-@@ -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
-@@ -2519,8 +2523,8 @@
+@@ -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.
.RE
-@@ -2527,14 +2531,14 @@
.IP
.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
.IP "\fB\-h, \-\-human\-readable\fP"
-@@ -2556,7 +2560,7 @@
+@@ -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
.IP "\fB\-\-partial\fP"
-@@ -2577,12 +2581,12 @@
+@@ -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
(since
@@ -1569,7 +1599,7 @@
remove it again when the partial file is deleted.
.IP
If the partial\-dir value is not an absolute path, rsync will add an exclude
-@@ -2590,21 +2594,21 @@
+@@ -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 @@
.IP
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
-@@ -2617,7 +2621,7 @@
+@@ -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).
.IP
@@ -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
-@@ -2628,12 +2632,12 @@
+@@ -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.
.IP
This option uses more memory on the receiving side (one bit per file
-@@ -2645,9 +2649,9 @@
+@@ -2683,9 +2687,9 @@
the updated files will be put into a single directory if the path is
absolute)
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).
.IP
-@@ -2671,26 +2675,26 @@
+@@ -2709,26 +2713,26 @@
this.
.IP
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
.IP "\fB\-\-progress\fP"
-@@ -2699,7 +2703,7 @@
+@@ -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 @@
.IP
While rsync is transferring a regular file, it updates a progress line that
looks like this:
-@@ -2710,12 +2714,12 @@
+@@ -2748,12 +2752,12 @@
.IP
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
-@@ -2736,12 +2740,12 @@
+@@ -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.
.IP
@@ -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
list).
-@@ -2755,7 +2759,7 @@
+@@ -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
.IP "\fB\-\-password\-file=FILE\fP"
-@@ -2766,10 +2770,10 @@
+@@ -2804,10 +2808,10 @@
readable or if a root\-run rsync command finds a non\-root\-owned file.
.IP
This option does not supply a password to a remote shell transport such as
@@ -1733,7 +1763,7 @@
config file).
.IP
.IP "\fB\-\-list\-only\fP"
-@@ -2799,17 +2803,17 @@
+@@ -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.
.IP
-@@ -2818,7 +2822,7 @@
+@@ -2856,7 +2860,7 @@
.IP
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.
.IP
Due to the internal buffering of data, the \fB\-\-progress\fP option may not be an
-@@ -2829,7 +2833,7 @@
+@@ -2867,7 +2871,7 @@
.IP
.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
.IP "\fB\-\-only\-write\-batch=FILE\fP"
-@@ -2841,7 +2845,7 @@
+@@ -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
happening).
.IP
-@@ -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
.IP "\fB\-\-protocol=NUM\fP"
Force an older protocol version to be used. This
-@@ -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 @@
.IP
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
-@@ -2886,13 +2890,13 @@
remote host. See also the \fB\-\-files\-from\fP option.
.IP
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).
.IP
-@@ -2909,7 +2913,7 @@
+@@ -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
-@@ -2942,7 +2946,7 @@
+-\f(CWtime()\fP
+-\&. This
++\f(CWtime().\fP
++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
+@@ -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
.IP "\fB\-\-bwlimit=RATE\fP"
This option allows you to specify the maximum transfer
-@@ -2960,7 +2964,7 @@
+@@ -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:
.IP
-@@ -2974,7 +2978,7 @@
+@@ -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
sshd.
-@@ -2981,18 +2985,18 @@
.IP
.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
.IP "\fB\-\-sockopts\fP"
-@@ -3002,8 +3006,8 @@
+@@ -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
.IP "\fB\-4, \-\-ipv4\fP or \fB\-6, \-\-ipv6\fP"
Tells rsync to prefer IPv4/IPv6
-@@ -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).
.IP
If rsync was complied without support for IPv6, the \fB\-\-ipv6\fP option
-@@ -3049,7 +3053,7 @@
+@@ -3087,7 +3091,7 @@
.PP
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:
-@@ -3077,15 +3081,15 @@
+@@ -3115,15 +3119,15 @@
.PP
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.
-@@ -3098,8 +3102,8 @@
+@@ -3136,8 +3140,8 @@
.SH "INCLUDE/EXCLUDE PATTERN RULES"
.PP
@@ -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:
-@@ -3109,15 +3113,15 @@
+@@ -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
-@@ -3126,44 +3130,44 @@
+@@ -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 @@
.PP
.RS
\f(CW+ /some/path/this\-file\-will\-not\-be\-found\fP
-@@ -3175,11 +3179,11 @@
+@@ -3217,11 +3221,11 @@
.RE
.PP
@@ -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:
-@@ -3201,44 +3205,44 @@
+@@ -3243,44 +3247,44 @@
Here are some examples of exclude/include matching:
.PP
.IP o
@@ -2126,7 +2162,7 @@
follow.
.IP o
An \fBs\fP is used to indicate that the rule applies to the sending
-@@ -3256,7 +3260,7 @@
+@@ -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.
-@@ -3268,9 +3272,9 @@
+@@ -3310,16 +3314,16 @@
merge (.) or a dir\-merge (:) filter rule (as introduced in the FILTER RULES
section above).
.PP
@@ -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
-@@ -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 @@
below).
.PP
Some examples:
-@@ -3306,12 +3310,12 @@
+@@ -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
-@@ -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
-@@ -3334,22 +3338,22 @@
+@@ -3376,22 +3380,22 @@
.PP
Per\-directory rules are inherited in all subdirectories of the directory
@@ -2222,7 +2256,7 @@
.PP
.RS
\f(CWmerge /home/user/.global\-filter\fP
-@@ -3366,7 +3370,7 @@
+@@ -3408,7 +3412,7 @@
.PP
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).
-@@ -3377,7 +3381,7 @@
+@@ -3419,7 +3423,7 @@
per\-directory file. For instance, here is a common filter (see \fB\-F\fP):
.PP
.RS
@@ -2240,7 +2274,7 @@
.RE
.PP
-@@ -3385,7 +3389,7 @@
+@@ -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 @@
.PP
Some examples of this pre\-scanning for per\-directory files:
.PP
-@@ -3392,31 +3396,31 @@
.RS
\f(CWrsync \-avF /src/path/ /dest/dir\fP
.br
@@ -2291,7 +2324,7 @@
.br
\f(CW+ foo.o\fP
.br
-@@ -3426,7 +3430,7 @@
+@@ -3468,7 +3472,7 @@
.br
\f(CWEOT\fP
.br
@@ -2300,7 +2333,7 @@
.br
.RE
-@@ -3437,25 +3441,25 @@
+@@ -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.
-@@ -3466,8 +3470,8 @@
+@@ -3508,8 +3512,8 @@
changing how much of the file tree is duplicated on the destination
host). The following examples demonstrate this.
.PP
@@ -2344,7 +2377,7 @@
Here is how the various command choices differ for a 2\-source transfer:
.PP
.RS
-@@ -3487,9 +3491,9 @@
+@@ -3529,9 +3533,9 @@
.RS
Example cmd: rsync \-a /home/me/ /home/you/ /dest
.br
@@ -2356,7 +2389,7 @@
.br
Target file: /dest/foo/bar
.br
-@@ -3528,7 +3532,7 @@
+@@ -3570,26 +3574,26 @@
.PP
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 @@
.PP
.SH "PER\-DIRECTORY RULES AND DELETE"
-@@ -3535,19 +3539,19 @@
.PP
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
-@@ -3558,14 +3562,14 @@
+@@ -3600,14 +3604,14 @@
.RE
.PP
@@ -2407,7 +2439,7 @@
\-\-delete host:src/dir /dest
.fi
-@@ -3578,12 +3582,12 @@
+@@ -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
.fi
-@@ -3599,7 +3603,7 @@
+@@ -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.
.PP
Generating the batch file once saves having to perform the file
-@@ -3614,7 +3618,7 @@
+@@ -3656,7 +3660,7 @@
using the information stored in the batch file.
.PP
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
-@@ -3643,25 +3647,25 @@
+@@ -3685,25 +3689,25 @@
.PP
In these examples, rsync is used to update /adest/dir/ from /source/dir/
@@ -2472,7 +2504,7 @@
.PP
Caveats:
-@@ -3674,7 +3678,7 @@
+@@ -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
-@@ -3690,7 +3694,7 @@
+@@ -3732,7 +3736,7 @@
older than that with newer versions will not work.)
.PP
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
-@@ -3698,13 +3702,13 @@
+@@ -3740,13 +3744,13 @@
one of the \fB\-\-delete\fP options is specified.
.PP
The code that creates the BATCH.sh file transforms any filter/include/exclude
@@ -2506,7 +2538,7 @@
version uses a new implementation.
.PP
.SH "SYMBOLIC LINKS"
-@@ -3714,16 +3718,16 @@
+@@ -3756,16 +3760,16 @@
link in the source directory.
.PP
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
-@@ -3733,11 +3737,11 @@
+@@ -3775,11 +3779,11 @@
\fB\-\-links\fP for \fB\-\-safe\-links\fP to have any effect.)
.PP
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:
.PP
.IP "\fB\-\-copy\-links\fP"
-@@ -3763,8 +3767,8 @@
+@@ -3805,8 +3809,8 @@
.PP
rsync occasionally produces error messages that may seem a little
@@ -2552,7 +2584,7 @@
.PP
This message is usually caused by your startup scripts or remote shell
facility producing unwanted garbage on the stream that rsync is using
-@@ -3864,13 +3868,13 @@
+@@ -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.
.PP
-@@ -3945,7 +3949,7 @@
+@@ -3987,7 +3991,7 @@
gone\-but\-not\-forgotten compadre, J.W. Schultz.
.PP
Thanks also to Richard Brent, Brendan Mackay, Bill Waite, Stephen Rothwell