X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..998e0bab068d64092214e4e923e518c599faff61:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index c6c7e40..411154d 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -44,11 +44,11 @@ To use this patch, run these commands for a successful build: -OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ +OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ @SSL_OBJS@ - TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o + TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ --- old/cleanup.c +++ new/cleanup.c -@@ -26,6 +26,9 @@ +@@ -25,6 +25,9 @@ extern int am_server; extern int am_daemon; extern int io_error; @@ -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; -@@ -117,6 +120,14 @@ NORETURN void _exit_cleanup(int code, co +@@ -116,6 +119,14 @@ NORETURN void _exit_cleanup(int code, co code, file, line); } @@ -75,7 +75,7 @@ To use this patch, run these commands for a successful build: --- old/clientserver.c +++ new/clientserver.c -@@ -30,6 +30,9 @@ extern int am_sender; +@@ -29,6 +29,9 @@ extern int am_sender; extern int am_server; extern int am_daemon; extern int am_root; @@ -83,8 +83,8 @@ To use this patch, run these commands for a successful build: +extern int use_ssl; +#endif extern int rsync_port; + extern int ignore_errors; extern int kluge_around_eof; - extern int daemon_over_rsh; @@ -106,8 +109,18 @@ int start_socket_client(char *host, char set_socket_options(fd, sockopts); @@ -104,8 +104,8 @@ To use this patch, run these commands for a successful build: + return client_run(fd, fd, -1, argc, argv); } - int start_inband_exchange(char *user, char *path, int f_in, int f_out, -@@ -168,6 +181,33 @@ int start_inband_exchange(char *user, ch + 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 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(char *user, ch +@@ -196,6 +236,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(char *user, ch +@@ -203,6 +247,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; } -@@ -780,6 +828,9 @@ int start_daemon(int f_in, int f_out) +@@ -789,6 +837,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; -@@ -791,6 +842,20 @@ int start_daemon(int f_in, int f_out) +@@ -800,6 +851,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 -@@ -173,6 +173,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,38 +233,36 @@ 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; -@@ -201,6 +209,7 @@ static void print_rsync_version(enum log - char const *hardlinks = "no "; +@@ -212,6 +220,7 @@ static void print_rsync_version(enum log char const *links = "no "; + char const *iconv = "no "; char const *ipv6 = "no "; + char const *ssl = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR -@@ -223,6 +232,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -241,6 +250,9 @@ static void print_rsync_version(enum log + #ifdef ICONV_OPTION + iconv = ""; #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-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -235,9 +248,9 @@ static void print_rsync_version(enum log - /* Note that this field may not have type ino_t. It depends - * on the complicated interaction between largefile feature - * macros. */ -- rprintf(f, " %sinplace, %sIPv6, " -+ rprintf(f, " %sinplace, %sIPv6, %sSSL, " - "%d-bit system inums, %d-bit internal inums\n", -- have_inplace, ipv6, -+ have_inplace, ipv6, ssl, - (int) (sizeof dumstat->st_ino * 8), - (int) (sizeof (int64) * 8)); + + 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 + (int)(sizeof (int64) * 8)); + rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", + got_socketpair, hardlinks, links, ipv6, have_inplace); +- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv\n", +- have_inplace, acls, xattrs, iconv); ++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %sSSL\n", ++ have_inplace, acls, xattrs, iconv, ssl); + #ifdef MAINTAINER_MODE -@@ -385,6 +398,13 @@ void usage(enum logcode F) + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); +@@ -415,6 +427,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -278,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"); -@@ -398,7 +418,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -428,7 +447,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, @@ -287,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[] = { -@@ -545,6 +565,13 @@ static struct poptOption long_options[] +@@ -590,6 +609,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 }, @@ -301,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 }, -@@ -572,6 +599,13 @@ static void daemon_usage(enum logcode F) +@@ -617,6 +643,13 @@ static void daemon_usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -315,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"); -@@ -598,6 +632,13 @@ static struct poptOption long_daemon_opt +@@ -643,6 +676,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 }, @@ -329,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 }, -@@ -855,6 +896,12 @@ int parse_arguments(int *argc, const cha +@@ -913,6 +953,12 @@ int parse_arguments(int *argc, const cha verbose++; break; @@ -342,7 +340,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -878,6 +925,17 @@ int parse_arguments(int *argc, const cha +@@ -936,6 +982,17 @@ int parse_arguments(int *argc, const cha exit_cleanup(RERR_SYNTAX); } @@ -360,9 +358,9 @@ To use this patch, run these commands for a successful build: *argv = poptGetArgs(pc); *argc = count_args(*argv); am_starting_up = 0; -@@ -1089,6 +1147,12 @@ int parse_arguments(int *argc, const cha - usage(FINFO); - exit_cleanup(0); +@@ -1180,6 +1237,12 @@ int parse_arguments(int *argc, const cha + return 0; + #endif +#ifdef HAVE_OPENSSL + case OPT_USE_SSL: @@ -373,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. */ -@@ -1365,6 +1429,17 @@ int parse_arguments(int *argc, const cha +@@ -1475,6 +1538,17 @@ int parse_arguments(int *argc, const cha if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -391,7 +389,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1782,10 +1857,27 @@ char *check_for_hostspec(char *s, char * +@@ -1928,10 +2002,27 @@ char *check_for_hostspec(char *s, char * char *p; int not_host; int hostlen; @@ -423,7 +421,7 @@ To use this patch, run these commands for a successful build: path = p + 1; --- old/rsync.h +++ new/rsync.h -@@ -32,6 +32,7 @@ +@@ -31,6 +31,7 @@ #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" @@ -431,7 +429,7 @@ To use this patch, run these commands for a successful build: #define BACKUP_SUFFIX "~" -@@ -419,6 +420,11 @@ enum msgcode { +@@ -488,6 +489,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif