Simplified the build instructions now that we have "prepare-source".

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 411ee35..6ecd93e 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -1,9 +1,7 @@
 After applying this patch, run these commands for a successful build:
 
-    autoconf
-    autoheader
+    ./prepare-source
     ./configure
-    make proto
     make
 
 Casey Marshall writes:
@@ -37,7 +35,7 @@ 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-01-14 08:14:29
+--- orig/Makefile.in   2006-02-06 05:03:50
 +++ Makefile.in        2004-10-08 20:17:06
 @@ -38,7 +38,7 @@ OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
@@ -48,7 +46,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-02-02 02:41:08
+--- orig/cleanup.c     2006-02-03 20:00:35
 +++ cleanup.c  2005-01-10 10:43:22
 @@ -22,6 +22,9 @@
  #include "rsync.h"
@@ -72,7 +70,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, file, line);
---- orig/clientserver.c        2006-02-01 19:37:05
+--- orig/clientserver.c        2006-02-03 20:41:03
 +++ clientserver.c     2005-04-09 17:39:57
 @@ -45,6 +45,9 @@ extern int io_timeout;
  extern int orig_umask;
@@ -178,7 +176,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;
-@@ -777,6 +829,20 @@ int start_daemon(int f_in, int f_out)
+@@ -781,6 +833,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -199,7 +197,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-02-02 02:41:09
+--- orig/configure.in  2006-02-05 04:53:34
 +++ 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,7 +221,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/options.c     2006-02-02 11:40:45
+--- orig/options.c     2006-02-03 23:51:57
 +++ options.c  2006-02-02 11:49:06
 @@ -167,6 +167,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
@@ -370,7 +368,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-02-02 02:41:09
+--- orig/rsync.h       2006-02-03 20:00:36
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@