Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 6ecd93e..d7966f2 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -35,8 +35,8 @@ All warnings apply; I don't do C programming all that often, so I
 can't say if I've left any cleanup/compatibility errors in the code.
 
 
---- orig/Makefile.in   2006-02-06 05:03:50
-+++ Makefile.in        2004-10-08 20:17:06
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -38,7 +38,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 \
@@ -46,8 +46,8 @@ 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-02-03 20:00:35
-+++ cleanup.c  2005-01-10 10:43:22
+--- old/cleanup.c
++++ new/cleanup.c
 @@ -22,6 +22,9 @@
  #include "rsync.h"
  
@@ -70,8 +70,8 @@ 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-02-03 20:41:03
-+++ clientserver.c     2005-04-09 17:39:57
+--- old/clientserver.c
++++ new/clientserver.c
 @@ -45,6 +45,9 @@ extern int io_timeout;
  extern int orig_umask;
  extern int no_detach;
@@ -197,8 +197,8 @@ 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-02-05 04:53:34
-+++ configure.in       2004-07-03 20:22:28
+--- old/configure.in
++++ new/configure.in
 @@ -282,6 +282,21 @@ if test x"$enable_locale" != x"no"; then
        AC_DEFINE(CONFIG_LOCALE)
  fi
@@ -221,8 +221,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-02-03 23:51:57
-+++ options.c  2006-02-02 11:49:06
+--- old/options.c
++++ new/options.c
 @@ -167,6 +167,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -368,8 +368,8 @@ 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-02-03 20:00:36
-+++ rsync.h    2004-10-08 21:01:33
+--- old/rsync.h
++++ new/rsync.h
 @@ -32,6 +32,7 @@
  
  #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
@@ -390,8 +390,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
  /* Starting from protocol version 26, we always use 64-bit
   * ino_t and dev_t internally, even if this platform does not
   * allow files to have 64-bit inums.  That's because the
---- orig/ssl.c 2004-10-08 19:37:22
-+++ ssl.c      2004-10-08 19:37:22
+--- old/ssl.c
++++ new/ssl.c
 @@ -0,0 +1,366 @@
 +/* -*- c-file-style: "linux" -*-
 + * ssl.c: operations for negotiating SSL rsync connections.