Updated to apply cleanly.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 9cb5e01..1960c1b 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -38,7 +38,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
-+++ Makefile.in        18 Jun 2004 17:28:26 -0000
++++ Makefile.in        30 Jun 2004 00:11:17 -0000
 @@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
@@ -49,7 +49,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  TLS_OBJ = tls.o syscall.o lib/permstring.o
  
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22
-+++ cleanup.c  18 Jun 2004 17:28:26 -0000
++++ cleanup.c  30 Jun 2004 00:11:17 -0000
 @@ -24,6 +24,9 @@
  extern int io_error;
  extern int keep_partial;
@@ -73,7 +73,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
                        code, file, line);
 --- clientserver.c     13 Jun 2004 14:18:48 -0000      1.127
-+++ clientserver.c     18 Jun 2004 17:28:26 -0000
++++ clientserver.c     30 Jun 2004 00:11:17 -0000
 @@ -46,6 +46,9 @@ extern int io_timeout;
  extern int orig_umask;
  extern int no_detach;
@@ -190,7 +190,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        /* it's some sort of command that I don't understand */
                        io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
 --- config.h.in        29 Apr 2004 19:40:39 -0000      1.90
-+++ config.h.in        18 Jun 2004 17:28:26 -0000
++++ config.h.in        30 Jun 2004 00:11:17 -0000
 @@ -167,6 +167,9 @@
  /* */
  #undef HAVE_OFF64_T
@@ -202,7 +202,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #undef HAVE_READLINK
  
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196
-+++ configure.in       18 Jun 2004 17:28:26 -0000
++++ configure.in       30 Jun 2004 00:11:17 -0000
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
  fi
@@ -225,8 +225,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)
---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:28:26 -0000
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:11:17 -0000
 @@ -52,6 +52,9 @@ extern int rsync_port;
  extern int read_batch;
  extern int write_batch;
@@ -237,7 +237,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern pid_t cleanup_child_pid;
  extern char *files_from;
  extern char *remote_filesfrom_file;
-@@ -709,17 +712,32 @@ static int start_client(int argc, char *
+@@ -719,17 +722,32 @@ static int start_client(int argc, char *
        pid_t pid;
        int f_in,f_out;
        int rc;
@@ -272,7 +272,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                p = strchr(host,'/');
                if (p) {
                        *p = 0;
-@@ -767,12 +785,27 @@ static int start_client(int argc, char *
+@@ -777,12 +795,27 @@ static int start_client(int argc, char *
                        argv++;
                } else { /* source is local */
                        am_sender = 1;
@@ -302,8 +302,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
                                p = strchr(host,'/');
                                if (p) {
                                        *p = 0;
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:28:27 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:11:18 -0000
 @@ -133,6 +133,14 @@ int quiet = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -427,7 +427,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                bwlimit_writemax = (size_t)bwlimit * 128;
                if (bwlimit_writemax < 512)
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
-+++ rsync.h    18 Jun 2004 17:28:27 -0000
++++ rsync.h    30 Jun 2004 00:11:18 -0000
 @@ -32,6 +32,7 @@
  
  #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
@@ -449,7 +449,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
   * ino_t and dev_t internally, even if this platform does not
   * allow files to have 64-bit inums.  That's because the
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ ssl.c      18 Jun 2004 17:28:27 -0000
++++ ssl.c      30 Jun 2004 00:11:18 -0000
 @@ -0,0 +1,366 @@
 +/* -*- c-file-style: "linux" -*-
 + * ssl.c: operations for negotiating SSL rsync connections.