The patches for 3.2.5.

Author: WayneD

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -137,7 +137,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)
-@@ -2619,6 +2620,18 @@ expand it.
+@@ -2624,6 +2625,18 @@ expand it.
      this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
      old rsync.
 

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

db.diff

@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -136,7 +136,7 @@ diff --git a/checksum.c b/checksum.c
  extern const char *checksum_choice;
 
  struct name_num_obj valid_checksums = {
-@@ -386,6 +387,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -391,6 +392,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
  			md5_update(&m5, (uchar *)map_ptr(buf, i, remainder), remainder);
 
  		md5_result(&m5, (uchar *)sum);
@@ -145,7 +145,7 @@ diff --git a/checksum.c b/checksum.c
  		break;
  	  }
  	  case CSUM_MD4:
-@@ -425,6 +428,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -430,6 +433,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
  			mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
 
  		mdfour_result(&m, (uchar *)sum);
@@ -3202,7 +3202,7 @@ diff --git a/usage.c b/usage.c
  	"*Optimizations",
 
  #ifndef USE_ROLL_SIMD
-@@ -261,6 +271,14 @@ void daemon_usage(enum logcode F)
+@@ -263,6 +273,14 @@ void daemon_usage(enum logcode F)
    rprintf(F,"daemon-specific rsync options.  See also the rsyncd.conf(5) manpage.\n");
  }
 

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
-@@ -2551,6 +2553,20 @@ expand it.
+@@ -2556,6 +2558,20 @@ expand it.
      otential alternate-basis files will be removed as the transfer progresses.
      This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
 

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -666,7 +666,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
-@@ -2534,6 +2535,22 @@ expand it.
+@@ -2539,6 +2540,22 @@ expand it.
      potential fuzzy-match files, so either use [`--delete-after`](#opt) or
      specify some filename exclusions if you need to prevent this.
 

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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
-@@ -3334,6 +3335,17 @@ expand it.
+@@ -3339,6 +3340,17 @@ expand it.
      update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
      and a parallel hierarchy of files).
 

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

fileflags.diff

@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -36,7 +36,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 */
-@@ -574,6 +576,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -576,6 +578,8 @@ void setup_protocol(int f_out,int f_in)
  		uid_ndx = ++file_extra_cnt;
  	if (preserve_gid)
  		gid_ndx = ++file_extra_cnt;
@@ -45,7 +45,7 @@ diff --git a/compat.c b/compat.c
  	if (preserve_acls && !am_sender)
  		acls_ndx = ++file_extra_cnt;
  	if (preserve_xattrs)
-@@ -737,6 +741,10 @@ void setup_protocol(int f_out,int f_in)
+@@ -739,6 +743,10 @@ void setup_protocol(int f_out,int f_in)
  			fprintf(stderr, "Both rsync versions must be at least 3.2.0 for --crtimes.\n");
  			exit_cleanup(RERR_PROTOCOL);
  		}
@@ -554,7 +554,7 @@ diff --git a/rsync.1.md b/rsync.1.md
      [`--recursive`](#opt) option was also enabled.
 
  0.  `--max-delete=NUM`
-@@ -3000,7 +3036,7 @@ expand it.
+@@ -3005,7 +3041,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

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -349,7 +349,7 @@ diff --git a/rsync.1.md b/rsync.1.md
 
      See the [`--perms`](#opt) and [`--executability`](#opt) options for how the
      resulting permission value can be applied to the files in the transfer.
-@@ -2934,6 +2936,10 @@ expand it.
+@@ -2939,6 +2941,10 @@ expand it.
      avoid a complaint about wildcard characters, but a modern rsync handles
      this automatically.
 
@@ -360,7 +360,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
-@@ -4084,6 +4090,15 @@ The following modifiers are accepted after an include (+) or exclude (-) rule:
+@@ -4089,6 +4095,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.
@@ -376,7 +376,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
-@@ -4141,6 +4156,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -4146,6 +4161,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`).
 

fix-checksums.diff

@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 9cb7529ba60cd59519489ad0fc7fbb69ced6411f
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/authenticate.c b/authenticate.c
 --- a/authenticate.c
 +++ b/authenticate.c
@@ -85,9 +85,9 @@ diff --git a/checksum.c b/checksum.c
 +int file_sum_type = 0; /* used for the pre-transfer (--checksum) checksums */
 +int file_sum_len = 0;
 
- int parse_csum_name(const char *name, int len)
- {
-@@ -99,26 +109,28 @@ static const char *checksum_name(int num)
+ static int initialized_choices = 0;
+ 
+@@ -104,26 +114,28 @@ static const char *checksum_name(int num)
  void parse_checksum_choice(int final_call)
  {
  	if (valid_checksums.negotiated_name)
@@ -123,7 +123,7 @@ diff --git a/checksum.c b/checksum.c
 
  	if (final_call && DEBUG_GTE(NSTR, am_server ? 3 : 1)) {
  		rprintf(FINFO, "%s%s checksum: %s\n",
-@@ -204,7 +216,7 @@ uint32 get_checksum1(char *buf1, int32 len)
+@@ -209,7 +221,7 @@ uint32 get_checksum1(char *buf1, int32 len)
 
  void get_checksum2(char *buf, int32 len, char *sum)
  {
@@ -132,7 +132,7 @@ diff --git a/checksum.c b/checksum.c
  #ifdef SUPPORT_XXHASH
  	  case CSUM_XXH64:
  		SIVAL64(sum, 0, XXH64(buf, len, checksum_seed));
-@@ -288,7 +300,7 @@ void get_checksum2(char *buf, int32 len, char *sum)
+@@ -293,7 +305,7 @@ void get_checksum2(char *buf, int32 len, char *sum)
  		 * are multiples of 64.  This is fixed by calling mdfour_update()
  		 * even when there are no more bytes.
  		 */
@@ -141,7 +141,7 @@ diff --git a/checksum.c b/checksum.c
  			mdfour_update(&m, (uchar *)(buf1+i), len-i);
 
  		mdfour_result(&m, (uchar *)sum);
-@@ -306,7 +318,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -311,7 +323,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
  	int32 remainder;
  	int fd;
 
@@ -150,7 +150,7 @@ diff --git a/checksum.c b/checksum.c
 
  	fd = do_open(fname, O_RDONLY, 0);
  	if (fd == -1)
-@@ -314,7 +326,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -319,7 +331,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
 
  	buf = map_file(fd, len, MAX_MAP_SIZE, CHUNK_SIZE);
 
@@ -159,7 +159,7 @@ diff --git a/checksum.c b/checksum.c
  #ifdef SUPPORT_XXHASH
  	  case CSUM_XXH64: {
  		static XXH64_state_t* state = NULL;
-@@ -421,7 +433,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -426,7 +438,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
  		 * are multiples of 64.  This is fixed by calling mdfour_update()
  		 * even when there are no more bytes. */
  		remainder = (int32)(len - i);
@@ -168,7 +168,7 @@ diff --git a/checksum.c b/checksum.c
  			mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
 
  		mdfour_result(&m, (uchar *)sum);
-@@ -429,7 +441,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -434,7 +446,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
  	  }
  	  default:
  		rprintf(FERROR, "Invalid checksum-choice for --checksum: %s (%d)\n",
@@ -177,7 +177,7 @@ diff --git a/checksum.c b/checksum.c
  		exit_cleanup(RERR_UNSUPPORTED);
  	}
 
-@@ -452,14 +464,16 @@ static XXH64_state_t* xxh64_state;
+@@ -457,14 +469,16 @@ static XXH64_state_t* xxh64_state;
  static XXH3_state_t* xxh3_state;
  #endif
  static int cursum_type;
@@ -195,7 +195,7 @@ diff --git a/checksum.c b/checksum.c
 
  	switch (csum_type) {
  #ifdef SUPPORT_XXHASH
-@@ -505,6 +519,8 @@ void sum_init(int csum_type, int seed)
+@@ -510,6 +524,8 @@ void sum_init(int csum_type, int seed)
  	  default: /* paranoia to prevent missing case values */
  		exit_cleanup(RERR_UNSUPPORTED);
  	}
@@ -204,7 +204,7 @@ diff --git a/checksum.c b/checksum.c
  }
 
  /**
-@@ -573,11 +589,11 @@ void sum_update(const char *p, int32 len)
+@@ -578,11 +594,11 @@ void sum_update(const char *p, int32 len)
  	}
  }
 
@@ -221,13 +221,15 @@ diff --git a/checksum.c b/checksum.c
  {
  	switch (cursum_type) {
  #ifdef SUPPORT_XXHASH
-@@ -620,6 +636,4 @@ int sum_end(char *sum)
+@@ -625,8 +641,6 @@ int sum_end(char *sum)
  	  default: /* paranoia to prevent missing case values */
  		exit_cleanup(RERR_UNSUPPORTED);
  	}
 -
 -	return csum_len_for_type(cursum_type, 0);
  }
+ 
+ void init_checksum_choices()
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -406,7 +408,7 @@ diff --git a/compat.c b/compat.c
 
  	if (!am_server || !do_negotiated_strings) {
  		char *cp = tmpbuf;
-@@ -801,11 +804,73 @@ void setup_protocol(int f_out,int f_in)
+@@ -803,11 +806,73 @@ void setup_protocol(int f_out,int f_in)
  		checksum_seed = read_int(f_in);
  	}
 

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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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
-@@ -2482,6 +2483,12 @@ expand it.
+@@ -2487,6 +2488,12 @@ expand it.
 
      >     sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
 

kerberos.diff

@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in