The patches for 3.2.5.

diff --git a/backup-deleted.diff b/backup-deleted.diff
index 81d822f993467dc1c7644d3235ebaf15763b7ac2..5b947501be52d6f65261ca2807e182a5f509f7b0 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 103f9ffe9616fa4d4f9350f08eb5dd6479c232d0..486062e863a9f4d47e27cb478163c7057165404c 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 19738035f0499cfac681d148d708d7d83cd23909..f70f53d8fa8c1d746b81344ee44c77ab73c2d6ad 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 a32c8295dd1ee4b96b8fcde952c6fdf97008ff2a..20446e0725245f5797fefa00ac1762dc51f2884e 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 c813775b56f357f37a4d380c4cfa99196c9d23e8..c72cb6cfa914b073915f217700e1c269cf6375db 100644 (file)
--- 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: 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.
  

diff --git a/congestion.diff b/congestion.diff
index 75f9a1a9b967cac7f3e28f23a09defc99f815d38..112688bde1d4662a56e2674c3a7245d1fad94cc4 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt

diff --git a/date-only.diff b/date-only.diff
index 22083a15468a897efa951206eb235dc6f54184c7..4d67e367665e012ed05d0cd8d40560ce509f6e0f 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index 4b474fe1f2e6d447c80da1e06953ac17f71aaeb3..e5c7fb6f5f2c8405e65c10b136e1d74ec035441d 100644 (file)
--- 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: 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");
  }
  

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index 025d4e50801195a3e36439eb5391a324acefedd4..f2de77bce847dcdb243099b7064419673397e44b 100644 (file)
--- 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
-@@ -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).
  

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 7ee87b2435c9125588ff2adb59ee162d1815d535..c9ad751dce1eea1592c3b1e32f1a22714c25d128 100644 (file)
--- 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: 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.
  

diff --git a/direct-io.diff b/direct-io.diff
index 97c366d1bbd06165181a833d5cfb670c8a1702c2..1ad91ec705cc421d32a0f3d2a63e98f26e9de9f1 100644 (file)
--- 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: 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).
  

diff --git a/downdate.diff b/downdate.diff
index 138aa89c54211af030758aae679a091321f08c2d..0580e305541e91028e9978ebd7d7d0c80c480c25 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 5d0aced521812f0c8147f7bb943b546bf9598f11..93064b55a1d8d78d32bfc5ca2e4031012de5a302 100644 (file)
--- a/fileflags.diff
+++ b/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

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 9f0089291b4f04536e2bc713e86c09f663f003fd..ba89b47b224be3678a30cfd0662ffeca57cffcfb 100644 (file)
--- 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: 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`).
  

diff --git a/fix-checksums.diff b/fix-checksums.diff
index aa60c1533151deb18e21365dd72bcadf64e14b1c..357418ec4fc11e202ba434efb7e1dfb8dd7287c1 100644 (file)
--- a/fix-checksums.diff
+++ b/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);
        }
  

diff --git a/ignore-case.diff b/ignore-case.diff
index 96cb47c27d560c86cc16d256466341e64d7a43bb..4411904fe3a54e025d992a517501b339aef7e234 100644 (file)
--- 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: 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/
  

diff --git a/kerberos.diff b/kerberos.diff
index 5813aadbb01bec420aa2ff83e1b974b8d05007ae..d79421e6ab0ddb8665c3f0c91fc6f2b71021ba80 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 45af67fe5e592455c9dc0dd4fc63e59b2f7d22c3..0c443997c4e429a447cf0119d0e69cd5a643a36c 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -37,7 +37,7 @@ diff --git a/checksum.c b/checksum.c
  extern const char *checksum_choice;
  
  struct name_num_obj valid_checksums = {
-@@ -444,7 +446,7 @@ static union {
+@@ -449,7 +451,7 @@ static union {
        MD4_CTX m4;
  #endif
        md5_context m5;
@@ -46,7 +46,7 @@ diff --git a/checksum.c b/checksum.c
  #ifdef SUPPORT_XXHASH
  static XXH64_state_t* xxh64_state;
  #endif
-@@ -483,6 +485,8 @@ void sum_init(int csum_type, int seed)
+@@ -488,6 +490,8 @@ void sum_init(int csum_type, int seed)
  #endif
          case CSUM_MD5:
                md5_begin(&ctx.m5);
@@ -55,7 +55,7 @@ diff --git a/checksum.c b/checksum.c
                break;
          case CSUM_MD4:
  #ifdef USE_OPENSSL
-@@ -533,6 +537,8 @@ void sum_update(const char *p, int32 len)
+@@ -538,6 +542,8 @@ void sum_update(const char *p, int32 len)
  #endif
          case CSUM_MD5:
                md5_update(&ctx.m5, (uchar *)p, len);
@@ -64,7 +64,7 @@ diff --git a/checksum.c b/checksum.c
                break;
          case CSUM_MD4:
  #ifdef USE_OPENSSL
-@@ -598,6 +604,8 @@ int sum_end(char *sum)
+@@ -603,6 +609,8 @@ int sum_end(char *sum)
  #endif
          case CSUM_MD5:
                md5_result(&ctx.m5, (uchar *)sum);
@@ -311,7 +311,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,50 @@ expand it.
+@@ -2624,6 +2625,50 @@ expand it.
      this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
      old rsync.
  

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index 72c0374cce0e34df9a46ab2fc9d87a3c2bd219fe..4437295cdbf9ad0875e205b6ae0aaa96a4c370ff 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/sha1.diff b/sha1.diff
index a421031b1d53aaa38ffbb003bb02712d1d68e8c9..0bf46c99a57c932d7e0ee964fafc63de2b2eeb73 100644 (file)
--- a/sha1.diff
+++ b/sha1.diff
@@ -44,7 +44,7 @@ diff --git a/checksum.c b/checksum.c
                { CSUM_MD5, "md5", NULL },
                { CSUM_MD4, "md4", NULL },
                { 0, NULL, NULL }
-@@ -155,6 +173,18 @@ int csum_len_for_type(int cst, BOOL flist_csum)
+@@ -160,6 +178,18 @@ int csum_len_for_type(int cst, BOOL flist_csum)
                return MD4_DIGEST_LEN;
          case CSUM_MD5:
                return MD5_DIGEST_LEN;
@@ -63,7 +63,7 @@ diff --git a/checksum.c b/checksum.c
          case CSUM_XXH64:
          case CSUM_XXH3_64:
                return 64/8;
-@@ -180,6 +210,9 @@ int canonical_checksum(int csum_type)
+@@ -185,6 +215,9 @@ int canonical_checksum(int csum_type)
                break;
          case CSUM_MD4:
          case CSUM_MD5:
@@ -73,7 +73,7 @@ diff --git a/checksum.c b/checksum.c
                return -1;
          case CSUM_XXH64:
          case CSUM_XXH3_64:
-@@ -232,6 +265,26 @@ void get_checksum2(char *buf, int32 len, char *sum)
+@@ -237,6 +270,26 @@ void get_checksum2(char *buf, int32 len, char *sum)
                SIVAL64(sum, 8, digest.high64);
                break;
          }
@@ -100,7 +100,7 @@ diff --git a/checksum.c b/checksum.c
  #endif
          case CSUM_MD5: {
                md5_context m5;
-@@ -384,6 +437,31 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -389,6 +442,31 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
                SIVAL64(sum, 8, digest.high64);
                break;
          }
@@ -132,7 +132,7 @@ diff --git a/checksum.c b/checksum.c
  #endif
          case CSUM_MD5: {
                md5_context m5;
-@@ -457,6 +535,9 @@ static union {
+@@ -462,6 +540,9 @@ static union {
  #endif
        md5_context m5;
  } ctx;
@@ -142,7 +142,7 @@ diff --git a/checksum.c b/checksum.c
  #ifdef SUPPORT_XXHASH
  static XXH64_state_t* xxh64_state;
  #endif
-@@ -494,6 +575,17 @@ int sum_init(int csum_type, int seed)
+@@ -499,6 +580,17 @@ int sum_init(int csum_type, int seed)
                        out_of_memory("sum_init");
                XXH3_128bits_reset(xxh3_state);
                break;
@@ -160,7 +160,7 @@ diff --git a/checksum.c b/checksum.c
  #endif
          case CSUM_MD5:
                md5_begin(&ctx.m5);
-@@ -546,6 +638,13 @@ void sum_update(const char *p, int32 len)
+@@ -551,6 +643,13 @@ void sum_update(const char *p, int32 len)
          case CSUM_XXH3_128:
                XXH3_128bits_update(xxh3_state, p, len);
                break;
@@ -174,7 +174,7 @@ diff --git a/checksum.c b/checksum.c
  #endif
          case CSUM_MD5:
                md5_update(&ctx.m5, (uchar *)p, len);
-@@ -611,6 +710,13 @@ void sum_end(char *sum)
+@@ -616,6 +715,13 @@ void sum_end(char *sum)
                SIVAL64(sum, 8, digest.high64);
                break;
          }
@@ -230,3 +230,15 @@ diff --git a/lib/mdigest.h b/lib/mdigest.h
  #endif
  #include "md-defines.h"
  
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -1173,7 +1173,7 @@ struct name_num_obj {
+       uchar *saw;
+       int saw_len;
+       int negotiated_num;
+-      struct name_num_item list[10]; /* we'll get a compile error/warning if this is ever too small */
++      struct name_num_item list[12]; /* we'll get a compile error/warning if this is ever too small */
+ };
+ 
+ #ifdef EXTERNAL_ZLIB

diff --git a/slow-down.diff b/slow-down.diff
index 298e1d5b2d47540f73e71c17fdf211481b11e063..fdc345e17245ddd4436f1b537277f420fb2479ae 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index b220ecbc8f7a994f89d09c5c2ea5e7fd70dafb16..c6563e67d416863ab4122ea0e7119491bbf26611 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 e3cbb327d23bfc95c6ef178a5a2520f04295045e..73c59a34663d6b96afef0e484748a945846b2ede 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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 2efd0f4122b065f8266215b65dd667fcb8e22ad5..1744642873233fb7016ec599f4ea437db268b6d2 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 6a6ce7f4fc97c1653f215ea4e3b1ba789d69a1b6..ff85d79cdfd6a9a4dce8c815d0583142b15bfae8 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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)
-@@ -3610,6 +3613,36 @@ expand it.
+@@ -3615,6 +3618,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.
  

diff --git a/sparse-block.diff b/sparse-block.diff
index 84b8eb86170510933f12ec8ece24198e2612dd3d..41e202037bf35cd08fccc7afc3fb3524fa73b34b 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c

diff --git a/transliterate.diff b/transliterate.diff
index 79aba2d2f857e3439d61ab9562a42cd3181a995f..2600d74599d6eb9d7e3aeeccf28f34c271e3f318 100644 (file)
--- 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: 4c0a4067df2516ce50e12a7d3ae572275fa9fc0b
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 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
-@@ -3652,6 +3653,25 @@ expand it.
+@@ -3657,6 +3658,25 @@ expand it.
      free to specify just the local charset for a daemon transfer (e.g.
      `--iconv=utf8`).