./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/errcode.h b/errcode.h
--- a/errcode.h
+++ b/errcode.h
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
-@@ -445,6 +445,19 @@ the values of parameters. See the GLOBAL PARAMETERS section for more details.
+@@ -449,6 +449,19 @@ the values of parameters. See the GLOBAL PARAMETERS section for more details.
the max connections limit is not exceeded for the modules sharing the lock
file. The default is `/var/run/rsyncd.lock`.
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
-@@ -450,13 +450,15 @@ the values of parameters. See the GLOBAL PARAMETERS section for more details.
+@@ -454,13 +454,15 @@ the values of parameters. See the GLOBAL PARAMETERS section for more details.
This parameter tells rsync to make use of any cached checksum information
it finds in per-directory .rsyncsums files when the current transfer is
using the `--checksum` option. The value can be set to either "lax",
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
--compress, -z compress file data during the transfer
--compress-choice=STR choose the compression algorithm (aka --zc)
--compress-level=NUM explicitly set compression level (aka --zl)
-@@ -2667,6 +2668,18 @@ expand it.
+@@ -2665,6 +2666,18 @@ expand it.
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
old rsync.
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/daemon-parm.txt b/daemon-parm.txt
--- a/daemon-parm.txt
+++ b/daemon-parm.txt
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
./configure
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -2599,6 +2601,20 @@ expand it.
+@@ -2597,6 +2599,20 @@ expand it.
otential alternate-basis files will be removed as the transfer progresses.
This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
a file that can't use it, while missing out on giving it to a file
that could use it.
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/backup.c b/backup.c
--- a/backup.c
+++ b/backup.c
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -2582,6 +2583,22 @@ expand it.
+@@ -2580,6 +2581,22 @@ expand it.
potential fuzzy-match files, so either use [`--delete-after`](#opt) or
specify some filename exclusions if you need to prevent this.
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
--prune-empty-dirs, -m prune empty directory chains from file-list
--numeric-ids don't map uid/gid values by user/group name
--usermap=STRING custom username mapping
-@@ -3380,6 +3381,17 @@ expand it.
+@@ -3378,6 +3379,17 @@ expand it.
update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
and a parallel hierarchy of files).
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
0. `--chmod=CHMOD`
This option tells rsync to apply one or more comma-separated "chmod" modes
-@@ -1969,8 +2005,8 @@ expand it.
+@@ -1967,8 +2003,8 @@ expand it.
[`--ignore-missing-args`](#opt) option a step farther: each missing arg
will become a deletion request of the corresponding destination file on the
receiving side (should it exist). If the destination file is a non-empty
independent of any other type of delete processing.
The missing source files are represented by special file-list entries which
-@@ -1981,14 +2017,14 @@ expand it.
+@@ -1979,14 +2015,14 @@ expand it.
Tells [`--delete`](#opt) to go ahead and delete files even when there are
I/O errors.
[`--recursive`](#opt) option was also enabled.
0. `--max-delete=NUM`
-@@ -3046,7 +3082,7 @@ expand it.
+@@ -3044,7 +3080,7 @@ expand it.
also turns on the output of other verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
See the [`--perms`](#opt) and [`--executability`](#opt) options for how the
resulting permission value can be applied to the files in the transfer.
-@@ -2980,6 +2982,10 @@ expand it.
+@@ -2978,6 +2980,10 @@ expand it.
An older rsync client may need to use [`-s`](#opt) to avoid a complaint
about wildcard characters, but a modern rsync handles this automatically.
0. `--timeout=SECONDS`
This option allows you to set a maximum I/O timeout in seconds. If no data
-@@ -4130,6 +4136,15 @@ The following modifiers are accepted after an include (+) or exclude (-) rule:
+@@ -4128,6 +4134,15 @@ The following modifiers are accepted after an include (+) or exclude (-) rule:
like "CVS" and "`*.o`" are marked as perishable, and will not prevent a
directory that was removed on the source from being deleted on the
destination.
- An `x` indicates that a rule affects xattr names in xattr copy/delete
operations (and is thus ignored when matching file/dir names). If no
xattr-matching rules are specified, a default xattr filtering rule is used
-@@ -4187,6 +4202,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -4185,6 +4200,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
rules in the file must not specify sides (via a modifier or a rule prefix
such as `hide`).
- Make this code handle multibyte character encodings, and honor the
--iconv setting when converting case.
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
-@@ -2530,6 +2531,12 @@ expand it.
+@@ -2528,6 +2529,12 @@ expand it.
> sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
./configure
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
./configure
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
#ifdef SUPPORT_XXHASH
static XXH64_state_t* xxh64_state;
#endif
-@@ -593,6 +595,8 @@ int sum_init(struct name_num_item *nni, int seed)
+@@ -596,6 +598,8 @@ int sum_init(struct name_num_item *nni, int seed)
#endif
case CSUM_MD5:
md5_begin(&ctx_md);
break;
case CSUM_MD4:
mdfour_begin(&ctx_md);
-@@ -646,6 +650,8 @@ void sum_update(const char *p, int32 len)
+@@ -642,6 +646,8 @@ void sum_update(const char *p, int32 len)
#endif
case CSUM_MD5:
md5_update(&ctx_md, (uchar *)p, len);
break;
case CSUM_MD4:
case CSUM_MD4_OLD:
-@@ -712,6 +718,8 @@ void sum_end(char *sum)
+@@ -708,6 +714,8 @@ void sum_end(char *sum)
#endif
case CSUM_MD5:
md5_result(&ctx_md, (uchar *)sum);
--compress, -z compress file data during the transfer
--compress-choice=STR choose the compression algorithm (aka --zc)
--compress-level=NUM explicitly set compression level (aka --zl)
-@@ -2667,6 +2668,50 @@ expand it.
+@@ -2665,6 +2666,50 @@ expand it.
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
old rsync.
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
-@@ -380,6 +380,23 @@ the values of parameters. See the GLOBAL PARAMETERS section for more details.
+@@ -384,6 +384,23 @@ the values of parameters. See the GLOBAL PARAMETERS section for more details.
is 0, which means no limit. A negative value disables the module. See
also the "[lock file](#)" parameter.
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
## MODULE PARAMETERS
After the global parameters you should define a number of modules, each module
-@@ -1200,6 +1215,7 @@ A more sophisticated example would be:
+@@ -1204,6 +1219,7 @@ A more sophisticated example would be:
> max connections = 4
> syslog facility = local5
> pid file = /var/run/rsyncd.pid
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/syscall.c b/syscall.c
--- a/syscall.c
+++ b/syscall.c
-- Matt McCutchen <hashproduct@gmail.com>
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
--del an alias for --delete-during
--delete delete extraneous files from dest dirs
--delete-before receiver deletes before xfer, not during
-@@ -1843,6 +1844,17 @@ expand it.
+@@ -1841,6 +1842,17 @@ expand it.
not remove a file the receiver just verified, such as when the user
accidentally makes the source and destination directory the same path.
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filenames
--checksum-seed=NUM set block/file checksum seed (advanced)
-@@ -3656,6 +3659,36 @@ expand it.
+@@ -3654,6 +3657,36 @@ expand it.
[`--write-batch`](#opt). If _FILE_ is `-`, the batch data will be read
from standard input. See the "BATCH MODE" section for details.
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/fileio.c b/fileio.c
--- a/fileio.c
+++ b/fileio.c
./configure (optional if already run)
make
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: ed4b3448be243b1bdb30a5da811f1e217f5a0601
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
--checksum-seed=NUM set block/file checksum seed (advanced)
--ipv4, -4 prefer IPv4
--ipv6, -6 prefer IPv6
-@@ -3698,6 +3699,22 @@ expand it.
+@@ -3696,6 +3697,22 @@ expand it.
free to specify just the local charset for a daemon transfer (e.g.
`--iconv=utf8`).