From 896871f8c1a4f6e6226fb8f81ef27431e2860f6b Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 3 May 2005 16:52:06 +0000 Subject: [PATCH] Fixed failing hunks. --- ignore-case.diff | 20 ++++++++++---------- openssl-support.diff | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ignore-case.diff b/ignore-case.diff index a2aa6b6..49b05b1 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -35,9 +35,9 @@ in a case-insensitive manner. case '?': /* Match anything but '/'. */ if (*text == '/') ---- 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; +--- orig/options.c 2005-05-03 16:47:32 ++++ options.c 2005-05-03 16:47:52 +@@ -101,6 +101,7 @@ int max_delete = 0; OFF_T max_size = 0; int ignore_errors = 0; int modify_window = 0; @@ -45,15 +45,15 @@ in a case-insensitive manner. int blocking_io = -1; int checksum_seed = 0; int inplace = 0; -@@ -331,6 +332,7 @@ void usage(enum logcode F) +@@ -332,6 +333,7 @@ void usage(enum logcode F) rprintf(F," --include-from=FILE read include patterns from FILE\n"); rprintf(F," --files-from=FILE read list of source-file names from FILE\n"); - rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n"); + rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\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"); -@@ -390,6 +392,7 @@ static struct poptOption long_options[] + rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); +@@ -393,6 +395,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 }, -@@ -1391,6 +1394,9 @@ void server_options(char **args,int *arg +@@ -1414,6 +1417,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-04-04 16:28:37 +--- orig/util.c 2005-05-03 16:47:33 +++ 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; -@@ -1028,11 +1029,23 @@ int u_strcmp(const char *cs1, const char +@@ -1029,11 +1030,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 a4c2d57..a7d47f0 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -223,8 +223,8 @@ 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-04-09 18:00:28 -+++ options.c 2005-04-09 18:03:00 +--- orig/options.c 2005-05-03 16:47:32 ++++ options.c 2005-05-03 16:51:16 @@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 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()); -@@ -353,6 +366,13 @@ void usage(enum logcode F) +@@ -352,6 +365,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -283,9 +283,9 @@ can't say if I've left any cleanup/compatibility errors in the code. + rprintf(F," --ssl-key-passwd=PASS password for PEM-encoded private key\n"); + rprintf(F," --ssl-ca-certs=FILE path to trusted CA certificates\n"); +#endif + rprintf(F," --version print version number\n"); rprintf(F," -h, --help show this help screen\n"); - rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); @@ -364,7 +384,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, @@ -309,7 +309,7 @@ can't say if I've left any cleanup/compatibility errors in the code. /* All these 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 }, -@@ -873,6 +900,12 @@ int parse_arguments(int *argc, const cha +@@ -882,6 +909,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. */ -@@ -1124,6 +1157,17 @@ int parse_arguments(int *argc, const cha +@@ -1133,6 +1166,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) { -@@ -1493,11 +1537,28 @@ char *check_for_hostspec(char *s, char * +@@ -1502,11 +1546,28 @@ char *check_for_hostspec(char *s, char * { char *p; int not_host; @@ -371,7 +371,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if ((p = strchr(s, '/')) != NULL) { hostlen = p - s; path = p + 1; ---- orig/rsync.h 2005-03-28 20:56:55 +--- orig/rsync.h 2005-04-14 01:53:12 +++ rsync.h 2004-10-08 21:01:33 @@ -32,6 +32,7 @@ @@ -381,7 +381,7 @@ can't say if I've left any cleanup/compatibility errors in the code. #define BACKUP_SUFFIX "~" -@@ -411,6 +412,11 @@ enum msgcode { +@@ -410,6 +411,11 @@ enum msgcode { # define SIZEOF_INT64 SIZEOF_OFF_T #endif -- 2.34.1