--- a/components/rsync/patches/rsync.1.patch Thu Jan 14 09:13:01 2016 +0100
+++ b/components/rsync/patches/rsync.1.patch Mon Jan 18 07:29:54 2016 -0800
@@ -2,8 +2,10 @@
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.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
+Add information about rsync not supporting NFSv4 ACLs.
+
+--- rsync-3.1.1/rsync.1.orig 2016-01-18 06:37:45.403381738 -0800
++++ rsync-3.1.1/rsync.1 2016-01-20 11:02:51.388263060 -0800
@@ -35,11 +35,11 @@
destination. Rsync is widely used for backups and mirroring and as an
improved copy command for everyday use.
@@ -790,7 +792,16 @@
.RE
.IP
-@@ -1265,19 +1269,19 @@
+@@ -1253,6 +1257,8 @@
+ The source and destination systems must have compatible ACL entries for this
+ option to work properly. See the \fB\-\-fake\-super\fP option for a way to backup
+ and restore ACLs that are not compatible.
++.IP
++Note, that rsync does not support NFSv4 ACLs.
+ .IP
+ .IP "\fB\-X, \-\-xattrs\fP"
+ This option causes rsync to update the destination
+@@ -1265,19 +1271,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
@@ -814,7 +825,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:
-@@ -1344,8 +1348,8 @@
+@@ -1344,8 +1350,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
@@ -825,7 +836,7 @@
.IP
.IP "\fB\-O, \-\-omit\-dir\-times\fP"
This tells rsync to omit directories when
-@@ -1360,7 +1364,7 @@
+@@ -1360,7 +1366,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
@@ -834,7 +845,7 @@
option can help when someone wants to avoid these partially\-finished
directories.
.IP
-@@ -1370,12 +1374,12 @@
+@@ -1370,12 +1376,12 @@
.IP
.IP "\fB\-\-super\fP"
This tells the receiving side to attempt super\-user
@@ -850,7 +861,7 @@
being run as the super\-user. To turn off super\-user activities, the
super\-user can use \fB\-\-no\-super\fP.
.IP
-@@ -1383,10 +1387,10 @@
+@@ -1383,10 +1389,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
@@ -864,7 +875,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
-@@ -1412,18 +1416,18 @@
+@@ -1412,18 +1418,18 @@
.IP
This option is overridden by both \fB\-\-super\fP and \fB\-\-no\-super\fP.
.IP
@@ -887,7 +898,7 @@
glibc implementation that writes a zero byte into each block.
.IP
Without this option, larger files may not be entirely contiguous on the
-@@ -1432,7 +1436,7 @@
+@@ -1432,7 +1438,7 @@
etc.), this option may have no positive effect at all.
.IP
.IP "\fB\-n, \-\-dry\-run\fP"
@@ -896,7 +907,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
-@@ -1440,29 +1444,29 @@
+@@ -1440,29 +1446,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
@@ -934,7 +945,7 @@
same filesystem.
.IP
If this option is repeated, rsync omits all mount\-point directories from
-@@ -1482,8 +1486,8 @@
+@@ -1482,8 +1488,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
@@ -945,7 +956,7 @@
It just limits the files that the receiver requests to be transferred.
.IP
.IP "\fB\-\-ignore\-existing\fP"
-@@ -1491,15 +1495,15 @@
+@@ -1491,15 +1497,15 @@
already exist on the destination (this does \fInot\fP ignore existing
directories, or nothing would get done). See also \fB\-\-existing\fP.
.IP
@@ -964,7 +975,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
-@@ -1511,24 +1515,24 @@
+@@ -1511,24 +1517,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
@@ -999,7 +1010,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).
-@@ -1585,7 +1589,7 @@
+@@ -1585,7 +1591,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
@@ -1008,7 +1019,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).
-@@ -1627,7 +1631,7 @@
+@@ -1627,7 +1633,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
@@ -1017,7 +1028,7 @@
.IP
.IP "\fB\-\-ignore\-errors\fP"
Tells \fB\-\-delete\fP to go ahead and delete files
-@@ -1651,27 +1655,27 @@
+@@ -1651,27 +1657,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.
@@ -1055,7 +1066,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
-@@ -1689,7 +1693,7 @@
+@@ -1689,7 +1695,7 @@
.IP
.IP "\fB\-B, \-\-block\-size=BLOCKSIZE\fP"
This forces the block size used in
@@ -1064,7 +1075,7 @@
the size of each file being updated. See the technical report for details.
.IP
.IP "\fB\-e, \-\-rsh=COMMAND\fP"
-@@ -1702,8 +1706,8 @@
+@@ -1702,8 +1708,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
@@ -1075,7 +1086,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
-@@ -1715,9 +1719,9 @@
+@@ -1715,9 +1721,9 @@
shell is parsing and which quotes rsync is parsing). Some examples:
.IP
.RS
@@ -1087,7 +1098,7 @@
.br
.RE
-@@ -1733,9 +1737,9 @@
+@@ -1733,9 +1739,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
@@ -1099,7 +1110,7 @@
not corrupt the standard\-in & standard\-out that rsync is using to
communicate.
.IP
-@@ -1743,7 +1747,7 @@
+@@ -1743,7 +1749,7 @@
machine for use with the \fB\-\-relative\fP option. For instance:
.IP
.RS
@@ -1108,7 +1119,7 @@
.RE
.IP
-@@ -1776,8 +1780,8 @@
+@@ -1776,8 +1782,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
@@ -1119,7 +1130,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
-@@ -1786,7 +1790,7 @@
+@@ -1786,7 +1792,7 @@
.IP
.IP "\fB\-C, \-\-cvs\-exclude\fP"
This is a useful shorthand for excluding a
@@ -1128,7 +1139,7 @@
systems. It uses a similar algorithm to CVS to determine if
a file should be ignored.
.IP
-@@ -1808,17 +1812,17 @@
+@@ -1808,17 +1814,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
@@ -1149,7 +1160,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.
-@@ -1841,7 +1845,7 @@
+@@ -1841,7 +1847,7 @@
your command. The first time it is used is a shorthand for this rule:
.IP
.RS
@@ -1158,7 +1169,7 @@
.RE
.IP
-@@ -1851,7 +1855,7 @@
+@@ -1851,7 +1857,7 @@
rule:
.IP
.RS
@@ -1167,7 +1178,7 @@
.RE
.IP
-@@ -1870,7 +1874,7 @@
+@@ -1870,7 +1876,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).
@@ -1176,7 +1187,7 @@
If \fIFILE\fP is \fB\-\fP, the list will be read from standard input.
.IP
.IP "\fB\-\-include=PATTERN\fP"
-@@ -1883,7 +1887,7 @@
+@@ -1883,7 +1889,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).
@@ -1185,7 +1196,7 @@
If \fIFILE\fP is \fB\-\fP, the list will be read from standard input.
.IP
.IP "\fB\-\-files\-from=FILE\fP"
-@@ -1902,7 +1906,7 @@
+@@ -1902,7 +1908,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
@@ -1194,7 +1205,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
-@@ -1913,7 +1917,7 @@
+@@ -1913,7 +1919,7 @@
.IP
The filenames that are read from the FILE are all relative to the
@@ -1203,7 +1214,7 @@
allowed to go higher than the source dir. For example, take this
command:
.IP
-@@ -1922,12 +1926,12 @@
+@@ -1922,12 +1928,12 @@
.RE
.IP
@@ -1219,7 +1230,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
-@@ -1936,10 +1940,10 @@
+@@ -1936,10 +1942,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
@@ -1233,7 +1244,7 @@
.IP
.RS
\f(CW rsync \-a \-\-files\-from=:/path/file\-list src:/ /tmp/copy\fP
-@@ -1947,12 +1951,12 @@
+@@ -1947,12 +1953,12 @@
.IP
This would copy all the files specified in the /path/file\-list file that
@@ -1249,7 +1260,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
-@@ -1962,7 +1966,7 @@
+@@ -1962,7 +1968,7 @@
.IP
.IP "\fB\-0, \-\-from0\fP"
This tells rsync that the rules/filenames it reads from a
@@ -1258,7 +1269,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
-@@ -1985,7 +1989,7 @@
+@@ -1985,7 +1991,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).
@@ -1267,7 +1278,7 @@
disabled if you ever need to interact with a remote rsync that is older than
that.
.IP
-@@ -2020,9 +2024,9 @@
+@@ -2020,9 +2026,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
@@ -1279,7 +1290,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
-@@ -2050,7 +2054,7 @@
+@@ -2050,7 +2056,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
@@ -1288,7 +1299,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)
-@@ -2099,10 +2103,10 @@
+@@ -2099,10 +2105,10 @@
.RE
.IP
@@ -1302,7 +1313,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
-@@ -2172,11 +2176,11 @@
+@@ -2172,11 +2178,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
@@ -1316,7 +1327,7 @@
matches 2 suffixes):
.IP
.nf
-@@ -2234,8 +2238,8 @@
+@@ -2234,8 +2240,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
@@ -1327,7 +1338,7 @@
users and groups and what you can do about it.
.IP
.IP "\fB\-\-usermap=STRING, \-\-groupmap=STRING\fP"
-@@ -2245,9 +2249,9 @@
+@@ -2245,9 +2251,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
@@ -1339,7 +1350,7 @@
numbers via an inclusive range: LOW\-HIGH. For example:
.IP
.nf
-@@ -2259,15 +2263,15 @@
+@@ -2259,15 +2265,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
@@ -1358,7 +1369,7 @@
.IP
.nf
\-\-usermap=:nobody \-\-groupmap=*:nobody
-@@ -2294,8 +2298,8 @@
+@@ -2294,8 +2300,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
@@ -1369,7 +1380,7 @@
.IP
.IP "\fB\-\-timeout=TIMEOUT\fP"
This option allows you to set a maximum I/O
-@@ -2345,18 +2349,18 @@
+@@ -2345,18 +2351,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
@@ -1391,7 +1402,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
-@@ -2382,7 +2386,7 @@
+@@ -2382,7 +2388,7 @@
have attributes that are being modified).
.IP o
A \fB*\fP means that the rest of the itemized\-output area contains
@@ -1400,7 +1411,7 @@
.RE
.IP
-@@ -2392,10 +2396,10 @@
+@@ -2392,10 +2398,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
@@ -1414,7 +1425,7 @@
.IP
The attribute that is associated with each letter is as follows:
.IP
-@@ -2411,21 +2415,21 @@
+@@ -2411,21 +2417,21 @@
by the file transfer.
.IP o
A \fBt\fP means the modification time is different and is being updated
@@ -1441,7 +1452,7 @@
.IP o
The \fBu\fP slot is reserved for future use.
.IP o
-@@ -2435,8 +2439,8 @@
+@@ -2435,8 +2441,8 @@
.RE
.IP
@@ -1452,7 +1463,7 @@
you are talking to a recent enough rsync that it logs deletions instead of
outputting them as a verbose message).
.IP
-@@ -2444,10 +2448,10 @@
+@@ -2444,10 +2450,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
@@ -1465,7 +1476,7 @@
rsyncd.conf manpage.
.IP
Specifying the \fB\-\-out\-format\fP option implies the \fB\-\-info=name\fP option,
-@@ -2457,11 +2461,11 @@
+@@ -2457,11 +2463,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
@@ -1480,7 +1491,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).
-@@ -2471,10 +2475,10 @@
+@@ -2471,10 +2477,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
@@ -1493,7 +1504,7 @@
happening:
.IP
.nf
-@@ -2490,15 +2494,15 @@
+@@ -2490,15 +2496,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.
@@ -1512,7 +1523,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.
-@@ -2506,27 +2510,27 @@
+@@ -2506,27 +2512,27 @@
The current statistics are as follows:
.RS
.IP o
@@ -1546,7 +1557,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
-@@ -2557,22 +2561,22 @@
+@@ -2557,22 +2563,22 @@
from the client side to the server side.
.IP o
\fBTotal bytes received\fP is the count of all non\-message bytes that
@@ -1574,7 +1585,7 @@
escaped unless it is followed by a hash and 3 digits (0\-9).
.IP
.IP "\fB\-h, \-\-human\-readable\fP"
-@@ -2594,7 +2598,7 @@
+@@ -2594,7 +2600,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
@@ -1583,7 +1594,7 @@
options. See the \fB\-\-list\-only\fP option for one difference.
.IP
.IP "\fB\-\-partial\fP"
-@@ -2615,12 +2619,12 @@
+@@ -2615,12 +2621,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
@@ -1599,7 +1610,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
-@@ -2628,21 +2632,21 @@
+@@ -2628,21 +2634,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
@@ -1627,7 +1638,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
-@@ -2655,7 +2659,7 @@
+@@ -2655,7 +2661,7 @@
specified (since \fB\-\-inplace\fP conflicts with \fB\-\-partial\-dir\fP), and (2) when
\fB\-\-delay\-updates\fP was specified (see below).
.IP
@@ -1636,7 +1647,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
-@@ -2666,12 +2670,12 @@
+@@ -2666,12 +2672,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
@@ -1653,7 +1664,7 @@
Conflicts with \fB\-\-inplace\fP and \fB\-\-append\fP.
.IP
This option uses more memory on the receiving side (one bit per file
-@@ -2683,9 +2687,9 @@
+@@ -2683,9 +2689,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
@@ -1665,7 +1676,7 @@
update algorithm that is even more atomic (it uses \fB\-\-link\-dest\fP and a
parallel hierarchy of files).
.IP
-@@ -2709,26 +2713,26 @@
+@@ -2709,26 +2715,26 @@
this.
.IP
You can prevent the pruning of certain empty directories from the file\-list
@@ -1699,7 +1710,7 @@
in place of the hide\-filter (if that is more natural to you).
.IP
.IP "\fB\-\-progress\fP"
-@@ -2737,7 +2741,7 @@
+@@ -2737,7 +2743,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
@@ -1708,7 +1719,7 @@
.IP
While rsync is transferring a regular file, it updates a progress line that
looks like this:
-@@ -2748,12 +2752,12 @@
+@@ -2748,12 +2754,12 @@
.IP
In this example, the receiver has reconstructed 782448 bytes or 63% of the
@@ -1724,7 +1735,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
-@@ -2774,12 +2778,12 @@
+@@ -2774,12 +2780,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
@@ -1741,7 +1752,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).
-@@ -2793,7 +2797,7 @@
+@@ -2793,7 +2799,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
@@ -1750,7 +1761,7 @@
order to use \fB\-\-info=progress2\fP.)
.IP
.IP "\fB\-\-password\-file=FILE\fP"
-@@ -2804,10 +2808,10 @@
+@@ -2804,10 +2810,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
@@ -1763,7 +1774,7 @@
config file).
.IP
.IP "\fB\-\-list\-only\fP"
-@@ -2837,17 +2841,17 @@
+@@ -2837,17 +2843,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
@@ -1787,7 +1798,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
-@@ -2856,7 +2860,7 @@
+@@ -2856,7 +2862,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
@@ -1796,7 +1807,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
-@@ -2867,7 +2871,7 @@
+@@ -2867,7 +2873,7 @@
.IP
.IP "\fB\-\-write\-batch=FILE\fP"
Record a file that can later be applied to
@@ -1805,7 +1816,7 @@
section for details, and also the \fB\-\-only\-write\-batch\fP option.
.IP
.IP "\fB\-\-only\-write\-batch=FILE\fP"
-@@ -2879,58 +2883,58 @@
+@@ -2879,58 +2885,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
@@ -1875,7 +1886,7 @@
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
-@@ -2947,10 +2951,10 @@
+@@ -2947,10 +2953,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
@@ -1889,7 +1900,7 @@
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 @@
+@@ -2980,7 +2986,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.
@@ -1898,7 +1909,7 @@
.IP
.IP "\fB\-\-bwlimit=RATE\fP"
This option allows you to specify the maximum transfer
-@@ -2998,7 +3002,7 @@
+@@ -2998,7 +3004,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
@@ -1907,7 +1918,7 @@
definition. The parameter names can be specified without spaces, if you so
desire. For instance:
.IP
-@@ -3012,25 +3016,25 @@
+@@ -3012,25 +3018,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
@@ -1938,7 +1949,7 @@
case transfer logging is turned off.
.IP
.IP "\fB\-\-sockopts\fP"
-@@ -3040,15 +3044,15 @@
+@@ -3040,15 +3046,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
@@ -1957,7 +1968,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
-@@ -3087,7 +3091,7 @@
+@@ -3087,7 +3093,7 @@
.PP
You have your choice of using either short or long RULE names, as described
@@ -1966,7 +1977,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:
-@@ -3115,15 +3119,15 @@
+@@ -3115,15 +3121,15 @@
.PP
When rules are being read from a file, empty lines are ignored, as are
@@ -1986,7 +1997,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.
-@@ -3136,8 +3140,8 @@
+@@ -3136,8 +3142,8 @@
.SH "INCLUDE/EXCLUDE PATTERN RULES"
.PP
@@ -1997,7 +2008,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:
-@@ -3147,15 +3151,15 @@
+@@ -3147,15 +3153,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.
@@ -2019,7 +2030,7 @@
a full discussion of how to specify a pattern that matches at the root
of the transfer.
.IP o
-@@ -3164,48 +3168,48 @@
+@@ -3164,48 +3170,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
@@ -2086,7 +2097,7 @@
.PP
.RS
\f(CW+ /some/path/this\-file\-will\-not\-be\-found\fP
-@@ -3217,11 +3221,11 @@
+@@ -3217,11 +3223,11 @@
.RE
.PP
@@ -2102,7 +2113,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:
-@@ -3243,44 +3247,44 @@
+@@ -3243,44 +3249,44 @@
Here are some examples of exclude/include matching:
.PP
.IP o
@@ -2162,7 +2173,7 @@
follow.
.IP o
An \fBs\fP is used to indicate that the rule applies to the sending
-@@ -3298,7 +3302,7 @@
+@@ -3298,7 +3304,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
@@ -2171,7 +2182,7 @@
marked as perishable, and will not prevent a directory that was removed
on the source from being deleted on the destination.
-@@ -3310,16 +3314,16 @@
+@@ -3310,16 +3316,16 @@
merge (.) or a dir\-merge (:) filter rule (as introduced in the FILTER RULES
section above).
.PP
@@ -2192,7 +2203,7 @@
below).
.PP
Some examples:
-@@ -3348,27 +3352,27 @@
+@@ -3348,27 +3354,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
@@ -2227,7 +2238,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
-@@ -3376,22 +3380,22 @@
+@@ -3376,22 +3382,22 @@
.PP
Per\-directory rules are inherited in all subdirectories of the directory
@@ -2256,7 +2267,7 @@
.PP
.RS
\f(CWmerge /home/user/.global\-filter\fP
-@@ -3408,7 +3412,7 @@
+@@ -3408,7 +3414,7 @@
.PP
This will merge the contents of the /home/user/.global\-filter file at the
@@ -2265,7 +2276,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).
-@@ -3419,7 +3423,7 @@
+@@ -3419,7 +3425,7 @@
per\-directory file. For instance, here is a common filter (see \fB\-F\fP):
.PP
.RS
@@ -2274,7 +2285,7 @@
.RE
.PP
-@@ -3427,38 +3431,38 @@
+@@ -3427,38 +3433,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
@@ -2324,7 +2335,7 @@
.br
\f(CW+ foo.o\fP
.br
-@@ -3468,7 +3472,7 @@
+@@ -3468,7 +3474,7 @@
.br
\f(CWEOT\fP
.br
@@ -2333,7 +2344,7 @@
.br
.RE
-@@ -3479,25 +3483,25 @@
+@@ -3479,25 +3485,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
@@ -2366,7 +2377,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.
-@@ -3508,8 +3512,8 @@
+@@ -3508,8 +3514,8 @@
changing how much of the file tree is duplicated on the destination
host). The following examples demonstrate this.
.PP
@@ -2377,7 +2388,7 @@
Here is how the various command choices differ for a 2\-source transfer:
.PP
.RS
-@@ -3529,9 +3533,9 @@
+@@ -3529,9 +3535,9 @@
.RS
Example cmd: rsync \-a /home/me/ /home/you/ /dest
.br
@@ -2389,7 +2400,7 @@
.br
Target file: /dest/foo/bar
.br
-@@ -3570,26 +3574,26 @@
+@@ -3570,26 +3576,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
@@ -2421,7 +2432,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
-@@ -3600,14 +3604,14 @@
+@@ -3600,14 +3606,14 @@
.RE
.PP
@@ -2439,7 +2450,7 @@
\-\-delete host:src/dir /dest
.fi
-@@ -3620,12 +3624,12 @@
+@@ -3620,12 +3626,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
@@ -2454,7 +2465,7 @@
host:src/dir /dest
rsync \-avFF \-\-delete host:src/dir /dest
.fi
-@@ -3641,7 +3645,7 @@
+@@ -3641,7 +3647,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
@@ -2463,7 +2474,7 @@
this operation against other, identical destination trees.
.PP
Generating the batch file once saves having to perform the file
-@@ -3656,7 +3660,7 @@
+@@ -3656,7 +3662,7 @@
using the information stored in the batch file.
.PP
For your convenience, a script file is also created when the write\-batch
@@ -2472,7 +2483,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
-@@ -3685,25 +3689,25 @@
+@@ -3685,25 +3691,25 @@
.PP
In these examples, rsync is used to update /adest/dir/ from /source/dir/
@@ -2504,7 +2515,7 @@
.PP
Caveats:
-@@ -3716,7 +3720,7 @@
+@@ -3716,7 +3722,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
@@ -2513,7 +2524,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
-@@ -3732,7 +3736,7 @@
+@@ -3732,7 +3738,7 @@
older than that with newer versions will not work.)
.PP
When reading a batch file, rsync will force the value of certain options
@@ -2522,7 +2533,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
-@@ -3740,13 +3744,13 @@
+@@ -3740,13 +3746,13 @@
one of the \fB\-\-delete\fP options is specified.
.PP
The code that creates the BATCH.sh file transforms any filter/include/exclude
@@ -2538,7 +2549,7 @@
version uses a new implementation.
.PP
.SH "SYMBOLIC LINKS"
-@@ -3756,16 +3760,16 @@
+@@ -3756,16 +3762,16 @@
link in the source directory.
.PP
By default, symbolic links are not transferred at all. A message
@@ -2558,7 +2569,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
-@@ -3775,11 +3779,11 @@
+@@ -3775,11 +3781,11 @@
\fB\-\-links\fP for \fB\-\-safe\-links\fP to have any effect.)
.PP
Symbolic links are considered unsafe if they are absolute symlinks
@@ -2573,7 +2584,7 @@
use the first line that is a complete subset of your options:
.PP
.IP "\fB\-\-copy\-links\fP"
-@@ -3805,8 +3809,8 @@
+@@ -3805,8 +3811,8 @@
.PP
rsync occasionally produces error messages that may seem a little
@@ -2584,7 +2595,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
-@@ -3906,13 +3910,13 @@
+@@ -3906,13 +3912,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,
@@ -2601,7 +2612,16 @@
default .cvsignore file.
.PP
-@@ -3987,7 +3991,7 @@
+@@ -3924,7 +3930,7 @@
+ .SH "SEE ALSO"
+
+ .PP
+-\fBrsyncd.conf\fP(5)
++\fBrsyncd.conf\fP(5), \fBacl\fP(5)
+ .PP
+ .SH "BUGS"
+
+@@ -3987,7 +3993,7 @@
gone\-but\-not\-forgotten compadre, J.W. Schultz.
.PP
Thanks also to Richard Brent, Brendan Mackay, Bill Waite, Stephen Rothwell