Fixed failing hunks.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 1088d74..411ee35 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -48,7 +48,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
  
---- orig/cleanup.c     2006-01-30 07:18:27
+--- orig/cleanup.c     2006-02-02 02:41:08
 +++ cleanup.c  2005-01-10 10:43:22
 @@ -22,6 +22,9 @@
  #include "rsync.h"
@@ -60,9 +60,9 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern int keep_partial;
  extern int log_got_error;
  extern char *partial_dir;
-@@ -97,6 +100,11 @@ void _exit_cleanup(int code, const char 
-       signal(SIGUSR1, SIG_IGN);
-       signal(SIGUSR2, SIG_IGN);
+@@ -101,6 +104,11 @@ void _exit_cleanup(int code, const char 
+       SIGACTION(SIGUSR1, SIG_IGN);
+       SIGACTION(SIGUSR2, SIG_IGN);
  
 +#if HAVE_OPENSSL
 +      if (use_ssl)
@@ -72,9 +72,9 @@ 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, file, line);
---- orig/clientserver.c        2006-01-30 21:47:45
+--- orig/clientserver.c        2006-02-01 19:37:05
 +++ clientserver.c     2005-04-09 17:39:57
-@@ -44,6 +44,9 @@ extern int io_timeout;
+@@ -45,6 +45,9 @@ extern int io_timeout;
  extern int orig_umask;
  extern int no_detach;
  extern int default_af_hint;
@@ -84,7 +84,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern char *bind_address;
  extern char *sockopts;
  extern char *config_file;
-@@ -103,8 +106,18 @@ int start_socket_client(char *host, char
+@@ -104,8 +107,18 @@ int start_socket_client(char *host, char
        set_socket_options(fd, sockopts);
  
        ret = start_inband_exchange(user, path, fd, fd, argc);
@@ -104,7 +104,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  }
  
  int start_inband_exchange(char *user, char *path, int f_in, int f_out, 
-@@ -165,6 +178,33 @@ int start_inband_exchange(char *user, ch
+@@ -166,6 +179,33 @@ int start_inband_exchange(char *user, ch
        if (verbose > 1)
                print_child_argv(sargs);
  
@@ -138,7 +138,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(f_out, "%s\n", path);
-@@ -193,6 +233,10 @@ int start_inband_exchange(char *user, ch
+@@ -194,6 +234,10 @@ int start_inband_exchange(char *user, ch
                         * server to terminate the listing of modules.
                         * We don't want to go on and transfer
                         * anything; just exit. */
@@ -149,7 +149,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        exit(0);
                }
  
-@@ -200,6 +244,10 @@ int start_inband_exchange(char *user, ch
+@@ -201,6 +245,10 @@ int start_inband_exchange(char *user, ch
                        rprintf(FERROR, "%s\n", line);
                        /* This is always fatal; the server will now
                         * close the socket. */
@@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        return -1;
                }
  
-@@ -714,6 +762,7 @@ static void send_listing(int fd)
+@@ -716,6 +764,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 */
-@@ -766,6 +815,9 @@ int start_daemon(int f_in, int f_out)
+@@ -768,6 +817,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;
-@@ -775,6 +827,20 @@ int start_daemon(int f_in, int f_out)
+@@ -777,6 +829,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -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  2006-01-15 14:52:33
+--- orig/configure.in  2006-02-02 02:41:09
 +++ configure.in       2004-07-03 20:22:28
 @@ -282,6 +282,21 @@ if test x"$enable_locale" != x"no"; then
        AC_DEFINE(CONFIG_LOCALE)
@@ -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     2006-01-31 03:11:30
-+++ options.c  2006-01-26 10:57:46
+--- orig/options.c     2006-02-02 11:40:45
++++ options.c  2006-02-02 11:49:06
 @@ -167,6 +167,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -259,19 +259,18 @@ can't say if I've left any cleanup/compatibility errors in the code.
        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");
-@@ -229,10 +242,10 @@ static void print_rsync_version(enum log
+@@ -229,9 +242,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, %d-bit system inums, %d-bit internal inums\n",
-+      rprintf(f, "              %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums, %sssl\n",
-               have_inplace, ipv6,
+-      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));
-+              (int) (sizeof (int64) * 8), ssl);
+               (int) (sizeof (int64) * 8));
  #ifdef MAINTAINER_MODE
-       rprintf(f, "              panic action: \"%s\"\n",
-               get_panic_action());
 @@ -371,6 +384,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
@@ -371,7 +370,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       2006-01-30 20:39:09
+--- orig/rsync.h       2006-02-02 02:41:09
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@