From d705d4dd33c2cd5a83d772df98c7b3ff5319af34 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 27 Aug 2007 21:23:02 +0000 Subject: [PATCH] Fixed failing hunks. --- openssl-support.diff | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/openssl-support.diff b/openssl-support.diff index 411154d..a4ad294 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -85,7 +85,7 @@ To use this patch, run these commands for a successful build: extern int rsync_port; extern int ignore_errors; extern int kluge_around_eof; -@@ -106,8 +109,18 @@ int start_socket_client(char *host, char +@@ -109,8 +112,18 @@ int start_socket_client(char *host, char set_socket_options(fd, sockopts); ret = start_inband_exchange(user, path, fd, fd, argc); @@ -105,7 +105,7 @@ To use this patch, run these commands for a successful build: } int start_inband_exchange(const char *user, char *path, int f_in, int f_out, -@@ -168,6 +181,33 @@ int start_inband_exchange(const char *us +@@ -171,6 +184,33 @@ int start_inband_exchange(const char *us if (verbose > 1) print_child_argv(sargs); @@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build: p = strchr(path,'/'); if (p) *p = 0; io_printf(f_out, "%s\n", path); -@@ -196,6 +236,10 @@ int start_inband_exchange(const char *us +@@ -199,6 +239,10 @@ int start_inband_exchange(const char *us * server to terminate the listing of modules. * We don't want to go on and transfer * anything; just exit. */ @@ -150,7 +150,7 @@ To use this patch, run these commands for a successful build: exit(0); } -@@ -203,6 +247,10 @@ int start_inband_exchange(const char *us +@@ -206,6 +250,10 @@ int start_inband_exchange(const char *us rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ @@ -161,7 +161,7 @@ To use this patch, run these commands for a successful build: return -1; } -@@ -789,6 +837,9 @@ int start_daemon(int f_in, int f_out) +@@ -796,6 +844,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; -@@ -800,6 +851,20 @@ int start_daemon(int f_in, int f_out) +@@ -807,6 +858,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -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 -@@ -174,6 +174,14 @@ int logfile_format_has_o_or_i = 0; +@@ -181,6 +181,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; @@ -233,7 +233,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; -@@ -212,6 +220,7 @@ static void print_rsync_version(enum log +@@ -219,6 +227,7 @@ static void print_rsync_version(enum log char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -241,7 +241,7 @@ To use this patch, run these commands for a successful build: STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -241,6 +250,9 @@ static void print_rsync_version(enum log +@@ -248,6 +257,9 @@ static void print_rsync_version(enum log #ifdef ICONV_OPTION iconv = ""; #endif @@ -251,7 +251,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); -@@ -254,8 +266,8 @@ static void print_rsync_version(enum log +@@ -261,8 +273,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); @@ -262,10 +262,10 @@ To use this patch, run these commands for a successful build: #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -415,6 +427,13 @@ void usage(enum logcode F) +@@ -421,6 +433,13 @@ void usage(enum logcode F) + #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); - #endif +#ifdef HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); + rprintf(F," --ssl-cert=FILE path to daemon's SSL certificate\n"); @@ -276,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"); -@@ -428,7 +447,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -434,7 +453,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, @@ -285,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[] = { -@@ -590,6 +609,13 @@ static struct poptOption long_options[] +@@ -610,6 +629,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,10 +299,10 @@ 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 }, -@@ -617,6 +643,13 @@ static void daemon_usage(enum logcode F) +@@ -635,6 +661,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"); - #endif +#ifdef HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); + rprintf(F," --ssl-cert=FILE path to daemon's SSL certificate\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"); -@@ -643,6 +676,13 @@ static struct poptOption long_daemon_opt +@@ -659,6 +692,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 }, -@@ -913,6 +953,12 @@ int parse_arguments(int *argc, const cha +@@ -929,6 +969,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", -@@ -936,6 +982,17 @@ int parse_arguments(int *argc, const cha +@@ -952,6 +998,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; -@@ -1180,6 +1237,12 @@ int parse_arguments(int *argc, const cha +@@ -1195,6 +1252,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. */ -@@ -1475,6 +1538,17 @@ int parse_arguments(int *argc, const cha +@@ -1495,6 +1558,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) { -@@ -1928,10 +2002,27 @@ char *check_for_hostspec(char *s, char * +@@ -1960,10 +2034,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen; @@ -429,7 +429,7 @@ To use this patch, run these commands for a successful build: #define BACKUP_SUFFIX "~" -@@ -488,6 +489,11 @@ enum msgcode { +@@ -491,6 +492,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif -- 2.34.1