X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5795bf59eae77f5d56b33a883708280b458f9fca..12b04b405932934777191a34869d4136d028a555:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 830a088..02cbdf8 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -161,7 +161,7 @@ To use this patch, run these commands for a successful build: return -1; } -@@ -785,6 +833,9 @@ int start_daemon(int f_in, int f_out) +@@ -784,6 +832,9 @@ int start_daemon(int f_in, int f_out) if (protocol_version > remote_protocol) protocol_version = remote_protocol; @@ -171,7 +171,7 @@ To use this patch, run these commands for a successful build: line[0] = 0; if (!read_line(f_in, line, sizeof line - 1)) return -1; -@@ -796,6 +847,20 @@ int start_daemon(int f_in, int f_out) +@@ -795,6 +846,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -233,26 +233,25 @@ 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; -@@ -205,6 +213,7 @@ static void print_rsync_version(enum log +@@ -206,6 +214,7 @@ static void print_rsync_version(enum log char const *xattrs = "no "; char const *links = "no "; char const *ipv6 = "no "; + char const *ssl = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR -@@ -233,6 +242,10 @@ static void print_rsync_version(enum log + #if SUBPROTOCOL_VERSION != 0 +@@ -232,6 +241,9 @@ static void print_rsync_version(enum log + #ifdef INET6 ipv6 = ""; #endif - +#ifdef HAVE_OPENSSL + ssl = ""; +#endif -+ - rprintf(f, "%s version %s protocol version %d\n", - RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); - rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -243,8 +256,8 @@ static void print_rsync_version(enum log + + rprintf(f, "%s version %s protocol version %d%s\n", + RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); +@@ -245,8 +257,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); @@ -263,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()); -@@ -398,6 +411,13 @@ void usage(enum logcode F) +@@ -400,6 +412,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -277,7 +276,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"); -@@ -411,7 +431,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -413,7 +432,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, @@ -286,7 +285,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -569,6 +589,13 @@ static struct poptOption long_options[] +@@ -571,6 +590,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 }, @@ -300,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 }, -@@ -596,6 +623,13 @@ static void daemon_usage(enum logcode F) +@@ -598,6 +624,13 @@ static void daemon_usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -314,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"); -@@ -622,6 +656,13 @@ static struct poptOption long_daemon_opt +@@ -624,6 +657,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 }, @@ -328,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 }, -@@ -881,6 +922,12 @@ int parse_arguments(int *argc, const cha +@@ -883,6 +923,12 @@ int parse_arguments(int *argc, const cha verbose++; break; @@ -341,7 +340,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -904,6 +951,17 @@ int parse_arguments(int *argc, const cha +@@ -906,6 +952,17 @@ int parse_arguments(int *argc, const cha exit_cleanup(RERR_SYNTAX); } @@ -359,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; -@@ -1148,6 +1206,12 @@ int parse_arguments(int *argc, const cha +@@ -1150,6 +1207,12 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -372,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. */ -@@ -1426,6 +1490,17 @@ int parse_arguments(int *argc, const cha +@@ -1428,6 +1491,17 @@ int parse_arguments(int *argc, const cha if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -390,7 +389,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1857,10 +1932,27 @@ char *check_for_hostspec(char *s, char * +@@ -1868,10 +1942,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen; @@ -430,7 +429,7 @@ To use this patch, run these commands for a successful build: #define BACKUP_SUFFIX "~" -@@ -474,6 +475,11 @@ enum msgcode { +@@ -479,6 +480,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif