Updated to apply cleanly.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 4e265b1..280a7d0 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -189,7 +189,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  2004-08-13 07:18:59
+--- orig/configure.in  2004-09-23 17:42:07
 +++ configure.in       2004-07-03 20:22:28
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
@@ -213,7 +213,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/main.c        2004-09-18 01:49:33
+--- orig/main.c        2004-09-29 17:58:26
 +++ main.c     2004-07-15 02:40:51
 @@ -56,6 +56,9 @@ extern int write_batch;
  extern int batch_fd;
@@ -225,7 +225,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;
-@@ -761,18 +764,32 @@ static int start_client(int argc, char *
+@@ -771,18 +774,32 @@ static int start_client(int argc, char *
        pid_t pid;
        int f_in,f_out;
        int rc;
@@ -261,7 +261,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                p = strchr(host,'/');
                if (p) {
                        *p = '\0';
-@@ -825,12 +842,27 @@ static int start_client(int argc, char *
+@@ -835,12 +852,27 @@ static int start_client(int argc, char *
                        argv++;
                } else { /* source is local */
                        am_sender = 1;
@@ -291,7 +291,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                                p = strchr(host,'/');
                                if (p) {
                                        *p = '\0';
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-07-16 20:19:50
 @@ -135,6 +135,14 @@ int quiet = 0;
  int always_checksum = 0;
@@ -408,7 +408,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (bwlimit) {
                bwlimit_writemax = (size_t)bwlimit * 128;
                if (bwlimit_writemax < 512)
---- orig/rsync.h       2004-08-03 15:41:32
+--- orig/rsync.h       2004-09-22 08:47:31
 +++ rsync.h    2004-07-03 20:22:28
 @@ -32,6 +32,7 @@
  
@@ -418,7 +418,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -329,6 +330,11 @@ enum msgcode {
+@@ -330,6 +331,11 @@ enum msgcode {
  #define uint64 unsigned off_t
  #endif