X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5befb07913169aa9449c29914401fccaa544677a..c8a8b4a7fd58ee1ee8b055a1559c71c9921d8753:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 711242b..101cdae 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -58,7 +58,7 @@ To use this patch, run these commands for a successful build: extern int keep_partial; extern int log_got_error; extern char *partial_dir; -@@ -116,6 +119,14 @@ NORETURN void _exit_cleanup(int code, co +@@ -121,6 +124,14 @@ NORETURN void _exit_cleanup(int code, co code, file, line); } @@ -107,7 +107,7 @@ To use this patch, run these commands for a successful build: static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client) @@ -244,6 +257,32 @@ int start_inband_exchange(int f_in, int if (verbose > 1) - print_child_argv(sargs); + print_child_argv("sending daemon args:", sargs); +#ifdef HAVE_OPENSSL + if (use_ssl) { @@ -217,7 +217,7 @@ To use this patch, run these commands for a successful build: *cygwin* ) AC_MSG_RESULT(yes) --- old/options.c +++ new/options.c -@@ -181,6 +181,14 @@ int logfile_format_has_o_or_i = 0; +@@ -182,6 +182,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; @@ -232,7 +232,7 @@ To use this patch, run these commands for a successful build: #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; -@@ -220,6 +228,7 @@ static void print_rsync_version(enum log +@@ -221,6 +229,7 @@ static void print_rsync_version(enum log char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -240,7 +240,7 @@ To use this patch, run these commands for a successful build: STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -249,6 +258,9 @@ static void print_rsync_version(enum log +@@ -250,6 +259,9 @@ static void print_rsync_version(enum log #ifdef ICONV_OPTION iconv = ""; #endif @@ -250,7 +250,7 @@ To use this patch, run these commands for a successful build: rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -262,8 +274,8 @@ static void print_rsync_version(enum log +@@ -263,8 +275,8 @@ static void print_rsync_version(enum log (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); @@ -261,7 +261,7 @@ To use this patch, run these commands for a successful build: #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -424,6 +436,13 @@ void usage(enum logcode F) +@@ -425,6 +437,13 @@ void usage(enum logcode F) #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -275,7 +275,7 @@ 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"); -@@ -437,7 +456,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -438,7 +457,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, @@ -284,7 +284,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -620,6 +639,13 @@ static struct poptOption long_options[] +@@ -623,6 +642,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 }, @@ -298,7 +298,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 }, -@@ -645,6 +671,13 @@ static void daemon_usage(enum logcode F) +@@ -648,6 +674,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"); @@ -312,7 +312,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -669,6 +702,13 @@ static struct poptOption long_daemon_opt +@@ -672,6 +705,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 }, @@ -326,7 +326,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 }, -@@ -943,6 +983,12 @@ int parse_arguments(int *argc_p, const c +@@ -946,6 +986,12 @@ int parse_arguments(int *argc_p, const c verbose++; break; @@ -339,7 +339,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -966,6 +1012,17 @@ int parse_arguments(int *argc_p, const c +@@ -969,6 +1015,17 @@ int parse_arguments(int *argc_p, const c exit_cleanup(RERR_SYNTAX); } @@ -357,7 +357,7 @@ To use this patch, run these commands for a successful build: *argv_p = argv = poptGetArgs(pc); *argc_p = argc = count_args(argv); am_starting_up = 0; -@@ -1216,6 +1273,12 @@ int parse_arguments(int *argc_p, const c +@@ -1221,6 +1278,12 @@ int parse_arguments(int *argc_p, const c return 0; #endif @@ -370,7 +370,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. */ -@@ -1530,6 +1593,17 @@ int parse_arguments(int *argc_p, const c +@@ -1536,6 +1599,17 @@ int parse_arguments(int *argc_p, const c if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -388,7 +388,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1997,10 +2071,27 @@ char *check_for_hostspec(char *s, char * +@@ -2011,10 +2085,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen; @@ -428,7 +428,7 @@ To use this patch, run these commands for a successful build: #define BACKUP_SUFFIX "~" -@@ -491,6 +492,11 @@ enum msgcode { +@@ -500,6 +501,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif