The patches for 3.2.5pre2.

Author: WayneD

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -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 },
-@@ -2760,6 +2761,10 @@ void server_options(char **args, int *argc_p)
+@@ -2763,6 +2764,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = safe_arg("--compress-choice", compress_choice);
 
  	if (am_sender) {

backup-dir-dels.diff

@@ -319,7 +319,7 @@ diff --git a/options.c b/options.c
 
  	if (make_backups && !backup_dir)
  		omit_dir_times = -1; /* Implied, so avoid -O to sender. */
-@@ -2745,11 +2805,20 @@ void server_options(char **args, int *argc_p)
+@@ -2748,11 +2808,20 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = safe_arg("", backup_dir);
  	}

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c

checksum-updating.diff

@@ -520,7 +520,7 @@ diff --git a/io.c b/io.c
  extern int daemon_connection;
  extern int protocol_version;
  extern int remove_source_files;
-@@ -1089,6 +1090,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
+@@ -1092,6 +1093,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
  				if (inc_recurse)
  					flist->in_progress++;
  			}

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -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 },
-@@ -2807,6 +2809,9 @@ void server_options(char **args, int *argc_p)
+@@ -2810,6 +2812,9 @@ void server_options(char **args, int *argc_p)
  	else if (missing_args == 1 && !am_sender)
  		args[ac++] = "--ignore-missing-args";
 

db.diff

@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -2378,7 +2378,7 @@ diff --git a/io.c b/io.c
  extern int io_error;
  extern int batch_fd;
  extern int eol_nulls;
-@@ -1517,6 +1519,32 @@ static void read_a_msg(void)
+@@ -1520,6 +1522,32 @@ static void read_a_msg(void)
  		if (am_sender)
  			maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
  		break;
@@ -2411,7 +2411,7 @@ diff --git a/io.c b/io.c
  	case MSG_DELETED:
  		if (msg_bytes >= sizeof data)
  			goto overflow;
-@@ -1670,6 +1698,7 @@ static void read_a_msg(void)
+@@ -1673,6 +1701,7 @@ static void read_a_msg(void)
  		 * with a duplicate exit message. */
  		_exit_cleanup(val, __FILE__, 0 - __LINE__);
  	default:

detect-renamed-lax.diff

@@ -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 },
-@@ -2793,8 +2795,14 @@ void server_options(char **args, int *argc_p)
+@@ -2796,8 +2798,14 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--super";
  		if (size_only)
  			args[ac++] = "--size-only";

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -634,7 +634,7 @@ diff --git a/options.c b/options.c
  				 delay_updates ? "delay-updates" : "partial-dir");
  			return 0;
  		}
-@@ -2790,6 +2793,8 @@ void server_options(char **args, int *argc_p)
+@@ -2793,6 +2796,8 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--super";
  		if (size_only)
  			args[ac++] = "--size-only";

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -420,7 +420,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++) {
-@@ -2689,6 +2707,9 @@ void server_options(char **args, int *argc_p)
+@@ -2692,6 +2710,9 @@ void server_options(char **args, int *argc_p)
  	if (xfer_dirs && !recurse && delete_mode && am_sender)
  		args[ac++] = "--no-r";
 
@@ -430,7 +430,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;
-@@ -2784,6 +2805,16 @@ void server_options(char **args, int *argc_p)
+@@ -2787,6 +2808,16 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--delete-excluded";
  		if (force_delete)
  			args[ac++] = "--force";

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -53,11 +53,14 @@ filter_rule_list cvs_filter_list = { .debug_type = " [global CVS]" };
+@@ -54,11 +54,14 @@ filter_rule_list cvs_filter_list = { .debug_type = " [global CVS]" };
  filter_rule_list daemon_filter_list = { .debug_type = " [daemon]" };
  filter_rule_list implied_filter_list = { .debug_type = " [implied]" };
 
@@ -30,7 +30,7 @@ diff --git a/exclude.c b/exclude.c
 
  #define SLASH_WILD3_SUFFIX "/***"
 
-@@ -136,8 +139,27 @@ static void teardown_mergelist(filter_rule *ex)
+@@ -137,8 +140,27 @@ static void teardown_mergelist(filter_rule *ex)
  		mergelist_cnt--;
  }
 
@@ -58,7 +58,7 @@ diff --git a/exclude.c b/exclude.c
  	if (ex->rflags & FILTRULE_PERDIR_MERGE)
  		teardown_mergelist(ex);
  	free(ex->pattern);
-@@ -864,7 +886,9 @@ static void report_filter_result(enum logcode code, char const *name,
+@@ -962,7 +984,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
@@ -69,7 +69,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) {
-@@ -873,6 +897,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -971,6 +995,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
  		return 1;
  	}
 
@@ -79,7 +79,7 @@ diff --git a/exclude.c b/exclude.c
  	if (filter_level != ALL_FILTERS)
  		return 0;
 
-@@ -883,7 +910,8 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -981,7 +1008,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
@@ -89,7 +89,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)
  {
-@@ -906,10 +934,12 @@ int check_filter(filter_rule_list *listp, enum logcode code,
+@@ -1004,10 +1032,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);
@@ -102,7 +102,7 @@ diff --git a/exclude.c b/exclude.c
  	return 0;
  }
 
-@@ -926,9 +956,45 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
+@@ -1024,9 +1054,45 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
  	return NULL;
  }
 
@@ -149,15 +149,15 @@ 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
-@@ -943,6 +1009,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -1041,6 +1107,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;
 +	char *val;
  	filter_rule *rule;
  	unsigned int len;
 
-@@ -961,6 +1028,12 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -1059,6 +1126,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
-@@ -1107,11 +1180,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -1205,11 +1278,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;
-@@ -1425,6 +1550,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
+@@ -1523,6 +1648,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
  		else if (am_sender)
  			return NULL;
  	}

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -824,16 +824,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
+@@ -922,16 +922,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) {
@@ -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},
-@@ -2820,6 +2823,9 @@ void server_options(char **args, int *argc_p)
+@@ -2823,6 +2826,9 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
 

kerberos.diff

@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

link-by-hash.diff

@@ -12,7 +12,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -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;
-@@ -2896,6 +2918,12 @@ void server_options(char **args, int *argc_p)
+@@ -2899,6 +2921,12 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--no-W";
  	}
 

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -76,7 +76,7 @@ diff --git a/options.c b/options.c
  		omit_dir_times = -1; /* Implied, so avoid -O to sender. */
 
  	if (stdout_format) {
-@@ -2792,6 +2794,8 @@ void server_options(char **args, int *argc_p)
+@@ -2795,6 +2797,8 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--size-only";
  		if (do_stats)
  			args[ac++] = "--stats";

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

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: 0773cecc1fc6462b321f96dc8cae6e11983c357d
+based-on: 5ce575b15726c653312b473bd770c3e7d74d3449
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c