The patches for 3.2.2.

diff --git a/acls.diff b/acls.diff
index e48740ef81507cb98464c1de7961bd0d25a9445d..271cd597e2a3ace68df39964ee5c4a548afa2eb6 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/acls.c b/acls.c
 --- a/acls.c
 +++ b/acls.c

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index 422fca7a70e1321f3baec557d6237f87868cdc84..39df8332a4654470e9fdab4c17b034d9a435581f 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 ba6bc192b6b21364a4ace497d40dd922b78d878c..86e847ba4431ef4a3ad6acb5e3893920740bd7a8 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 48092c16218433a672323e20625e28f3b7dce0e8..aedc22f7a16c6a03894fbdd83d8be9ca61a46d63 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 7390fd7a7d3f4c17a38310df505bcff4c89e6763..de77d66f396ca886cbf4c8e639cffbdcda57e98e 100644 (file)
--- a/checksum-reading.diff
+++ b/checksum-reading.diff
@@ -16,11 +16,11 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -43,6 +43,8 @@ extern int numeric_ids;
+@@ -44,6 +44,8 @@ extern int numeric_ids;
  extern int filesfrom_fd;
  extern int remote_protocol;
  extern int protocol_version;
@@ -29,7 +29,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern int io_timeout;
  extern int no_detach;
  extern int write_batch;
-@@ -1015,6 +1017,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -1021,6 +1023,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        } else if (am_root < 0) /* Treat --fake-super from client as --super. */
                am_root = 2;
  
@@ -594,7 +594,7 @@ diff --git a/hlink.c b/hlink.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -163,6 +163,13 @@ static struct enum_list enum_syslog_facility[] = {
+@@ -162,6 +162,13 @@ static struct enum_list enum_syslog_facility[] = {
        { -1, NULL }
  };
  
@@ -691,7 +691,7 @@ diff --git a/rsync.1.md b/rsync.1.md
      reconstructed on the receiving side by checking a whole-file checksum that
      is generated as the file is transferred, but that automatic
 @@ -691,6 +694,38 @@ your home directory (remove the '=' for that).
-     can be overridden using either the `--checksum-choice` option or an
+     can be overridden using either the `--checksum-choice` (`--cc`) option or an
      environment variable that is discussed in that option's section.
  
 +0.  `--sumfiles=MODE`
@@ -732,7 +732,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
-@@ -835,6 +835,10 @@ extern int xattrs_ndx;
+@@ -836,6 +836,10 @@ extern int xattrs_ndx;
  #define F_SUM(f) ((char*)OPT_EXTRA(f, START_BUMP(f) + HLINK_BUMP(f) \
                                    + SUM_EXTRA_CNT - 1))
  
@@ -743,7 +743,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)
-@@ -1037,6 +1041,13 @@ typedef struct {
+@@ -1038,6 +1042,13 @@ typedef struct {
        char fname[1]; /* has variable size */
  } relnamecache;
  

diff --git a/checksum-updating.diff b/checksum-updating.diff
index 3ce52b13ae09286db8fbb980aa9c054c2f53578d..cf3b7984b0612cf3ed807b80f328d8341bc1dc56 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -533,7 +533,7 @@ diff --git a/io.c b/io.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -167,6 +167,10 @@ static struct enum_list enum_checksum_files[] = {
+@@ -166,6 +166,10 @@ static struct enum_list enum_checksum_files[] = {
        { CSF_IGNORE_FILES, "none" },
        { CSF_LAX_MODE, "lax" },
        { CSF_STRICT_MODE, "strict" },
@@ -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
-@@ -1043,6 +1043,8 @@ typedef struct {
+@@ -1044,6 +1044,8 @@ typedef struct {
  
  #define CSF_ENABLE (1<<1)
  #define CSF_LAX (1<<2)

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 5c90a6c3710e474dbfaafb16453577a9429ebb90..e3ed7a07c5bf0bf02739560ba7ca0289af81365e 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 452dbd51fc71f00b60b3c1573c8c955fd4672a76..4992de5ab86bf11df35299d448321d2e612d26ce 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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)
-@@ -2281,6 +2282,17 @@ your home directory (remove the '=' for that).
+@@ -2282,6 +2283,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.
  
@@ -152,7 +152,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
-@@ -164,6 +164,11 @@
+@@ -165,6 +165,11 @@
  #define COMPARE_DEST 1
  #define COPY_DEST 2
  #define LINK_DEST 3

diff --git a/congestion.diff b/congestion.diff
index c3e0e8d94f76b92beedeeff7034dd14140a5aa89..858bae08b094bbed1110abf47ede91dde6db880b 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt

diff --git a/copy-devices.diff b/copy-devices.diff
index d3eb31de0123e2e7ae3f0036c9646c3ee7ca997d..bb25104a53acbdde6f5032b5c6f579c3b38d8761 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -119,7 +119,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
 --- a/rsyncd.conf.5.md
 +++ b/rsyncd.conf.5.md
-@@ -897,9 +897,10 @@ the values of parameters.  See the GLOBAL PARAMETERS section for more details.
+@@ -913,9 +913,10 @@ the values of parameters.  See the GLOBAL PARAMETERS section for more details.
      If you are un-refusing the compress option, you probably want to match
      "`!compress*`" so that you also accept the `--compress-level` option.
  

diff --git a/crtimes.diff b/crtimes.diff
index 2284deedc05c8718de9730974b74276e0dfe6dff..292914912ae807d341809d5c47b7b12ad32814e8 100644 (file)
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -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
-@@ -2638,7 +2644,7 @@ your home directory (remove the '=' for that).
+@@ -2642,7 +2648,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.
  
-@@ -2695,6 +2701,8 @@ your home directory (remove the '=' for that).
+@@ -2699,6 +2705,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.
@@ -424,7 +424,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -69,7 +69,7 @@
+@@ -70,7 +70,7 @@
  /* The following XMIT flags require an rsync that uses a varint for the flag values */
  
  #define XMIT_SAME_FLAGS (1<<16)       /* any protocol - restricted by command-line option */
@@ -433,7 +433,7 @@ diff --git a/rsync.h b/rsync.h
  
  /* These flags are used in the live flist data. */
  
-@@ -182,6 +182,7 @@
+@@ -183,6 +183,7 @@
  #define ATTRS_ACCURATE_TIME   (1<<2)
  #define ATTRS_SKIP_ATIME      (1<<3)
  #define ATTRS_DELAY_IMMUTABLE (1<<4)
@@ -441,7 +441,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define MSG_FLUSH     2
  #define FULL_FLUSH    1
-@@ -210,6 +211,7 @@
+@@ -211,6 +212,7 @@
  #define ITEM_REPORT_ACL (1<<7)
  #define ITEM_REPORT_XATTR (1<<8)
  #define ITEM_REPORT_FFLAGS (1<<9)
@@ -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)
-@@ -576,6 +578,10 @@ typedef unsigned int size_t;
+@@ -577,6 +579,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. */
-@@ -785,6 +791,7 @@ struct file_struct {
+@@ -786,6 +792,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;
-@@ -849,6 +856,7 @@ extern int xattrs_ndx;
+@@ -850,6 +857,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 */
-@@ -1091,6 +1099,7 @@ typedef struct {
+@@ -1092,6 +1100,7 @@ typedef struct {
  
  typedef struct {
      STRUCT_STAT st;

diff --git a/cvs-entries.diff b/cvs-entries.diff
index a5985ec9aa16178bb07b10eaa8902c26f6ab1db3..2d823db4fe11b612d1ec59ef00fa0e34456726ed 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -88,7 +88,7 @@ diff --git a/exclude.c b/exclude.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -176,6 +176,7 @@
+@@ -177,6 +177,7 @@
  #define XFLG_ANCHORED2ABS     (1<<2) /* leading slash indicates absolute */
  #define XFLG_ABS_IF_SLASH     (1<<3) /* leading or interior slash is absolute */
  #define XFLG_DIR2WILD3                (1<<4) /* dir/ match gets trailing *** added */

diff --git a/date-only.diff b/date-only.diff
index c24df560db6899e7540abf2312b03aa220f52e04..95a54760d02dd37aaf5d283e5a36ce9398e6b6a7 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index 48ea2234e3075b233332c550ad79fbf8cfe5b1ae..dd2f45211813602ee16ee996126462c162a9af2b 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -181,7 +181,7 @@ diff --git a/cleanup.c b/cleanup.c
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -43,12 +43,15 @@ extern int numeric_ids;
+@@ -44,12 +44,15 @@ extern int numeric_ids;
  extern int filesfrom_fd;
  extern int remote_protocol;
  extern int protocol_version;
@@ -197,7 +197,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *bind_address;
  extern char *config_file;
  extern char *logfile_format;
-@@ -809,6 +812,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -810,6 +813,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        log_init(1);
  
@@ -207,9 +207,9 @@ diff --git a/clientserver.c b/clientserver.c
 +      }
 +
  #ifdef HAVE_PUTENV
-       if ((*lp_early_exec(i) || *lp_prexfer_exec(i) || *lp_postxfer_exec(i))
+       if ((*lp_early_exec(module_id) || *lp_prexfer_exec(module_id) || *lp_postxfer_exec(module_id))
         && !getenv("RSYNC_NO_XFER_EXEC")) {
-@@ -1003,6 +1011,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -1009,6 +1017,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        am_server = 1; /* Don't let someone try to be tricky. */
        quiet = 0;
@@ -2870,7 +2870,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -258,12 +258,16 @@ enum msgcode {
+@@ -259,12 +259,16 @@ enum msgcode {
        MSG_IO_ERROR=22,/* the sending side had an I/O error */
        MSG_IO_TIMEOUT=33,/* tell client about a daemon's timeout value */
        MSG_NOOP=42,    /* a do-nothing message (legacy protocol-30 only) */
@@ -2887,7 +2887,7 @@ diff --git a/rsync.h b/rsync.h
  #define NDX_DONE -1
  #define NDX_FLIST_EOF -2
  #define NDX_DEL_STATS -3
-@@ -1358,7 +1362,8 @@ extern short info_levels[], debug_levels[];
+@@ -1359,7 +1363,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 71c09a9604f3b7bbecc91ef91548089a5852d01f..0d28d8e0bbcb6538a1b4a1d157d770b2313f6546 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
-@@ -2214,6 +2216,17 @@ your home directory (remove the '=' for that).
+@@ -2215,6 +2217,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 3139a911fbd4af2c8906badc257153e4f9a45d6d..0a383f4029fe16c8c26dd240393ee49038684503 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -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
-@@ -2197,6 +2198,22 @@ your home directory (remove the '=' for that).
+@@ -2198,6 +2199,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.
  
@@ -680,7 +680,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
-@@ -269,7 +269,7 @@ enum msgcode {
+@@ -270,7 +270,7 @@ enum msgcode {
  #define NDX_DEL_STATS -3
  #define NDX_FLIST_OFFSET -101
  
@@ -689,7 +689,7 @@ diff --git a/rsync.h b/rsync.h
  #define DEL_NO_UID_WRITE      (1<<0) /* file/dir has our uid w/o write perm */
  #define DEL_RECURSE           (1<<1) /* if dir, delete all contents */
  #define DEL_DIR_IS_EMPTY      (1<<2) /* internal delete_FUNCTIONS use only */
-@@ -279,6 +279,7 @@ enum msgcode {
+@@ -280,6 +280,7 @@ enum msgcode {
  #define DEL_FOR_DEVICE                (1<<6) /* making room for a replacement device */
  #define DEL_FOR_SPECIAL       (1<<7) /* making room for a replacement special */
  #define DEL_FOR_BACKUP                (1<<8) /* the delete is for a backup operation */

diff --git a/direct-io.diff b/direct-io.diff
index 2daeec90b7e3b737bf74b8444d54b0557057fb3d..1ab64a1e1bc2cec4131a54c6bafe1f2689cc0991 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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
-@@ -2914,6 +2915,16 @@ your home directory (remove the '=' for that).
+@@ -2918,6 +2919,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 2816d2fa8a486694a07072a9e7930d249c535f3b..ce4b7b1a34988b33ce96607a52148220d1509d9b 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 6164019602344eac1ffac6fa8b512b55c6ed505b..1d6728d3fb3529e876c0a651436c8320297ceb8a 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -557,7 +557,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  
  0.  `--max-delete=NUM`
  
-@@ -2608,7 +2638,7 @@ your home directory (remove the '=' for that).
+@@ -2612,7 +2642,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
@@ -679,7 +679,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
  
  /* The following XMIT flags require an rsync that uses a varint for the flag values */
  
@@ -688,7 +688,7 @@ diff --git a/rsync.h b/rsync.h
  #define XMIT_RESERVED_17 (1<<17)      /* reserved for future crtimes use */
  
  /* These flags are used in the live flist data. */
-@@ -181,6 +181,7 @@
+@@ -182,6 +182,7 @@
  #define ATTRS_SKIP_MTIME      (1<<1)
  #define ATTRS_ACCURATE_TIME   (1<<2)
  #define ATTRS_SKIP_ATIME      (1<<3)
@@ -696,7 +696,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define MSG_FLUSH     2
  #define FULL_FLUSH    1
-@@ -208,6 +209,7 @@
+@@ -209,6 +210,7 @@
  #define ITEM_REPORT_GROUP (1<<6)
  #define ITEM_REPORT_ACL (1<<7)
  #define ITEM_REPORT_XATTR (1<<8)
@@ -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)
-@@ -549,6 +551,31 @@ typedef unsigned int size_t;
+@@ -550,6 +552,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. */
-@@ -762,6 +789,7 @@ extern int pathname_ndx;
+@@ -763,6 +790,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;
  
-@@ -812,6 +840,11 @@ extern int xattrs_ndx;
+@@ -813,6 +841,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 99aa06bd3259bee3c5f9b38cd7e84c967505acc6..5616bb68cf836fa34664a10d1fd613c5eb8692e2 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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.
-@@ -2544,6 +2546,10 @@ your home directory (remove the '=' for that).
+@@ -2548,6 +2550,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
-@@ -3495,6 +3501,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3499,6 +3505,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
-@@ -3552,6 +3567,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3556,6 +3571,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`).
  
@@ -390,7 +390,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
-@@ -170,6 +170,9 @@
+@@ -171,6 +171,9 @@
  #define NO_FILTERS    0
  #define SERVER_FILTERS        1
  #define ALL_FILTERS   2
@@ -400,7 +400,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define XFLG_FATAL_ERRORS     (1<<0)
  #define XFLG_OLD_PREFIXES     (1<<1)
-@@ -919,6 +922,8 @@ struct map_struct {
+@@ -920,6 +923,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 */
-@@ -944,8 +949,18 @@ struct map_struct {
+@@ -945,8 +950,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;
-@@ -955,6 +970,11 @@ typedef struct filter_struct {
+@@ -956,6 +971,11 @@ typedef struct filter_struct {
                int slash_cnt;
                struct filter_list_struct *mergelist;
        } u;

diff --git a/fsync.diff b/fsync.diff
index b95854444bbfb4a16e9ec52e1ed8ad6311194161..0fbfd036a89358e7200605e666b9695f6d13e38a 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 1e110712d2338f3e89a4d07d98874f8316727e66..58d68472d0f47bee7fe9063e1be512d47f24af60 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
-@@ -578,6 +578,17 @@ typedef unsigned int size_t;
+@@ -579,6 +579,17 @@ typedef unsigned int size_t;
  #define ST_FLAGS(st) NO_FFLAGS
  #endif
  

diff --git a/ignore-case.diff b/ignore-case.diff
index b59868c3e743b2a59cff56dd76f34f98bc4a4893..0e6a20fd2729086fe2a46b31be7068be41c05ceb 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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
-@@ -2145,6 +2146,12 @@ your home directory (remove the '=' for that).
+@@ -2146,6 +2147,12 @@ your home directory (remove the '=' for that).
  
      >     sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
  

diff --git a/kerberos.diff b/kerberos.diff
index 458cbef67d324d46063c81cbea4c6fff33069236..b08c203a4d199bb1d065c029e48e1116f02db69f 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -25,7 +25,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -137,7 +137,7 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
+@@ -138,7 +138,7 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
        setup_iconv();
  #endif
  
@@ -34,7 +34,7 @@ diff --git a/clientserver.c b/clientserver.c
  
        return ret ? ret : client_run(fd, fd, -1, argc, argv);
  }
-@@ -214,7 +214,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
+@@ -215,7 +215,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
        return 0;
  }
  
@@ -43,7 +43,7 @@ diff --git a/clientserver.c b/clientserver.c
  {
        int i, modlen;
        char line[BIGPATHBUFLEN];
-@@ -329,6 +329,17 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
+@@ -330,6 +330,17 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
                        continue;
                }
  
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
                if (strcmp(line,"@RSYNCD: OK") == 0)
                        break;
  
-@@ -685,7 +696,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -686,7 +697,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        }
  
        read_only = lp_read_only(i); /* may also be overridden by auth_server() */
@@ -113,12 +113,14 @@ diff --git a/configure.ac b/configure.ac
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt
-@@ -62,4 +62,5 @@ BOOL reverse_lookup          True
+@@ -60,6 +60,7 @@ BOOL reverse_lookup          True
  BOOL  strict_modes            True
  BOOL  transfer_logging        False
  BOOL  use_chroot              True
 +BOOL  use_gssapi              False
  BOOL  write_only              False
+ 
+ BOOL3 munge_symlinks          Unset
 diff --git a/gss-auth.c b/gss-auth.c
 new file mode 100644
 --- /dev/null
@@ -473,7 +475,7 @@ diff --git a/main.c b/main.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -499,6 +499,15 @@ enum delret {
+@@ -500,6 +500,15 @@ enum delret {
  #define iconv_t int
  #endif
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 83e4473d8291809c7704f6f2510082b85b994412..94c36d8f193d86291c9b57f1a387a7f6376241fc 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -76,7 +76,7 @@ diff --git a/checksum.c b/checksum.c
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -51,6 +51,7 @@ extern int logfile_format_has_i;
+@@ -52,6 +52,7 @@ extern int logfile_format_has_i;
  extern int logfile_format_has_o_or_i;
  extern char *bind_address;
  extern char *config_file;
@@ -84,7 +84,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *logfile_format;
  extern char *files_from;
  extern char *tmpdir;
-@@ -665,6 +666,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -666,6 +667,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                return -1;
        }
  
@@ -312,7 +312,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)
-@@ -2281,6 +2282,50 @@ your home directory (remove the '=' for that).
+@@ -2282,6 +2283,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.
  
@@ -388,7 +388,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -1367,7 +1367,8 @@ extern short info_levels[], debug_levels[];
+@@ -1368,7 +1368,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 507a1259391e906d4578015a1663edc2244a8e10..66edb2943c78240917653c158fdc2a57b4b9ee43 100644 (file)
--- 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/nameconverter.diff b/nameconverter.diff
index 970e37070f92d3facec89e27b611280b0fd05351..c2c8bd1ca42a32ae71776842adfad21c0512c022 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: f4184849c44cfb30cb9f77161dd5ff2656877691
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 6e09b352c1b278c93b48f8d3d7a4666bfa79aa0e..64e01a5942393687ece50a31bcd10a576237474a 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 f3f469f9879a1eb808939237cfe3a717eb11f714..602e7410953390377eb3f11249610f8b283983f0 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 fb7ab72bd2e619d471395e54b3b5c479d9ece17c..2c3b7296230195ac5d1768ab550f3f88f8ba4250 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index e7dafb95be54947138c4326500b98bb6fe56c643..d8da1083ce85317977d13ed1e085a08045481518 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -44,7 +44,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1405,6 +1405,13 @@ int daemon_main(void)
+@@ -1411,6 +1411,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do getnameinfo on the
         * local address??? */
  
@@ -97,7 +97,7 @@ diff --git a/daemon-parm.txt b/daemon-parm.txt
 @@ -10,6 +10,7 @@ STRING       socket_options          NULL
  
  INTEGER       listen_backlog          5
- INTEGER       rsync_port              0
+ INTEGER       rsync_port|port         0
 +INTEGER       slp_refresh             0
  
  BOOL  proxy_protocol          False
@@ -159,7 +159,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
-@@ -221,6 +221,10 @@
+@@ -222,6 +222,10 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
        ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
  

diff --git a/soften-links.diff b/soften-links.diff
index f0bd02ca24940393d2039f81ea28e86018e2b7b8..11f294c5ce10be27408ca4e0d156c43530030757 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 8b3a58a93bb091f37961080aa0dc81d0486d6296..d696d589b1f7006da2ce314df8c4f1b97ce6dc57 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 4383aac5d834ff221787058d31e5644a5daaf376..f2328d45b155e8d6af214f9528e7a2faf0f9be91 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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)
-@@ -3139,6 +3142,36 @@ your home directory (remove the '=' for that).
+@@ -3143,6 +3146,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.
  
@@ -370,7 +370,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
-@@ -158,6 +158,7 @@
+@@ -159,6 +159,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000

diff --git a/sparse-block.diff b/sparse-block.diff
index 573a1e32560fef27af8fa99959b39969ecd36cf9..a478f91ae879c45063107f03529b29eeaba9c578 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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 7802750d50e1ee79558a8121e1405754dd6b333c..45f01e59ada3f05de02e3e2c3b76efac845f2f15 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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
-@@ -3103,6 +3105,22 @@ your home directory (remove the '=' for that).
+@@ -3107,6 +3109,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 c94623731502ea51d0dbf06b1e9ed4987a9b6659..e8c3b06e7d46980c62032ecad97fa8d7937b5e19 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 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
-@@ -3181,6 +3182,25 @@ your home directory (remove the '=' for that).
+@@ -3185,6 +3186,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 a083767214b7bf650554552e44571eb4acb6571b..d0549f62127cad86dc9c7888499e78eae20b272a 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/xxh3.diff b/xxh3.diff
index 97ddaa100a72ba45e633c5642cf88e12e4b4c85a..49491e9dad5b5ed873714dd89ec185696ce5b4a3 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: a1cc50ba96d212c0647a91bf56e3de25eb35bd56
+based-on: 194cee671d5e178f20c4494f41911fa8db942935
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c