From: Wayne Davison Date: Sat, 1 Sep 2007 16:43:25 +0000 (+0000) Subject: Fixed failing hunks. X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/5ba66156c2f3b31eae4a1ae88a44c1efaf248c9c Fixed failing hunks. --- diff --git a/acls.diff b/acls.diff index eb4cc59..1038d73 100644 --- a/acls.diff +++ b/acls.diff @@ -314,10 +314,10 @@ To use this patch, run these commands for a successful build: if (S_ISDIR(file->mode)) --- old/compat.c +++ new/compat.c -@@ -145,13 +145,6 @@ void setup_protocol(int f_out,int f_in) - } - +@@ -148,13 +148,6 @@ void setup_protocol(int f_out,int f_in) if (protocol_version < 30) { + if (append_mode == 1) + append_mode = 2; - if (preserve_acls && !local_server) { - rprintf(FERROR, - "--acls requires protocol 30 or higher" diff --git a/link-by-hash.diff b/link-by-hash.diff index 5d72765..9532c5b 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build: popt/popthelp.o popt/poptparse.o --- old/flist.c +++ new/flist.c -@@ -61,6 +61,7 @@ extern int copy_unsafe_links; +@@ -63,6 +63,7 @@ extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; extern struct stats stats; @@ -33,7 +33,7 @@ To use this patch, run these commands for a successful build: extern char curr_dir[MAXPATHLEN]; -@@ -748,7 +749,7 @@ static struct file_struct *recv_file_ent +@@ -818,7 +819,7 @@ static struct file_struct *recv_file_ent extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN; #endif @@ -383,7 +383,7 @@ To use this patch, run these commands for a successful build: +#endif --- old/options.c +++ new/options.c -@@ -146,6 +146,7 @@ char *backup_suffix = NULL; +@@ -153,6 +153,7 @@ char *backup_suffix = NULL; char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; @@ -391,32 +391,32 @@ To use this patch, run these commands for a successful build: char *config_file = NULL; char *shell_cmd = NULL; char *logfile_name = NULL; -@@ -362,6 +363,7 @@ void usage(enum logcode F) +@@ -384,6 +385,7 @@ void usage(enum logcode F) rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); + rprintf(F," --link-by-hash=DIR create hardlinks by hash into DIR\n"); rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," --compress-level=NUM explicitly set compression level\n"); - rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); -@@ -411,7 +413,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP + rprintf(F," --skip-compress=LIST skip compressing files with a suffix in LIST\n"); +@@ -435,7 +437,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, -- OPT_NO_D, -+ OPT_NO_D, OPT_LINK_BY_HASH, +- OPT_NO_D, OPT_APPEND, ++ OPT_NO_D, OPT_APPEND, OPT_LINK_BY_HASH, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -523,6 +525,7 @@ static struct poptOption long_options[] +@@ -554,6 +556,7 @@ static struct poptOption long_options[] {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, + {"link-by-hash", 0, POPT_ARG_STRING, 0, OPT_LINK_BY_HASH, 0, 0}, {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, - {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, -@@ -1148,6 +1151,21 @@ int parse_arguments(int *argc, const cha + {"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 }, +@@ -1205,6 +1208,21 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -438,9 +438,9 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1814,6 +1832,11 @@ void server_options(char **args,int *arg - } - } +@@ -1929,6 +1947,11 @@ void server_options(char **args,int *arg + } else if (inplace) + args[ac++] = "--inplace"; + if (link_by_hash_dir && am_sender) { + args[ac++] = "--link-by-hash"; @@ -478,7 +478,7 @@ To use this patch, run these commands for a successful build: sum_init(checksum_seed); if (append_mode > 0) { -@@ -192,6 +197,8 @@ static int receive_data(int f_in, char * +@@ -194,6 +199,8 @@ static int receive_data(int f_in, char * cleanup_got_literal = 1; sum_update(data, i); @@ -487,7 +487,7 @@ To use this patch, run these commands for a successful build: if (fd != -1 && write_file(fd,data,i) != i) goto report_write_error; -@@ -218,6 +225,8 @@ static int receive_data(int f_in, char * +@@ -220,6 +227,8 @@ static int receive_data(int f_in, char * see_token(map, len); sum_update(map, len); @@ -496,7 +496,7 @@ To use this patch, run these commands for a successful build: } if (updating_basis) { -@@ -260,6 +269,8 @@ static int receive_data(int f_in, char * +@@ -262,6 +271,8 @@ static int receive_data(int f_in, char * } sum_len = sum_end(file_sum1); @@ -505,7 +505,7 @@ To use this patch, run these commands for a successful build: if (mapbuf) unmap_file(mapbuf); -@@ -275,7 +286,7 @@ static int receive_data(int f_in, char * +@@ -277,7 +288,7 @@ static int receive_data(int f_in, char * static void discard_receive_data(int f_in, OFF_T length) { @@ -514,7 +514,7 @@ To use this patch, run these commands for a successful build: } static void handle_delayed_updates(char *local_name) -@@ -646,7 +657,7 @@ int recv_files(int f_in, char *local_nam +@@ -665,7 +676,7 @@ int recv_files(int f_in, char *local_nam /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, @@ -525,15 +525,15 @@ To use this patch, run these commands for a successful build: --- old/rsync.c +++ new/rsync.c -@@ -51,6 +51,7 @@ extern int inplace; +@@ -48,6 +48,7 @@ extern int inplace; extern int flist_eof; extern int keep_dirlinks; extern int make_backups; +extern char *link_by_hash_dir; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; - -@@ -410,8 +411,15 @@ void finish_transfer(const char *fname, + #ifdef ICONV_OPTION +@@ -458,8 +459,15 @@ void finish_transfer(const char *fname, /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); @@ -553,7 +553,7 @@ To use this patch, run these commands for a successful build: ret == -2 ? "copy" : "rename", --- old/rsync.h +++ new/rsync.h -@@ -758,6 +758,14 @@ struct stats { +@@ -778,6 +778,14 @@ struct stats { int current_file_index; }; @@ -570,11 +570,11 @@ To use this patch, run these commands for a successful build: #define EMPTY_ITEM_LIST {NULL, 0, 0} --- old/rsync.yo +++ new/rsync.yo -@@ -369,6 +369,7 @@ to the detailed description below for a +@@ -392,6 +392,7 @@ to the detailed description below for a --compare-dest=DIR also compare received files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged + --link-by-hash=DIR create hardlinks by hash into DIR -z, --compress compress file data during the transfer --compress-level=NUM explicitly set compression level - -C, --cvs-exclude auto-ignore files in the same way CVS does + --skip-compress=LIST skip compressing files with suffix in LIST diff --git a/openssl-support.diff b/openssl-support.diff index a4ad294..534307d 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -262,7 +262,7 @@ To use this patch, run these commands for a successful build: #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -421,6 +433,13 @@ void usage(enum logcode F) +@@ -422,6 +434,13 @@ void usage(enum logcode F) #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -276,16 +276,16 @@ To use this patch, run these commands for a successful build: rprintf(F," --version print version number\n"); rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); -@@ -434,7 +453,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -435,7 +454,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, -- OPT_NO_D, -+ OPT_NO_D, OPT_USE_SSL, +- OPT_NO_D, OPT_APPEND, ++ OPT_NO_D, OPT_APPEND, OPT_USE_SSL, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -610,6 +629,13 @@ static struct poptOption long_options[] +@@ -613,6 +632,13 @@ static struct poptOption long_options[] {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, @@ -299,7 +299,7 @@ To use this patch, run these commands for a successful build: /* All the following options switch us into daemon-mode option-parsing. */ {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 }, -@@ -635,6 +661,13 @@ static void daemon_usage(enum logcode F) +@@ -638,6 +664,13 @@ static void daemon_usage(enum logcode F) rprintf(F," -v, --verbose increase verbosity\n"); rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -313,7 +313,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -659,6 +692,13 @@ static struct poptOption long_daemon_opt +@@ -662,6 +695,13 @@ static struct poptOption long_daemon_opt {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, @@ -327,7 +327,7 @@ To use this patch, run these commands for a successful build: {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, -@@ -929,6 +969,12 @@ int parse_arguments(int *argc, const cha +@@ -932,6 +972,12 @@ int parse_arguments(int *argc, const cha verbose++; break; @@ -340,7 +340,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -952,6 +998,17 @@ int parse_arguments(int *argc, const cha +@@ -955,6 +1001,17 @@ int parse_arguments(int *argc, const cha exit_cleanup(RERR_SYNTAX); } @@ -358,7 +358,7 @@ To use this patch, run these commands for a successful build: *argv = poptGetArgs(pc); *argc = count_args(*argv); am_starting_up = 0; -@@ -1195,6 +1252,12 @@ int parse_arguments(int *argc, const cha +@@ -1205,6 +1262,12 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -371,7 +371,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1495,6 +1558,17 @@ int parse_arguments(int *argc, const cha +@@ -1505,6 +1568,17 @@ int parse_arguments(int *argc, const cha if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -389,7 +389,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1960,10 +2034,27 @@ char *check_for_hostspec(char *s, char * +@@ -1972,10 +2046,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen; diff --git a/time-limit.diff b/time-limit.diff index 07b79ba..10acf14 100644 --- a/time-limit.diff +++ b/time-limit.diff @@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build: int max_delete = INT_MIN; OFF_T max_size = 0; OFF_T min_size = 0; -@@ -407,6 +408,8 @@ void usage(enum logcode F) +@@ -413,6 +414,8 @@ void usage(enum logcode F) rprintf(F," --password-file=FILE read daemon-access password from FILE\n"); rprintf(F," --list-only list the files instead of copying them\n"); rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n"); @@ -66,16 +66,16 @@ To use this patch, run these commands for a successful build: rprintf(F," --write-batch=FILE write a batched update to FILE\n"); rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n"); rprintf(F," --read-batch=FILE read a batched update from FILE\n"); -@@ -431,7 +434,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -435,7 +438,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, -- OPT_NO_D, -+ OPT_NO_D, OPT_STOP_AT, OPT_TIME_LIMIT, +- OPT_NO_D, OPT_APPEND, ++ OPT_NO_D, OPT_APPEND, OPT_STOP_AT, OPT_TIME_LIMIT, OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -587,6 +590,8 @@ static struct poptOption long_options[] +@@ -593,6 +596,8 @@ static struct poptOption long_options[] {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 }, {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 }, {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 }, @@ -84,7 +84,7 @@ To use this patch, run these commands for a successful build: {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, -@@ -1198,6 +1203,36 @@ int parse_arguments(int *argc, const cha +@@ -1205,6 +1210,36 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -121,7 +121,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1796,6 +1831,15 @@ void server_options(char **args,int *arg +@@ -1803,6 +1838,15 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build: args[ac++] = backup_dir; --- old/rsync.yo +++ new/rsync.yo -@@ -420,6 +420,8 @@ to the detailed description below for a +@@ -421,6 +421,8 @@ to the detailed description below for a --password-file=FILE read daemon-access password from FILE --list-only list the files instead of copying them --bwlimit=KBPS limit I/O bandwidth; KBytes per second @@ -148,7 +148,7 @@ To use this patch, run these commands for a successful build: --write-batch=FILE write a batched update to FILE --only-write-batch=FILE like --write-batch but w/o updating dest --read-batch=FILE read a batched update from FILE -@@ -1892,6 +1894,19 @@ transfer was too fast, it will wait befo +@@ -1902,6 +1904,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/xattrs.diff b/xattrs.diff index fd731ef..6cfc8d0 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -12,11 +12,10 @@ To use this patch, run these commands for a successful build: --- old/compat.c +++ new/compat.c -@@ -144,16 +144,6 @@ void setup_protocol(int f_out,int f_in) - exit_cleanup(RERR_PROTOCOL); - } - -- if (protocol_version < 30) { +@@ -148,13 +148,6 @@ void setup_protocol(int f_out,int f_in) + if (protocol_version < 30) { + if (append_mode == 1) + append_mode = 2; - if (preserve_xattrs && !local_server) { - rprintf(FERROR, - "--xattrs requires protocol 30 or higher" @@ -24,11 +23,9 @@ To use this patch, run these commands for a successful build: - protocol_version); - exit_cleanup(RERR_PROTOCOL); - } -- } -- + } + if (delete_mode && !(delete_before+delete_during+delete_after)) { - if (protocol_version < 30) - delete_before = 1; --- old/xattrs.c +++ new/xattrs.c @@ -20,6 +20,7 @@