The patches for 3.2.2pre2.

diff --git a/acls.diff b/acls.diff
index ba0b2f5c17e14f827240a59dfdc7b11306428299..1cb8554b8bfd96372e4537e434d44aeb62936760 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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
-@@ -627,6 +627,13 @@ void setup_protocol(int f_out,int f_in)
+@@ -629,6 +629,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 c5012b0282c114c1aabf886dd55b7b278d187cd0..116c466101771bf252512621ec98e41a63cccda4 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 f03a7c7b0b6ba9bf340cf9176587e3076bbdf0b7..b3fe6baf94828195e929e7b3eab8988f1488bf2e 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 6fdd719d6b29819ad5a00ceb526ed4b2b053eddc..2d4a9f29572d5386d9a2d311828c2441e5fd96c6 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 561c2350ea23cbe88206d3bc5d1bce9784ec1ec3..8607a069b391d51fcd9c22270d9617d77e5b831b 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -753,7 +753,7 @@ diff --git a/rsync.1.md b/rsync.1.md
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -834,6 +834,10 @@ extern int xattrs_ndx;
+@@ -835,6 +835,10 @@ extern int xattrs_ndx;
  #define F_SUM(f) ((char*)OPT_EXTRA(f, START_BUMP(f) + HLINK_BUMP(f) \
                                    + SUM_EXTRA_CNT - 1))
  
@@ -764,7 +764,7 @@ diff --git a/rsync.h b/rsync.h
  /* Some utility defines: */
  #define F_IS_ACTIVE(f) (f)->basename[0]
  #define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED)
-@@ -1036,6 +1040,13 @@ typedef struct {
+@@ -1037,6 +1041,13 @@ typedef struct {
        char fname[1]; /* has variable size */
  } relnamecache;
  

diff --git a/checksum-updating.diff b/checksum-updating.diff
index 7e97b224e3abab81b0c14a5bd393a1e8f4f52d0e..700ae8a06d91fe94f3567663501c7d6d41d949b3 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -616,7 +616,7 @@ diff --git a/rsync.1.md b/rsync.1.md
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -1042,6 +1042,8 @@ typedef struct {
+@@ -1043,6 +1043,8 @@ typedef struct {
  
  #define CSF_ENABLE (1<<1)
  #define CSF_LAX (1<<2)

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 3986ec876cc9d23eb15d73d57db19bcfd2470575..54c3bbcdc7feb9ece54995d905bbe6df913d5c2d 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 21c8f3538ada11984586fd1bcc47bb27bbf1a022..14c788049875529811070367030d2cabf4507127 100644 (file)
--- a/clone-dest.diff
+++ b/clone-dest.diff
@@ -13,11 +13,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -53,7 +53,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
+@@ -50,7 +50,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
  OBJS=$(OBJS1) $(OBJS2) $(OBJS3) @SIMD@ $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
  
@@ -26,7 +26,7 @@ diff --git a/Makefile.in b/Makefile.in
  
  # Programs we must have to run the test cases
  CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-@@ -150,7 +150,7 @@ getgroups$(EXEEXT): getgroups.o
+@@ -147,7 +147,7 @@ getgroups$(EXEEXT): getgroups.o
  getfsdev$(EXEEXT): getfsdev.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
  

diff --git a/congestion.diff b/congestion.diff
index e0b7dc45689af804c5e66658518b8e2d53233f1d..f667acc8eafb16e05d8136513be421a838a2fece 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 6a0d2021720eeff01cd34bbae3e4c029b64b400e..893163fd81ab7524e6429239311319a98e993efc 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/crtimes.diff b/crtimes.diff
index cbb30c3cbc7a3fcf2096a8d749af490c3a2c83ce..8462658b06874c29c383efbca93b296ac3dab1c2 100644 (file)
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -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 */
-@@ -553,6 +554,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -555,6 +556,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
-@@ -716,6 +719,10 @@ void setup_protocol(int f_out,int f_in)
+@@ -718,6 +721,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
-@@ -2640,7 +2646,7 @@ your home directory (remove the '=' for that).
+@@ -2641,7 +2647,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.
  
-@@ -2697,6 +2703,8 @@ your home directory (remove the '=' for that).
+@@ -2698,6 +2704,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.
@@ -449,7 +449,7 @@ diff --git a/rsync.h b/rsync.h
  #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
  #define ITEM_XNAME_FOLLOWS (1<<12)
  #define ITEM_IS_NEW (1<<13)
-@@ -575,6 +577,10 @@ typedef unsigned int size_t;
+@@ -576,6 +578,10 @@ typedef unsigned int size_t;
  #define ST_FLAGS(st) NO_FFLAGS
  #endif
  
@@ -460,7 +460,7 @@ diff --git a/rsync.h b/rsync.h
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -784,6 +790,7 @@ struct file_struct {
+@@ -785,6 +791,7 @@ struct file_struct {
  extern int file_extra_cnt;
  extern int inc_recurse;
  extern int atimes_ndx;
@@ -468,7 +468,7 @@ diff --git a/rsync.h b/rsync.h
  extern int pathname_ndx;
  extern int depth_ndx;
  extern int uid_ndx;
-@@ -848,6 +855,7 @@ extern int xattrs_ndx;
+@@ -849,6 +856,7 @@ extern int xattrs_ndx;
  #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
  #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
  #define F_ATIME(f) REQ_EXTRA64(f, atimes_ndx)->num
@@ -476,7 +476,7 @@ diff --git a/rsync.h b/rsync.h
  
  /* These items are per-entry optional: */
  #define F_HL_GNUM(f) OPT_EXTRA(f, START_BUMP(f))->num /* non-dirs */
-@@ -1090,6 +1098,7 @@ typedef struct {
+@@ -1091,6 +1099,7 @@ typedef struct {
  
  typedef struct {
      STRUCT_STAT st;

diff --git a/cvs-entries.diff b/cvs-entries.diff
index d528ef195ec2cdb24166463ce3c41a6873b647b2..11eab5549ed68963d14001d4900d2d9461855ab1 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 0628dca719a3b53969e374e2bf4d4f6b661c9660..63e746df29ed3b6c3d2e0d51721531caf3395d54 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index bbe9fc23cbcf0e28a01b74eb98a2be4dea346bfb..7123af698a39f52a2ae11f23bdcff2256e3dac15 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: d2496524269cdac5dee36449db983f39ab6f243f
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 2b2410efb67cb20b0d914e3cfae7a28ba28bae8f..818bcf3b008e7e1ccde72f4890924d0c00a32bd6 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c

diff --git a/direct-io.diff b/direct-io.diff
index 9df11b7ceaac990e1f1b63d81d7f874e4c1cf418..48afc1c523f9436c16f2576c4dd3a75b95a824b7 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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
-@@ -2916,6 +2917,16 @@ your home directory (remove the '=' for that).
+@@ -2917,6 +2918,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 8bd4ed1b45be39a05d37ee8c2f540228b46ebb45..462f70213c6754133805d0c703e826e6ae80f04f 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 078e69a185a2fdcf72278776f8cc4d3aeb59c137..18dfcf9b254ab625e929c36b5c3fe2349fa30a46 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -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 */
-@@ -559,6 +561,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -561,6 +563,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)
-@@ -712,6 +716,10 @@ void setup_protocol(int f_out,int f_in)
+@@ -714,6 +718,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;
@@ -557,7 +557,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  
  0.  `--max-delete=NUM`
  
-@@ -2610,7 +2640,7 @@ your home directory (remove the '=' for that).
+@@ -2611,7 +2641,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
@@ -704,7 +704,7 @@ diff --git a/rsync.h b/rsync.h
  #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
  #define ITEM_XNAME_FOLLOWS (1<<12)
  #define ITEM_IS_NEW (1<<13)
-@@ -548,6 +550,31 @@ typedef unsigned int size_t;
+@@ -549,6 +551,31 @@ typedef unsigned int size_t;
  #endif
  #endif
  
@@ -736,7 +736,7 @@ diff --git a/rsync.h b/rsync.h
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -761,6 +788,7 @@ extern int pathname_ndx;
+@@ -762,6 +789,7 @@ extern int pathname_ndx;
  extern int depth_ndx;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -744,7 +744,7 @@ diff --git a/rsync.h b/rsync.h
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -811,6 +839,11 @@ extern int xattrs_ndx;
+@@ -812,6 +840,11 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
  #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 25bc03ee042bdb1821b36924d8498fb15947371a..2dd7ce5d4a7fc16176ae48f10721569f148b6dea 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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.
-@@ -2546,6 +2548,10 @@ your home directory (remove the '=' for that).
+@@ -2547,6 +2549,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
-@@ -3497,6 +3503,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3498,6 +3504,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
-@@ -3554,6 +3569,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3555,6 +3570,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`).
  
@@ -400,7 +400,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define XFLG_FATAL_ERRORS     (1<<0)
  #define XFLG_OLD_PREFIXES     (1<<1)
-@@ -918,6 +921,8 @@ struct map_struct {
+@@ -919,6 +922,8 @@ struct map_struct {
        int status;             /* first errno from read errors         */
  };
  
@@ -409,7 +409,7 @@ diff --git a/rsync.h b/rsync.h
  #define NAME_IS_FILE          (0)    /* filter name as a file */
  #define NAME_IS_DIR           (1<<0) /* filter name as a dir */
  #define NAME_IS_XATTR         (1<<2) /* filter name as an xattr */
-@@ -943,8 +948,18 @@ struct map_struct {
+@@ -944,8 +949,18 @@ struct map_struct {
  #define FILTRULE_CLEAR_LIST   (1<<18)/* this item is the "!" token */
  #define FILTRULE_PERISHABLE   (1<<19)/* perishable if parent dir goes away */
  #define FILTRULE_XATTR                (1<<20)/* rule only applies to xattr names */
@@ -428,7 +428,7 @@ diff --git a/rsync.h b/rsync.h
  
  typedef struct filter_struct {
        struct filter_struct *next;
-@@ -954,6 +969,11 @@ typedef struct filter_struct {
+@@ -955,6 +970,11 @@ typedef struct filter_struct {
                int slash_cnt;
                struct filter_list_struct *mergelist;
        } u;

diff --git a/fsync.diff b/fsync.diff
index 6163f88f0cc25feb5d0b2cb9d7cb6e90c182cd7e..e7605218d2a1f971570ec1e53aa721fa3f7731a7 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 04f0364cf87774f64c3b8e450c4a4e31848a7ed3..b115c0b2096335008c9059835065609da237faf4 100644 (file)
--- a/hfs-compression.diff
+++ b/hfs-compression.diff
@@ -418,7 +418,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -577,6 +577,17 @@ typedef unsigned int size_t;
+@@ -578,6 +578,17 @@ typedef unsigned int size_t;
  #define ST_FLAGS(st) NO_FFLAGS
  #endif
  

diff --git a/ignore-case.diff b/ignore-case.diff
index 698c22ed96dd9eece3b7c7e575358cb445b2f71a..e4493d7e7e74676a01f8fd0eaca07febdb4318ad 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/kerberos.diff b/kerberos.diff
index 2a749d66a722c3d9d2e11a61b760a2e467507867..4bbf5d19595e70e5eeff7e07a7ed027bf52ededa 100644 (file)
--- a/kerberos.diff
+++ b/kerberos.diff
@@ -9,11 +9,11 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -47,7 +47,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -44,7 +44,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
        util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
        fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
@@ -78,7 +78,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -918,6 +918,31 @@ if test x"$enable_iconv" != x"no"; then
+@@ -917,6 +917,31 @@ if test x"$enable_iconv" != x"no"; then
        AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.])
  fi
  
@@ -499,7 +499,7 @@ diff --git a/main.c b/main.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -498,6 +498,15 @@ enum delret {
+@@ -499,6 +499,15 @@ enum delret {
  #define iconv_t int
  #endif
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index b59b94cb915fc50b3f916a50d7bff972f2fe56db..a36f7e1831ccf26d4682d6ed4654654c43eaedc3 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,11 +12,11 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -47,7 +47,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -44,7 +44,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
        util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
        fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
@@ -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
-@@ -1365,7 +1365,8 @@ extern short info_levels[], debug_levels[];
+@@ -1366,7 +1366,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 b8bcf288ce41eb6481eda76f2fa14c4746818193..a207408b2645d0d0dd3e77b6559e0018557e6c63 100644 (file)
--- a/md5p8.diff
+++ b/md5p8.diff
@@ -27,11 +27,11 @@ 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -32,14 +32,14 @@ VERSION=@RSYNC_VERSION@
+@@ -29,14 +29,14 @@ SHELL=/bin/sh
  .SUFFIXES:
  .SUFFIXES: .c .o
  
@@ -42,13 +42,13 @@ diff --git a/Makefile.in b/Makefile.in
  GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync.1.html \
         rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
-       lib/pool_alloc.h lib/mdigest.h lib/md-defines.h
+       lib/pool_alloc.h lib/mdigest.h lib/md-defines.h version.h
 -LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
 +LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o lib/md5p8.o \
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
  zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
-@@ -135,6 +135,9 @@ rounding.h: rounding.c rsync.h proto.h
+@@ -132,6 +132,9 @@ rounding.h: rounding.c rsync.h proto.h
  simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
        @$(srcdir)/cmdormsg disable-simd $(CXX) -I. $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
  

diff --git a/nameconverter.diff b/nameconverter.diff
index 5bfdd6f88c477a219f52162e403d4dd2bc8c07c5..0a90cdeb217710f3730b179672d0de3ad90e4f04 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/authenticate.c b/authenticate.c
 --- a/authenticate.c
 +++ b/authenticate.c

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index b3d24f5160a501f45d0ef960e82431a1140a2581..4a41cee968acbc5263ca355e1452105b22ad3d00 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 a5702cb8ac63409da33f09e877f00d7f435e07b3..68260b122d2c0dd2284bdbe6fdd19cbda2f1ed6e 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 8444eb2dab7a74cf242cdeb9047f3b5778b6f798..45b4f3bbde4da890f4d185b4908e287496812f76 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 699125c285ee3277a4647da07cc9042ce49bb675..38d353b8b253adf910664af8df3f1c51b77210b9 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -10,11 +10,11 @@ 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -17,6 +17,8 @@ CXX=@CXX@
+@@ -16,6 +16,8 @@ CXX=@CXX@
  CXXFLAGS=@CXXFLAGS@
  EXEEXT=@EXEEXT@
  LDFLAGS=@LDFLAGS@
@@ -23,7 +23,7 @@ diff --git a/Makefile.in b/Makefile.in
  LIBOBJDIR=lib/
  
  INSTALLCMD=@INSTALL@
-@@ -48,7 +50,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -45,7 +47,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
        fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
  OBJS3=progress.o pipe.o @ASM@
@@ -32,7 +32,7 @@ diff --git a/Makefile.in b/Makefile.in
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
  OBJS=$(OBJS1) $(OBJS2) $(OBJS3) @SIMD@ $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
-@@ -97,7 +99,7 @@ install-strip:
+@@ -94,7 +96,7 @@ install-strip:
        $(MAKE) INSTALL_STRIP='-s' install
  
  rsync$(EXEEXT): $(OBJS)
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -977,6 +977,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -976,6 +976,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
  fi
  

diff --git a/soften-links.diff b/soften-links.diff
index 124317af756937409fcb9c9a60fcb7af8a21a208..282bb13b819b2663f828041f6564cc2d5601ca5d 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 11cca9674c889c53cef403202a1282f09dc1a046..760aecdb97182104872e3c6b99d83d43250e867a 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 0e69aea31925fbdb704ad6b82d7a0e44fdea4d88..f51e9267965a7fc0429ba4cfc2287377f03d5380 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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)
-@@ -3141,6 +3144,36 @@ your home directory (remove the '=' for that).
+@@ -3142,6 +3145,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 89551c303fc366584738c159c1b8ca1818f0bae5..b2dc2ddfb6c25127582e6981015163d49a80e76b 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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 a75d992c523f2e672088ba37949a0160f94be49b..43f6db09acbccd2deadaa7f9b960de1a9c5d6bc1 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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
-@@ -3105,6 +3107,22 @@ your home directory (remove the '=' for that).
+@@ -3106,6 +3108,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 5169e206f978ab4466fbfbf89c5c6917c8b33109..98eed78749e95672545cab8c97204d0bdeaa3167 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 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
-@@ -3183,6 +3184,25 @@ your home directory (remove the '=' for that).
+@@ -3184,6 +3185,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 39977db3d9069686196746c90ff62a6524195345..be47d16dad9c548e4f27de04430a24b30c86aa1d 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/xattrs.diff b/xattrs.diff
index 3679dfd3613c69a51902ea977f41eee778641dad..ec2287a8927221dfe50bcd7df9f0003a13de64de 100644 (file)
--- 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
-@@ -634,13 +634,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -636,13 +636,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 f6cdf5bf706a330b3f61c4e0f5f3068885a7667b..02cb0bb8a275b2ad3f19c928cf157bf670ccbe2c 100644 (file)
--- 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: dcbe005a6a557294ceba3fd3d8a22ecf62d47e54
+based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c