X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ffc188460d94afdf8da233d822e7312e676b146a..39c135f960128d34b26fccc35773393965e9dc1d:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 1903186..830a088 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -218,7 +218,7 @@ To use this patch, run these commands for a successful build: *cygwin* ) AC_MSG_RESULT(yes) --- old/options.c +++ new/options.c -@@ -172,6 +172,14 @@ int logfile_format_has_o_or_i = 0; +@@ -174,6 +174,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; @@ -233,15 +233,15 @@ 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; -@@ -202,6 +210,7 @@ static void print_rsync_version(enum log - char const *acls = "no "; +@@ -205,6 +213,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 -@@ -228,6 +237,10 @@ static void print_rsync_version(enum log +@@ -233,6 +242,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif @@ -252,18 +252,18 @@ To use this patch, run these commands for a successful build: 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"); -@@ -238,8 +251,8 @@ static void print_rsync_version(enum log +@@ -243,8 +256,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); -- rprintf(f, " %sappend, %sACLs\n", -- have_inplace, acls); -+ rprintf(f, " %sappend, %sACLs, %sSSL\n", -+ have_inplace, acls, ssl); +- rprintf(f, " %sappend, %sACLs, %sxattrs\n", +- have_inplace, acls, xattrs); ++ rprintf(f, " %sappend, %sACLs, %sxattrs, %sSSL\n", ++ have_inplace, acls, xattrs, ssl); #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -390,6 +403,13 @@ void usage(enum logcode F) +@@ -398,6 +411,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -277,7 +277,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"); -@@ -403,7 +423,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -411,7 +431,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 +286,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -554,6 +574,13 @@ static struct poptOption long_options[] +@@ -569,6 +589,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 +300,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 }, -@@ -581,6 +608,13 @@ static void daemon_usage(enum logcode F) +@@ -596,6 +623,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 +314,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -607,6 +641,13 @@ static struct poptOption long_daemon_opt +@@ -622,6 +656,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 +328,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 }, -@@ -866,6 +907,12 @@ int parse_arguments(int *argc, const cha +@@ -881,6 +922,12 @@ int parse_arguments(int *argc, const cha verbose++; break; @@ -341,7 +341,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -889,6 +936,17 @@ int parse_arguments(int *argc, const cha +@@ -904,6 +951,17 @@ int parse_arguments(int *argc, const cha exit_cleanup(RERR_SYNTAX); } @@ -359,10 +359,10 @@ To use this patch, run these commands for a successful build: *argv = poptGetArgs(pc); *argc = count_args(*argv); am_starting_up = 0; -@@ -1122,6 +1180,12 @@ int parse_arguments(int *argc, const cha +@@ -1148,6 +1206,12 @@ int parse_arguments(int *argc, const cha + return 0; #endif - +#ifdef HAVE_OPENSSL + case OPT_USE_SSL: + use_ssl = 1; @@ -372,7 +372,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. */ -@@ -1400,6 +1464,17 @@ int parse_arguments(int *argc, const cha +@@ -1426,6 +1490,17 @@ int parse_arguments(int *argc, const cha if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -390,7 +390,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1827,10 +1902,27 @@ char *check_for_hostspec(char *s, char * +@@ -1857,10 +1932,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen;