From f26fcad4caf03bd5748486e3293bf10ac5c01964 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 28 Feb 2005 02:18:10 +0000 Subject: [PATCH] Updated to apply cleanly. --- ODBC-dblog.diff | 2 +- acls.diff | 4 ++-- append.diff | 6 +++--- atimes.diff | 4 ++-- backup-dir-dels.diff | 2 +- chmod-option.diff | 2 +- date-only.diff | 4 ++-- fname-convert.diff | 4 ++-- link-by-hash.diff | 2 +- links-depth.diff | 2 +- openssl-support.diff | 6 +++--- source-cd.diff | 2 +- time-limit.diff | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 7c06e54..b4ad3d0 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -697,7 +697,7 @@ This patch adds the following options: { int i; for (i = 0; rerr_names[i].name; i++) { ---- orig/main.c 2005-02-27 07:33:41 +--- orig/main.c 2005-02-28 02:16:55 +++ main.c 2004-07-03 20:22:18 @@ -139,6 +139,9 @@ static void report(int f) diff --git a/acls.diff b/acls.diff index 1abc230..c944226 100644 --- a/acls.diff +++ b/acls.diff @@ -1325,7 +1325,7 @@ 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-02-27 07:50:58 +--- orig/generator.c 2005-02-27 18:24:42 +++ generator.c 2005-02-20 00:02:51 @@ -686,6 +686,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) @@ -4748,7 +4748,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 2005-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ rsync.yo 2004-07-03 20:11:58 @@ -317,6 +317,7 @@ to the detailed description below for a -H, --hard-links preserve hard links diff --git a/append.diff b/append.diff index fa5e9ca..a5d973b 100644 --- a/append.diff +++ b/append.diff @@ -1,7 +1,7 @@ This patch adds the --append option, which works like a "resume" mode in an ftp client, appending new data onto the end of the files it updates. ---- orig/generator.c 2005-02-27 07:50:58 +--- orig/generator.c 2005-02-27 18:24:42 +++ generator.c 2005-02-27 07:51:38 @@ -51,6 +51,7 @@ extern int remove_sent_files; extern int update_only; @@ -80,7 +80,7 @@ an ftp client, appending new data onto the end of the files it updates. if (statret == 0) statret = 1; goto notify_others; -@@ -1146,6 +1157,8 @@ void generate_files(int f_out, struct fi +@@ -1147,6 +1158,8 @@ void generate_files(int f_out, struct fi only_existing = max_size = opt_ignore_existing = 0; update_only = always_checksum = size_only = 0; ignore_times = 1; @@ -246,7 +246,7 @@ an ftp client, appending new data onto the end of the files it updates. continue; } ---- orig/rsync.yo 2005-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ rsync.yo 2005-02-11 20:36:38 @@ -309,6 +309,7 @@ to the detailed description below for a --suffix=SUFFIX backup suffix (default ~ w/o --backup-dir) diff --git a/atimes.diff b/atimes.diff index 98778ce..69365b7 100644 --- a/atimes.diff +++ b/atimes.diff @@ -127,7 +127,7 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- orig/generator.c 2005-02-27 07:50:58 +--- orig/generator.c 2005-02-27 18:24:42 +++ generator.c 2004-11-03 23:02:12 @@ -364,7 +364,7 @@ static int unchanged_file(char *fn, stru if (ignore_times) @@ -260,7 +260,7 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- orig/rsync.yo 2005-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ 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 305bc63..55194ab 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -106,7 +106,7 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/generator.c 2005-02-27 07:50:58 +--- orig/generator.c 2005-02-27 18:24:42 +++ generator.c 2005-02-26 19:31:06 @@ -82,16 +82,23 @@ extern dev_t filesystem_dev; extern char *backup_dir; diff --git a/chmod-option.diff b/chmod-option.diff index 81a3b39..4f8d05c 100644 --- a/chmod-option.diff +++ b/chmod-option.diff @@ -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 2005-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ 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 2cb5d9d..be0ccf5 100644 --- 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-02-27 07:50:58 +--- orig/generator.c 2005-02-27 18:24:42 +++ generator.c 2004-11-11 22:15:27 @@ -54,6 +54,7 @@ extern int inplace; extern int make_backups; @@ -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-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ 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 03ebc37..3105dec 100644 --- a/fname-convert.diff +++ b/fname-convert.diff @@ -382,7 +382,7 @@ 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-02-27 07:50:58 +--- orig/generator.c 2005-02-27 18:24:42 +++ generator.c 2005-02-03 02:07:33 @@ -554,7 +554,13 @@ static int find_fuzzy(struct file_struct * start sending checksums. @@ -409,7 +409,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 2005-02-27 07:33:41 +--- orig/main.c 2005-02-28 02:16:55 +++ main.c 2004-07-22 00:31:47 @@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac whole_file = 1; diff --git a/link-by-hash.diff b/link-by-hash.diff index 72657b7..36173ef 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -560,7 +560,7 @@ the file's name. #include "byteorder.h" #include "lib/mdfour.h" ---- orig/rsync.yo 2005-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ rsync.yo 2005-02-13 06:58:47 @@ -355,6 +355,7 @@ to the detailed description below for a -y, --fuzzy find similar file for basis if no dest file diff --git a/links-depth.diff b/links-depth.diff index 5be3389..316e921 100644 --- a/links-depth.diff +++ b/links-depth.diff @@ -88,7 +88,7 @@ in this modified version. {"copy-links", 'L', POPT_ARG_NONE, ©_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-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ 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/openssl-support.diff b/openssl-support.diff index a4f3c38..2543996 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -223,7 +223,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 2005-02-27 07:33:41 +--- orig/main.c 2005-02-28 02:16:55 +++ main.c 2004-10-08 20:15:28 @@ -56,6 +56,9 @@ extern int write_batch; extern int batch_fd; @@ -235,7 +235,7 @@ can't say if I've left any cleanup/compatibility errors in the code. extern pid_t cleanup_child_pid; extern struct stats stats; extern char *files_from; -@@ -857,33 +860,48 @@ static int start_client(int argc, char * +@@ -866,33 +869,48 @@ static int start_client(int argc, char * if ((rc = copy_argv(argv))) return rc; @@ -308,7 +308,7 @@ can't say if I've left any cleanup/compatibility errors in the code. p = find_colon(argv[0]); if (p) { /* source is remote */ if (remote_filesfrom_file -@@ -915,12 +933,26 @@ static int start_client(int argc, char * +@@ -924,12 +942,26 @@ static int start_client(int argc, char * argv++; } else { /* source is local */ am_sender = 1; diff --git a/source-cd.diff b/source-cd.diff index ab78721..336949a 100644 --- a/source-cd.diff +++ b/source-cd.diff @@ -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-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ 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/time-limit.diff b/time-limit.diff index 16e5279..f71989e 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -3,7 +3,7 @@ to be simpler and more efficient by Wayne Davison. Do we need configure support for mktime()? ---- orig/io.c 2005-02-27 07:33:41 +--- orig/io.c 2005-02-27 18:24:42 +++ io.c 2005-02-26 05:28:35 @@ -51,6 +51,7 @@ extern int eol_nulls; extern int csum_length; @@ -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 2005-02-26 05:22:51 +--- orig/rsync.yo 2005-02-28 02:16:55 +++ rsync.yo 2005-02-01 10:46:35 @@ -378,6 +378,8 @@ to the detailed description below for a --password-file=FILE read password from FILE -- 2.34.1