The patches for 3.2.0.

diff --git a/acls.diff b/acls.diff
index a74daa8de462d98b0ba9909960f55be665fb33c3..5f4f88dfd3e8de7f8ecafd7057254bd8e93afb00 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 6af862f347084735e7bc387c5d16b7e2b3687228..3f18b57040c9ac0bd6bc5d7179dad17b5a8765db 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 df5dbe76f17e700ecef7c76d20d3cb5ffc3f17c5..ff890039ed0b4bfcc15577b2887e6d043cd18ae8 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 ee7d3479e36889a4cd10b664a8ab1b365aad83b5..17884f90ec1b2898bfb1697999b4c2850f062da6 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 4ffb6877f1f2952dee420c7aa61b54226597f9a9..065e6031e54b99acc6f66a5819f116e2bb0bd88a 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -29,7 +29,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern int io_timeout;
  extern int no_detach;
  extern int write_batch;
-@@ -974,6 +976,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -973,6 +975,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;
  
@@ -586,7 +586,7 @@ diff --git a/hlink.c b/hlink.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -177,6 +177,7 @@ typedef struct {
+@@ -173,6 +173,7 @@ typedef struct {
        BOOL temp_dir_EXP;
        BOOL uid_EXP;
  
@@ -594,7 +594,7 @@ diff --git a/loadparm.c b/loadparm.c
        int max_connections;
        int max_verbosity;
        int syslog_facility;
-@@ -294,6 +295,7 @@ static const all_vars Defaults = {
+@@ -290,6 +291,7 @@ static const all_vars Defaults = {
   /* temp_dir_EXP; */          False,
   /* uid_EXP; */                       False,
  
@@ -602,7 +602,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* max_connections; */               0,
   /* max_verbosity; */         1,
   /* syslog_facility; */               LOG_DAEMON,
-@@ -396,6 +398,13 @@ static struct enum_list enum_facilities[] = {
+@@ -392,6 +394,13 @@ static struct enum_list enum_facilities[] = {
        { -1, NULL }
  };
  
@@ -616,7 +616,7 @@ diff --git a/loadparm.c b/loadparm.c
  static struct parm_struct parm_table[] =
  {
   {"address",           P_STRING, P_GLOBAL,&Vars.g.bind_address,        NULL,0},
-@@ -411,6 +420,7 @@ static struct parm_struct parm_table[] =
+@@ -407,6 +416,7 @@ static struct parm_struct parm_table[] =
  
   {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
   {"charset",           P_STRING, P_LOCAL, &Vars.l.charset,             NULL,0},
@@ -624,7 +624,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"comment",           P_STRING, P_LOCAL, &Vars.l.comment,             NULL,0},
   {"dont compress",     P_STRING, P_LOCAL, &Vars.l.dont_compress,       NULL,0},
   {"early exec",        P_STRING, P_LOCAL, &Vars.l.early_exec,          NULL,0},
-@@ -579,6 +589,7 @@ FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
+@@ -575,6 +585,7 @@ FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
  FN_LOCAL_STRING(lp_temp_dir, temp_dir)
  FN_LOCAL_STRING(lp_uid, uid)
  

diff --git a/checksum-updating.diff b/checksum-updating.diff
index 71c7c45d84843270a0d413798f5eaf8434d8818f..e2fdb4b08addf96f5b4069afbab8b8544eb16a42 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
-@@ -402,6 +402,10 @@ static struct enum_list enum_csum_modes[] = {
+@@ -398,6 +398,10 @@ static struct enum_list enum_csum_modes[] = {
        { CSF_IGNORE_FILES, "none" },
        { CSF_LAX_MODE, "lax" },
        { CSF_STRICT_MODE, "strict" },

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 0a969d950eec5e1d8e9309211ad4eb45f395efe9..114cc12da518aab8b1cd1b558157f856b3406027 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 cb93c7b0e6c3f3efdef20f9a3c14621d963e66b9..354c94364a9e3e7253525bde14a9552b38df13f0 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -110,7 +110,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --compress, -z           compress file data during the transfer
  --compress-level=NUM     explicitly set compression level
  --skip-compress=LIST     skip compressing files with suffix in LIST
-@@ -2244,6 +2245,17 @@ your home directory (remove the '=' for that).
+@@ -2246,6 +2247,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.
  

diff --git a/congestion.diff b/congestion.diff
index d272b637918e98261f1dc4745423f42dd77c6bd4..3c927fbb2b126ecbdb8f96b9eb1cacec0340f17f 100644 (file)
--- a/congestion.diff
+++ b/congestion.diff
@@ -27,11 +27,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -123,6 +123,7 @@ typedef struct {
+@@ -119,6 +119,7 @@ typedef struct {
        char *auth_users;
        char *charset;
        char *comment;
@@ -39,7 +39,7 @@ diff --git a/loadparm.c b/loadparm.c
        char *dont_compress;
        char *early_exec;
        char *exclude;
-@@ -152,6 +153,7 @@ typedef struct {
+@@ -148,6 +149,7 @@ typedef struct {
        BOOL auth_users_EXP;
        BOOL charset_EXP;
        BOOL comment_EXP;
@@ -47,7 +47,7 @@ diff --git a/loadparm.c b/loadparm.c
        BOOL dont_compress_EXP;
        BOOL early_exec_EXP;
        BOOL exclude_EXP;
-@@ -177,6 +179,7 @@ typedef struct {
+@@ -173,6 +175,7 @@ typedef struct {
        BOOL temp_dir_EXP;
        BOOL uid_EXP;
  
@@ -55,7 +55,7 @@ diff --git a/loadparm.c b/loadparm.c
        int max_connections;
        int max_verbosity;
        int syslog_facility;
-@@ -241,6 +244,7 @@ static const all_vars Defaults = {
+@@ -237,6 +240,7 @@ static const all_vars Defaults = {
   /* auth_users; */            NULL,
   /* charset; */               NULL,
   /* comment; */               NULL,
@@ -63,7 +63,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* dont_compress; */         DEFAULT_DONT_COMPRESS,
   /* early_exec; */            NULL,
   /* exclude; */               NULL,
-@@ -269,6 +273,7 @@ static const all_vars Defaults = {
+@@ -265,6 +269,7 @@ static const all_vars Defaults = {
   /* auth_users_EXP; */                False,
   /* charset_EXP; */           False,
   /* comment_EXP; */           False,
@@ -71,7 +71,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* dont_compress_EXP; */     False,
   /* early_exec_EXP; */                False,
   /* exclude_EXP; */           False,
-@@ -294,6 +299,7 @@ static const all_vars Defaults = {
+@@ -290,6 +295,7 @@ static const all_vars Defaults = {
   /* temp_dir_EXP; */          False,
   /* uid_EXP; */                       False,
  
@@ -79,7 +79,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* max_connections; */               0,
   /* max_verbosity; */         1,
   /* syslog_facility; */               LOG_DAEMON,
-@@ -412,6 +418,8 @@ static struct parm_struct parm_table[] =
+@@ -408,6 +414,8 @@ static struct parm_struct parm_table[] =
   {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
   {"charset",           P_STRING, P_LOCAL, &Vars.l.charset,             NULL,0},
   {"comment",           P_STRING, P_LOCAL, &Vars.l.comment,             NULL,0},
@@ -88,7 +88,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"dont compress",     P_STRING, P_LOCAL, &Vars.l.dont_compress,       NULL,0},
   {"early exec",        P_STRING, P_LOCAL, &Vars.l.early_exec,          NULL,0},
   {"exclude from",      P_STRING, P_LOCAL, &Vars.l.exclude_from,        NULL,0},
-@@ -554,6 +562,7 @@ FN_GLOBAL_BOOL(lp_proxy_protocol, proxy_protocol)
+@@ -550,6 +558,7 @@ FN_GLOBAL_BOOL(lp_proxy_protocol, proxy_protocol)
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_charset, charset)
  FN_LOCAL_STRING(lp_comment, comment)
@@ -96,7 +96,7 @@ diff --git a/loadparm.c b/loadparm.c
  FN_LOCAL_STRING(lp_dont_compress, dont_compress)
  FN_LOCAL_STRING(lp_early_exec, early_exec)
  FN_LOCAL_STRING(lp_exclude, exclude)
-@@ -579,6 +588,7 @@ FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
+@@ -575,6 +584,7 @@ FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
  FN_LOCAL_STRING(lp_temp_dir, temp_dir)
  FN_LOCAL_STRING(lp_uid, uid)
  

diff --git a/copy-devices.diff b/copy-devices.diff
index 07f629b95ed9f3c678809e5c97bd010b56e6c16e..45ba05827c3db0d19f9d92eb548b18423490470e 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/crtimes.diff b/crtimes.diff
index 5a58067c857291b55bb5b4086d11cdf466a744aa..3b9493e715a539669ad7f080c54bee93a58b15e5 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
-@@ -2537,7 +2543,7 @@ your home directory (remove the '=' for that).
+@@ -2570,7 +2576,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.
  
-@@ -2594,6 +2600,8 @@ your home directory (remove the '=' for that).
+@@ -2627,6 +2633,8 @@ your home directory (remove the '=' for that).
        happens when a symlink or directory is updated.
      - The `a` means that the ACL information changed.
      - The `x` means that the extended attribute information changed.

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 3fcac88106c21838e8e0431e040d83c4448346bb..061778f4ece2176570610b53915c46d8ab625143 100644 (file)
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -8,11 +8,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -263,6 +263,8 @@ static void add_rule(filter_rule_list *listp, const char *pat, unsigned int pat_
+@@ -264,6 +264,8 @@ static void add_rule(filter_rule_list *listp, const char *pat, unsigned int pat_
  
                if (!(lp = new_array0(filter_rule_list, 1)))
                        out_of_memory("add_rule");
@@ -21,7 +21,7 @@ diff --git a/exclude.c b/exclude.c
                if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
                        out_of_memory("add_rule");
                rule->u.mergelist = lp;
-@@ -532,6 +534,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
+@@ -533,6 +535,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
                                set_filter_dir(dir, dirlen);
                }
  
@@ -36,7 +36,7 @@ diff --git a/exclude.c b/exclude.c
                if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
                    MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) {
                        parse_filter_file(lp, dirbuf, ex,
-@@ -1175,6 +1185,7 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
+@@ -1166,6 +1176,7 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
        char line[BIGPATHBUFLEN];
        char *eob = line + sizeof line - 1;
        BOOL word_split = (template->rflags & FILTRULE_WORD_SPLIT) != 0;
@@ -44,7 +44,7 @@ diff --git a/exclude.c b/exclude.c
  
        if (!fname || !*fname)
                return;
-@@ -1221,6 +1232,24 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
+@@ -1212,6 +1223,24 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
                                }
                                break;
                        }
@@ -69,7 +69,7 @@ diff --git a/exclude.c b/exclude.c
                        if (word_split && isspace(ch))
                                break;
                        if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1230,13 +1259,14 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
+@@ -1221,13 +1250,14 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
                        else
                                overflow = 1;
                }

diff --git a/date-only.diff b/date-only.diff
index e3981a0a3f9ee2ea37aff186e23a9e3d3f96af30..be43b8348289dc2f37ceec8a8e7cc58587c42c51 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index 1d946586dd6f6f5b021d05ea7f69fe0a915c8046..6c5e7cf15e6967f8284a98a5ae52d5f75b1d1b0d 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: b5e539fc5aa52b94608dbb976981930c03213a78
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -44,7 +44,7 @@ diff --git a/Makefile.in b/Makefile.in
  libdir=@libdir@/rsync
  mandir=@mandir@
  
-@@ -33,8 +34,9 @@ VERSION=@RSYNC_VERSION@
+@@ -34,8 +35,9 @@ VERSION=@RSYNC_VERSION@
  
  SIMD_x86_64=simd-checksum-x86_64.o lib/md5-asm-x86_64.o
  
@@ -55,7 +55,7 @@ diff --git a/Makefile.in b/Makefile.in
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
        lib/pool_alloc.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
-@@ -44,7 +46,7 @@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+@@ -45,7 +47,7 @@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
  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 \
@@ -64,7 +64,7 @@ diff --git a/Makefile.in b/Makefile.in
  OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
-@@ -76,10 +78,12 @@ install: all
+@@ -77,10 +79,12 @@ install: all
        -${MKDIR_P} ${DESTDIR}${bindir}
        ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
        ${INSTALLCMD} -m 755 rsync-ssl ${DESTDIR}${bindir}
@@ -77,7 +77,7 @@ diff --git a/Makefile.in b/Makefile.in
        if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
  
  install-ssl-daemon: stunnel-rsyncd.conf
-@@ -97,9 +101,12 @@ install-strip:
+@@ -98,10 +102,13 @@ install-strip:
  rsync$(EXEEXT): $(OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
@@ -86,14 +86,15 @@ diff --git a/Makefile.in b/Makefile.in
 +
  $(OBJS): $(HEADERS)
  $(CHECK_OBJS): $(HEADERS)
+ tls.o xattrs.o: lib/sysxattrs.h
 -options.o: latest-year.h help-rsync.h help-rsyncd.h
 +options.o: latest-year.h help-rsync.h help-rsyncd.h help-rsyncdb.h
  exclude.o: default-cvsignore.h
  loadparm.o: default-dont-compress.h
  
-@@ -111,6 +118,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
+@@ -113,6 +120,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
  help-rsync.h help-rsyncd.h: rsync.1.md help-from-md.awk
-       awk -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
+       $(AWK) -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
  
 +help-rsyncdb.h: rsyncdb.1.md help-from-md.awk
 +      awk -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsyncdb.1.md
@@ -101,8 +102,8 @@ diff --git a/Makefile.in b/Makefile.in
  rounding.h: rounding.c rsync.h proto.h
        @for r in 0 1 3; do \
            if $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >rounding.out 2>&1; then \
-@@ -228,7 +238,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
-       awk -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
+@@ -230,7 +240,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
+       $(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
  
  .PHONY: man
 -man: rsync.1 rsync-ssl.1 rsyncd.conf.5
@@ -110,7 +111,7 @@ diff --git a/Makefile.in b/Makefile.in
  
  rsync.1: rsync.1.md md2man NEWS.md Makefile
        @$(srcdir)/maybe-make-man $(srcdir) rsync.1.md
-@@ -239,9 +249,12 @@ rsync-ssl.1: rsync-ssl.1.md md2man NEWS.md Makefile
+@@ -241,9 +251,12 @@ rsync-ssl.1: rsync-ssl.1.md md2man NEWS.md Makefile
  rsyncd.conf.5: rsyncd.conf.5.md md2man NEWS.md Makefile
        @$(srcdir)/maybe-make-man $(srcdir) rsyncd.conf.5.md
  
@@ -196,7 +197,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *bind_address;
  extern char *config_file;
  extern char *logfile_format;
-@@ -775,6 +778,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -774,6 +777,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        log_init(1);
  
@@ -208,7 +209,7 @@ diff --git a/clientserver.c b/clientserver.c
  #ifdef HAVE_PUTENV
        if ((*lp_early_exec(i) || *lp_prexfer_exec(i) || *lp_postxfer_exec(i))
         && !getenv("RSYNC_NO_XFER_EXEC")) {
-@@ -962,6 +970,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -961,6 +969,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;
@@ -220,7 +221,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -412,6 +412,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
+@@ -439,6 +439,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
      unistd.h utime.h grp.h compat.h sys/param.h ctype.h sys/wait.h \
      sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \
      sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
@@ -228,7 +229,7 @@ diff --git a/configure.ac b/configure.ac
      netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
      sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
      popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netinet/ip.h \
-@@ -1261,6 +1262,48 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
+@@ -1288,6 +1289,48 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
      fi
  fi
  

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index 56352dfe9a8d6c7aa99fbc3f87c185082bacc6f5..33b2e8c33310c4166e87331cb1873d9b65b807ea 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
-@@ -2177,6 +2179,17 @@ your home directory (remove the '=' for that).
+@@ -2179,6 +2181,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 a802884e448af27d36e3d3b06bf34882e83186fd..55bbf2dc745a9343162811eed25f4db393759a96 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -656,7 +656,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
-@@ -2160,6 +2161,22 @@ your home directory (remove the '=' for that).
+@@ -2162,6 +2163,22 @@ your home directory (remove the '=' for that).
      fuzzy-match files, so either use `--delete-after` or specify some filename
      exclusions if you need to prevent this.
  

diff --git a/direct-io.diff b/direct-io.diff
index 28c2f7b1af2612ef48488b444557840196d8e856..8faacfd1ff0639cb7742a6966f7a18c64300f7a4 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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
-@@ -2813,6 +2814,16 @@ your home directory (remove the '=' for that).
+@@ -2846,6 +2847,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 5c6160c8087793d6633dd3612d9b827b16d40379..f59162e65938eb2f4ec8beb4aec5cc12a578d33d 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 2d07a1b9b1cc736f475260fb8085d2377c6a130a..67cbe1ae4bfcda12690cae938173668339222217 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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`
  
-@@ -2507,7 +2537,7 @@ your home directory (remove the '=' for that).
+@@ -2540,7 +2570,7 @@ your home directory (remove the '=' for that).
      output of other verbose messages).
  
      The "%i" escape has a cryptic output that is 11 letters long.  The general

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 52d2b3e2eb948dbb9f18c28c7b32a56b6985f31c..9e48eaaadfd69ef4c8866c9641e38fb16ec87b6d 100644 (file)
--- a/filter-attribute-mods.diff
+++ b/filter-attribute-mods.diff
@@ -9,11 +9,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -44,10 +44,13 @@ filter_rule_list filter_list = { .debug_type = "" };
+@@ -45,10 +45,13 @@ filter_rule_list filter_list = { .debug_type = "" };
  filter_rule_list cvs_filter_list = { .debug_type = " [global CVS]" };
  filter_rule_list daemon_filter_list = { .debug_type = " [daemon]" };
  
@@ -29,7 +29,7 @@ diff --git a/exclude.c b/exclude.c
  
  #define SLASH_WILD3_SUFFIX "/***"
  
-@@ -126,8 +129,27 @@ static void teardown_mergelist(filter_rule *ex)
+@@ -127,8 +130,27 @@ static void teardown_mergelist(filter_rule *ex)
                mergelist_cnt--;
  }
  
@@ -57,7 +57,7 @@ diff --git a/exclude.c b/exclude.c
        if (ex->rflags & FILTRULE_PERDIR_MERGE)
                teardown_mergelist(ex);
        free(ex->pattern);
-@@ -729,7 +751,9 @@ static void report_filter_result(enum logcode code, char const *name,
+@@ -730,7 +752,9 @@ static void report_filter_result(enum logcode code, char const *name,
  
  /* This function is used to check if a file should be included/excluded
   * from the list of files based on its name and type etc.  The value of
@@ -68,7 +68,7 @@ diff --git a/exclude.c b/exclude.c
  int name_is_excluded(const char *fname, int name_flags, int filter_level)
  {
        if (daemon_filter_list.head && check_filter(&daemon_filter_list, FLOG, fname, name_flags) < 0) {
-@@ -738,6 +762,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -739,6 +763,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
                return 1;
        }
  
@@ -78,7 +78,7 @@ diff --git a/exclude.c b/exclude.c
        if (filter_level != ALL_FILTERS)
                return 0;
  
-@@ -748,7 +775,8 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -749,7 +776,8 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
  }
  
  /* Return -1 if file "name" is defined to be excluded by the specified
@@ -88,7 +88,7 @@ diff --git a/exclude.c b/exclude.c
  int check_filter(filter_rule_list *listp, enum logcode code,
                 const char *name, int name_flags)
  {
-@@ -771,10 +799,12 @@ int check_filter(filter_rule_list *listp, enum logcode code,
+@@ -772,10 +800,12 @@ int check_filter(filter_rule_list *listp, enum logcode code,
                }
                if (rule_matches(name, ent, name_flags)) {
                        report_filter_result(code, name, ent, name_flags, listp->debug_type);
@@ -101,7 +101,7 @@ diff --git a/exclude.c b/exclude.c
        return 0;
  }
  
-@@ -791,9 +821,46 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
+@@ -792,9 +822,46 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
        return NULL;
  }
  
@@ -149,7 +149,7 @@ diff --git a/exclude.c b/exclude.c
  
  /* Gets the next include/exclude rule from *rulestr_ptr and advances
   * *rulestr_ptr to point beyond it.  Stores the pattern's start (within
-@@ -808,6 +875,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -809,6 +876,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
                                   const char **pat_ptr, unsigned int *pat_len_ptr)
  {
        const uchar *s = (const uchar *)*rulestr_ptr;
@@ -157,7 +157,7 @@ diff --git a/exclude.c b/exclude.c
        filter_rule *rule;
        unsigned int len;
  
-@@ -827,6 +895,12 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -828,6 +896,12 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
        /* Inherit from the template.  Don't inherit FILTRULES_SIDES; we check
         * that later. */
        rule->rflags = template->rflags & FILTRULES_FROM_CONTAINER;
@@ -170,7 +170,7 @@ diff --git a/exclude.c b/exclude.c
  
        /* Figure out what kind of a filter rule "s" is pointing at.  Note
         * that if FILTRULE_NO_PREFIXES is set, the rule is either an include
-@@ -972,11 +1046,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -973,11 +1047,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
                                        goto invalid;
                                rule->rflags |= FILTRULE_EXCLUDE_SELF;
                                break;
@@ -234,7 +234,7 @@ diff --git a/exclude.c b/exclude.c
                        case 'p':
                                rule->rflags |= FILTRULE_PERISHABLE;
                                break;
-@@ -1301,6 +1427,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
+@@ -1292,6 +1418,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
                else if (am_sender)
                        return NULL;
        }
@@ -348,7 +348,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.
-@@ -2444,6 +2446,10 @@ your home directory (remove the '=' for that).
+@@ -2476,6 +2478,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.
  
@@ -359,7 +359,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  0.  `--timeout=TIMEOUT`
  
      This option allows you to set a maximum I/O timeout in seconds.  If no data
-@@ -3382,6 +3388,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3413,6 +3419,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.
@@ -375,7 +375,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
-@@ -3439,6 +3454,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3470,6 +3485,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
    rules in the file must not specify sides (via a modifier or a rule prefix
    such as `hide`).
  

diff --git a/fsync.diff b/fsync.diff
index 476fe3e91c527090bfabdd3ed58fd38190464bc9..72c3a858ced7acffcb41a64ca1f46ab16a153c74 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/ignore-case.diff b/ignore-case.diff
index 1c12694b936c28e40e059e31440eec939a7a3b4b..6d4edfbc241d022c3441f52d7ff5094af802ea59 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -21,10 +21,10 @@ diff --git a/exclude.c b/exclude.c
  
  #include "rsync.h"
 +#include "ifuncs.h"
+ #include "default-cvsignore.h"
  
  extern int am_server;
- extern int am_sender;
-@@ -690,16 +691,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
+@@ -691,16 +692,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
                if (litmatch_array(pattern, strings, slash_handling))
                        return ret_match;
        } else if (anchored_match) {
@@ -250,7 +250,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
-@@ -2108,6 +2109,12 @@ your home directory (remove the '=' for that).
+@@ -2110,6 +2111,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 7cb94cfcbb773c4ed742afa1121c88d59d06d105..bd23ed5d6e33f0858605504c5dc19c7a79090235 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -45,7 +45,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -46,7 +46,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
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
                if (strcmp(line,"@RSYNCD: OK") == 0)
                        break;
  
-@@ -651,7 +662,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -650,7 +661,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() */
@@ -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
-@@ -848,6 +848,31 @@ if test x"$enable_iconv" != x"no"; then
+@@ -878,6 +878,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
  
@@ -460,7 +460,7 @@ new file mode 100644
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -194,6 +194,7 @@ typedef struct {
+@@ -190,6 +190,7 @@ typedef struct {
        BOOL strict_modes;
        BOOL transfer_logging;
        BOOL use_chroot;
@@ -468,7 +468,7 @@ diff --git a/loadparm.c b/loadparm.c
        BOOL write_only;
  } local_vars;
  
-@@ -311,6 +312,7 @@ static const all_vars Defaults = {
+@@ -307,6 +308,7 @@ static const all_vars Defaults = {
   /* strict_modes; */          True,
   /* transfer_logging; */      False,
   /* use_chroot; */            True,
@@ -476,7 +476,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* write_only; */            False,
   }
  };
-@@ -454,6 +456,7 @@ static struct parm_struct parm_table[] =
+@@ -450,6 +452,7 @@ static struct parm_struct parm_table[] =
   {"transfer logging",  P_BOOL,   P_LOCAL, &Vars.l.transfer_logging,    NULL,0},
   {"uid",               P_STRING, P_LOCAL, &Vars.l.uid,                 NULL,0},
   {"use chroot",        P_BOOL,   P_LOCAL, &Vars.l.use_chroot,          NULL,0},
@@ -484,7 +484,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"write only",        P_BOOL,   P_LOCAL, &Vars.l.write_only,          NULL,0},
   {NULL,                P_BOOL,   P_NONE,  NULL,                        NULL,0}
  };
-@@ -596,6 +599,7 @@ FN_LOCAL_BOOL(lp_reverse_lookup, reverse_lookup)
+@@ -592,6 +595,7 @@ FN_LOCAL_BOOL(lp_reverse_lookup, reverse_lookup)
  FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
  FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
  FN_LOCAL_BOOL(lp_use_chroot, use_chroot)

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 94d52c8c4659be419077ba8034f6de5ea069e33f..8ae2d682361812a4f59cd6cf2584a86e736e9ddd 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -45,7 +45,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -46,7 +46,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
@@ -84,7 +84,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *logfile_format;
  extern char *files_from;
  extern char *tmpdir;
-@@ -631,6 +632,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -630,6 +631,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                return -1;
        }
  
@@ -194,7 +194,7 @@ new file mode 100644
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -134,6 +134,7 @@ typedef struct {
+@@ -130,6 +130,7 @@ typedef struct {
        char *include;
        char *include_from;
        char *incoming_chmod;
@@ -202,7 +202,7 @@ diff --git a/loadparm.c b/loadparm.c
        char *lock_file;
        char *log_file;
        char *log_format;
-@@ -163,6 +164,7 @@ typedef struct {
+@@ -159,6 +160,7 @@ typedef struct {
        BOOL include_EXP;
        BOOL include_from_EXP;
        BOOL incoming_chmod_EXP;
@@ -210,7 +210,7 @@ diff --git a/loadparm.c b/loadparm.c
        BOOL lock_file_EXP;
        BOOL log_file_EXP;
        BOOL log_format_EXP;
-@@ -252,6 +254,7 @@ static const all_vars Defaults = {
+@@ -248,6 +250,7 @@ static const all_vars Defaults = {
   /* include; */                       NULL,
   /* include_from; */          NULL,
   /* incoming_chmod; */                NULL,
@@ -218,7 +218,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* lock_file; */             DEFAULT_LOCK_FILE,
   /* log_file; */              NULL,
   /* log_format; */            "%o %h [%a] %m (%u) %f %l",
-@@ -280,6 +283,7 @@ static const all_vars Defaults = {
+@@ -276,6 +279,7 @@ static const all_vars Defaults = {
   /* include_EXP; */           False,
   /* include_from_EXP; */      False,
   /* incoming_chmod_EXP; */    False,
@@ -226,7 +226,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* lock_file_EXP; */         False,
   /* log_file_EXP; */          False,
   /* log_format_EXP; */                False,
-@@ -427,6 +431,7 @@ static struct parm_struct parm_table[] =
+@@ -423,6 +427,7 @@ static struct parm_struct parm_table[] =
   {"include from",      P_STRING, P_LOCAL, &Vars.l.include_from,        NULL,0},
   {"include",           P_STRING, P_LOCAL, &Vars.l.include,             NULL,0},
   {"incoming chmod",    P_STRING, P_LOCAL, &Vars.l.incoming_chmod,      NULL,0},
@@ -234,7 +234,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"list",              P_BOOL,   P_LOCAL, &Vars.l.list,                NULL,0},
   {"lock file",         P_STRING, P_LOCAL, &Vars.l.lock_file,           NULL,0},
   {"log file",          P_STRING, P_LOCAL, &Vars.l.log_file,            NULL,0},
-@@ -565,6 +570,7 @@ FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
+@@ -561,6 +566,7 @@ FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
  FN_LOCAL_STRING(lp_include, include)
  FN_LOCAL_STRING(lp_include_from, include_from)
  FN_LOCAL_STRING(lp_incoming_chmod, incoming_chmod)
@@ -352,7 +352,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --compress, -z           compress file data during the transfer
  --compress-level=NUM     explicitly set compression level
  --skip-compress=LIST     skip compressing files with suffix in LIST
-@@ -2244,6 +2245,50 @@ your home directory (remove the '=' for that).
+@@ -2246,6 +2247,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.
  

diff --git a/md5p8.diff b/md5p8.diff
index e786cfcbe9df133edd07b7c3fa6fe8c47364a237..dd5cddb143b109ec0666b6633895b62261aaec7a 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: 3c56896d2153148da2c3ac876b725968044a815f
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/nameconverter.diff b/nameconverter.diff
index 5357155ca84af92dfd512a3555444b579fe71519..d54cdfe4f23b21498a6f803b331804471c60cd8f 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/authenticate.c b/authenticate.c
 --- a/authenticate.c
 +++ b/authenticate.c
@@ -79,7 +79,7 @@ diff --git a/clientserver.c b/clientserver.c
  
  #ifdef HAVE_SIGACTION
  static struct sigaction sigact;
-@@ -776,7 +778,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -775,7 +777,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        log_init(1);
  
  #ifdef HAVE_PUTENV
@@ -88,7 +88,7 @@ diff --git a/clientserver.c b/clientserver.c
         && !getenv("RSYNC_NO_XFER_EXEC")) {
                set_env_num("RSYNC_PID", (long)getpid());
  
-@@ -836,6 +838,45 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -835,6 +837,45 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                                return -1;
                        }
                }
@@ -134,7 +134,7 @@ diff --git a/clientserver.c b/clientserver.c
        }
  #endif
  
-@@ -1077,6 +1118,44 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -1076,6 +1117,44 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        return 0;
  }
  
@@ -182,7 +182,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -138,6 +138,7 @@ typedef struct {
+@@ -134,6 +134,7 @@ typedef struct {
        char *log_file;
        char *log_format;
        char *name;
@@ -190,7 +190,7 @@ diff --git a/loadparm.c b/loadparm.c
        char *outgoing_chmod;
        char *path;
        char *postxfer_exec;
-@@ -167,6 +168,7 @@ typedef struct {
+@@ -163,6 +164,7 @@ typedef struct {
        BOOL log_file_EXP;
        BOOL log_format_EXP;
        BOOL name_EXP;
@@ -198,7 +198,7 @@ diff --git a/loadparm.c b/loadparm.c
        BOOL outgoing_chmod_EXP;
        BOOL path_EXP;
        BOOL postxfer_exec_EXP;
-@@ -256,6 +258,7 @@ static const all_vars Defaults = {
+@@ -252,6 +254,7 @@ static const all_vars Defaults = {
   /* log_file; */              NULL,
   /* log_format; */            "%o %h [%a] %m (%u) %f %l",
   /* name; */                  NULL,
@@ -206,7 +206,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* outgoing_chmod; */                NULL,
   /* path; */                  NULL,
   /* postxfer_exec; */         NULL,
-@@ -284,6 +287,7 @@ static const all_vars Defaults = {
+@@ -280,6 +283,7 @@ static const all_vars Defaults = {
   /* log_file_EXP; */          False,
   /* log_format_EXP; */                False,
   /* name_EXP; */              False,
@@ -214,7 +214,7 @@ diff --git a/loadparm.c b/loadparm.c
   /* outgoing_chmod_EXP; */    False,
   /* path_EXP; */              False,
   /* postxfer_exec_EXP; */     False,
-@@ -435,6 +439,7 @@ static struct parm_struct parm_table[] =
+@@ -431,6 +435,7 @@ static struct parm_struct parm_table[] =
   {"max verbosity",     P_INTEGER,P_LOCAL, &Vars.l.max_verbosity,       NULL,0},
   {"munge symlinks",    P_BOOL,   P_LOCAL, &Vars.l.munge_symlinks,      NULL,0},
   {"name",              P_STRING, P_LOCAL, &Vars.l.name,                NULL,0},
@@ -222,7 +222,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"numeric ids",       P_BOOL,   P_LOCAL, &Vars.l.numeric_ids,         NULL,0},
   {"outgoing chmod",    P_STRING, P_LOCAL, &Vars.l.outgoing_chmod,      NULL,0},
   {"path",              P_PATH,   P_LOCAL, &Vars.l.path,                NULL,0},
-@@ -573,6 +578,7 @@ FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod)
+@@ -569,6 +574,7 @@ FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod)
  FN_LOCAL_STRING(lp_path, path)
  FN_LOCAL_STRING(lp_postxfer_exec, postxfer_exec)
  FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index b4c2adcd89fd4be291db5a28fdf2a82b9bb6e5e9..cf0f3ea905455ef1a98e9c7687517accfed48df0 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 8e7454122fbcce95b8be1a91c3daf4981287e7c5..cf808a838616cb692b0b20c93f1b9df19d28e38c 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 9a901aa9910dd622d76765d04f17bd33e272d945..ca0779273399a44249e89f9dedbb917e58f951b0 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 4e11540bfd907555764280ad3d6370a7634939df..b00bf23e52bd3fb33843008cace2873096467b28 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -16,6 +16,8 @@ CXX=@CXX@
+@@ -17,6 +17,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@
-@@ -46,7 +48,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -47,7 +49,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
@@ -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@
-@@ -95,7 +97,7 @@ install-strip:
+@@ -96,7 +98,7 @@ install-strip:
        $(MAKE) INSTALL_STRIP='-s' install
  
  rsync$(EXEEXT): $(OBJS)
@@ -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
-@@ -1351,6 +1351,13 @@ int daemon_main(void)
+@@ -1350,6 +1350,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do getnameinfo on the
         * local address??? */
  
@@ -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
-@@ -907,6 +907,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -937,6 +937,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
  
@@ -94,7 +94,7 @@ diff --git a/configure.ac b/configure.ac
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
-@@ -111,6 +111,9 @@ typedef struct {
+@@ -107,6 +107,9 @@ typedef struct {
  
        int listen_backlog;
        int rsync_port;
@@ -104,7 +104,7 @@ diff --git a/loadparm.c b/loadparm.c
  
        BOOL proxy_protocol;
  } global_vars;
-@@ -407,6 +410,9 @@ static struct parm_struct parm_table[] =
+@@ -403,6 +406,9 @@ static struct parm_struct parm_table[] =
   {"pid file",          P_STRING, P_GLOBAL,&Vars.g.pid_file,            NULL,0},
   {"port",              P_INTEGER,P_GLOBAL,&Vars.g.rsync_port,          NULL,0},
   {"proxy protocol",    P_BOOL,   P_LOCAL, &Vars.g.proxy_protocol,      NULL,0},
@@ -114,7 +114,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"socket options",    P_STRING, P_GLOBAL,&Vars.g.socket_options,      NULL,0},
  
   {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
-@@ -548,6 +554,9 @@ FN_GLOBAL_STRING(lp_socket_options, socket_options)
+@@ -544,6 +550,9 @@ FN_GLOBAL_STRING(lp_socket_options, socket_options)
  
  FN_GLOBAL_INTEGER(lp_listen_backlog, listen_backlog)
  FN_GLOBAL_INTEGER(lp_rsync_port, rsync_port)

diff --git a/soften-links.diff b/soften-links.diff
index 10faed4d955b53d48372f6c900134a5e9f689e95..6ec45eeaa78a5d3af9a126f927c9eb8a6b01de42 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 416b79b90ec6fb00df2187080bf6d6463051177b..6d663fdd1ef2ce5926a064265630cf934e4c4846 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 f256acde6874e5ee769d6cb9cd1dec6e318e4323..2bad7c67e6a03968ead43e3ebec675cd1d2111e4 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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)
-@@ -3024,6 +3027,36 @@ your home directory (remove the '=' for that).
+@@ -3057,6 +3060,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 24e9a9093f5aeb9d87331458db55b9defda9cb7e..328b40a75484b68b8a204f336dd674a5a42ea5b6 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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 41d321b4e9e4453e974f6aa003759c2d3937bf41..0cfe7f1705aec5923b0156851c9f53df099b07e1 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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
-@@ -2993,6 +2995,22 @@ your home directory (remove the '=' for that).
+@@ -3026,6 +3028,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 12b24091f4bdf142153a26054181e79953fea9ed..549c343a723c405b90642f770120bce712bb4592 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 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
-@@ -3066,6 +3067,25 @@ your home directory (remove the '=' for that).
+@@ -3099,6 +3100,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 71a5b526cafbde2c4cc7c9086451ef53a943a484..77524bbdc93357adb0f5133b703088d3518b5d18 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/xxh3.diff b/xxh3.diff
index 859f9314d37b29e1f56abb3b6ed07796ef9ceaf7..3b2e00d28cab3eb0efce1b64dc163c18d08065fb 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: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: c225330aaf9d6032a79317bda1bf669e90ac7212
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c