Updated to apply cleanly.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 9ec481c..ceb98c1 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -47,8 +47,8 @@ LEvhhkUglOm3xMyrdJT4u9Q=
 =aT/N
 -----END PGP SIGNATURE-----
 
---- Makefile.in        10 Feb 2004 17:06:11 -0000      1.98
-+++ Makefile.in        25 Apr 2004 18:37:22 -0000
+--- Makefile.in        2 May 2004 17:04:14 -0000       1.100
++++ Makefile.in        8 May 2004 18:40:16 -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 \
@@ -59,7 +59,7 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  TLS_OBJ = tls.o syscall.o lib/permstring.o
  
 --- cleanup.c  27 Jan 2004 08:14:33 -0000      1.21
-+++ cleanup.c  25 Apr 2004 18:37:22 -0000
++++ cleanup.c  8 May 2004 18:40:16 -0000
 @@ -87,6 +87,9 @@ void _exit_cleanup(int code, const char 
        int ocode = code;
        extern int keep_partial;
@@ -83,7 +83,7 @@ LEvhhkUglOm3xMyrdJT4u9Q=
        if (verbose > 3)
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", 
 --- clientserver.c     14 Apr 2004 23:33:34 -0000      1.121
-+++ clientserver.c     25 Apr 2004 18:37:23 -0000
++++ clientserver.c     8 May 2004 18:40:16 -0000
 @@ -46,6 +46,9 @@ extern int io_timeout;
  extern int orig_umask;
  extern int no_detach;
@@ -199,8 +199,8 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  
                if (*line == '#') {
                        /* it's some sort of command that I don't understand */
---- config.h.in        9 Apr 2004 18:09:30 -0000       1.89
-+++ config.h.in        25 Apr 2004 18:37:23 -0000
+--- config.h.in        29 Apr 2004 19:40:39 -0000      1.90
++++ config.h.in        8 May 2004 18:40:16 -0000
 @@ -167,6 +167,9 @@
  /* */
  #undef HAVE_OFF64_T
@@ -211,9 +211,9 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  /* Define to 1 if you have the `readlink' function. */
  #undef HAVE_READLINK
  
---- configure.in       17 Apr 2004 18:40:16 -0000      1.191
-+++ configure.in       25 Apr 2004 18:37:23 -0000
-@@ -266,6 +266,21 @@ yes
+--- configure.in       30 Apr 2004 18:03:33 -0000      1.196
++++ configure.in       8 May 2004 18:40:16 -0000
+@@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
  fi
  
@@ -236,7 +236,7 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)
 --- main.c     10 Feb 2004 03:54:47 -0000      1.192
-+++ main.c     25 Apr 2004 18:37:23 -0000
++++ main.c     8 May 2004 18:40:16 -0000
 @@ -51,6 +51,9 @@ extern int rsync_port;
  extern int read_batch;
  extern int write_batch;
@@ -312,8 +312,8 @@ LEvhhkUglOm3xMyrdJT4u9Q=
                                p = strchr(host,'/');
                                if (p) {
                                        *p = 0;
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  25 Apr 2004 18:37:24 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  8 May 2004 18:40:17 -0000
 @@ -130,6 +130,14 @@ int quiet = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -368,9 +368,9 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
-@@ -295,6 +307,13 @@ void usage(enum logcode F)
-   rprintf(F," -4                          prefer IPv4\n");
-   rprintf(F," -6                          prefer IPv6\n");
+@@ -294,6 +306,13 @@ void usage(enum logcode F)
+   rprintf(F," -4  --ipv4                  prefer IPv4\n");
+   rprintf(F," -6  --ipv6                  prefer IPv6\n");
  #endif
 +#ifdef HAVE_OPENSSL
 +  rprintf(F,"     --ssl                   allow socket connections to use SSL\n");
@@ -379,9 +379,9 @@ LEvhhkUglOm3xMyrdJT4u9Q=
 +  rprintf(F,"     --ssl-key-passwd=PASS   password for PEM-encoded private key\n");
 +  rprintf(F,"     --ssl-ca-certs=FILE     path to trusted CA certificates\n");
 +#endif
+   rprintf(F," -h, --help                  show this help screen\n");
  
    rprintf(F,"\n");
- 
 @@ -305,7 +324,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
@@ -392,8 +392,8 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  
  static struct poptOption long_options[] = {
 @@ -390,6 +409,13 @@ static struct poptOption long_options[] 
-   {0,               '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-   {0,               '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
+   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
  #endif
 +#ifdef HAVE_OPENSSL
 +  {"ssl",              0,  POPT_ARG_NONE,   0,               OPT_USE_SSL, 0, 0},
@@ -437,7 +437,7 @@ LEvhhkUglOm3xMyrdJT4u9Q=
        if (files_from) {
                char *colon;
 --- proto.h    22 Apr 2004 09:58:09 -0000      1.189
-+++ proto.h    25 Apr 2004 18:37:24 -0000
++++ proto.h    8 May 2004 18:40:17 -0000
 @@ -209,6 +209,12 @@ void start_accept_loop(int port, int (*f
  void set_socket_options(int fd, char *options);
  void become_daemon(void);
@@ -451,8 +451,8 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  int do_unlink(char *fname);
  int do_symlink(char *fname1, char *fname2);
  int do_link(char *fname1, char *fname2);
---- rsync.h    22 Apr 2004 09:58:24 -0000      1.198
-+++ rsync.h    25 Apr 2004 18:37:24 -0000
+--- rsync.h    2 May 2004 16:34:33 -0000       1.200
++++ rsync.h    8 May 2004 18:40:17 -0000
 @@ -32,6 +32,7 @@
  
  #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
@@ -474,7 +474,7 @@ LEvhhkUglOm3xMyrdJT4u9Q=
  
  /* Starting from protocol version 26, we always use 64-bit
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ ssl.c      25 Apr 2004 18:37:24 -0000
++++ ssl.c      8 May 2004 18:40:17 -0000
 @@ -0,0 +1,366 @@
 +/* -*- c-file-style: "linux" -*-
 + * ssl.c: operations for negotiating SSL rsync connections.