From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 28 Jun 2020 04:23:41 +0000 (-0700)
Subject: The patches for 3.2.2pre1.
X-Git-Tag: v3.2.2pre1^0
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=05fb1c60fa485359322c6740cfd4ce388cd76350;p=rsync.git%2Fpatches.git

The patches for 3.2.2pre1.
---

diff --git a/acls.diff b/acls.diff
index dfc9308..ba0b2f5 100644
--- a/acls.diff
+++ b/acls.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/acls.c b/acls.c
 --- a/acls.c
 +++ b/acls.c
@@ -322,7 +322,7 @@ diff --git a/acls.c b/acls.c
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -579,6 +579,13 @@ void setup_protocol(int f_out,int f_in)
+@@ -627,6 +627,13 @@ void setup_protocol(int f_out,int f_in)
  				protocol_version);
  			exit_cleanup(RERR_PROTOCOL);
  		}
diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index 4095765..c5012b0 100644
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -24,7 +24,7 @@ Todo:
 Fix a bug that could lose some bits when stripping some (supposedly)
 superfluous ACL info.
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/lib/sysacls.c b/lib/sysacls.c
 --- a/lib/sysacls.c
 +++ b/lib/sysacls.c
diff --git a/backup-deleted.diff b/backup-deleted.diff
index f04fd49..f03a7c7 100644
--- a/backup-deleted.diff
+++ b/backup-deleted.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 773e304..6fdd719 100644
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
diff --git a/checksum-reading.diff b/checksum-reading.diff
index 55ef6af..561c235 100644
--- a/checksum-reading.diff
+++ b/checksum-reading.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index a0e0ffe..3986ec8 100644
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
diff --git a/clone-dest.diff b/clone-dest.diff
index 71d744e..21c8f35 100644
--- a/clone-dest.diff
+++ b/clone-dest.diff
@@ -13,7 +13,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 3a6f06003cdd29e9385dba3a9673122e0e356c76
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -131,7 +131,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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)
-@@ -2287,6 +2288,17 @@ your home directory (remove the '=' for that).
+@@ -2284,6 +2285,17 @@ your home directory (remove the '=' for that).
      specified (or implied by `-a`).  You can work-around this bug by avoiding
      the `-o` option when sending to an old rsync.
  
@@ -225,7 +225,7 @@ diff --git a/syscall.c b/syscall.c
 diff --git a/t_stub.c b/t_stub.c
 --- a/t_stub.c
 +++ b/t_stub.c
-@@ -37,6 +37,7 @@ size_t max_alloc = 1024*1024*1024;
+@@ -37,6 +37,7 @@ size_t max_alloc = 1024*1024*1024; /* max_alloc is needed when combined with uti
  char *partial_dir;
  char *module_dir;
  filter_rule_list daemon_filter_list;
diff --git a/congestion.diff b/congestion.diff
index a467e08..e0b7dc4 100644
--- a/congestion.diff
+++ b/congestion.diff
@@ -27,7 +27,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
diff --git a/copy-devices.diff b/copy-devices.diff
index 2c8bb11..6a0d202 100644
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
diff --git a/crtimes.diff b/crtimes.diff
index 08397f9..cbb30c3 100644
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -12,7 +12,7 @@ based-on: patch/master/fileflags
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -43,6 +43,7 @@ extern int protect_args;
+@@ -44,6 +44,7 @@ extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
  extern int preserve_atimes;
@@ -20,7 +20,7 @@ diff --git a/compat.c b/compat.c
  extern int preserve_acls;
  extern int preserve_xattrs;
  extern int preserve_fileflags;
-@@ -76,7 +77,7 @@ int inplace_partial = 0;
+@@ -77,7 +78,7 @@ int inplace_partial = 0;
  int do_negotiated_strings = 0;
  
  /* These index values are for the file-list's extra-attribute array. */
@@ -29,7 +29,7 @@ diff --git a/compat.c b/compat.c
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
  int sender_symlink_iconv = 0;	/* sender should convert symlink content */
-@@ -505,6 +506,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -553,6 +554,8 @@ void setup_protocol(int f_out,int f_in)
  	 * aligned for direct int64-pointer memory access. */
  	if (preserve_atimes)
  		atimes_ndx = (file_extra_cnt += EXTRA64_CNT);
@@ -38,7 +38,7 @@ diff --git a/compat.c b/compat.c
  	if (am_sender) /* This is most likely in the in64 union as well. */
  		pathname_ndx = (file_extra_cnt += PTR_EXTRA_CNT);
  	else
-@@ -670,6 +673,10 @@ void setup_protocol(int f_out,int f_in)
+@@ -716,6 +719,10 @@ void setup_protocol(int f_out,int f_in)
  		want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
  		proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
  		xfer_flags_as_varint = compat_flags & CF_VARINT_FLIST_FLAGS ? 1 : 0;
@@ -355,7 +355,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  0.  `--omit-dir-times`, `-O`
  
      This tells rsync to omit directories when it is preserving modification
-@@ -2633,7 +2639,7 @@ your home directory (remove the '=' for that).
+@@ -2640,7 +2646,7 @@ your home directory (remove the '=' for that).
      output of other verbose messages).
  
      The "%i" escape has a cryptic output that is 11 letters long.  The general
@@ -364,7 +364,7 @@ diff --git a/rsync.1.md b/rsync.1.md
      of update being done, **X** is replaced by the file-type, and the other
      letters represent attributes that may be output if they are being modified.
  
-@@ -2690,6 +2696,8 @@ your home directory (remove the '=' for that).
+@@ -2697,6 +2703,8 @@ your home directory (remove the '=' for that).
        happens when a symlink or directory is updated.
      - The `a` means that the ACL information changed.
      - The `x` means that the extended attribute information changed.
diff --git a/cvs-entries.diff b/cvs-entries.diff
index 11e42d3..d528ef1 100644
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
diff --git a/date-only.diff b/date-only.diff
index 90acea0..0628dca 100644
--- a/date-only.diff
+++ b/date-only.diff
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
diff --git a/db.diff b/db.diff
index aff36af..d99c03c 100644
--- a/db.diff
+++ b/db.diff
@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -2942,7 +2942,7 @@ diff --git a/rsync.h b/rsync.h
  #define NDX_DONE -1
  #define NDX_FLIST_EOF -2
  #define NDX_DEL_STATS -3
-@@ -1353,7 +1357,8 @@ extern short info_levels[], debug_levels[];
+@@ -1356,7 +1360,8 @@ extern short info_levels[], debug_levels[];
  #define DEBUG_CHDIR (DEBUG_BIND+1)
  #define DEBUG_CONNECT (DEBUG_CHDIR+1)
  #define DEBUG_CMD (DEBUG_CONNECT+1)
diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index a82dd9f..54c09d1 100644
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -100,7 +100,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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
-@@ -2215,6 +2217,17 @@ your home directory (remove the '=' for that).
+@@ -2217,6 +2219,17 @@ your home directory (remove the '=' for that).
      otential alternate-basis files will be removed as the transfer progresses.
      This option conflicts with `--inplace` and `--append`.
  
diff --git a/detect-renamed.diff b/detect-renamed.diff
index 77c48a8..2b2410e 100644
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -38,7 +38,7 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -54,7 +54,7 @@ diff --git a/backup.c b/backup.c
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -38,6 +38,7 @@ extern int checksum_seed;
+@@ -39,6 +39,7 @@ extern int checksum_seed;
  extern int basis_dir_cnt;
  extern int prune_empty_dirs;
  extern int protocol_version;
@@ -62,7 +62,7 @@ diff --git a/compat.c b/compat.c
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
-@@ -155,6 +156,7 @@ void set_allow_inc_recurse(void)
+@@ -156,6 +157,7 @@ void set_allow_inc_recurse(void)
  		allow_inc_recurse = 0;
  	else if (!am_sender
  	 && (delete_before || delete_after
@@ -654,7 +654,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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
-@@ -2198,6 +2199,22 @@ your home directory (remove the '=' for that).
+@@ -2200,6 +2201,22 @@ your home directory (remove the '=' for that).
      fuzzy-match files, so either use `--delete-after` or specify some filename
      exclusions if you need to prevent this.
  
diff --git a/direct-io.diff b/direct-io.diff
index f628273..9df11b7 100644
--- a/direct-io.diff
+++ b/direct-io.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -42,7 +42,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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
-@@ -2909,6 +2910,16 @@ your home directory (remove the '=' for that).
+@@ -2916,6 +2917,16 @@ your home directory (remove the '=' for that).
      update algorithm that is even more atomic (it uses `--link-dest` and a
      parallel hierarchy of files).
  
diff --git a/downdate.diff b/downdate.diff
index 39cc571..8bd4ed1 100644
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
diff --git a/fileflags.diff b/fileflags.diff
index 6356e0f..078e69a 100644
--- a/fileflags.diff
+++ b/fileflags.diff
@@ -7,11 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -38,12 +38,14 @@ extern int checksum_seed;
+@@ -39,12 +39,14 @@ extern int checksum_seed;
  extern int basis_dir_cnt;
  extern int prune_empty_dirs;
  extern int protocol_version;
@@ -26,7 +26,7 @@ diff --git a/compat.c b/compat.c
  extern int xfer_flags_as_varint;
  extern int need_messages_from_generator;
  extern int delete_mode, delete_before, delete_during, delete_after;
-@@ -74,7 +76,7 @@ int inplace_partial = 0;
+@@ -75,7 +77,7 @@ int inplace_partial = 0;
  int do_negotiated_strings = 0;
  
  /* These index values are for the file-list's extra-attribute array. */
@@ -35,7 +35,7 @@ diff --git a/compat.c b/compat.c
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
  int sender_symlink_iconv = 0;	/* sender should convert symlink content */
-@@ -511,6 +513,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -559,6 +561,8 @@ void setup_protocol(int f_out,int f_in)
  		uid_ndx = ++file_extra_cnt;
  	if (preserve_gid)
  		gid_ndx = ++file_extra_cnt;
@@ -44,7 +44,7 @@ diff --git a/compat.c b/compat.c
  	if (preserve_acls && !am_sender)
  		acls_ndx = ++file_extra_cnt;
  	if (preserve_xattrs)
-@@ -666,6 +670,10 @@ void setup_protocol(int f_out,int f_in)
+@@ -712,6 +716,10 @@ void setup_protocol(int f_out,int f_in)
  		want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
  		proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
  		xfer_flags_as_varint = compat_flags & CF_VARINT_FLIST_FLAGS ? 1 : 0;
@@ -527,7 +527,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  0.  `--chmod=CHMOD`
  
      This option tells rsync to apply one or more comma-separated "chmod" modes
-@@ -1687,7 +1716,7 @@ your home directory (remove the '=' for that).
+@@ -1689,7 +1718,7 @@ your home directory (remove the '=' for that).
      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 directory, it will only be
@@ -536,7 +536,7 @@ diff --git a/rsync.1.md b/rsync.1.md
      that, this option is independent of any other type of delete processing.
  
      The missing source files are represented by special file-list entries which
-@@ -1698,15 +1727,16 @@ your home directory (remove the '=' for that).
+@@ -1700,15 +1729,16 @@ your home directory (remove the '=' for that).
      Tells `--delete` to go ahead and delete files even when there are I/O
      errors.
  
@@ -557,7 +557,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  
  0.  `--max-delete=NUM`
  
-@@ -2603,7 +2633,7 @@ your home directory (remove the '=' for that).
+@@ -2610,7 +2640,7 @@ your home directory (remove the '=' for that).
      output of other verbose messages).
  
      The "%i" escape has a cryptic output that is 11 letters long.  The general
diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 667842f..25bc03e 100644
--- a/filter-attribute-mods.diff
+++ b/filter-attribute-mods.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -347,7 +347,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  
      See the `--perms` and `--executability` options for how the resulting
      permission value can be applied to the files in the transfer.
-@@ -2539,6 +2541,10 @@ your home directory (remove the '=' for that).
+@@ -2546,6 +2548,10 @@ your home directory (remove the '=' for that).
      If you specify "`--chown=foo:bar`", this is exactly the same as specifying
      "`--usermap=*:foo --groupmap=*:bar`", only easier.
  
@@ -358,7 +358,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  0.  `--timeout=SECONDS`
  
      This option allows you to set a maximum I/O timeout in seconds.  If no data
-@@ -3485,6 +3491,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3497,6 +3503,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
    rules that exclude things 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.
@@ -374,7 +374,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  - 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
-@@ -3542,6 +3557,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3554,6 +3569,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`).
  
diff --git a/fsync.diff b/fsync.diff
index 9d9ff23..6163f88 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
diff --git a/hfs-compression.diff b/hfs-compression.diff
index fbfbe55..04f0364 100644
--- a/hfs-compression.diff
+++ b/hfs-compression.diff
@@ -445,7 +445,7 @@ diff --git a/t_stub.c b/t_stub.c
  int preserve_executability = 0;
 +int preserve_hfs_compression = 0;
  int open_noatime = 0;
- size_t max_alloc = 1024*1024*1024;
+ size_t max_alloc = 1024*1024*1024; /* max_alloc is needed when combined with util2.o */
  char *partial_dir;
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
diff --git a/ignore-case.diff b/ignore-case.diff
index dd55a30..698c22e 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,7 +12,7 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
-based-on: 3a6f06003cdd29e9385dba3a9673122e0e356c76
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -252,7 +252,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --address=ADDRESS        bind address for outgoing socket to daemon
  --port=PORT              specify double-colon alternate port number
  --sockopts=OPTIONS       specify custom TCP options
-@@ -2151,6 +2152,12 @@ your home directory (remove the '=' for that).
+@@ -2148,6 +2149,12 @@ your home directory (remove the '=' for that).
  
      >     sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
  
@@ -273,7 +273,7 @@ diff --git a/t_stub.c b/t_stub.c
  int preserve_executability = 0;
  int open_noatime = 0;
 +int ignore_case = 0;
- size_t max_alloc = 1024*1024*1024;
+ size_t max_alloc = 1024*1024*1024; /* max_alloc is needed when combined with util2.o */
  char *partial_dir;
  char *module_dir;
 diff --git a/wildtest.c b/wildtest.c
diff --git a/kerberos.diff b/kerberos.diff
index 1a51a50..2a749d6 100644
--- a/kerberos.diff
+++ b/kerberos.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
diff --git a/link-by-hash.diff b/link-by-hash.diff
index 157a3a9..b59b94c 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,7 +12,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -352,7 +352,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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)
-@@ -2282,6 +2283,50 @@ your home directory (remove the '=' for that).
+@@ -2284,6 +2285,50 @@ your home directory (remove the '=' for that).
      specified (or implied by `-a`).  You can work-around this bug by avoiding
      the `-o` option when sending to an old rsync.
  
@@ -428,7 +428,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -1362,7 +1362,8 @@ extern short info_levels[], debug_levels[];
+@@ -1365,7 +1365,8 @@ extern short info_levels[], debug_levels[];
  #define DEBUG_FUZZY (DEBUG_FLIST+1)
  #define DEBUG_GENR (DEBUG_FUZZY+1)
  #define DEBUG_HASH (DEBUG_GENR+1)
diff --git a/md5p8.diff b/md5p8.diff
index 03901d2..b8bcf28 100644
--- a/md5p8.diff
+++ b/md5p8.diff
@@ -27,7 +27,7 @@ xxHash is still preferred (and faster), but this provides a reasonably
 fast fallback for the case where xxHash libraries are not available at
 build time.
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
diff --git a/nameconverter.diff b/nameconverter.diff
index d275d6e..5bfdd6f 100644
--- a/nameconverter.diff
+++ b/nameconverter.diff
@@ -20,7 +20,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 3a6f06003cdd29e9385dba3a9673122e0e356c76
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/authenticate.c b/authenticate.c
 --- a/authenticate.c
 +++ b/authenticate.c
@@ -322,7 +322,7 @@ diff --git a/t_stub.c b/t_stub.c
 --- a/t_stub.c
 +++ b/t_stub.c
 @@ -36,6 +36,7 @@ int open_noatime = 0;
- size_t max_alloc = 1024*1024*1024;
+ size_t max_alloc = 1024*1024*1024; /* max_alloc is needed when combined with util2.o */
  char *partial_dir;
  char *module_dir;
 +pid_t namecvt_pid;
diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index 0ebc4f1..b3d24f5 100644
--- a/netgroup-auth.diff
+++ b/netgroup-auth.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/access.c b/access.c
 --- a/access.c
 +++ b/access.c
diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index d10492a..a5702cb 100644
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
diff --git a/slow-down.diff b/slow-down.diff
index 58747ff..8444eb2 100644
--- a/slow-down.diff
+++ b/slow-down.diff
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
diff --git a/slp.diff b/slp.diff
index b74dcc2..699125c 100644
--- a/slp.diff
+++ b/slp.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
diff --git a/soften-links.diff b/soften-links.diff
index ebd0bdb..124317a 100644
--- a/soften-links.diff
+++ b/soften-links.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c
diff --git a/source-backup.diff b/source-backup.diff
index bd34bec..11cca96 100644
--- a/source-backup.diff
+++ b/source-backup.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
 
 -- Matt McCutchen <hashproduct@gmail.com>
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -49,7 +49,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --del                    an alias for --delete-during
  --delete                 delete extraneous files from dest dirs
  --delete-before          receiver deletes before xfer, not during
-@@ -1578,6 +1579,16 @@ your home directory (remove the '=' for that).
+@@ -1580,6 +1581,16 @@ your home directory (remove the '=' for that).
      Starting with 3.1.0, rsync will skip the sender-side removal (and output an
      error) if the file's size or modify time has not stayed unchanged.
  
diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 57e65e5..0e69aea 100644
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -30,7 +30,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                (optional if already run)
     make
 
-based-on: 3a6f06003cdd29e9385dba3a9673122e0e356c76
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -330,7 +330,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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)
-@@ -3142,6 +3145,36 @@ your home directory (remove the '=' for that).
+@@ -3141,6 +3144,36 @@ your home directory (remove the '=' for that).
      `--write-batch`.  If _FILE_ is `-`, the batch data will be read from
      standard input. See the "BATCH MODE" section for details.
  
diff --git a/sparse-block.diff b/sparse-block.diff
index 93bc8a1..89551c3 100644
--- a/sparse-block.diff
+++ b/sparse-block.diff
@@ -18,7 +18,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c
diff --git a/time-limit.diff b/time-limit.diff
index 2692acd..a75d992 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c
@@ -135,7 +135,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --write-batch=FILE       write a batched update to FILE
  --only-write-batch=FILE  like --write-batch but w/o updating dest
  --read-batch=FILE        read a batched update from FILE
-@@ -3098,6 +3100,22 @@ your home directory (remove the '=' for that).
+@@ -3105,6 +3107,22 @@ your home directory (remove the '=' for that).
      buffered, while other can show up as very slow when the flushing of the
      output buffer occurs.  This may be fixed in a future version.
  
diff --git a/transliterate.diff b/transliterate.diff
index 599ab3a..5169e20 100644
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -153,7 +153,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --checksum-seed=NUM      set block/file checksum seed (advanced)
  --ipv4, -4               prefer IPv4
  --ipv6, -6               prefer IPv6
-@@ -3171,6 +3172,25 @@ your home directory (remove the '=' for that).
+@@ -3183,6 +3184,25 @@ your home directory (remove the '=' for that).
      free to specify just the local charset for a daemon transfer (e.g.
      `--iconv=utf8`).
  
diff --git a/tru64.diff b/tru64.diff
index 2b5a90e..39977db 100644
--- a/tru64.diff
+++ b/tru64.diff
@@ -6,7 +6,7 @@ To use this patch, run these commands for a successful build:
     ./configure                          (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c
diff --git a/xattrs.diff b/xattrs.diff
index 4145d82..3679dfd 100644
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -14,7 +14,7 @@ based-on: patch/master/acls
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -586,13 +586,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -634,13 +634,6 @@ void setup_protocol(int f_out,int f_in)
  				protocol_version);
  			exit_cleanup(RERR_PROTOCOL);
  		}
diff --git a/xxh3.diff b/xxh3.diff
index 09b5651..f6cdf5b 100644
--- a/xxh3.diff
+++ b/xxh3.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 0eec25f75b044b00d3ba9ac445402b130c694ccb
+based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c