Updated to apply cleanly.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 482e055..4aeede1 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -115,9 +115,9 @@ This patch adds the following options:
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c        2005-04-09 17:38:31
+--- orig/clientserver.c        2005-05-19 08:52:42
 +++ clientserver.c     2004-07-03 20:22:18
-@@ -347,6 +347,9 @@ static int rsync_module(int f_in, int f_
+@@ -346,6 +346,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
  
        log_init();
@@ -127,7 +127,7 @@ This patch adds the following options:
  
        if (use_chroot) {
                /*
-@@ -469,6 +472,9 @@ static int rsync_module(int f_in, int f_
+@@ -468,6 +471,9 @@ static int rsync_module(int f_in, int f_
                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);
@@ -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  2005-04-07 17:04:26
+--- orig/configure.in  2005-05-13 22:24:18
 +++ 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        2005-05-03 17:11:01
+--- orig/main.c        2005-05-12 07:51:58
 +++ main.c     2004-07-03 20:22:18
 @@ -144,6 +144,9 @@ static void handle_stats(int f)
  
@@ -721,9 +721,9 @@ This patch adds the following options:
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2005-04-14 01:53:12
+--- orig/sender.c      2005-05-19 08:52:42
 +++ sender.c   2005-03-05 00:31:19
-@@ -342,6 +342,9 @@ void send_files(struct file_list *flist,
+@@ -347,6 +347,9 @@ void send_files(struct file_list *flist,
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);

diff --git a/acls.diff b/acls.diff
index c76b53b..edd3029 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1325,9 +1325,9 @@ ACLs to a non-ACL-supporting disk should complain.
        if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
---- orig/generator.c   2005-05-14 19:51:15
+--- orig/generator.c   2005-05-19 08:52:42
 +++ generator.c        2005-05-12 23:34:00
-@@ -721,6 +721,10 @@ static void recv_generator(char *fname, 
+@@ -719,6 +719,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && code && f_out != -1)
                        rprintf(code, "%s/\n", safe_fname(fname));
@@ -4625,9 +4625,9 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-05-12 23:34:38
-@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
+@@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
  int preserve_hard_links = 0;
@@ -4674,7 +4674,7 @@ ACLs to a non-ACL-supporting disk should complain.
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
-@@ -409,6 +416,7 @@ static struct poptOption long_options[] 
+@@ -408,6 +415,7 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
@@ -4682,7 +4682,7 @@ ACLs to a non-ACL-supporting disk should complain.
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
-@@ -882,6 +890,24 @@ int parse_arguments(int *argc, const cha
+@@ -876,6 +884,24 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -4707,7 +4707,7 @@ ACLs to a non-ACL-supporting disk should complain.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1286,6 +1312,8 @@ void server_options(char **args,int *arg
+@@ -1282,6 +1308,8 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';

diff --git a/atimes.diff b/atimes.diff
index 1b98762..ef0df33 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -15,7 +15,7 @@ command before "make":
                rprintf(FINFO, "flist->length=%.0f\n",
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c       2005-04-28 15:56:50
+--- orig/flist.c       2005-05-14 19:51:15
 +++ flist.c    2005-02-07 21:06:04
 @@ -54,6 +54,7 @@ extern int relative_paths;
  extern int implied_dirs;
@@ -127,9 +127,9 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
---- orig/generator.c   2005-04-28 16:26:28
+--- orig/generator.c   2005-05-19 08:52:42
 +++ generator.c        2004-11-03 23:02:12
-@@ -380,7 +380,7 @@ static int unchanged_file(char *fn, stru
+@@ -379,7 +379,7 @@ static int unchanged_file(char *fn, stru
        if (ignore_times)
                return 0;
  
@@ -138,7 +138,7 @@ command before "make":
  }
  
  
-@@ -854,7 +854,7 @@ static void recv_generator(char *fname, 
+@@ -853,7 +853,7 @@ static void recv_generator(char *fname, 
        }
  
        if (update_only && statret == 0
@@ -147,9 +147,9 @@ command before "make":
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", safe_fname(fname));
                return;
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-02-21 10:53:28
-@@ -50,6 +50,7 @@ int preserve_uid = 0;
+@@ -49,6 +49,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
  int omit_dir_times = 0;
@@ -165,7 +165,7 @@ command before "make":
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
-@@ -414,6 +416,7 @@ static struct poptOption long_options[] 
+@@ -413,6 +415,7 @@ static struct poptOption long_options[] 
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
@@ -173,7 +173,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 },
-@@ -1294,6 +1297,8 @@ void server_options(char **args,int *arg
+@@ -1290,6 +1293,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -260,7 +260,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2005-05-10 16:14:33
+--- orig/rsync.yo      2005-05-10 23:47:12
 +++ rsync.yo   2005-01-24 01:57:18
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 81d3d48..0740c95 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -106,9 +106,9 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/generator.c   2005-04-28 16:26:28
+--- orig/generator.c   2005-05-19 08:52:42
 +++ generator.c        2005-03-11 11:22:38
-@@ -86,6 +86,9 @@ extern dev_t filesystem_dev;
+@@ -86,16 +86,23 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
@@ -118,7 +118,6 @@ Marc St-Onge
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -94,10 +97,14 @@ int allowed_lull = 0;
  static int deletion_count = 0; /* used to implement --max-delete */
  
  
@@ -134,7 +133,7 @@ Marc St-Onge
  }
  
  
-@@ -114,8 +121,8 @@ static int delete_item(char *fname, int 
+@@ -112,8 +119,8 @@ static int delete_item(char *fname, int 
        if (!S_ISDIR(mode)) {
                if (max_delete && ++deletion_count > max_delete)
                        return 0;
@@ -145,7 +144,7 @@ Marc St-Onge
                else
                        ok = robust_unlink(fname) == 0;
                if (ok) {
-@@ -138,9 +145,9 @@ static int delete_item(char *fname, int 
+@@ -136,9 +143,9 @@ static int delete_item(char *fname, int 
            || (dry_run && zap_dir)) {
                ok = 0;
                errno = ENOTEMPTY;
@@ -157,7 +156,7 @@ Marc St-Onge
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-03-01 01:25:39
 @@ -128,10 +128,14 @@ int no_detach
  int write_batch = 0;
@@ -193,7 +192,7 @@ Marc St-Onge
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -d, --dirs                  transfer directories without recursing\n");
-@@ -371,6 +379,7 @@ static struct poptOption long_options[] 
+@@ -370,6 +378,7 @@ static struct poptOption long_options[] 
    /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
    {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
@@ -201,7 +200,7 @@ Marc St-Onge
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
-@@ -452,6 +461,7 @@ static struct poptOption long_options[] 
+@@ -451,6 +460,7 @@ static struct poptOption long_options[] 
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -209,7 +208,7 @@ Marc St-Onge
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 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 },
-@@ -1027,6 +1037,8 @@ int parse_arguments(int *argc, const cha
+@@ -1021,6 +1031,8 @@ int parse_arguments(int *argc, const cha
                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -218,7 +217,7 @@ Marc St-Onge
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
-@@ -1061,6 +1073,14 @@ int parse_arguments(int *argc, const cha
+@@ -1055,6 +1067,14 @@ int parse_arguments(int *argc, const cha
                                return 0;
                        }
                }
@@ -233,7 +232,7 @@ Marc St-Onge
        }
  
        if (!backup_suffix)
-@@ -1072,6 +1092,16 @@ int parse_arguments(int *argc, const cha
+@@ -1066,6 +1086,16 @@ int parse_arguments(int *argc, const cha
                        backup_suffix);
                return 0;
        }
@@ -250,7 +249,7 @@ Marc St-Onge
        if (backup_dir) {
                backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
                backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -1093,6 +1123,31 @@ int parse_arguments(int *argc, const cha
+@@ -1087,6 +1117,31 @@ int parse_arguments(int *argc, const cha
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
@@ -282,7 +281,7 @@ Marc St-Onge
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
-@@ -1373,6 +1428,10 @@ void server_options(char **args,int *arg
+@@ -1369,6 +1424,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -293,7 +292,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1381,7 +1440,13 @@ void server_options(char **args,int *arg
+@@ -1377,7 +1436,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }

diff --git a/chmod-option.diff b/chmod-option.diff
index 5ae1649..bdc1dcf 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -202,7 +202,7 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2005-04-28 15:56:50
+--- orig/flist.c       2005-05-14 19:51:15
 +++ flist.c    2004-09-18 01:51:11
 @@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
  
@@ -225,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-03-01 01:26:56
 @@ -141,6 +141,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -252,7 +252,7 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy files whole (without rsync algorithm)\n");
-@@ -411,6 +415,7 @@ static struct poptOption long_options[] 
+@@ -410,6 +414,7 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
@@ -260,7 +260,7 @@ command before "make":
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
-@@ -1096,6 +1101,13 @@ int parse_arguments(int *argc, const cha
+@@ -1090,6 +1095,13 @@ int parse_arguments(int *argc, const cha
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
@@ -274,7 +274,7 @@ command before "make":
        if (log_format) {
                if (log_format_has(log_format, 'i'))
                        log_format_has_i = 1;
-@@ -1462,6 +1474,11 @@ void server_options(char **args,int *arg
+@@ -1458,6 +1470,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -286,7 +286,7 @@ command before "make":
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2005-05-10 16:14:33
+--- orig/rsync.yo      2005-05-10 23:47:12
 +++ rsync.yo   2005-01-24 01:48:43
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)

diff --git a/date-only.diff b/date-only.diff
index 9df0156..648a9be 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,7 +15,7 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- orig/generator.c   2005-04-28 16:26:28
+--- orig/generator.c   2005-05-19 08:52:42
 +++ generator.c        2004-11-11 22:15:27
 @@ -57,6 +57,7 @@ extern int inplace;
  extern int make_backups;
@@ -24,8 +24,8 @@ Jeremy Bornstein
 +extern int date_only;
  extern int size_only;
  extern OFF_T max_size;
- extern int io_timeout;
-@@ -362,6 +363,8 @@ void itemize(struct file_struct *file, i
+ extern int io_error;
+@@ -361,6 +362,8 @@ void itemize(struct file_struct *file, i
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -34,7 +34,7 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
  
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-01-28 19:14:15
 @@ -90,6 +90,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
@@ -52,7 +52,7 @@ Jeremy Bornstein
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
-@@ -375,6 +377,7 @@ static struct poptOption long_options[] 
+@@ -374,6 +376,7 @@ static struct poptOption long_options[] 
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 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 },
    {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-@@ -1402,6 +1405,9 @@ void server_options(char **args,int *arg
+@@ -1398,6 +1401,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      2005-05-10 16:14:33
+--- orig/rsync.yo      2005-05-10 23:47:12
 +++ rsync.yo   2005-02-11 22:49:10
 @@ -350,6 +350,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds

diff --git a/fname-convert.diff b/fname-convert.diff
index 72c70f6..a597e0c 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -87,7 +87,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
---- orig/flist.c       2005-04-28 15:56:50
+--- orig/flist.c       2005-05-14 19:51:15
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "send_file_list");
  
        io_start_buffering_out();
-@@ -1269,6 +1279,9 @@ struct file_list *send_file_list(int f, 
+@@ -1279,6 +1289,9 @@ struct file_list *send_file_list(int f, 
        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->count;
  
@@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (verbose > 3)
                output_flist(flist);
  
-@@ -1290,6 +1303,9 @@ struct file_list *recv_file_list(int f)
+@@ -1300,6 +1313,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -149,7 +149,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;
-@@ -1342,6 +1358,9 @@ struct file_list *recv_file_list(int f)
+@@ -1352,6 +1368,9 @@ struct file_list *recv_file_list(int f)
                        io_error |= read_int(f);
        }
  
@@ -382,9 +382,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      if (verbose > 2)
 +              rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}
---- orig/generator.c   2005-04-28 16:26:28
+--- orig/generator.c   2005-05-19 08:52:42
 +++ generator.c        2005-03-05 00:29:37
-@@ -588,7 +588,13 @@ static int phase = 0;
+@@ -587,7 +587,13 @@ static int phase = 0;
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
@@ -409,9 +409,9 @@ 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        2005-05-03 17:11:01
+--- orig/main.c        2005-05-12 07:51:58
 +++ main.c     2004-07-22 00:31:47
-@@ -376,7 +376,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -373,7 +373,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
                ret = local_child(argc, args, f_in, f_out, child_main);
        } else
@@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-02-14 02:50:32
 @@ -138,6 +138,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
@@ -438,7 +438,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -434,6 +436,7 @@ static struct poptOption long_options[] 
+@@ -433,6 +435,7 @@ static struct poptOption long_options[] 
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },

diff --git a/fsync.diff b/fsync.diff
index 1a4f41b..960938d 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,9 +1,9 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-01-28 19:30:47
-@@ -39,6 +39,7 @@ int make_backups = 0;
+@@ -38,6 +38,7 @@ int make_backups = 0;
   **/
  int whole_file = -1;
  
@@ -19,7 +19,7 @@ to be called on every file we write.
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
-@@ -396,6 +398,7 @@ static struct poptOption long_options[] 
+@@ -395,6 +397,7 @@ static struct poptOption long_options[] 
    {"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 },
@@ -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 },
-@@ -1450,6 +1453,9 @@ void server_options(char **args,int *arg
+@@ -1446,6 +1449,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  

diff --git a/ignore-case.diff b/ignore-case.diff
index aff192f..5a0b6cb 100644 (file)
--- 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     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-05-03 16:47:52
 @@ -101,6 +101,7 @@ int max_delete = 0;
  OFF_T max_size = 0;
@@ -53,7 +53,7 @@ in a case-insensitive manner.
    rprintf(F,"     --address=ADDRESS       bind address for outgoing socket to daemon\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
-@@ -393,6 +395,7 @@ static struct poptOption long_options[] 
+@@ -392,6 +394,7 @@ static struct poptOption long_options[] 
    {"include",          0,  POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
    {"exclude-from",     0,  POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
    {"include-from",     0,  POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 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 },
-@@ -1414,6 +1417,9 @@ void server_options(char **args,int *arg
+@@ -1410,6 +1413,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  

diff --git a/links-depth.diff b/links-depth.diff
index c08f088..3b7e71b 100644 (file)
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,7 +6,7 @@ with the latest codebase, but even in its original form it didn't
 handle relative symlinks properly, and that has not yet been fixed
 in this modified version.
 
---- orig/flist.c       2005-04-28 15:56:50
+--- orig/flist.c       2005-05-14 19:51:15
 +++ flist.c    2004-07-16 16:58:04
 @@ -45,6 +45,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
@@ -62,9 +62,9 @@ in this modified version.
  #else
        linkname_len = 0;
  #endif
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-01-28 19:33:24
-@@ -43,6 +43,7 @@ int archive_mode = 0;
+@@ -42,6 +42,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -80,7 +80,7 @@ in this modified version.
    rprintf(F," -L, --copy-links            transform symlink into referent file/dir\n");
    rprintf(F,"     --copy-unsafe-links     only \"unsafe\" symlinks are transformed\n");
    rprintf(F,"     --safe-links            ignore symlinks that point outside the source tree\n");
-@@ -403,6 +405,7 @@ static struct poptOption long_options[] 
+@@ -402,6 +404,7 @@ static struct poptOption long_options[] 
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
@@ -88,7 +88,7 @@ in this modified version.
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
---- orig/rsync.yo      2005-05-10 16:14:33
+--- orig/rsync.yo      2005-05-10 23:47:12
 +++ rsync.yo   2005-01-28 19:33:40
 @@ -311,6 +311,7 @@ to the detailed description below for a 
       --inplace               update destination files in-place

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index 156ca99..c2f7d74 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -34,9 +34,9 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2004-09-09 01:59:08
-@@ -409,8 +409,8 @@ static struct poptOption long_options[] 
+@@ -408,8 +408,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
@@ -47,7 +47,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
-@@ -782,6 +782,14 @@ int parse_arguments(int *argc, const cha
+@@ -781,6 +781,14 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -62,7 +62,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                case 'v':
                        verbose++;
                        break;
-@@ -969,8 +977,8 @@ int parse_arguments(int *argc, const cha
+@@ -963,8 +971,8 @@ int parse_arguments(int *argc, const cha
  #endif
                preserve_perms = 1;
                preserve_times = 1;
@@ -73,7 +73,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                preserve_devices = 1;
        }
  
-@@ -1286,10 +1294,16 @@ void server_options(char **args,int *arg
+@@ -1282,10 +1290,16 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';

diff --git a/rsyncd-perm.diff b/rsyncd-perm.diff
index e5f0803..20b6d2f 100644 (file)
--- a/rsyncd-perm.diff
+++ b/rsyncd-perm.diff
@@ -79,7 +79,7 @@
                                rsyserr(FERROR, errno, "failed to set permissions on %s",
                                        full_fname(fname));
                                return 0;
---- orig/rsyncd.conf.yo        2005-05-10 16:14:33
+--- orig/rsyncd.conf.yo        2005-05-10 23:47:13
 +++ rsyncd.conf.yo     2005-03-31 08:28:41
 @@ -221,6 +221,70 @@ file transfers to and from that module s
  was run as root. This complements the "uid" option. The default is gid -2,

diff --git a/source-cd.diff b/source-cd.diff
index d5e7661..dfbb187 100644 (file)
--- a/source-cd.diff
+++ b/source-cd.diff
@@ -6,7 +6,7 @@ rsync -avR --source-cd=/usr local/bin host:/
 
 For two systems where one uses /usr/local/bin and the other /local/bin.
 
---- orig/flist.c       2005-04-28 15:56:50
+--- orig/flist.c       2005-05-14 19:51:15
 +++ flist.c    2005-03-05 00:31:42
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -36,7 +36,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  
        while (1) {
                struct file_struct *file;
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-03-01 01:37:22
 @@ -82,6 +82,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
@@ -54,7 +54,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-@@ -424,6 +426,7 @@ static struct poptOption long_options[] 
+@@ -423,6 +425,7 @@ static struct poptOption long_options[] 
    {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
    {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
@@ -62,7 +62,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -933,6 +936,11 @@ int parse_arguments(int *argc, const cha
+@@ -927,6 +930,11 @@ int parse_arguments(int *argc, const cha
                } else if (dry_run)
                        write_batch = 0;
        }
@@ -74,7 +74,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        if (read_batch && files_from) {
                snprintf(err_buf, sizeof err_buf,
                        "--read-batch cannot be used with --files-from\n");
-@@ -1027,6 +1035,14 @@ int parse_arguments(int *argc, const cha
+@@ -1021,6 +1029,14 @@ int parse_arguments(int *argc, const cha
                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -89,7 +89,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
-@@ -1424,6 +1440,11 @@ void server_options(char **args,int *arg
+@@ -1420,6 +1436,11 @@ void server_options(char **args,int *arg
        } else if (keep_partial)
                args[ac++] = "--partial";
  
@@ -101,7 +101,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        if (ignore_errors)
                args[ac++] = "--ignore-errors";
  
---- orig/rsync.yo      2005-05-10 16:14:33
+--- orig/rsync.yo      2005-05-10 23:47:12
 +++ rsync.yo   2005-02-22 18:20:24
 @@ -304,6 +304,7 @@ to the detailed description below for a 
   -R, --relative              use relative path names

diff --git a/xattrs.diff b/xattrs.diff
index ebb902c..6248a9a 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -109,7 +109,7 @@ After applying this patch, run these commands for a successful build:
        }
        return file;
  }
-@@ -1315,6 +1319,7 @@ struct file_list *recv_file_list(int f)
+@@ -1325,6 +1329,7 @@ struct file_list *recv_file_list(int f)
                file = receive_file_entry(flist, flags, f);
  
                RECEIVE_ACL(file, f);
@@ -117,7 +117,7 @@ After applying this patch, run these commands for a successful build:
  
                if (S_ISREG(file->mode))
                        stats.total_size += file->length;
-@@ -1339,6 +1344,7 @@ struct file_list *recv_file_list(int f)
+@@ -1349,6 +1354,7 @@ struct file_list *recv_file_list(int f)
        clean_flist(flist, relative_paths, 1);
  
        SORT_FILE_ACL_INDEX_LISTS();
@@ -127,7 +127,7 @@ After applying this patch, run these commands for a successful build:
                /* Now send the uid/gid list. This was introduced in
 --- orig/generator.c   2005-05-12 23:34:00
 +++ generator.c        2005-05-12 23:21:08
-@@ -724,6 +724,10 @@ static void recv_generator(char *fname, 
+@@ -723,6 +723,10 @@ static void recv_generator(char *fname, 
                if (f_out == -1)
                        SET_ACL(fname, file);
  #endif
@@ -196,7 +196,7 @@ After applying this patch, run these commands for a successful build:
 +#endif /* No xattrs */
 --- orig/options.c     2005-05-12 23:34:38
 +++ options.c  2005-05-12 23:21:25
-@@ -45,6 +45,7 @@ int copy_links = 0;
+@@ -44,6 +44,7 @@ int copy_links = 0;
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
@@ -243,7 +243,7 @@ After applying this patch, run these commands for a successful build:
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
-@@ -417,6 +422,7 @@ static struct poptOption long_options[] 
+@@ -416,6 +421,7 @@ static struct poptOption long_options[] 
    {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"acls",            'A', POPT_ARG_NONE,   0,              'A', 0, 0 },
@@ -251,7 +251,7 @@ After applying this patch, run these commands for a successful build:
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
-@@ -907,6 +913,17 @@ int parse_arguments(int *argc, const cha
+@@ -901,6 +907,17 @@ int parse_arguments(int *argc, const cha
  #endif /* SUPPORT_ACLS */
                        break;
  
@@ -269,7 +269,7 @@ After applying this patch, run these commands for a successful build:
  
                default:
                        /* A large opt value means that set_refuse_options()
-@@ -1314,6 +1331,8 @@ void server_options(char **args,int *arg
+@@ -1310,6 +1327,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'H';
        if (preserve_acls)
                argstr[x++] = 'A';