Fixed failing hunks.

diff --git a/flags.diff b/flags.diff
index ffce970..69dcc3f 100644 (file)
--- a/flags.diff
+++ b/flags.diff
@@ -23,7 +23,7 @@ TODO: fix --delete-delay to work with --flags option.
        if (preserve_xattrs)
 --- old/configure.in
 +++ new/configure.in
-@@ -559,7 +559,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
@@ -34,7 +34,7 @@ TODO: fix --delete-delay to work with --flags option.
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
 --- old/flist.c
 +++ new/flist.c
-@@ -48,6 +48,7 @@ extern int preserve_links;
+@@ -49,6 +49,7 @@ extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
  extern int preserve_specials;
@@ -42,7 +42,7 @@ TODO: fix --delete-delay to work with --flags option.
  extern int preserve_uid;
  extern int preserve_gid;
  extern int relative_paths;
-@@ -353,6 +354,9 @@ static void send_file_entry(int f, struc
+@@ -354,6 +355,9 @@ static void send_file_entry(int f, struc
  {
        static time_t modtime;
        static mode_t mode;
@@ -52,7 +52,7 @@ TODO: fix --delete-delay to work with --flags option.
        static int64 dev;
        static dev_t rdev;
        static uint32 rdev_major;
-@@ -373,6 +377,12 @@ static void send_file_entry(int f, struc
+@@ -374,6 +378,12 @@ static void send_file_entry(int f, struc
                flags |= XMIT_SAME_MODE;
        else
                mode = file->mode;
@@ -65,8 +65,8 @@ TODO: fix --delete-delay to work with --flags option.
        if ((preserve_devices && IS_DEVICE(mode))
         || (preserve_specials && IS_SPECIAL(mode))) {
                if (protocol_version < 28) {
-@@ -486,6 +496,10 @@ static void send_file_entry(int f, struc
-               write_int(f, modtime);
+@@ -491,6 +501,10 @@ static void send_file_entry(int f, struc
+       }
        if (!(flags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
 +#ifdef SUPPORT_FLAGS
@@ -76,9 +76,9 @@ TODO: fix --delete-delay to work with --flags option.
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
                if (protocol_version < 30)
                        write_int(f, uid);
-@@ -574,6 +588,9 @@ static struct file_struct *recv_file_ent
+@@ -579,6 +593,9 @@ static struct file_struct *recv_file_ent
  {
-       static time_t modtime;
+       static int64 modtime;
        static mode_t mode;
 +#ifdef SUPPORT_FLAGS
 +      static uint32 fileflags;
@@ -86,8 +86,8 @@ TODO: fix --delete-delay to work with --flags option.
        static int64 dev;
        static dev_t rdev;
        static uint32 rdev_major;
-@@ -670,9 +687,12 @@ static struct file_struct *recv_file_ent
-               modtime = (time_t)read_int(f);
+@@ -686,9 +703,12 @@ static struct file_struct *recv_file_ent
+       }
        if (!(flags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
 -
@@ -100,7 +100,7 @@ TODO: fix --delete-delay to work with --flags option.
  
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
                if (protocol_version < 30)
-@@ -790,6 +810,10 @@ static struct file_struct *recv_file_ent
+@@ -806,6 +826,10 @@ static struct file_struct *recv_file_ent
                OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
        }
        file->mode = mode;
@@ -111,7 +111,7 @@ TODO: fix --delete-delay to work with --flags option.
        if (preserve_uid)
                F_OWNER(file) = uid;
        if (preserve_gid)
-@@ -1099,6 +1123,10 @@ struct file_struct *make_file(const char
+@@ -1115,6 +1139,10 @@ struct file_struct *make_file(const char
                OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
        }
        file->mode = st.st_mode;
@@ -284,7 +284,7 @@ TODO: fix --delete-delay to work with --flags option.
  int preserve_executability = 0;
  int preserve_devices = 0;
  int preserve_specials = 0;
-@@ -205,6 +206,7 @@ static void print_rsync_version(enum log
+@@ -206,6 +207,7 @@ static void print_rsync_version(enum log
        char const *xattrs = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
@@ -292,7 +292,7 @@ TODO: fix --delete-delay to work with --flags option.
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -233,6 +235,10 @@ static void print_rsync_version(enum log
+@@ -234,6 +236,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -300,10 +300,10 @@ TODO: fix --delete-delay to work with --flags option.
 +      fileflags = "";
 +#endif
 +
-       rprintf(f, "%s  version %s  protocol version %d\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -243,8 +249,8 @@ static void print_rsync_version(enum log
+       if (SUBPROTOCOL_VERSION)
+               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
+       else
+@@ -250,8 +256,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);
@@ -314,7 +314,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -310,6 +316,7 @@ void usage(enum logcode F)
+@@ -317,6 +323,7 @@ void usage(enum logcode F)
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
@@ -322,7 +322,7 @@ TODO: fix --delete-delay to work with --flags option.
    rprintf(F," -E, --executability         preserve the file's executability\n");
    rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
  #ifdef SUPPORT_ACLS
-@@ -441,6 +448,8 @@ static struct poptOption long_options[] 
+@@ -448,6 +455,8 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
@@ -331,7 +331,7 @@ TODO: fix --delete-delay to work with --flags option.
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
-@@ -1187,6 +1196,15 @@ int parse_arguments(int *argc, const cha
+@@ -1194,6 +1203,15 @@ int parse_arguments(int *argc, const cha
        }
  #endif
  
@@ -347,7 +347,7 @@ TODO: fix --delete-delay to work with --flags option.
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");
-@@ -1654,6 +1672,9 @@ void server_options(char **args,int *arg
+@@ -1661,6 +1679,9 @@ void server_options(char **args,int *arg
        if (xfer_dirs && !recurse && delete_mode && am_sender)
                args[ac++] = "--no-r";
  
@@ -384,7 +384,7 @@ TODO: fix --delete-delay to work with --flags option.
  #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
  iconv_t ic_chck = (iconv_t)-1;
  
-@@ -222,6 +233,41 @@ mode_t dest_mode(mode_t flist_mode, mode
+@@ -218,6 +229,41 @@ mode_t dest_mode(mode_t flist_mode, mode
        return new_mode;
  }
  
@@ -426,7 +426,7 @@ TODO: fix --delete-delay to work with --flags option.
  int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                   const char *fnamecmp, int flags)
  {
-@@ -348,6 +394,15 @@ int set_file_attrs(const char *fname, st
+@@ -344,6 +390,15 @@ int set_file_attrs(const char *fname, st
        }
  #endif
  
@@ -442,7 +442,7 @@ TODO: fix --delete-delay to work with --flags option.
        if (verbose > 1 && flags & ATTRS_REPORT) {
                if (updated)
                        rprintf(FCLIENT, "%s\n", fname);
-@@ -407,6 +462,9 @@ void finish_transfer(const char *fname, 
+@@ -403,6 +458,9 @@ void finish_transfer(const char *fname, 
        set_file_attrs(fnametmp, file, NULL, fnamecmp,
                       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
  
@@ -452,7 +452,7 @@ TODO: fix --delete-delay to work with --flags option.
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
-@@ -421,6 +479,9 @@ void finish_transfer(const char *fname, 
+@@ -417,6 +475,9 @@ void finish_transfer(const char *fname, 
        }
        if (ret == 0) {
                /* The file was moved into place (not copied), so it's done. */
@@ -472,7 +472,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  /* These flags are used in the live flist data. */
  
-@@ -389,6 +390,10 @@ enum msgcode {
+@@ -394,6 +395,10 @@ enum msgcode {
  #endif
  #endif
  
@@ -483,7 +483,7 @@ TODO: fix --delete-delay to work with --flags option.
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -568,6 +573,7 @@ struct file_struct {
+@@ -573,6 +578,7 @@ struct file_struct {
  extern int file_extra_cnt;
  extern int preserve_uid;
  extern int preserve_gid;
@@ -491,7 +491,7 @@ TODO: fix --delete-delay to work with --flags option.
  extern int preserve_acls;
  extern int preserve_xattrs;
  
-@@ -602,6 +608,7 @@ extern int preserve_xattrs;
+@@ -607,6 +613,7 @@ extern int preserve_xattrs;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
  #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
@@ -509,7 +509,7 @@ TODO: fix --delete-delay to work with --flags option.
   -E, --executability         preserve executability
       --chmod=CHMOD           affect file and/or directory permissions
   -A, --acls                  preserve ACLs (implies -p)
-@@ -512,7 +513,9 @@ specified, in which case bf(-r) is not i
+@@ -518,7 +519,9 @@ specified, in which case bf(-r) is not i
  
  Note that bf(-a) bf(does not preserve hardlinks), because
  finding multiply-linked files is expensive.  You must separately
@@ -520,7 +520,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  dit(--no-OPTION) You may turn off one or more implied options by prefixing
  the option name with "no-".  Not all options may be prefixed with a "no-":
-@@ -837,6 +840,13 @@ extended attributes to be the same as th
+@@ -843,6 +846,13 @@ extended attributes to be the same as th
  only if the remote machine's rsync supports this option also. This is
  a non-standard option.
  

diff --git a/openssl-support.diff b/openssl-support.diff
index 830a088..a570cda 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -233,7 +233,7 @@ To use this patch, run these commands for a successful build:
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  
-@@ -205,6 +213,7 @@ static void print_rsync_version(enum log
+@@ -206,6 +214,7 @@ static void print_rsync_version(enum log
        char const *xattrs = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
@@ -241,7 +241,7 @@ To use this patch, run these commands for a successful build:
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -233,6 +242,10 @@ static void print_rsync_version(enum log
+@@ -234,6 +243,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -249,10 +249,10 @@ To use this patch, run these commands for a successful build:
 +      ssl = "";
 +#endif
 +
-       rprintf(f, "%s  version %s  protocol version %d\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -243,8 +256,8 @@ static void print_rsync_version(enum log
+       if (SUBPROTOCOL_VERSION)
+               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
+       else
+@@ -250,8 +263,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);
@@ -263,7 +263,7 @@ To use this patch, run these commands for a successful build:
  
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -398,6 +411,13 @@ void usage(enum logcode F)
+@@ -405,6 +418,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -277,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");
  
-@@ -411,7 +431,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -418,7 +438,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,
@@ -286,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[] = {
-@@ -569,6 +589,13 @@ static struct poptOption long_options[] 
+@@ -576,6 +596,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 },
@@ -300,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 },
-@@ -596,6 +623,13 @@ static void daemon_usage(enum logcode F)
+@@ -603,6 +630,13 @@ static void daemon_usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -314,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");
-@@ -622,6 +656,13 @@ static struct poptOption long_daemon_opt
+@@ -629,6 +663,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 },
@@ -328,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 },
-@@ -881,6 +922,12 @@ int parse_arguments(int *argc, const cha
+@@ -888,6 +929,12 @@ int parse_arguments(int *argc, const cha
                                        verbose++;
                                        break;
  
@@ -341,7 +341,7 @@ To use this patch, run these commands for a successful build:
                                default:
                                        rprintf(FERROR,
                                            "rsync: %s: %s (in daemon mode)\n",
-@@ -904,6 +951,17 @@ int parse_arguments(int *argc, const cha
+@@ -911,6 +958,17 @@ int parse_arguments(int *argc, const cha
                                exit_cleanup(RERR_SYNTAX);
                        }
  
@@ -359,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;
-@@ -1148,6 +1206,12 @@ int parse_arguments(int *argc, const cha
+@@ -1155,6 +1213,12 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -372,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. */
-@@ -1426,6 +1490,17 @@ int parse_arguments(int *argc, const cha
+@@ -1433,6 +1497,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = tmp_partialdir;
  
@@ -390,7 +390,7 @@ To use this patch, run these commands for a successful build:
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1857,10 +1932,27 @@ char *check_for_hostspec(char *s, char *
+@@ -1864,10 +1939,27 @@ char *check_for_hostspec(char *s, char *
        char *p;
        int not_host;
        int hostlen;
@@ -430,7 +430,7 @@ To use this patch, run these commands for a successful build:
  
  #define BACKUP_SUFFIX "~"
  
-@@ -474,6 +475,11 @@ enum msgcode {
+@@ -479,6 +480,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif
  

diff --git a/preallocate.diff b/preallocate.diff
index 3481313..26b2993 100644 (file)
--- a/preallocate.diff
+++ b/preallocate.diff
@@ -11,7 +11,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/configure.in
 +++ new/configure.in
-@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -561,7 +561,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
      strerror putenv iconv_open locale_charset nl_langinfo \
@@ -30,7 +30,7 @@ To use this patch, run these commands for a successful build:
  int do_compression = 0;
  int def_compress_level = Z_DEFAULT_COMPRESSION;
  int am_root = 0;
-@@ -205,6 +206,7 @@ static void print_rsync_version(enum log
+@@ -206,6 +207,7 @@ static void print_rsync_version(enum log
        char const *xattrs = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
@@ -38,7 +38,7 @@ To use this patch, run these commands for a successful build:
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -233,6 +235,10 @@ static void print_rsync_version(enum log
+@@ -234,6 +236,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -46,10 +46,10 @@ To use this patch, run these commands for a successful build:
 +      preallocation = "";
 +#endif
 +
-       rprintf(f, "%s  version %s  protocol version %d\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -243,8 +249,8 @@ static void print_rsync_version(enum log
+       if (SUBPROTOCOL_VERSION)
+               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
+       else
+@@ -250,8 +256,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);
@@ -60,7 +60,7 @@ To use this patch, run these commands for a successful build:
  
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -327,6 +333,9 @@ void usage(enum logcode F)
+@@ -334,6 +340,9 @@ void usage(enum logcode F)
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
@@ -70,7 +70,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy files whole (without rsync algorithm)\n");
    rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
-@@ -494,6 +503,7 @@ static struct poptOption long_options[] 
+@@ -501,6 +510,7 @@ static struct poptOption long_options[] 
    {"max-size",         0,  POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
    {"min-size",         0,  POPT_ARG_STRING, &min_size_arg, OPT_MIN_SIZE, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
@@ -78,7 +78,7 @@ To use this patch, run these commands for a successful build:
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"append",           0,  POPT_ARG_VAL,    &append_mode, 1, 0, 0 },
    {"del",              0,  POPT_ARG_NONE,   &delete_during, 0, 0, 0 },
-@@ -1187,6 +1197,15 @@ int parse_arguments(int *argc, const cha
+@@ -1194,6 +1204,15 @@ int parse_arguments(int *argc, const cha
        }
  #endif
  
@@ -94,7 +94,7 @@ To use this patch, run these commands for a successful build:
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");
-@@ -1838,6 +1857,9 @@ void server_options(char **args,int *arg
+@@ -1845,6 +1864,9 @@ void server_options(char **args,int *arg
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
@@ -157,7 +157,7 @@ To use this patch, run these commands for a successful build:
        if (do_progress)
 --- old/rsync.h
 +++ new/rsync.h
-@@ -549,6 +549,10 @@ struct idev_node {
+@@ -554,6 +554,10 @@ struct idev_node {
  #define ACLS_NEED_MASK 1
  #endif
  
@@ -178,7 +178,7 @@ To use this patch, run these commands for a successful build:
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole (without rsync algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
-@@ -920,6 +921,19 @@ NOTE: Don't use this option when the des
+@@ -926,6 +927,19 @@ NOTE: Don't use this option when the des
  filesystem. It doesn't seem to handle seeks over null regions
  correctly and ends up corrupting the files.
  

diff --git a/slp.diff b/slp.diff
index 192a397..90a86a0 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -57,7 +57,7 @@ and we can't honor that request.
                int fd;
 --- old/configure.in
 +++ new/configure.in
-@@ -624,6 +624,29 @@ if test $rsync_cv_can_hardlink_special =
+@@ -625,6 +625,29 @@ if test $rsync_cv_can_hardlink_special =
      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
  fi
  
@@ -121,7 +121,7 @@ and we can't honor that request.
  FN_LOCAL_STRING(lp_comment, comment)
 --- old/main.c
 +++ new/main.c
-@@ -1075,6 +1075,18 @@ static int start_client(int argc, char *
+@@ -1076,6 +1076,18 @@ static int start_client(int argc, char *
  
        if (!read_batch) { /* for read_batch, NO source is specified */
                shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -142,7 +142,7 @@ and we can't honor that request.
                        int dummy2;
 --- old/options.c
 +++ new/options.c
-@@ -205,6 +205,7 @@ static void print_rsync_version(enum log
+@@ -206,6 +206,7 @@ static void print_rsync_version(enum log
        char const *xattrs = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
@@ -150,7 +150,7 @@ and we can't honor that request.
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -233,6 +234,10 @@ static void print_rsync_version(enum log
+@@ -234,6 +235,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -158,10 +158,10 @@ and we can't honor that request.
 +      slp = "";
 +#endif
 +
-       rprintf(f, "%s  version %s  protocol version %d\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -243,8 +248,8 @@ static void print_rsync_version(enum log
+       if (SUBPROTOCOL_VERSION)
+               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
+       else
+@@ -250,8 +255,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);
@@ -174,7 +174,7 @@ and we can't honor that request.
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
 --- old/rsync.h
 +++ new/rsync.h
-@@ -174,6 +174,9 @@
+@@ -179,6 +179,9 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
        ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))