Updated to apply cleanly.

[rsync/rsync-patches.git] / openssl-support.diff

diff --git a/openssl-support.diff b/openssl-support.diff
index 526e4f0..a8b097f 100644 (file)
--- 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-01 03:39:32
+--- orig/clientserver.c        2005-03-31 00:24:21
 +++ clientserver.c     2004-10-08 20:44:59
 @@ -45,6 +45,9 @@ extern int select_timeout;
  extern int orig_umask;
@@ -199,7 +199,7 @@ 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-16 02:19:29
+--- orig/configure.in  2005-03-29 11:15:05
 +++ configure.in       2004-07-03 20:22:28
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
@@ -223,9 +223,9 @@ 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-28 20:56:55
+--- orig/options.c     2005-03-31 00:24:21
 +++ options.c  2005-03-01 01:34:42
-@@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
+@@ -156,6 +156,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
  
@@ -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. */
-@@ -1112,6 +1145,17 @@ int parse_arguments(int *argc, const cha
+@@ -1111,6 +1144,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) {
-@@ -1479,11 +1523,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1478,11 +1522,28 @@ char *check_for_hostspec(char *s, char *
  {
        char *p;
        int not_host;