From a60267abe26619cfb59a9617d83501ae9eb16e89 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 30 Sep 2004 16:32:36 +0000
Subject: [PATCH] Updated to apply cleanly.

---
 ODBC-dblog.diff         |  4 ++--
 acls.diff               | 14 +++++++-------
 atimes.diff             | 16 ++++++++--------
 backup-dir-dels.diff    |  6 +++---
 chmod-option.diff       |  8 ++++----
 compare-dest.diff       |  6 +++---
 date-only.diff          |  6 +++---
 dir-times.diff          | 14 +++++++-------
 filter.diff             | 42 ++++++++++++++++++++---------------------
 flist_stats.diff        |  6 +++---
 fname-convert.diff      |  4 ++--
 fsync.diff              |  4 ++--
 fuzzy.diff              |  4 ++--
 g2r-basis-filename.diff |  2 +-
 ignore-case.diff        |  4 ++--
 links-depth.diff        |  2 +-
 max-size.diff           |  8 ++++----
 netgroup-auth.diff      |  2 +-
 openssl-support.diff    | 14 +++++++-------
 owner-group-mod.diff    |  4 ++--
 remove-sent-files.diff  | 16 ++++++++--------
 time-limit.diff         |  8 ++++----
 tru64.diff              | 10 +++++-----
 23 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 2cfa9a6..efb7b40 100644
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -137,7 +137,7 @@ This patch adds the following options:
  		} else {
  			rprintf(FLOG, "rsync %s %s from %s (%s)\n",
  				am_sender ? "on" : "to",
---- orig/configure.in	2004-08-13 07:18:59
+--- orig/configure.in	2004-09-23 17:42:07
 +++ configure.in	2004-07-03 20:22:18
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
  	[  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
@@ -697,7 +697,7 @@ This patch adds the following options:
  {
  	int i;
  	for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c	2004-09-18 01:49:33
+--- orig/main.c	2004-09-29 17:58:26
 +++ main.c	2004-07-03 20:22:18
 @@ -136,6 +136,9 @@ static void report(int f)
  
diff --git a/acls.diff b/acls.diff
index 39875cb..1b39ce6 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1205,7 +1205,7 @@ ACLs to a non-ACL-supporting disk should complain.
  	free(file);
  
  	if (verbose > 1)
---- orig/configure.in	2004-08-13 07:18:59
+--- orig/configure.in	2004-09-23 17:42:07
 +++ configure.in	2004-08-19 19:53:27
 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
@@ -1361,7 +1361,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-08-19 17:38:57
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -1443,7 +1443,7 @@ ACLs to a non-ACL-supporting disk should complain.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off (opt-BASE is its index). */
-@@ -938,6 +964,8 @@ void server_options(char **args,int *arg
+@@ -942,6 +968,8 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
@@ -1469,9 +1469,9 @@ ACLs to a non-ACL-supporting disk should complain.
  	if (verbose > 1 && flags & PERMS_REPORT) {
  		if (updated)
  			rprintf(FINFO,"%s\n",fname);
---- orig/rsync.h	2004-08-03 15:41:32
+--- orig/rsync.h	2004-09-22 08:47:31
 +++ rsync.h	2004-07-03 20:11:58
-@@ -541,6 +541,40 @@ static inline int flist_up(struct file_l
+@@ -542,6 +542,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
@@ -1512,7 +1512,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 20:11:58
 @@ -326,6 +326,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
@@ -1522,7 +1522,7 @@ ACLs to a non-ACL-supporting disk should complain.
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
-@@ -578,6 +579,11 @@ source file's permissions and the umask 
+@@ -585,6 +586,11 @@ source file's permissions and the umask 
  other files (including updated files) retain their existing permissions
  (which is the same behavior as other file-copy utilities, such as cp).
  
diff --git a/atimes.diff b/atimes.diff
index a023be9..51c34da 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -148,7 +148,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -174,7 +174,7 @@ command before "make":
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
-@@ -946,6 +949,8 @@ void server_options(char **args,int *arg
+@@ -950,6 +953,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -230,7 +230,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2004-08-03 15:41:32
+--- orig/rsync.h	2004-09-22 08:47:31
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -240,7 +240,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
-@@ -111,6 +112,7 @@
+@@ -112,6 +113,7 @@
  
  #define PERMS_REPORT		(1<<0)
  #define PERMS_SKIP_MTIME	(1<<1)
@@ -248,7 +248,7 @@ command before "make":
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -425,6 +427,7 @@ struct file_struct {
+@@ -426,6 +428,7 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -256,7 +256,7 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 20:15:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
@@ -266,7 +266,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -603,6 +604,11 @@ cause the next transfer to behave as if 
+@@ -610,6 +611,11 @@ cause the next transfer to behave as if 
  updated (though the rsync algorithm will make the update fairly efficient
  if the files haven't actually changed, you're much better off using -t).
  
@@ -346,7 +346,7 @@ command before "make":
      if [ -z "$failed" ] ; then
  	return 0
      else
---- orig/tls.c	2004-05-15 20:10:13
+--- orig/tls.c	2004-09-23 05:45:24
 +++ tls.c	2004-07-03 20:15:41
 @@ -39,6 +39,7 @@
  
diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 2c8e7ca..0ad9606 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -106,7 +106,7 @@ Marc St-Onge
 +	deleting = 0;
 +	return ret;
 +}
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-09-22 02:25:03
 @@ -113,10 +113,14 @@ int no_detach = 0;
  int write_batch = 0;
@@ -230,7 +230,7 @@ Marc St-Onge
  
  	if (do_progress && !verbose)
  		verbose = 1;
-@@ -1005,6 +1058,10 @@ void server_options(char **args,int *arg
+@@ -1009,6 +1062,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -241,7 +241,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1013,7 +1070,13 @@ void server_options(char **args,int *arg
+@@ -1017,7 +1074,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}
diff --git a/chmod-option.diff b/chmod-option.diff
index 7e22aeb..1d370d8 100644
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -225,7 +225,7 @@ command before "make":
  	file->uid = st.st_uid;
  	file->gid = st.st_gid;
  
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-03 20:13:41
 @@ -126,6 +126,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -274,7 +274,7 @@ command before "make":
  	if (do_progress && !verbose)
  		verbose = 1;
  
-@@ -1083,6 +1095,11 @@ void server_options(char **args,int *arg
+@@ -1087,6 +1099,11 @@ void server_options(char **args,int *arg
  		args[ac++] = compare_dest;
  	}
  
@@ -286,7 +286,7 @@ command before "make":
  	if (files_from && (!am_sender || remote_filesfrom_file)) {
  		if (remote_filesfrom_file) {
  			args[ac++] = "--files-from";
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 20:13:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
@@ -296,7 +296,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -603,6 +604,14 @@ cause the next transfer to behave as if 
+@@ -610,6 +611,14 @@ cause the next transfer to behave as if 
  updated (though the rsync algorithm will make the update fairly efficient
  if the files haven't actually changed, you're much better off using -t).
  
diff --git a/compare-dest.diff b/compare-dest.diff
index cdb9356..d2c3777 100644
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -82,7 +82,7 @@ Before compiling, be sure to run "make proto".
  
  	/* The receiving side mustn't obey this, or an existing symlink that
  	 * points to an identical file won't be replaced by the referent. */
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-08-13 07:55:37
 @@ -114,12 +114,13 @@ int write_batch = 0;
  int read_batch = 0;
@@ -198,7 +198,7 @@ Before compiling, be sure to run "make proto".
  				goto options_rejected;
  		}
  		if (backup_dir) {
-@@ -890,8 +916,8 @@ int parse_arguments(int *argc, const cha
+@@ -894,8 +920,8 @@ int parse_arguments(int *argc, const cha
   **/
  void server_options(char **args,int *argc)
  {
@@ -208,7 +208,7 @@ Before compiling, be sure to run "make proto".
  	char *arg;
  
  	int i, x;
-@@ -1074,13 +1100,16 @@ void server_options(char **args,int *arg
+@@ -1078,13 +1104,16 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
  
diff --git a/date-only.diff b/date-only.diff
index 195a932..85da954 100644
--- a/date-only.diff
+++ b/date-only.diff
@@ -34,7 +34,7 @@ Jeremy Bornstein
  	if (st->st_size != file->length)
  		return 0;
  	if (link_dest) {
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-03 20:16:51
 @@ -84,6 +84,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
@@ -60,7 +60,7 @@ Jeremy Bornstein
    {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
    {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
-@@ -1030,6 +1033,9 @@ void server_options(char **args,int *arg
+@@ -1034,6 +1037,9 @@ void server_options(char **args,int *arg
  	if (size_only)
  		args[ac++] = "--size-only";
  
@@ -70,7 +70,7 @@ Jeremy Bornstein
  	if (modify_window_set) {
  		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
  			goto oom;
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 20:16:51
 @@ -352,6 +352,7 @@ verb(
       --timeout=TIME          set I/O timeout in seconds
diff --git a/dir-times.diff b/dir-times.diff
index 1542737..8a725c6 100644
--- a/dir-times.diff
+++ b/dir-times.diff
@@ -1,4 +1,4 @@
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-03 20:17:33
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -26,7 +26,7 @@
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
-@@ -946,6 +949,8 @@ void server_options(char **args,int *arg
+@@ -950,6 +953,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -69,7 +69,7 @@
  			rsyserr(FERROR, errno, "failed to set times on %s",
  				full_fname(fname));
  			return 0;
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-08-11 17:27:51
 @@ -329,7 +329,8 @@ verb(
   -o, --owner                 preserve owner (root only)
@@ -81,7 +81,7 @@
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -595,14 +596,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -602,14 +603,23 @@ dit(bf(-D, --devices)) This option cause
  block device information to the remote system to recreate these
  devices. This option is only available to the super-user.
  
@@ -247,11 +247,11 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- orig/testsuite/devices.test	2004-05-18 09:14:24
+--- orig/testsuite/devices.test	2004-09-23 17:42:07
 +++ testsuite/devices.test	2004-07-03 20:17:33
-@@ -29,7 +29,7 @@ mknod "$fromdir/block" b 42 69 || test_s
- mknod "$fromdir/block2" b 42 73 || test_skipped "Can't create block device node unless root"
+@@ -30,7 +30,7 @@ mknod "$fromdir/block2" b 42 73 || test_
  mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
+ mkfifo "$fromdir/fifo" || test_skipped "Can't run mkfifo"
  
 -checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 +checkit "$RSYNC -adHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
diff --git a/filter.diff b/filter.diff
index ffaf81c..25300fe 100644
--- a/filter.diff
+++ b/filter.diff
@@ -88,7 +88,7 @@ that's how you can make rules local instead of inherited).
  
  	log_init();
  
---- orig/exclude.c	2004-08-10 18:17:01
+--- orig/exclude.c	2004-09-22 08:47:31
 +++ exclude.c	2004-08-13 07:40:08
 @@ -30,13 +30,69 @@ extern int verbose;
  extern int eol_nulls;
@@ -621,7 +621,7 @@ that's how you can make rules local instead of inherited).
  		s += 2;
  	} else if (xflags & XFLG_DEF_INCLUDE)
  		mflags |= MATCHFLG_INCLUDE;
-@@ -273,6 +660,8 @@ static const char *get_exclude_tok(const
+@@ -275,6 +662,8 @@ static const char *get_exclude_tok(const
  
  	if (*p == '!' && len == 1 && !(xflags & XFLG_WORDS_ONLY))
  		mflags |= MATCHFLG_CLEAR_LIST;
@@ -630,7 +630,7 @@ that's how you can make rules local instead of inherited).
  
  	*len_ptr = len;
  	*flag_ptr = mflags;
-@@ -284,7 +673,7 @@ void add_exclude(struct exclude_list_str
+@@ -286,7 +675,7 @@ void add_exclude(struct exclude_list_str
  		 int xflags)
  {
  	unsigned int pat_len, mflags;
@@ -639,7 +639,7 @@ that's how you can make rules local instead of inherited).
  
  	if (!pattern)
  		return;
-@@ -292,9 +681,15 @@ void add_exclude(struct exclude_list_str
+@@ -294,9 +683,15 @@ void add_exclude(struct exclude_list_str
  	cp = pattern;
  	pat_len = 0;
  	while (1) {
@@ -655,7 +655,7 @@ that's how you can make rules local instead of inherited).
  
  		if (mflags & MATCHFLG_CLEAR_LIST) {
  			if (verbose > 2) {
-@@ -306,13 +701,24 @@ void add_exclude(struct exclude_list_str
+@@ -308,13 +703,24 @@ void add_exclude(struct exclude_list_str
  			continue;
  		}
  
@@ -686,7 +686,7 @@ that's how you can make rules local instead of inherited).
  	}
  }
  
-@@ -321,7 +727,7 @@ void add_exclude_file(struct exclude_lis
+@@ -323,7 +729,7 @@ void add_exclude_file(struct exclude_lis
  		      int xflags)
  {
  	FILE *fp;
@@ -695,7 +695,7 @@ that's how you can make rules local instead of inherited).
  	char *eob = line + sizeof line - 1;
  	int word_split = xflags & XFLG_WORD_SPLIT;
  
-@@ -342,6 +748,12 @@ void add_exclude_file(struct exclude_lis
+@@ -344,6 +750,12 @@ void add_exclude_file(struct exclude_lis
  		}
  		return;
  	}
@@ -708,7 +708,7 @@ that's how you can make rules local instead of inherited).
  
  	while (1) {
  		char *s = line;
-@@ -402,7 +814,21 @@ void send_exclude_list(int f)
+@@ -404,7 +816,21 @@ void send_exclude_list(int f)
  		if (ent->match_flags & MATCHFLG_INCLUDE) {
  			write_int(f, l + 2);
  			write_buf(f, "+ ", 2);
@@ -731,7 +731,7 @@ that's how you can make rules local instead of inherited).
  			write_int(f, l + 2);
  			write_buf(f, "- ", 2);
  		} else
-@@ -443,6 +869,7 @@ void add_cvs_excludes(void)
+@@ -445,6 +871,7 @@ void add_cvs_excludes(void)
  	char fname[MAXPATHLEN];
  	char *p;
  
@@ -870,7 +870,7 @@ that's how you can make rules local instead of inherited).
  		if (link_stat(fname, &st, keep_dirlinks) != 0) {
  			if (f != -1) {
  				io_error |= IOERR_GENERAL;
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-08-12 18:59:28
 @@ -287,6 +287,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include=PATTERN       don't exclude files matching PATTERN\n");
@@ -900,17 +900,17 @@ that's how you can make rules local instead of inherited).
  		case 'P':
  			do_progress = 1;
  			keep_partial = 1;
---- orig/rsync.h	2004-08-03 15:41:32
-+++ rsync.h	2004-08-08 06:07:01
-@@ -108,6 +108,7 @@
- #define XFLG_DEF_INCLUDE	(1<<1)
+--- orig/rsync.h	2004-09-22 08:47:31
++++ rsync.h	2004-09-22 08:48:53
+@@ -109,6 +109,7 @@
  #define XFLG_WORDS_ONLY 	(1<<2)
  #define XFLG_WORD_SPLIT 	(1<<3)
-+#define XFLG_ABS_PATH	 	(1<<4)
+ #define XFLG_DIRECTORY	 	(1<<4)
++#define XFLG_ABS_PATH	 	(1<<5)
  
  #define PERMS_REPORT		(1<<0)
  #define PERMS_SKIP_MTIME	(1<<1)
-@@ -499,11 +500,18 @@ struct map_struct {
+@@ -500,11 +501,18 @@ struct map_struct {
  #define MATCHFLG_INCLUDE	(1<<4) /* this is an include, not an exclude */
  #define MATCHFLG_DIRECTORY	(1<<5) /* this matches only directories */
  #define MATCHFLG_CLEAR_LIST 	(1<<6) /* this item is the "!" token */
@@ -930,7 +930,7 @@ that's how you can make rules local instead of inherited).
  };
  
  struct exclude_list_struct {
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-08-13 00:43:31
 @@ -364,6 +364,7 @@ verb(
       --include=PATTERN       don't exclude files matching PATTERN
@@ -940,7 +940,7 @@ that's how you can make rules local instead of inherited).
   -0  --from0                 all file lists are delimited by nulls
       --version               print version number
       --daemon                run as an rsync daemon
-@@ -1025,24 +1026,32 @@ The exclude and include patterns specifi
+@@ -1037,24 +1038,32 @@ The exclude and include patterns specifi
  selection of which files to transfer and which files to skip.
  
  Rsync builds an ordered list of include/exclude options as specified on
@@ -981,7 +981,7 @@ that's how you can make rules local instead of inherited).
  
  Let's say that we want to match two source files, one with an absolute
  path of "/home/me/foo/bar", and one with a path of "/home/you/bar/baz".
-@@ -1089,23 +1098,27 @@ because rsync did not descend through th
+@@ -1101,23 +1110,27 @@ because rsync did not descend through th
  hierarchy.
  
  Note also that the --include and --exclude options take one pattern
@@ -1020,7 +1020,7 @@ that's how you can make rules local instead of inherited).
  
    it() if the pattern ends with a / then it will only match a
    directory, not a file, link, or device.
-@@ -1118,22 +1131,31 @@ itemize(
+@@ -1130,22 +1143,31 @@ itemize(
    single asterisk pattern "*" will stop at slashes.
  
    it() if the pattern contains a / (not counting a trailing /) or a "**"
@@ -1056,7 +1056,7 @@ that's how you can make rules local instead of inherited).
  )
  
  The +/- rules are most useful in a list that was read from a file, allowing
-@@ -1180,8 +1202,160 @@ itemize(
+@@ -1192,8 +1214,160 @@ itemize(
    it() --include "*/" --include "*.c" --exclude "*" would include all 
    directories and C source files
    it() --include "foo/" --include "foo/bar.c" --exclude "*" would include
diff --git a/flist_stats.diff b/flist_stats.diff
index 6adcc3b..2149951 100644
--- a/flist_stats.diff
+++ b/flist_stats.diff
@@ -27,7 +27,7 @@
  	if (flist->hlink_pool) {
  		pool_destroy(flist->hlink_pool);
  		flist->hlink_pool = NULL;
---- orig/main.c	2004-09-18 01:49:33
+--- orig/main.c	2004-09-29 17:58:26
 +++ main.c	2004-09-03 14:18:47
 @@ -178,6 +178,10 @@ static void report(int f)
  		rprintf(FINFO,"Matched data: %.0f bytes\n",
@@ -40,9 +40,9 @@
  		rprintf(FINFO,"Total bytes sent: %.0f\n",
  			(double)total_written);
  		rprintf(FINFO,"Total bytes received: %.0f\n",
---- orig/rsync.h	2004-08-03 15:41:32
+--- orig/rsync.h	2004-09-22 08:47:31
 +++ rsync.h	2004-09-03 14:05:13
-@@ -520,6 +520,8 @@ struct stats {
+@@ -521,6 +521,8 @@ struct stats {
  	int64 literal_data;
  	int64 matched_data;
  	int flist_size;
diff --git a/fname-convert.diff b/fname-convert.diff
index 838c671..ce29dd3 100644
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -407,7 +407,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  	{ RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
  	{ RERR_WAITCHILD  , "some error returned by waitpid()" },
  	{ RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c	2004-09-18 01:49:33
+--- orig/main.c	2004-09-29 17:58:26
 +++ main.c	2004-07-22 00:31:47
 @@ -332,7 +332,7 @@ static pid_t do_cmd(char *cmd, char *mac
  			whole_file = 1;
@@ -418,7 +418,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  	if (dir)
  		free(dir);
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-03 20:18:02
 @@ -129,6 +129,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
diff --git a/fsync.diff b/fsync.diff
index 77c8930..76bbf80 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,7 +1,7 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-03 20:18:13
 @@ -38,6 +38,7 @@ int make_backups = 0;
   **/
@@ -27,7 +27,7 @@ to be called on every file we write.
    {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
-@@ -1074,6 +1077,9 @@ void server_options(char **args,int *arg
+@@ -1078,6 +1081,9 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
  
diff --git a/fuzzy.diff b/fuzzy.diff
index 5b442a5..a8cdaef 100644
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -201,7 +201,7 @@ Be sure to run "make proto" before "make".
  
  	/* The receiving side mustn't obey this, or an existing symlink that
  	 * points to an identical file won't be replaced by the referent. */
---- orig/options.c	2004-09-22 08:47:31
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-09-23 14:59:46
 @@ -85,6 +85,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
@@ -300,7 +300,7 @@ Be sure to run "make proto" before "make".
  
  
  /* Log-message categories.  FLOG is only used on the daemon side to
---- orig/rsync.yo	2004-09-22 08:47:31
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 19:27:25
 @@ -356,6 +356,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR
diff --git a/g2r-basis-filename.diff b/g2r-basis-filename.diff
index b27f8e0..ca513cd 100644
--- a/g2r-basis-filename.diff
+++ b/g2r-basis-filename.diff
@@ -212,7 +212,7 @@ You must run "make proto" before compiling.
  	}
  
  	if (verbose > 2)
---- orig/main.c	2004-09-18 01:49:33
+--- orig/main.c	2004-09-29 17:58:26
 +++ main.c	2004-07-22 00:10:43
 @@ -59,6 +59,7 @@ extern int filesfrom_fd;
  extern pid_t cleanup_child_pid;
diff --git a/ignore-case.diff b/ignore-case.diff
index 666cd43..dda68a7 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,7 +35,7 @@ in a case-insensitive manner.
  	  case '?':
  	    /* Match anything but '/'. */
  	    if (*text == '/')
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-29 16:13:45
 @@ -92,6 +92,7 @@ int opt_ignore_existing = 0;
  int max_delete = 0;
@@ -61,7 +61,7 @@ in a case-insensitive manner.
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
-@@ -1042,6 +1045,9 @@ void server_options(char **args,int *arg
+@@ -1046,6 +1049,9 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
diff --git a/links-depth.diff b/links-depth.diff
index 12a62de..dbcdf9c 100644
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -62,7 +62,7 @@ in this modified version.
  #else
  	linkname_len = 0;
  #endif
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-16 16:12:29
 @@ -42,6 +42,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
diff --git a/max-size.diff b/max-size.diff
index b32097b..e5a5ce5 100644
--- a/max-size.diff
+++ b/max-size.diff
@@ -19,7 +19,7 @@
  	}
  
  	if (preserve_links && S_ISLNK(file->mode)) {
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-08-13 18:26:04
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
@@ -96,7 +96,7 @@
  		case OPT_TIMEOUT:
  			if (io_timeout && io_timeout < select_timeout)
  				select_timeout = io_timeout;
-@@ -989,6 +1020,11 @@ void server_options(char **args,int *arg
+@@ -993,6 +1024,11 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
@@ -108,7 +108,7 @@
  	if (io_timeout) {
  		if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
  			goto oom;
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 20:20:46
 @@ -345,6 +345,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before
@@ -118,7 +118,7 @@
       --partial               keep partially transferred files
       --partial-dir=DIR       put a partially transferred file into DIR
       --force                 force deletion of dirs even if not empty
-@@ -628,6 +629,11 @@ dit(bf(--max-delete=NUM)) This tells rsy
+@@ -635,6 +636,11 @@ dit(bf(--max-delete=NUM)) This tells rsy
  files or directories. This is useful when mirroring very large trees
  to prevent disasters.
  
diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index 34c1f15..1769972 100644
--- a/netgroup-auth.diff
+++ b/netgroup-auth.diff
@@ -3,7 +3,7 @@ and hosts deny.
 
 This patch still needs autoconf support for portability.
 
---- orig/access.c	2003-07-30 06:12:27
+--- orig/access.c	2004-09-25 16:57:35
 +++ access.c	2004-04-25 17:20:47
 @@ -22,11 +22,14 @@
    */
diff --git a/openssl-support.diff b/openssl-support.diff
index 4e265b1..280a7d0 100644
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -189,7 +189,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  	if (*line == '#') {
  		/* it's some sort of command that I don't understand */
  		io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
---- orig/configure.in	2004-08-13 07:18:59
+--- orig/configure.in	2004-09-23 17:42:07
 +++ configure.in	2004-07-03 20:22:28
 @@ -271,6 +271,21 @@ yes
  	AC_SEARCH_LIBS(getaddrinfo, inet6)
@@ -213,7 +213,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  AC_MSG_CHECKING([whether to call shutdown on all sockets])
  case $host_os in
  	*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c	2004-09-18 01:49:33
+--- orig/main.c	2004-09-29 17:58:26
 +++ main.c	2004-07-15 02:40:51
 @@ -56,6 +56,9 @@ extern int write_batch;
  extern int batch_fd;
@@ -225,7 +225,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern pid_t cleanup_child_pid;
  extern char *files_from;
  extern char *remote_filesfrom_file;
-@@ -761,18 +764,32 @@ static int start_client(int argc, char *
+@@ -771,18 +774,32 @@ static int start_client(int argc, char *
  	pid_t pid;
  	int f_in,f_out;
  	int rc;
@@ -261,7 +261,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  		p = strchr(host,'/');
  		if (p) {
  			*p = '\0';
-@@ -825,12 +842,27 @@ static int start_client(int argc, char *
+@@ -835,12 +852,27 @@ static int start_client(int argc, char *
  			argv++;
  		} else { /* source is local */
  			am_sender = 1;
@@ -291,7 +291,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  				p = strchr(host,'/');
  				if (p) {
  					*p = '\0';
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-16 20:19:50
 @@ -135,6 +135,14 @@ int quiet = 0;
  int always_checksum = 0;
@@ -408,7 +408,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  	if (bwlimit) {
  		bwlimit_writemax = (size_t)bwlimit * 128;
  		if (bwlimit_writemax < 512)
---- orig/rsync.h	2004-08-03 15:41:32
+--- orig/rsync.h	2004-09-22 08:47:31
 +++ rsync.h	2004-07-03 20:22:28
 @@ -32,6 +32,7 @@
  
@@ -418,7 +418,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -329,6 +330,11 @@ enum msgcode {
+@@ -330,6 +331,11 @@ enum msgcode {
  #define uint64 unsigned off_t
  #endif
  
diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index d512b46..c13d5cc 100644
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -31,7 +31,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +			preserve_gid = 2;
 +	}
  }
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-09-09 01:59:08
 @@ -358,8 +358,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
@@ -70,7 +70,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
  		preserve_devices = 1;
  	}
  
-@@ -938,10 +946,16 @@ void server_options(char **args,int *arg
+@@ -942,10 +950,16 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index baf5df6..c400b43 100644
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -38,7 +38,7 @@ command before "make":
  		case MSG_INFO:
  		case MSG_ERROR:
  			if (remaining >= sizeof line) {
---- orig/main.c	2004-09-18 01:49:33
+--- orig/main.c	2004-09-29 17:58:26
 +++ main.c	2004-08-13 08:24:23
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -57,7 +57,7 @@ command before "make":
  
  		recv_exclude_list(f_in);
  		if (cvs_exclude)
-@@ -692,6 +695,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -702,6 +705,9 @@ int client_run(int f_in, int f_out, pid_
  		exit_cleanup(status);
  	}
  
@@ -67,7 +67,7 @@ command before "make":
  	if (argc == 0)
  		list_only = 1;
  
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-16 20:09:54
 @@ -87,8 +87,10 @@ int size_only = 0;
  int bwlimit = 0;
@@ -119,7 +119,7 @@ command before "make":
  		case OPT_EXCLUDE:
  			add_exclude(&exclude_list, poptGetOptArg(pc), 0);
  			break;
-@@ -1095,6 +1104,9 @@ void server_options(char **args,int *arg
+@@ -1099,6 +1108,9 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -174,7 +174,7 @@ command before "make":
  			}
  		}
  	}
---- orig/rsync.h	2004-08-03 15:41:32
+--- orig/rsync.h	2004-09-22 08:47:31
 +++ rsync.h	2004-07-03 20:17:10
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
@@ -184,7 +184,7 @@ command before "make":
  
  /* update this if you make incompatible changes */
  #define PROTOCOL_VERSION 28
-@@ -126,6 +127,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -127,6 +128,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
  /* Messages types that are sent over the message channel.  The logcode
   * values must all be present here with identical numbers. */
  enum msgcode {
@@ -192,7 +192,7 @@ command before "make":
  	MSG_DONE=5,	/* current phase is done */
  	MSG_REDO=4,	/* reprocess indicated flist index */
  	MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-03 20:17:10
 @@ -343,6 +343,7 @@ verb(
       --delete                delete files that don't exist on sender
@@ -202,7 +202,7 @@ command before "make":
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files
       --partial               keep partially transferred files
-@@ -654,6 +655,11 @@ receiving side before transferring files
+@@ -661,6 +662,11 @@ receiving side before transferring files
  sufficient space on the receiving filesystem. If you want to delete
  after transferring, use the --delete-after switch. Implies --delete.
  
diff --git a/time-limit.diff b/time-limit.diff
index 5294ef3..092bdbe 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -41,7 +41,7 @@ Do we need configure support for mktime()?
  		if (!am_server && !am_daemon) {
  			rprintf(FERROR, "io timeout after %d seconds - exiting\n",
  				(int)(t-last_io));
---- orig/options.c	2004-09-20 05:10:48
+--- orig/options.c	2004-09-23 17:42:07
 +++ options.c	2004-07-15 17:06:09
 @@ -96,6 +96,7 @@ int blocking_io = -1;
  int checksum_seed = 0;
@@ -114,7 +114,7 @@ Do we need configure support for mktime()?
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off (opt-BASE is its index). */
-@@ -1001,6 +1037,15 @@ void server_options(char **args,int *arg
+@@ -1005,6 +1041,15 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
@@ -130,7 +130,7 @@ Do we need configure support for mktime()?
  	if (backup_dir) {
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
---- orig/rsync.yo	2004-09-20 05:10:48
+--- orig/rsync.yo	2004-09-24 16:42:30
 +++ rsync.yo	2004-07-15 02:44:40
 @@ -378,6 +378,8 @@ verb(
       --log-format=FORMAT     log file transfers using specified format
@@ -141,7 +141,7 @@ Do we need configure support for mktime()?
       --write-batch=FILE      write a batch to FILE 
       --read-batch=FILE       read a batch from FILE
       --checksum-seed=NUM     set block/file checksum seed
-@@ -989,6 +991,19 @@ transfer was too fast, it will wait befo
+@@ -1001,6 +1003,19 @@ transfer was too fast, it will wait befo
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  
diff --git a/tru64.diff b/tru64.diff
index ed7cfab..3555fb5 100644
--- a/tru64.diff
+++ b/tru64.diff
@@ -25,12 +25,12 @@ This is an adapted version of the original by Zoong Pham.
  #if defined(__KAME__) && defined(INET6)
  # define FAITH
  #endif
---- orig/rsync.h	2004-07-03 20:23:33
-+++ rsync.h	2004-07-03 20:23:33
-@@ -164,6 +164,7 @@ enum msgcode {
- #endif
+--- orig/syscall.c	2004-09-23 05:46:46
++++ syscall.c	2004-09-23 18:11:06
+@@ -27,6 +27,7 @@
+ #include "rsync.h"
  
- #ifdef HAVE_SYS_UN_H
+ #if HAVE_SYS_UN_H
 +#define _SOCKADDR_LEN
  #include <sys/un.h>
  #endif
-- 
2.34.1