Fixed failing hunks.

diff --git a/openssl-support.diff b/openssl-support.diff
index d0b1650..390c1ff 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -37,7 +37,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
 
 --- old/Makefile.in
 +++ new/Makefile.in
-@@ -38,7 +38,7 @@ OBJS3=progress.o pipe.o
+@@ -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 \
        popt/popthelp.o popt/poptparse.o
@@ -158,7 +158,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        return -1;
                }
  
-@@ -719,6 +767,7 @@ static void send_listing(int fd)
+@@ -718,6 +766,7 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -166,7 +166,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 */
-@@ -777,6 +826,9 @@ int start_daemon(int f_in, int f_out)
+@@ -776,6 +825,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -176,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;
-@@ -788,6 +840,20 @@ int start_daemon(int f_in, int f_out)
+@@ -787,6 +839,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -199,7 +199,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
 --- old/configure.in
 +++ new/configure.in
-@@ -282,6 +282,21 @@ if test x"$enable_locale" != x"no"; then
+@@ -290,6 +290,21 @@ if test x"$enable_locale" != x"no"; then
        AC_DEFINE(CONFIG_LOCALE)
  fi
  
@@ -269,7 +269,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                (int) (sizeof dumstat->st_ino * 8),
                (int) (sizeof (int64) * 8));
  #ifdef MAINTAINER_MODE
-@@ -378,6 +391,13 @@ void usage(enum logcode F)
+@@ -383,6 +396,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -283,7 +283,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    rprintf(F,"     --version               print version number\n");
    rprintf(F,"(-h) --help                  show this help (-h works with no other options)\n");
  
-@@ -390,7 +410,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -396,7 +416,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
@@ -292,7 +292,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -532,6 +552,13 @@ static struct poptOption long_options[] 
+@@ -541,6 +561,13 @@ static struct poptOption long_options[] 
    {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
    {"server",           0,  POPT_ARG_NONE,   0, OPT_SERVER, 0, 0 },
    {"sender",           0,  POPT_ARG_NONE,   0, OPT_SENDER, 0, 0 },
@@ -306,7 +306,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    /* All the following options switch us into daemon-mode option-parsing. */
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
-@@ -1080,6 +1107,12 @@ int parse_arguments(int *argc, const cha
+@@ -1084,6 +1111,12 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -319,7 +319,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. */
-@@ -1361,6 +1394,17 @@ int parse_arguments(int *argc, const cha
+@@ -1364,6 +1397,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = tmp_partialdir;
  
@@ -337,10 +337,10 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1774,11 +1818,28 @@ char *check_for_hostspec(char *s, char *
- {
+@@ -1781,10 +1825,27 @@ char *check_for_hostspec(char *s, char *
        char *p;
        int not_host;
+       int hostlen;
 +      int url_prefix_len = sizeof URL_PREFIX - 1;
  
 -      if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) {
@@ -362,7 +362,6 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +      }
 +      if (url_prefix_len) {
                char *path;
-               int hostlen;
 -              s += strlen(URL_PREFIX);
 +              s += url_prefix_len;
                if ((p = strchr(s, '/')) != NULL) {
@@ -378,7 +377,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -413,6 +414,11 @@ enum msgcode {
+@@ -419,6 +420,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif