Fixed failing hunks.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index c6c7e40..708ae3d 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -104,8 +104,8 @@ To use this patch, run these commands for a successful build:
 +      return client_run(fd, fd, -1, argc, argv);
  }
  
- int start_inband_exchange(char *user, char *path, int f_in, int f_out,
-@@ -168,6 +181,33 @@ int start_inband_exchange(char *user, ch
+ int start_inband_exchange(const char *user, char *path, int f_in, int f_out,
+@@ -168,6 +181,33 @@ int start_inband_exchange(const char *us
        if (verbose > 1)
                print_child_argv(sargs);
  
@@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build:
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(f_out, "%s\n", path);
-@@ -196,6 +236,10 @@ int start_inband_exchange(char *user, ch
+@@ -196,6 +236,10 @@ int start_inband_exchange(const char *us
                         * server to terminate the listing of modules.
                         * We don't want to go on and transfer
                         * anything; just exit. */
@@ -150,7 +150,7 @@ To use this patch, run these commands for a successful build:
                        exit(0);
                }
  
-@@ -203,6 +247,10 @@ int start_inband_exchange(char *user, ch
+@@ -203,6 +247,10 @@ int start_inband_exchange(const char *us
                        rprintf(FERROR, "%s\n", line);
                        /* This is always fatal; the server will now
                         * close the socket. */
@@ -252,19 +252,18 @@ To use this patch, run these commands for a successful build:
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -235,9 +248,9 @@ static void print_rsync_version(enum log
-       /* Note that this field may not have type ino_t.  It depends
-        * on the complicated interaction between largefile feature
-        * macros. */
--      rprintf(f, "              %sinplace, %sIPv6, "
-+      rprintf(f, "              %sinplace, %sIPv6, %sSSL, "
-               "%d-bit system inums, %d-bit internal inums\n",
--              have_inplace, ipv6,
-+              have_inplace, ipv6, ssl,
-               (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (int64) * 8));
+@@ -233,8 +246,8 @@ static void print_rsync_version(enum log
+               (int)(sizeof (int64) * 8));
+       rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
+               got_socketpair, hardlinks, links, ipv6, have_inplace);
+-      rprintf(f, "    %sappend\n",
+-              have_inplace);
++      rprintf(f, "    %sappend, %sSSL\n",
++              have_inplace, ssl);
+ 
  #ifdef MAINTAINER_MODE
-@@ -385,6 +398,13 @@ void usage(enum logcode F)
+       rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
+@@ -382,6 +395,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -278,7 +277,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --version               print version number\n");
    rprintf(F,"(-h) --help                  show this help (-h works with no other options)\n");
  
-@@ -398,7 +418,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -395,7 +415,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,
@@ -287,7 +286,7 @@ To use this patch, run these commands for a successful build:
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -545,6 +565,13 @@ static struct poptOption long_options[] 
+@@ -543,6 +563,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 },
@@ -301,7 +300,7 @@ To use this patch, run these commands for a successful build:
    /* 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 },
-@@ -572,6 +599,13 @@ static void daemon_usage(enum logcode F)
+@@ -570,6 +597,13 @@ static void daemon_usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -315,7 +314,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --help                  show this help screen\n");
  
    rprintf(F,"\n");
-@@ -598,6 +632,13 @@ static struct poptOption long_daemon_opt
+@@ -596,6 +630,13 @@ static struct poptOption long_daemon_opt
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
    {"server",           0,  POPT_ARG_NONE,   &am_server, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
@@ -329,7 +328,7 @@ To use this patch, run these commands for a successful build:
    {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
    {"no-verbose",       0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
    {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
-@@ -855,6 +896,12 @@ int parse_arguments(int *argc, const cha
+@@ -853,6 +894,12 @@ int parse_arguments(int *argc, const cha
                                        verbose++;
                                        break;
  
@@ -342,7 +341,7 @@ To use this patch, run these commands for a successful build:
                                default:
                                        rprintf(FERROR,
                                            "rsync: %s: %s (in daemon mode)\n",
-@@ -878,6 +925,17 @@ int parse_arguments(int *argc, const cha
+@@ -876,6 +923,17 @@ int parse_arguments(int *argc, const cha
                                exit_cleanup(RERR_SYNTAX);
                        }
  
@@ -360,7 +359,7 @@ To use this patch, run these commands for a successful build:
                        *argv = poptGetArgs(pc);
                        *argc = count_args(*argv);
                        am_starting_up = 0;
-@@ -1089,6 +1147,12 @@ int parse_arguments(int *argc, const cha
+@@ -1087,6 +1145,12 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -373,7 +372,7 @@ To use this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1365,6 +1429,17 @@ int parse_arguments(int *argc, const cha
+@@ -1359,6 +1423,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = tmp_partialdir;
  
@@ -391,7 +390,7 @@ To use this patch, run these commands for a successful build:
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1782,10 +1857,27 @@ char *check_for_hostspec(char *s, char *
+@@ -1783,10 +1858,27 @@ char *check_for_hostspec(char *s, char *
        char *p;
        int not_host;
        int hostlen;
@@ -431,7 +430,7 @@ To use this patch, run these commands for a successful build:
  
  #define BACKUP_SUFFIX "~"
  
-@@ -419,6 +420,11 @@ enum msgcode {
+@@ -420,6 +421,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif