Got rid of patch fuzz.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 0a76308..300ba14 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -72,7 +72,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, safe_fname(file), line);
---- orig/clientserver.c        2005-03-01 03:39:32
+--- orig/clientserver.c        2005-04-04 16:28:35
 +++ clientserver.c     2004-10-08 20:44:59
 @@ -45,6 +45,9 @@ extern int select_timeout;
  extern int orig_umask;
@@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        return RERR_STARTCLIENT;
                } else {
                        rprintf(FINFO,"%s\n", line);
-@@ -549,6 +597,7 @@ static void send_listing(int fd)
+@@ -547,6 +595,7 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  /* this is called when a connection is established to a client
     and we want to start talking. The setup of the system is done from
     here */
-@@ -598,6 +647,9 @@ int start_daemon(int f_in, int f_out)
+@@ -596,6 +645,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -178,7 +178,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;
-@@ -607,6 +659,20 @@ int start_daemon(int f_in, int f_out)
+@@ -605,6 +657,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -199,9 +199,9 @@ 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  2005-03-01 06:22:19
+--- orig/configure.in  2005-04-07 17:04:26
 +++ configure.in       2004-07-03 20:22:28
-@@ -271,6 +271,21 @@ yes
+@@ -282,6 +282,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
  fi
  
@@ -223,9 +223,9 @@ 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     2005-03-11 17:36:35.507159655
+--- orig/options.c     2005-04-07 17:04:26
 +++ options.c  2005-03-01 01:34:42
-@@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
+@@ -156,6 +156,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
  
@@ -272,7 +272,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
-@@ -349,6 +362,13 @@ void usage(enum logcode F)
+@@ -351,6 +364,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -286,7 +286,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    rprintf(F," -h, --help                  show this help screen\n");
  
    rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -359,7 +379,7 @@ void usage(enum logcode F)
+@@ -361,7 +381,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -295,7 +295,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -458,6 +478,13 @@ static struct poptOption long_options[] 
+@@ -461,6 +481,13 @@ static struct poptOption long_options[] 
    {"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
@@ -307,9 +307,9 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +  {"ssl-ca-certs",     0,  POPT_ARG_STRING, &ssl_ca_path, OPT_USE_SSL, 0, 0},
 +#endif
    /* All these options switch us into daemon-mode option-parsing. */
-   {"address",          0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
-@@ -862,6 +889,12 @@ int parse_arguments(int *argc, const cha
+   {"daemon",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
+@@ -864,6 +891,12 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -322,7 +322,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1116,6 +1149,17 @@ int parse_arguments(int *argc, const cha
+@@ -1112,6 +1145,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
  
@@ -340,7 +340,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1483,11 +1527,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1479,11 +1523,28 @@ char *check_for_hostspec(char *s, char *
  {
        char *p;
        int not_host;
@@ -371,7 +371,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       2005-03-09 18:53:49
+--- orig/rsync.h       2005-03-28 20:56:55
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@
  
@@ -381,7 +381,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -410,6 +411,11 @@ enum msgcode {
+@@ -411,6 +412,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif