From 2b06a19d5f46f38218c27bdd6e3ebb463eb7b3ba Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 8 Apr 2005 06:21:42 +0000 Subject: [PATCH] Got rid of patch fuzz. --- ignore-case.diff | 12 ++++++------ openssl-support.diff | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ignore-case.diff b/ignore-case.diff index e7e6b77..a2aa6b6 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -35,7 +35,7 @@ in a case-insensitive manner. case '?': /* Match anything but '/'. */ if (*text == '/') ---- orig/options.c 2005-03-31 00:24:21 +--- orig/options.c 2005-04-07 17:04:26 +++ options.c 2004-10-14 17:22:51 @@ -100,6 +100,7 @@ int max_delete = 0; OFF_T max_size = 0; @@ -51,9 +51,9 @@ in a case-insensitive manner. rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n"); + rprintf(F," --ignore-case ignore case when comparing filenames\n"); rprintf(F," --version print version number\n"); + rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n"); rprintf(F," --port=PORT specify double-colon alternate port number\n"); - rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); -@@ -389,6 +391,7 @@ static struct poptOption long_options[] +@@ -390,6 +392,7 @@ static struct poptOption long_options[] {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 }, {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 }, {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 }, @@ -61,7 +61,7 @@ in a case-insensitive manner. {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, -@@ -1390,6 +1393,9 @@ void server_options(char **args,int *arg +@@ -1391,6 +1394,9 @@ void server_options(char **args,int *arg args[ac++] = arg; } @@ -81,7 +81,7 @@ in a case-insensitive manner. char *partial_dir; struct filter_list_struct server_filter_list; ---- orig/util.c 2005-03-30 20:45:02 +--- orig/util.c 2005-04-04 16:28:37 +++ util.c 2004-08-13 16:40:34 @@ -31,6 +31,7 @@ extern int verbose; extern int dry_run; @@ -91,7 +91,7 @@ in a case-insensitive manner. extern char *partial_dir; extern struct filter_list_struct server_filter_list; -@@ -1019,11 +1020,23 @@ int u_strcmp(const char *cs1, const char +@@ -1028,11 +1029,23 @@ int u_strcmp(const char *cs1, const char { const uchar *s1 = (const uchar *)cs1; const uchar *s2 = (const uchar *)cs2; diff --git a/openssl-support.diff b/openssl-support.diff index a8b097f..300ba14 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -72,7 +72,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (verbose > 3) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", code, safe_fname(file), line); ---- orig/clientserver.c 2005-03-31 00:24:21 +--- orig/clientserver.c 2005-04-04 16:28:35 +++ clientserver.c 2004-10-08 20:44:59 @@ -45,6 +45,9 @@ extern int select_timeout; extern int orig_umask; @@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code. return RERR_STARTCLIENT; } else { rprintf(FINFO,"%s\n", line); -@@ -549,6 +597,7 @@ static void send_listing(int fd) +@@ -547,6 +595,7 @@ static void send_listing(int fd) io_printf(fd,"@RSYNCD: EXIT\n"); } @@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code. /* this is called when a connection is established to a client and we want to start talking. The setup of the system is done from here */ -@@ -598,6 +647,9 @@ int start_daemon(int f_in, int f_out) +@@ -596,6 +645,9 @@ int start_daemon(int f_in, int f_out) if (protocol_version > remote_protocol) protocol_version = remote_protocol; @@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code. line[0] = 0; if (!read_line(f_in, line, sizeof line - 1)) return -1; -@@ -607,6 +659,20 @@ int start_daemon(int f_in, int f_out) +@@ -605,6 +657,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -199,9 +199,9 @@ can't say if I've left any cleanup/compatibility errors in the code. if (*line == '#') { /* it's some sort of command that I don't understand */ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); ---- orig/configure.in 2005-03-29 11:15:05 +--- orig/configure.in 2005-04-07 17:04:26 +++ configure.in 2004-07-03 20:22:28 -@@ -271,6 +271,21 @@ yes +@@ -282,6 +282,21 @@ yes AC_SEARCH_LIBS(getaddrinfo, inet6) fi @@ -223,7 +223,7 @@ can't say if I've left any cleanup/compatibility errors in the code. AC_MSG_CHECKING([whether to call shutdown on all sockets]) case $host_os in *cygwin* ) AC_MSG_RESULT(yes) ---- orig/options.c 2005-03-31 00:24:21 +--- orig/options.c 2005-04-07 17:04:26 +++ options.c 2005-03-01 01:34:42 @@ -156,6 +156,14 @@ int log_format_has_o_or_i = 0; int always_checksum = 0; @@ -272,7 +272,7 @@ can't say if I've left any cleanup/compatibility errors in the code. #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); -@@ -350,6 +363,13 @@ void usage(enum logcode F) +@@ -351,6 +364,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -286,7 +286,7 @@ can't say if I've left any cleanup/compatibility errors in the code. rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); -@@ -360,7 +380,7 @@ void usage(enum logcode F) +@@ -361,7 +381,7 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, @@ -295,7 +295,7 @@ can't say if I've left any cleanup/compatibility errors in the code. OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -459,6 +479,13 @@ static struct poptOption long_options[] +@@ -461,6 +481,13 @@ static struct poptOption long_options[] {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, #endif @@ -307,9 +307,9 @@ can't say if I've left any cleanup/compatibility errors in the code. + {"ssl-ca-certs", 0, POPT_ARG_STRING, &ssl_ca_path, OPT_USE_SSL, 0, 0}, +#endif /* All these options switch us into daemon-mode option-parsing. */ - {"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, -@@ -863,6 +890,12 @@ int parse_arguments(int *argc, const cha + {"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 }, +@@ -864,6 +891,12 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -322,7 +322,7 @@ can't say if I've left any cleanup/compatibility errors in the code. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1111,6 +1144,17 @@ int parse_arguments(int *argc, const cha +@@ -1112,6 +1145,17 @@ int parse_arguments(int *argc, const cha if (delay_updates && !partial_dir) partial_dir = partialdir_for_delayupdate; @@ -340,7 +340,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1478,11 +1522,28 @@ char *check_for_hostspec(char *s, char * +@@ -1479,11 +1523,28 @@ char *check_for_hostspec(char *s, char * { char *p; int not_host; -- 2.34.1