The patches for 3.2.3.

diff --git a/backup-deleted.diff b/backup-deleted.diff
index 37b1ecbd073dc47a89605852aaed7e14d5d1049f..1d8dc025eca10c0de7dd7d36b1855b1873ba5630 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -41,7 +41,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -987,7 +987,8 @@ static struct poptOption long_options[] = {
+@@ -766,7 +766,8 @@ static struct poptOption long_options[] = {
    {"no-i",             0,  POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
    {"no-bwlimit",       0,  POPT_ARG_VAL,    &bwlimit, 0, 0, 0 },
@@ -51,7 +51,7 @@ diff --git a/options.c b/options.c
    {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -2959,6 +2960,10 @@ void server_options(char **args, int *argc_p)
+@@ -2726,6 +2727,10 @@ void server_options(char **args, int *argc_p)
        }
  
        if (am_sender) {

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 0f44c4d46d229c5d33dc921b35fecc5402df55cc..3640d40e777770d1a728a01124fc4c71080ccb0d 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -204,7 +204,7 @@ diff --git a/delete.c b/delete.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -160,10 +160,14 @@ int no_detach
+@@ -157,10 +157,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -219,7 +219,7 @@ diff --git a/options.c b/options.c
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -176,7 +180,9 @@ char *password_file = NULL;
+@@ -173,7 +177,9 @@ char *password_file = NULL;
  char *early_input_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -229,7 +229,7 @@ diff --git a/options.c b/options.c
  char *sockopts = NULL;
  char *usermap = NULL;
  char *groupmap = NULL;
-@@ -991,7 +997,9 @@ static struct poptOption long_options[] = {
+@@ -770,7 +776,9 @@ static struct poptOption long_options[] = {
    {"backup-deleted",   0,  POPT_ARG_VAL,    &make_backups, 1, 0, 0 },
    {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -239,7 +239,7 @@ diff --git a/options.c b/options.c
    {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -2420,6 +2428,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2187,6 +2195,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
@@ -248,7 +248,7 @@ diff --git a/options.c b/options.c
        }
        if (daemon_filter_list.head && !am_sender) {
                filter_rule_list *elp = &daemon_filter_list;
-@@ -2441,6 +2451,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2208,6 +2218,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        if (check_filter(elp, FLOG, dir, 1) < 0)
                                goto options_rejected;
                }
@@ -263,7 +263,7 @@ diff --git a/options.c b/options.c
        }
  
        if (!backup_suffix)
-@@ -2452,6 +2470,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2219,6 +2237,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        backup_suffix);
                return 0;
        }
@@ -284,7 +284,7 @@ diff --git a/options.c b/options.c
        if (backup_dir) {
                size_t len;
                make_backups = 1; /* --backup-dir implies --backup */
-@@ -2488,6 +2520,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2255,6 +2287,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        "P *%s", backup_suffix);
                parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
        }
@@ -319,7 +319,7 @@ diff --git a/options.c b/options.c
  
        if (preserve_times) {
                preserve_times = PRESERVE_FILE_TIMES;
-@@ -2934,6 +2994,10 @@ void server_options(char **args, int *argc_p)
+@@ -2701,6 +2761,10 @@ void server_options(char **args, int *argc_p)
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -330,7 +330,7 @@ diff --git a/options.c b/options.c
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -2942,6 +3006,14 @@ void server_options(char **args, int *argc_p)
+@@ -2709,6 +2773,14 @@ void server_options(char **args, int *argc_p)
                        goto oom;
                args[ac++] = arg;
        }

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 6307c24528d771f7ee7995c68b29c7dfaf3d0546..717256744ee19e3f6df6a0311a8a533084cd236e 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 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 8722fd5490cd5937a2a27bb94e8ff4ef300f27f6..4c06d6a8f1554e367193662b002df4543f3fca92 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -612,7 +612,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -120,6 +120,7 @@ size_t bwlimit_writemax = 0;
+@@ -117,6 +117,7 @@ size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
  int need_messages_from_generator = 0;
@@ -620,7 +620,7 @@ diff --git a/options.c b/options.c
  int max_delete = INT_MIN;
  OFF_T max_size = -1;
  OFF_T min_size = -1;
-@@ -794,7 +795,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -573,7 +574,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
        OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@ -629,7 +629,7 @@ diff --git a/options.c b/options.c
        OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
        OPT_STOP_AFTER, OPT_STOP_AT,
        OPT_REFUSED_BASE = 9000};
-@@ -950,6 +951,7 @@ static struct poptOption long_options[] = {
+@@ -729,6 +730,7 @@ static struct poptOption long_options[] = {
    {"no-c",             0,  POPT_ARG_VAL,    &always_checksum, 0, 0, 0 },
    {"checksum-choice",  0,  POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
    {"cc",               0,  POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
@@ -637,7 +637,7 @@ diff --git a/options.c b/options.c
    {"block-size",      'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
-@@ -1955,6 +1957,23 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1722,6 +1724,23 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        }
                        break;
  
@@ -661,7 +661,7 @@ diff --git a/options.c b/options.c
                case OPT_INFO:
                        arg = poptGetOptArg(pc);
                        parse_output_words(info_words, info_levels, arg, USER_PRIORITY);
-@@ -2285,6 +2304,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2052,6 +2071,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
        }
  #endif
  
@@ -733,7 +733,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
-@@ -878,6 +878,10 @@ extern int xattrs_ndx;
+@@ -882,6 +882,10 @@ extern int xattrs_ndx;
  #define F_SUM(f) ((char*)OPT_EXTRA(f, START_BUMP(f) + HLINK_BUMP(f) \
                                    + SUM_EXTRA_CNT - 1))
  
@@ -744,7 +744,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)
-@@ -1090,6 +1094,13 @@ typedef struct {
+@@ -1094,6 +1098,13 @@ typedef struct {
  #define RELNAMECACHE_LEN (offsetof(relnamecache, fname))
  #endif
  

diff --git a/checksum-updating.diff b/checksum-updating.diff
index 77c732c31152f1e734993ec76d1e062c3cd4e416..143a2f9b9b8ab1ce83a891adf0891299ed5d2d60 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -547,7 +547,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -1959,7 +1959,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1726,7 +1726,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  
                case OPT_SUMFILES:
                        arg = poptGetOptArg(pc);
@@ -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
-@@ -1096,6 +1096,8 @@ typedef struct {
+@@ -1100,6 +1100,8 @@ typedef struct {
  
  #define CSF_ENABLE (1<<1)
  #define CSF_LAX (1<<2)

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 854b027ce4c6b1b0d1eac5531432fba6ddb34823..5883e4dc669f96589b88e7996d8b9ecf9f5da71d 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 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 4791bb33aa9da6483fa3e5584ae128872454fe0e..ebdd95223913d032bda7c40c960c90a4fcb2911f 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -26,7 +26,7 @@ diff --git a/Makefile.in b/Makefile.in
  
  # Programs we must have to run the test cases
  CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-@@ -150,7 +150,7 @@ getgroups$(EXEEXT): getgroups.o
+@@ -155,7 +155,7 @@ getgroups$(EXEEXT): getgroups.o
  getfsdev$(EXEEXT): getfsdev.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
  
@@ -73,7 +73,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -794,7 +794,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -573,7 +573,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
        OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@ -82,7 +82,7 @@ diff --git a/options.c b/options.c
        OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
        OPT_STOP_AFTER, OPT_STOP_AT,
        OPT_REFUSED_BASE = 9000};
-@@ -954,6 +954,7 @@ static struct poptOption long_options[] = {
+@@ -733,6 +733,7 @@ static struct poptOption long_options[] = {
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -90,7 +90,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_NONE,   0, 'y', 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -1219,6 +1220,9 @@ static void set_refuse_options(void)
+@@ -986,6 +987,9 @@ static void set_refuse_options(void)
  #ifndef SUPPORT_HARD_LINKS
        parse_one_refuse_match(0, "link-dest", list_end);
  #endif
@@ -100,7 +100,7 @@ diff --git a/options.c b/options.c
  #ifndef HAVE_MKTIME
        parse_one_refuse_match(0, "stop-at", list_end);
  #endif
-@@ -1548,6 +1552,8 @@ char *alt_dest_opt(int type)
+@@ -1315,6 +1319,8 @@ char *alt_dest_opt(int type)
                return "--copy-dest";
        case LINK_DEST:
                return "--link-dest";
@@ -109,7 +109,7 @@ diff --git a/options.c b/options.c
        default:
                NOISY_DEATH("Unknown alt_dest_opt type");
        }
-@@ -1918,6 +1924,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1685,6 +1691,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        want_dest_type = LINK_DEST;
                        goto set_dest_dir;
  

diff --git a/congestion.diff b/congestion.diff
index 0ac19e9981f0ef5e27711172956169eb18c385a6..857df2242b35b7e8ce54a86f4160172d8d8619be 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt
@@ -50,7 +50,7 @@ diff --git a/daemon-parm.txt b/daemon-parm.txt
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -75,6 +75,8 @@ int delete_during = 0;
+@@ -72,6 +72,8 @@ int delete_during = 0;
  int delete_before = 0;
  int delete_after = 0;
  int delete_excluded = 0;
@@ -59,7 +59,7 @@ diff --git a/options.c b/options.c
  int remove_source_files = 0;
  int one_file_system = 0;
  int protocol_version = PROTOCOL_VERSION;
-@@ -1037,6 +1039,8 @@ static struct poptOption long_options[] = {
+@@ -816,6 +818,8 @@ static struct poptOption long_options[] = {
    {"outbuf",           0,  POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
    {"remote-option",   'M', POPT_ARG_STRING, 0, 'M', 0, 0 },
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },

diff --git a/copy-devices.diff b/copy-devices.diff
index 5b29d8f69ad54bbef618e1cbd673b5eedfc6aea1..313079e018963a8db28c78b94ef7f847c4e884cd 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -42,7 +42,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -50,6 +50,7 @@ int append_mode = 0;
+@@ -47,6 +47,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_dirlinks = 0;
  int copy_links = 0;
@@ -50,7 +50,7 @@ diff --git a/options.c b/options.c
  int write_devices = 0;
  int preserve_links = 0;
  int preserve_hard_links = 0;
-@@ -873,6 +874,7 @@ static struct poptOption long_options[] = {
+@@ -652,6 +653,7 @@ static struct poptOption long_options[] = {
    {"no-D",             0,  POPT_ARG_NONE,   0, OPT_NO_D, 0, 0 },
    {"devices",          0,  POPT_ARG_VAL,    &preserve_devices, 1, 0, 0 },
    {"no-devices",       0,  POPT_ARG_VAL,    &preserve_devices, 0, 0, 0 },
@@ -58,7 +58,7 @@ diff --git a/options.c b/options.c
    {"write-devices",    0,  POPT_ARG_VAL,    &write_devices, 1, 0, 0 },
    {"no-write-devices", 0,  POPT_ARG_VAL,    &write_devices, 0, 0, 0 },
    {"specials",         0,  POPT_ARG_VAL,    &preserve_specials, 1, 0, 0 },
-@@ -1175,6 +1177,7 @@ static void set_refuse_options(void)
+@@ -942,6 +944,7 @@ static void set_refuse_options(void)
                 || strcmp("iconv", longName) == 0
                 || strcmp("no-iconv", longName) == 0
                 || strcmp("checksum-seed", longName) == 0
@@ -66,7 +66,7 @@ diff --git a/options.c b/options.c
                 || strcmp("write-devices", longName) == 0 /* disable wild-match (it gets refused below) */
                 || strcmp("log-format", longName) == 0 /* aka out-format (NOT log-file-format) */
                 || strcmp("sender", longName) == 0
-@@ -1186,6 +1189,7 @@ static void set_refuse_options(void)
+@@ -953,6 +956,7 @@ static void set_refuse_options(void)
        assert(list_end != NULL);
  
        if (am_daemon) { /* Refused by default, but can be accepted via a negated exact match. */
@@ -74,7 +74,7 @@ diff --git a/options.c b/options.c
                parse_one_refuse_match(0, "write-devices", list_end);
        }
  
-@@ -3128,6 +3132,9 @@ void server_options(char **args, int *argc_p)
+@@ -2895,6 +2899,9 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  

diff --git a/date-only.diff b/date-only.diff
index e25b640cd8f587ff711b5a3492d5371535ed04b8..f570d6b4b49d83792aca0383e0e9ab64ff0ee42c 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -39,7 +39,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -113,6 +113,7 @@ int safe_symlinks = 0;
+@@ -110,6 +110,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int munge_symlinks = 0;
  int size_only = 0;
@@ -47,7 +47,7 @@ diff --git a/options.c b/options.c
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -900,6 +901,7 @@ static struct poptOption long_options[] = {
+@@ -679,6 +680,7 @@ static struct poptOption long_options[] = {
    {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
@@ -55,7 +55,7 @@ diff --git a/options.c b/options.c
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
-@@ -3015,6 +3017,9 @@ void server_options(char **args, int *argc_p)
+@@ -2782,6 +2784,9 @@ void server_options(char **args, int *argc_p)
        else if (missing_args == 1 && !am_sender)
                args[ac++] = "--ignore-missing-args";
  

diff --git a/db.diff b/db.diff
index 96736cc7c5e6ccb2644ed4b9baa4b6f90dce816e..2f13770013a2f72f3ea210a13677404ba92098c2 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: dee099328610e22e75967313d878010f4fed6cbb
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -2493,7 +2493,7 @@ diff --git a/options.c b/options.c
  int connect_timeout = 0;
  int keep_partial = 0;
  int safe_symlinks = 0;
-@@ -286,6 +291,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
+@@ -282,6 +287,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
        DEBUG_WORD(CHDIR, W_CLI|W_SRV, "Debug when the current directory changes"),
        DEBUG_WORD(CONNECT, W_CLI, "Debug connection events (levels 1-2)"),
        DEBUG_WORD(CMD, W_CLI, "Debug commands+options that are issued (levels 1-2)"),
@@ -2501,7 +2501,7 @@ diff --git a/options.c b/options.c
        DEBUG_WORD(DEL, W_REC, "Debug delete actions (levels 1-3)"),
        DEBUG_WORD(DELTASUM, W_SND|W_REC, "Debug delta-transfer checksumming (levels 1-4)"),
        DEBUG_WORD(DUP, W_REC, "Debug weeding of duplicate names"),
-@@ -577,6 +583,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -573,6 +579,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
        OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@ -2509,7 +2509,7 @@ diff --git a/options.c b/options.c
        OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT, OPT_STDERR,
        OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
        OPT_STOP_AFTER, OPT_STOP_AT,
-@@ -733,6 +740,10 @@ static struct poptOption long_options[] = {
+@@ -729,6 +736,10 @@ static struct poptOption long_options[] = {
    {"no-c",             0,  POPT_ARG_VAL,    &always_checksum, 0, 0, 0 },
    {"checksum-choice",  0,  POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
    {"cc",               0,  POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
@@ -2520,7 +2520,7 @@ diff --git a/options.c b/options.c
    {"block-size",      'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
-@@ -829,6 +840,9 @@ static struct poptOption long_options[] = {
+@@ -825,6 +836,9 @@ static struct poptOption long_options[] = {
    {"dparam",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"detach",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
    {"no-detach",        0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
@@ -2530,7 +2530,7 @@ diff --git a/options.c b/options.c
    {0,0,0,0, 0, 0, 0}
  };
  
-@@ -857,6 +871,31 @@ static struct poptOption long_daemon_options[] = {
+@@ -853,6 +867,31 @@ static struct poptOption long_daemon_options[] = {
    {0,0,0,0, 0, 0, 0}
  };
  
@@ -2562,7 +2562,7 @@ diff --git a/options.c b/options.c
  
  static char err_buf[200];
  
-@@ -982,6 +1021,8 @@ static void set_refuse_options(void)
+@@ -978,6 +1017,8 @@ static void set_refuse_options(void)
                        parse_one_refuse_match(0, "iconv", list_end);
  #endif
                parse_one_refuse_match(0, "log-file*", list_end);
@@ -2571,7 +2571,7 @@ diff --git a/options.c b/options.c
        }
  
  #ifndef SUPPORT_ATIMES
-@@ -1289,6 +1330,102 @@ static void create_refuse_error(int which)
+@@ -1285,6 +1326,102 @@ static void create_refuse_error(int which)
                snprintf(err_buf + n, sizeof err_buf - n, " (-%c)\n", op->shortName);
  }
  
@@ -2674,7 +2674,7 @@ diff --git a/options.c b/options.c
  /* This is used to make sure that --daemon & --server cannot be aliased to
   * something else. These options have always disabled popt aliases for the
   * parsing of a daemon or server command-line, but we have to make sure that
-@@ -1345,6 +1482,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1341,6 +1478,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                return 0;
        }
  
@@ -2687,7 +2687,7 @@ diff --git a/options.c b/options.c
        set_refuse_options();
  
  #ifdef ICONV_OPTION
-@@ -1463,6 +1606,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1459,6 +1602,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        am_daemon = 1;
                        return 1;
  
@@ -2700,7 +2700,7 @@ diff --git a/options.c b/options.c
                case OPT_MODIFY_WINDOW:
                        /* The value has already been set by popt, but
                         * we need to remember that we're using a
-@@ -1535,6 +1684,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1531,6 +1680,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        preserve_devices = preserve_specials = 0;
                        break;
  
@@ -2860,7 +2860,7 @@ diff --git a/rsync.h b/rsync.h
  #define NDX_DONE -1
  #define NDX_FLIST_EOF -2
  #define NDX_DEL_STATS -3
-@@ -1415,7 +1419,8 @@ extern short info_levels[], debug_levels[];
+@@ -1419,7 +1423,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 22159655ac5b4bb843a406f9e7dfbc8140d2cacc..03326df0e4e8537e7531ba162a8520cc3f9cb37c 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -60,7 +60,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -955,7 +955,9 @@ static struct poptOption long_options[] = {
+@@ -734,7 +734,9 @@ static struct poptOption long_options[] = {
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -71,7 +71,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_NONE,   0, 'y', 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -2996,8 +2998,14 @@ void server_options(char **args, int *argc_p)
+@@ -2763,8 +2765,14 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 3b6807eee4c9ce41c1ea50cc7f8f6012dc5e1ca9..87134f5904316c09d6e76ffbb859d55d2a4f9912 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -601,7 +601,7 @@ diff --git a/main.c b/main.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -87,6 +87,7 @@ int am_server = 0;
+@@ -84,6 +84,7 @@ int am_server = 0;
  int am_sender = 0;
  int am_starting_up = 1;
  int relative_paths = -1;
@@ -609,7 +609,7 @@ diff --git a/options.c b/options.c
  int implied_dirs = 1;
  int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
  int numeric_ids = 0;
-@@ -954,6 +955,7 @@ static struct poptOption long_options[] = {
+@@ -733,6 +734,7 @@ static struct poptOption long_options[] = {
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -617,7 +617,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_NONE,   0, 'y', 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -2579,7 +2581,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2346,7 +2348,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                inplace = 1;
        }
  
@@ -626,7 +626,7 @@ diff --git a/options.c b/options.c
                partial_dir = tmp_partialdir;
  
        if (inplace) {
-@@ -2588,6 +2590,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2355,6 +2357,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        snprintf(err_buf, sizeof err_buf,
                                 "--%s cannot be used with --%s\n",
                                 append_mode ? "append" : "inplace",
@@ -634,7 +634,7 @@ diff --git a/options.c b/options.c
                                 delay_updates ? "delay-updates" : "partial-dir");
                        return 0;
                }
-@@ -2993,6 +2996,8 @@ void server_options(char **args, int *argc_p)
+@@ -2760,6 +2763,8 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";

diff --git a/direct-io.diff b/direct-io.diff
index fb4fe816a72adf357240c023c922130e27ecb208..8c3189745d24976505a7bd8a352436a60551500b 100644 (file)
--- a/direct-io.diff
+++ b/direct-io.diff
@@ -10,19 +10,19 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -25,6 +25,7 @@
- #include "latest-year.h"
+@@ -24,6 +24,7 @@
+ #include "ifuncs.h"
  #include <popt.h>
  
 +extern int direct_io;
  extern int module_id;
  extern int local_server;
  extern int sanitize_paths;
-@@ -975,6 +976,8 @@ static struct poptOption long_options[] = {
+@@ -754,6 +755,8 @@ static struct poptOption long_options[] = {
    {"partial-dir",      0,  POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
    {"delay-updates",    0,  POPT_ARG_VAL,    &delay_updates, 1, 0, 0 },
    {"no-delay-updates", 0,  POPT_ARG_VAL,    &delay_updates, 0, 0, 0 },

diff --git a/downdate.diff b/downdate.diff
index f5118cee50bceadf9be16a832e4753c3726ebf26..5fb09e8074d488bf3dd45b340db06a01d5d25e26 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -51,7 +51,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -65,6 +65,7 @@ int preserve_times = 0;
+@@ -62,6 +62,7 @@ int preserve_times = 0;
  int preserve_atimes = 0;
  int preserve_crtimes = 0;
  int update_only = 0;
@@ -59,7 +59,7 @@ diff --git a/options.c b/options.c
  int open_noatime = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -904,6 +905,7 @@ static struct poptOption long_options[] = {
+@@ -683,6 +684,7 @@ static struct poptOption long_options[] = {
    {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },

diff --git a/fileflags.diff b/fileflags.diff
index 17b95174fae04deaa68440c989e36a5071d697a6..1910857cd620a0c73968a70d7f5f70e3fa10b6dd 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: dee099328610e22e75967313d878010f4fed6cbb
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -381,7 +381,7 @@ diff --git a/options.c b/options.c
  int io_timeout = 0;
  int prune_empty_dirs = 0;
  int use_qsort = 0;
-@@ -618,6 +620,8 @@ static struct poptOption long_options[] = {
+@@ -614,6 +616,8 @@ static struct poptOption long_options[] = {
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
@@ -390,7 +390,7 @@ diff --git a/options.c b/options.c
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
-@@ -715,6 +719,12 @@ static struct poptOption long_options[] = {
+@@ -711,6 +715,12 @@ static struct poptOption long_options[] = {
    {"remove-source-files",0,POPT_ARG_VAL,    &remove_source_files, 1, 0, 0 },
    {"force",            0,  POPT_ARG_VAL,    &force_delete, 1, 0, 0 },
    {"no-force",         0,  POPT_ARG_VAL,    &force_delete, 0, 0, 0 },
@@ -403,7 +403,7 @@ diff --git a/options.c b/options.c
    {"ignore-errors",    0,  POPT_ARG_VAL,    &ignore_errors, 1, 0, 0 },
    {"no-ignore-errors", 0,  POPT_ARG_VAL,    &ignore_errors, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -1002,6 +1012,14 @@ static void set_refuse_options(void)
+@@ -998,6 +1008,14 @@ static void set_refuse_options(void)
  #ifndef SUPPORT_CRTIMES
        parse_one_refuse_match(0, "crtimes", list_end);
  #endif
@@ -418,7 +418,7 @@ diff --git a/options.c b/options.c
  
        /* Now we use the descrip values to actually mark the options for refusal. */
        for (op = long_options; op != list_end; op++) {
-@@ -2650,6 +2668,9 @@ void server_options(char **args, int *argc_p)
+@@ -2646,6 +2664,9 @@ void server_options(char **args, int *argc_p)
        if (xfer_dirs && !recurse && delete_mode && am_sender)
                args[ac++] = "--no-r";
  
@@ -428,7 +428,7 @@ diff --git a/options.c b/options.c
        if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
                if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
                        goto oom;
-@@ -2758,6 +2779,16 @@ void server_options(char **args, int *argc_p)
+@@ -2754,6 +2775,16 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--delete-excluded";
                if (force_delete)
                        args[ac++] = "--force";
@@ -693,7 +693,7 @@ diff --git a/rsync.h b/rsync.h
  #define ITEM_REPORT_CRTIME (1<<10)
  #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
  #define ITEM_XNAME_FOLLOWS (1<<12)
-@@ -574,6 +576,31 @@ typedef unsigned int size_t;
+@@ -578,6 +580,31 @@ typedef unsigned int size_t;
  #define SUPPORT_CRTIMES 1
  #endif
  
@@ -725,7 +725,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. */
-@@ -800,6 +827,7 @@ extern int pathname_ndx;
+@@ -804,6 +831,7 @@ extern int pathname_ndx;
  extern int depth_ndx;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -733,7 +733,7 @@ diff --git a/rsync.h b/rsync.h
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -854,6 +882,11 @@ extern int xattrs_ndx;
+@@ -858,6 +886,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 aa87fd5858f1f95a5fa2f22b47ea2a3e5dff1b57..6d127344cd7a184c7da7c5a128665dec18d75831 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -46,10 +46,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 "/***"
  
-@@ -128,8 +131,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);
-@@ -723,7 +745,9 @@ static void report_filter_result(enum logcode code, char const *name,
+@@ -722,7 +744,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) {
-@@ -732,6 +756,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -731,6 +755,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;
  
-@@ -742,7 +769,8 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -741,7 +768,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)
  {
-@@ -765,10 +793,12 @@ int check_filter(filter_rule_list *listp, enum logcode code,
+@@ -764,10 +792,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;
  }
  
-@@ -785,9 +815,45 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
+@@ -784,9 +814,45 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
        return NULL;
  }
  
@@ -148,7 +148,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
-@@ -802,6 +868,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -801,6 +867,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;
@@ -156,7 +156,7 @@ diff --git a/exclude.c b/exclude.c
        filter_rule *rule;
        unsigned int len;
  
-@@ -820,6 +887,12 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -819,6 +886,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;
@@ -169,7 +169,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
-@@ -965,11 +1038,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -964,11 +1037,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
                                        goto invalid;
                                rule->rflags |= FILTRULE_EXCLUDE_SELF;
                                break;
@@ -233,7 +233,7 @@ diff --git a/exclude.c b/exclude.c
                        case 'p':
                                rule->rflags |= FILTRULE_PERISHABLE;
                                break;
-@@ -1283,6 +1408,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
+@@ -1282,6 +1407,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
                else if (am_sender)
                        return NULL;
        }
@@ -400,7 +400,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define XFLG_FATAL_ERRORS     (1<<0)
  #define XFLG_OLD_PREFIXES     (1<<1)
-@@ -962,6 +965,8 @@ struct map_struct {
+@@ -966,6 +969,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 */
-@@ -987,8 +992,18 @@ struct map_struct {
+@@ -991,8 +996,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;
-@@ -998,6 +1013,11 @@ typedef struct filter_struct {
+@@ -1002,6 +1017,11 @@ typedef struct filter_struct {
                int slash_cnt;
                struct filter_list_struct *mergelist;
        } u;

diff --git a/fsync.diff b/fsync.diff
index bb79d65ab546b3f2d547a3ff5baf47e4c2dfbab6..3e1041d9e11ac06cda21eafb47038949362c95fe 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,11 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -69,6 +69,7 @@ int open_noatime = 0;
+@@ -66,6 +66,7 @@ int open_noatime = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
@@ -19,7 +19,7 @@ diff --git a/options.c b/options.c
  int ignore_times = 0;
  int delete_mode = 0;
  int delete_during = 0;
-@@ -1010,6 +1011,7 @@ static struct poptOption long_options[] = {
+@@ -789,6 +790,7 @@ static struct poptOption long_options[] = {
    {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
    {"contimeout",       0,  POPT_ARG_INT,    &connect_timeout, 0, 0, 0 },
    {"no-contimeout",    0,  POPT_ARG_VAL,    &connect_timeout, 0, 0, 0 },
@@ -27,7 +27,7 @@ diff --git a/options.c b/options.c
    {"stop-after",       0,  POPT_ARG_STRING, 0, OPT_STOP_AFTER, 0, 0 },
    {"time-limit",       0,  POPT_ARG_STRING, 0, OPT_STOP_AFTER, 0, 0 }, /* earlier stop-after name */
    {"stop-at",          0,  POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 },
-@@ -3078,6 +3080,9 @@ void server_options(char **args, int *argc_p)
+@@ -2845,6 +2847,9 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = tmpdir;
                }
  

diff --git a/ignore-case.diff b/ignore-case.diff
index cc04d4ca16bf5dea7db953b94540806efc3b05f9..c20f55495f8539d21ff726e0c748108a155fc994 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,11 +12,11 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
-based-on: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -684,16 +684,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
+@@ -683,16 +683,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) {
@@ -214,7 +214,7 @@ diff --git a/lib/wildmatch.c b/lib/wildmatch.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -125,6 +125,7 @@ OFF_T max_size = -1;
+@@ -122,6 +122,7 @@ OFF_T max_size = -1;
  OFF_T min_size = -1;
  int ignore_errors = 0;
  int modify_window = 0;
@@ -222,7 +222,7 @@ diff --git a/options.c b/options.c
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -995,6 +996,8 @@ static struct poptOption long_options[] = {
+@@ -774,6 +775,8 @@ static struct poptOption long_options[] = {
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
@@ -231,7 +231,7 @@ diff --git a/options.c b/options.c
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_VAL,    &eol_nulls, 1, 0, 0},
    {"no-from0",         0,  POPT_ARG_VAL,    &eol_nulls, 0, 0, 0},
-@@ -3028,6 +3031,9 @@ void server_options(char **args, int *argc_p)
+@@ -2795,6 +2798,9 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  

diff --git a/kerberos.diff b/kerberos.diff
index b4e5a34407290ee57407d52c52c20370248abc27..dc1f1824cd2d523464f77bfb8131adaec203e3a0 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: dee099328610e22e75967313d878010f4fed6cbb
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 27251e457a07527fe02fc472e32cfdfb6be53d92..0785f8961ab387fd37d53d36e42d4a584c16c747 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: dee099328610e22e75967313d878010f4fed6cbb
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -213,7 +213,7 @@ diff --git a/options.c b/options.c
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *logfile_name = NULL;
-@@ -225,7 +226,7 @@ static const char *debug_verbosity[] = {
+@@ -221,7 +222,7 @@ static const char *debug_verbosity[] = {
        /*2*/ "BIND,CMD,CONNECT,DEL,DELTASUM,DUP,FILTER,FLIST,ICONV",
        /*3*/ "ACL,BACKUP,CONNECT2,DELTASUM2,DEL2,EXIT,FILTER2,FLIST2,FUZZY,GENR,OWN,RECV,SEND,TIME",
        /*4*/ "CMD2,DELTASUM3,DEL3,EXIT2,FLIST3,ICONV2,OWN2,PROTO,TIME2",
@@ -222,7 +222,7 @@ diff --git a/options.c b/options.c
  };
  
  #define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1)
-@@ -295,6 +296,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
+@@ -291,6 +292,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
        DEBUG_WORD(FUZZY, W_REC, "Debug fuzzy scoring (levels 1-2)"),
        DEBUG_WORD(GENR, W_REC, "Debug generator functions"),
        DEBUG_WORD(HASH, W_SND|W_REC, "Debug hashtable code"),
@@ -230,7 +230,7 @@ diff --git a/options.c b/options.c
        DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions (levels 1-3)"),
        DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"),
        DEBUG_WORD(IO, W_CLI|W_SRV, "Debug I/O routines (levels 1-4)"),
-@@ -577,7 +579,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -573,7 +575,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
        OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@ -239,7 +239,7 @@ diff --git a/options.c b/options.c
        OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
        OPT_STOP_AFTER, OPT_STOP_AT,
        OPT_REFUSED_BASE = 9000};
-@@ -737,6 +739,7 @@ static struct poptOption long_options[] = {
+@@ -733,6 +735,7 @@ static struct poptOption long_options[] = {
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -247,7 +247,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_NONE,   0, 'y', 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -976,6 +979,9 @@ static void set_refuse_options(void)
+@@ -972,6 +975,9 @@ static void set_refuse_options(void)
                ref = cp + 1;
        }
  
@@ -257,7 +257,7 @@ diff --git a/options.c b/options.c
        if (am_daemon) {
  #ifdef ICONV_OPTION
                if (!*lp_charset(module_id))
-@@ -1838,6 +1844,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1834,6 +1840,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        return 0;
  #endif
  
@@ -278,7 +278,7 @@ diff --git a/options.c b/options.c
                case OPT_STOP_AFTER: {
                        long val;
                        arg = poptGetOptArg(pc);
-@@ -2190,6 +2210,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2186,6 +2206,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
@@ -287,7 +287,7 @@ diff --git a/options.c b/options.c
        }
        if (daemon_filter_list.head && !am_sender) {
                filter_rule_list *elp = &daemon_filter_list;
-@@ -2874,6 +2896,12 @@ void server_options(char **args, int *argc_p)
+@@ -2870,6 +2892,12 @@ void server_options(char **args, int *argc_p)
        } else if (inplace)
                args[ac++] = "--inplace";
  
@@ -387,7 +387,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -1424,7 +1424,8 @@ extern short info_levels[], debug_levels[];
+@@ -1428,7 +1428,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 b798f1cf7c7299ebc5993c76dc1b6fe207a45618..a0094a15476e6706b432f59c8d78f8517593436c 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -39,7 +39,7 @@ diff --git a/Makefile.in b/Makefile.in
 +SIMD_x86_64=simd-checksum-x86_64.o simd-md5-parallel-x86_64.o
  ASM_x86_64=lib/md5-asm-x86_64.o
  
- GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync.1.html \
+ GENFILES=configure.sh aclocal.m4 config.h.in rsync.1 rsync.1.html \
         rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
        lib/pool_alloc.h lib/mdigest.h lib/md-defines.h version.h
@@ -48,7 +48,7 @@ diff --git a/Makefile.in b/Makefile.in
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
  zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
-@@ -135,6 +135,9 @@ rounding.h: rounding.c rsync.h proto.h
+@@ -140,6 +140,9 @@ git-version.h: mkgitver $(wildcard $(srcdir)/.git/logs/HEAD)
  simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
        @$(srcdir)/cmdormsg disable-simd $(CXX) -I. $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
  

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index 921fe076279127febe0c28ff8792facc71072944..c305e651b79112ea1058bd9b1ff34011e9424c26 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -51,7 +51,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -76,6 +76,7 @@ int delete_before = 0;
+@@ -73,6 +73,7 @@ int delete_before = 0;
  int delete_after = 0;
  int delete_excluded = 0;
  int remove_source_files = 0;
@@ -59,7 +59,7 @@ diff --git a/options.c b/options.c
  int one_file_system = 0;
  int protocol_version = PROTOCOL_VERSION;
  int sparse_files = 0;
-@@ -859,6 +860,7 @@ static struct poptOption long_options[] = {
+@@ -638,6 +639,7 @@ static struct poptOption long_options[] = {
    {"omit-link-times", 'J', POPT_ARG_VAL,    &omit_link_times, 1, 0, 0 },
    {"no-omit-link-times",0, POPT_ARG_VAL,    &omit_link_times, 0, 0, 0 },
    {"no-J",             0,  POPT_ARG_VAL,    &omit_link_times, 0, 0, 0 },
@@ -67,7 +67,7 @@ diff --git a/options.c b/options.c
    {"modify-window",   '@', POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
    {"no-super",         0,  POPT_ARG_VAL,    &am_root, 0, 0, 0 },
-@@ -2488,6 +2490,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2255,6 +2257,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
        }
  
@@ -77,7 +77,7 @@ diff --git a/options.c b/options.c
        if (preserve_times) {
                preserve_times = PRESERVE_FILE_TIMES;
                if (!omit_dir_times)
-@@ -2733,6 +2738,8 @@ void server_options(char **args, int *argc_p)
+@@ -2500,6 +2505,8 @@ void server_options(char **args, int *argc_p)
                        argstr[x++] = 'O';
                if (omit_link_times)
                        argstr[x++] = 'J';

diff --git a/slow-down.diff b/slow-down.diff
index 22114260b3ff0d5c4607634dcb91f8ea77f9612b..a8096ddcbe36b37aec70dcaa1e110e84bd29f96a 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -39,7 +39,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -116,6 +116,7 @@ int size_only = 0;
+@@ -113,6 +113,7 @@ int size_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
@@ -47,7 +47,7 @@ diff --git a/options.c b/options.c
  size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
-@@ -985,6 +986,7 @@ static struct poptOption long_options[] = {
+@@ -764,6 +765,7 @@ static struct poptOption long_options[] = {
    {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
    {"no-itemize-changes",0, POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
    {"no-i",             0,  POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },

diff --git a/slp.diff b/slp.diff
index 18fa8042bacf71c1dc1be4ca604138c4e7a536bf..6d391f2784ef09772016b58c58dd48fe624a90e1 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: dee099328610e22e75967313d878010f4fed6cbb
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/soften-links.diff b/soften-links.diff
index e9ff50013d14419e065df9dd405e64e6357ebe3a..e3b79069733b4b14c6ef95d1715454f3fb98fd92 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 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 954845add55f34859f811c96a88c5e296377f42e..6c029f3c3cffdf5cc6fd5303067884e5d52117d9 100644 (file)
--- a/source-backup.diff
+++ b/source-backup.diff
@@ -9,11 +9,11 @@ To use this patch, run these commands for a successful build:
 
 -- Matt McCutchen <hashproduct@gmail.com>
 
-based-on: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -35,6 +35,7 @@ extern filter_rule_list filter_list;
+@@ -32,6 +32,7 @@ extern filter_rule_list filter_list;
  extern filter_rule_list daemon_filter_list;
  
  int make_backups = 0;
@@ -21,7 +21,7 @@ diff --git a/options.c b/options.c
  
  /**
   * If 1, send the whole file as literal data rather than trying to
-@@ -988,6 +989,7 @@ static struct poptOption long_options[] = {
+@@ -767,6 +768,7 @@ static struct poptOption long_options[] = {
    {"bwlimit",          0,  POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
    {"no-bwlimit",       0,  POPT_ARG_VAL,    &bwlimit, 0, 0, 0 },
    {"backup",          'b', POPT_ARG_VAL,    &make_backups, 1, 0, 0 },
@@ -29,7 +29,7 @@ diff --git a/options.c b/options.c
    {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -3001,6 +3003,8 @@ void server_options(char **args, int *argc_p)
+@@ -2768,6 +2770,8 @@ void server_options(char **args, int *argc_p)
                                goto oom;
                        args[ac++] = arg;
                }

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index ac8e5f45369994082f7d20dae9b578d39885064d..c3c757fd15664c2479b237bab74d4350b6a90131 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -66,7 +66,7 @@ diff --git a/main.c b/main.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -113,6 +113,7 @@ int safe_symlinks = 0;
+@@ -110,6 +110,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int munge_symlinks = 0;
  int size_only = 0;
@@ -74,7 +74,7 @@ diff --git a/options.c b/options.c
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -173,6 +174,8 @@ char *logfile_name = NULL;
+@@ -170,6 +171,8 @@ char *logfile_name = NULL;
  char *logfile_format = NULL;
  char *stdout_format = NULL;
  char *password_file = NULL;
@@ -83,7 +83,7 @@ diff --git a/options.c b/options.c
  char *early_input_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
-@@ -900,6 +903,7 @@ static struct poptOption long_options[] = {
+@@ -679,6 +682,7 @@ static struct poptOption long_options[] = {
    {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
@@ -91,7 +91,7 @@ diff --git a/options.c b/options.c
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
-@@ -1034,6 +1038,8 @@ static struct poptOption long_options[] = {
+@@ -813,6 +817,8 @@ static struct poptOption long_options[] = {
    {"early-input",      0,  POPT_ARG_STRING, &early_input_file, 0, 0, 0 },
    {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
    {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
@@ -100,7 +100,7 @@ diff --git a/options.c b/options.c
    {"outbuf",           0,  POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
    {"remote-option",   'M', POPT_ARG_STRING, 0, 'M', 0, 0 },
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
-@@ -2623,6 +2629,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2390,6 +2396,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -117,7 +117,7 @@ diff --git a/options.c b/options.c
        if (files_from) {
                char *h, *p;
                int q;
-@@ -3015,6 +3031,25 @@ void server_options(char **args, int *argc_p)
+@@ -2782,6 +2798,25 @@ void server_options(char **args, int *argc_p)
        else if (missing_args == 1 && !am_sender)
                args[ac++] = "--ignore-missing-args";
  

diff --git a/sparse-block.diff b/sparse-block.diff
index ae8b24b14675504684b351ade8eef554c5f8969d..5b693867be17e419767dec2c1c41a46faf84b3c2 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c
@@ -42,7 +42,7 @@ diff --git a/fileio.c b/fileio.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -79,6 +79,7 @@ int remove_source_files = 0;
+@@ -76,6 +76,7 @@ int remove_source_files = 0;
  int one_file_system = 0;
  int protocol_version = PROTOCOL_VERSION;
  int sparse_files = 0;
@@ -50,7 +50,7 @@ diff --git a/options.c b/options.c
  int preallocate_files = 0;
  int do_compression = 0;
  int do_compression_level = CLVL_NOT_SPECIFIED;
-@@ -913,6 +914,7 @@ static struct poptOption long_options[] = {
+@@ -692,6 +693,7 @@ static struct poptOption long_options[] = {
    {"sparse",          'S', POPT_ARG_VAL,    &sparse_files, 1, 0, 0 },
    {"no-sparse",        0,  POPT_ARG_VAL,    &sparse_files, 0, 0, 0 },
    {"no-S",             0,  POPT_ARG_VAL,    &sparse_files, 0, 0, 0 },
@@ -58,7 +58,7 @@ diff --git a/options.c b/options.c
    {"preallocate",      0,  POPT_ARG_NONE,   &preallocate_files, 0, 0, 0},
    {"inplace",          0,  POPT_ARG_VAL,    &inplace, 1, 0, 0 },
    {"no-inplace",       0,  POPT_ARG_VAL,    &inplace, 0, 0, 0 },
-@@ -2917,6 +2919,12 @@ void server_options(char **args, int *argc_p)
+@@ -2684,6 +2686,12 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  

diff --git a/transliterate.diff b/transliterate.diff
index 852d8bd34a5516812d4fd0fa5aaa6ba7ebdfda98..d2beb4d7e5a32733619134ead0259d47fc64751d 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -88,7 +88,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -208,6 +208,7 @@ int logfile_format_has_i = 0;
+@@ -201,6 +201,7 @@ int logfile_format_has_i = 0;
  int logfile_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -96,7 +96,7 @@ diff --git a/options.c b/options.c
  
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
-@@ -1018,6 +1019,7 @@ static struct poptOption long_options[] = {
+@@ -797,6 +798,7 @@ static struct poptOption long_options[] = {
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"iconv",            0,  POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
    {"no-iconv",         0,  POPT_ARG_NONE,   0, OPT_NO_ICONV, 0, 0 },
@@ -104,7 +104,7 @@ diff --git a/options.c b/options.c
    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
    {"8-bit-output",    '8', POPT_ARG_VAL,    &allow_8bit_chars, 1, 0, 0 },
-@@ -2669,6 +2671,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2436,6 +2438,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -129,7 +129,7 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -3120,6 +3140,12 @@ void server_options(char **args, int *argc_p)
+@@ -2887,6 +2907,12 @@ void server_options(char **args, int *argc_p)
        if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
                args[ac++] = "--no-implied-dirs";