X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ac2da598d90fefcd23de41650cd1dd043625c9f4..adc8e875b40560052ba068a5a1934db1ef7046c3:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 02cbdf8..411154d 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -44,7 +44,7 @@ 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 @@ -161,7 +161,7 @@ To use this patch, run these commands for a successful build: return -1; } -@@ -784,6 +832,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; -@@ -795,6 +846,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; } @@ -233,17 +233,17 @@ 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; -@@ -206,6 +214,7 @@ static void print_rsync_version(enum log - char const *xattrs = "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; #if SUBPROTOCOL_VERSION != 0 -@@ -232,6 +241,9 @@ static void print_rsync_version(enum log - #ifdef INET6 - ipv6 = ""; +@@ -241,6 +250,9 @@ static void print_rsync_version(enum log + #ifdef ICONV_OPTION + iconv = ""; #endif +#ifdef HAVE_OPENSSL + ssl = ""; @@ -251,18 +251,18 @@ 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); -@@ -245,8 +257,8 @@ static void print_rsync_version(enum log +@@ -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\n", -- have_inplace, acls, xattrs); -+ rprintf(f, " %sappend, %sACLs, %sxattrs, %sSSL\n", -+ have_inplace, acls, xattrs, ssl); +- 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 rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -400,6 +412,13 @@ void usage(enum logcode F) +@@ -415,6 +427,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -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"); -@@ -413,7 +432,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, @@ -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[] = { -@@ -571,6 +590,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 }, @@ -299,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 }, -@@ -598,6 +624,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 @@ -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"); -@@ -624,6 +657,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 }, @@ -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 }, -@@ -883,6 +923,12 @@ int parse_arguments(int *argc, const cha +@@ -913,6 +953,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", -@@ -906,6 +952,17 @@ int parse_arguments(int *argc, const cha +@@ -936,6 +982,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; -@@ -1150,6 +1207,12 @@ int parse_arguments(int *argc, const cha +@@ -1180,6 +1237,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. */ -@@ -1428,6 +1491,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; @@ -389,7 +389,7 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1868,10 +1942,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; @@ -429,7 +429,7 @@ To use this patch, run these commands for a successful build: #define BACKUP_SUFFIX "~" -@@ -479,6 +480,11 @@ enum msgcode { +@@ -488,6 +489,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif