The patches for 3.0.8.

diff --git a/acls.diff b/acls.diff
index 4a96c603b92460e11e786ffbc2e62661a1097134..1434f7037a7c4ec1b666249cf9b460b0c3adad67 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/acls.c b/acls.c
 --- a/acls.c
 +++ b/acls.c

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index 8e84c4764779626ea0ccd122f2967736382dcab2..e0af3516b56d0cb6fd864c22d6f82d812efd4f60 100644 (file)
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -24,7 +24,7 @@ Todo:
 Fix a bug that could lose some bits when stripping some (supposedly)
 superfluous ACL info.
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/lib/sysacls.c b/lib/sysacls.c
 --- a/lib/sysacls.c
 +++ b/lib/sysacls.c

diff --git a/atimes.diff b/atimes.diff
index 2fffeb516db7983b96faeb17bfba933c2370cf6d..c8a764c616eb9465e6cd3e64a2e683aa58b5b0f7 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,7 +4,7 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -178,7 +178,7 @@ diff --git a/generator.c b/generator.c
                        f_name(f, NULL));
        }
  }
-@@ -2119,7 +2128,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+@@ -2120,7 +2129,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
                        STRUCT_STAT st;
                        if (link_stat(fname, &st, 0) == 0
                         && cmp_time(st.st_mtime, file->modtime) != 0)
@@ -389,7 +389,7 @@ diff --git a/rsync.yo b/rsync.yo
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-@@ -1057,6 +1058,12 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
+@@ -1058,6 +1059,12 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
@@ -402,7 +402,7 @@ diff --git a/rsync.yo b/rsync.yo
  dit(bf(--super)) This tells the receiving side to attempt super-user
  activities even if the receiving rsync wasn't run by the super-user.  These
  activities include: preserving users via the bf(--owner) option, preserving
-@@ -1812,7 +1819,10 @@ quote(itemization(
+@@ -1809,7 +1816,10 @@ quote(itemization(
    sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).
@@ -521,7 +521,7 @@ new file mode 100644
 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
 --- a/testsuite/rsync.fns
 +++ b/testsuite/rsync.fns
-@@ -219,6 +219,10 @@ checkit() {
+@@ -220,6 +220,10 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
@@ -532,7 +532,7 @@ diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -226,10 +230,13 @@ checkit() {
+@@ -227,10 +231,13 @@ checkit() {
        failed="$failed status=$status"
      fi
  
@@ -644,7 +644,7 @@ diff --git a/tls.c b/tls.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -126,20 +126,24 @@ NORETURN void overflow_exit(const char *str)
+@@ -125,20 +125,24 @@ NORETURN void overflow_exit(const char *str)
  
  /* This returns 0 for success, 1 for a symlink if symlink time-setting
   * is not possible, or -1 for any other error. */
@@ -673,7 +673,7 @@ diff --git a/util.c b/util.c
                        break;
                if (errno != ENOSYS)
                        return -1;
-@@ -149,7 +153,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
+@@ -148,7 +152,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
  
  #ifdef HAVE_LUTIMES
  #include "case_N.h"
@@ -682,7 +682,7 @@ diff --git a/util.c b/util.c
                        break;
                if (errno != ENOSYS)
                        return -1;
-@@ -168,10 +172,10 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
+@@ -167,10 +171,10 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
  
  #include "case_N.h"
  #ifdef HAVE_UTIMES

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 214ab019bcfe4f63785d0a6168f5c4b5d4a20c94..a930ee302fdda228e09f89c96c37f13b2e549e8f 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -19,7 +19,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 4c57d21127c86b1293af9394e34645b700548a49..f30752b93fcb9344959f72e63fdaf148a48a3dd0 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h

diff --git a/checksum-reading.diff b/checksum-reading.diff
index 783dff42cfd8b9e5a289990765e447f7bdd89d2a..7bb2ea22d2cf17b2436f36eb86d17e6ee2febe17 100644 (file)
--- a/checksum-reading.diff
+++ b/checksum-reading.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c
@@ -530,7 +530,7 @@ diff --git a/generator.c b/generator.c
                }
  
                statret = link_stat(fname, &sx.st, keep_dirlinks && is_dir);
-@@ -1853,7 +1862,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1854,7 +1863,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;

diff --git a/checksum-updating.diff b/checksum-updating.diff
index c6ce052aa31303a8f195f5262aaa35f3120144bb..4bf29a110b6f5466e80e1763b31aaadbf969d352 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -474,7 +474,7 @@ diff --git a/generator.c b/generator.c
                        }
                        need_new_dirscan = 0;
                }
-@@ -1570,6 +1572,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1571,6 +1573,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        else
                                change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
                }
@@ -482,7 +482,7 @@ diff --git a/generator.c b/generator.c
                goto cleanup;
        }
  
-@@ -1868,6 +1871,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1869,6 +1872,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        handle_partial_dir(partialptr, PDIR_DELETE);
                }
                set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
@@ -491,7 +491,7 @@ diff --git a/generator.c b/generator.c
                if (itemizing)
                        itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
  #ifdef SUPPORT_HARD_LINKS
-@@ -2311,6 +2316,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2312,6 +2317,7 @@ void generate_files(int f_out, const char *local_name)
                                } else
                                        change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
                        }
@@ -499,7 +499,7 @@ diff --git a/generator.c b/generator.c
                }
                for (i = cur_flist->low; i <= cur_flist->high; i++) {
                        struct file_struct *file = cur_flist->sorted[i];
-@@ -2395,6 +2401,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -2396,6 +2402,9 @@ void generate_files(int f_out, const char *local_name)
                        wait_for_receiver();
        }
  
@@ -584,7 +584,7 @@ diff --git a/receiver.c b/receiver.c
                                 || (preserve_hard_links && F_IS_HLINKED(file)))
                                        send_msg_int(MSG_SUCCESS, ndx);
                                handle_partial_dir(partialptr, PDIR_DELETE);
-@@ -789,7 +790,7 @@ int recv_files(int f_in, char *local_name)
+@@ -790,7 +791,7 @@ int recv_files(int f_in, char *local_name)
                case 2:
                        break;
                case 1:

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index bc7f4f8c442eac40875da00bc2585b39264a4573..a3f6a34abe23d399b5c740ced95b6545337ec526 100644 (file)
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/copy-devices.diff b/copy-devices.diff
index c6c57dabf3f909d5131578a6d295072781bb61b7..077c60631a1b852d1b87642ff0080dccacfc7b12 100644 (file)
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -20,7 +20,7 @@ diff --git a/generator.c b/generator.c
  extern int preserve_specials;
  extern int preserve_hard_links;
  extern int preserve_executability;
-@@ -1749,7 +1750,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1750,7 +1751,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  

diff --git a/crtimes.diff b/crtimes.diff
index 7bf5a5cc405f45c3a92e218dfed9ca0dcea12086..afa4e5181609a73de6801f8f4285c991a79828b6 100644 (file)
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -149,7 +149,7 @@ diff --git a/generator.c b/generator.c
  
  extern int verbose;
  extern int dry_run;
-@@ -40,6 +41,7 @@ extern int preserve_xattrs;
+@@ -41,6 +42,7 @@ extern int preserve_xattrs;
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;

diff --git a/cvs-entries.diff b/cvs-entries.diff
index a7d556f355957ea0daadbefa00e13ffd4450cdfc..3a9b2d514825744400d6ef04511199b2e206d49a 100644 (file)
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/daemon-forward-lookup.diff b/daemon-forward-lookup.diff
index 68d1466b0e9407ef8f486c20b6565c9c36c8c513..dedb0c2f4d1ede3b0e7ca719cff18c6a15f45b50 100644 (file)
--- a/daemon-forward-lookup.diff
+++ b/daemon-forward-lookup.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/access.c b/access.c
 --- a/access.c
 +++ b/access.c

diff --git a/date-only.diff b/date-only.diff
index 53579a5193da6ddf0bf6fcec4b2c9220a7a732e0..2e3f149eeec8d3e7673a4106f92382aefddfc64d 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index b6ca848bf16510cf58dbef90fa51f98ee852c226..b71a56ef0e89566d4d44d8f81435681edeaffc6c 100644 (file)
--- a/db.diff
+++ b/db.diff
@@ -157,7 +157,7 @@ diff --git a/configure.ac b/configure.ac
  AC_HEADER_MAJOR
  
  AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
-@@ -999,6 +999,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
+@@ -1001,6 +1001,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
      fi
  fi
  
@@ -820,7 +820,7 @@ diff --git a/generator.c b/generator.c
                return memcmp(sum, F_SUM(file), checksum_len) == 0;
        }
  
-@@ -2271,6 +2273,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -2272,6 +2274,9 @@ void generate_files(int f_out, const char *local_name)
         * notice that and let us know via the message pipe (or its closing). */
        ignore_timeout = 1;
  

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index a034be0a190305c380a1af326066a1cab01a3758..d3e812dd59f35b668cbb2e7a58c5861b452390b3 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -43,7 +43,7 @@ diff --git a/generator.c b/generator.c
  
        if (!fbuf) {
                change_local_filter_dir(NULL, 0, 0);
-@@ -2046,6 +2047,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -2047,6 +2048,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                fnamecmp = partialptr;
                fnamecmp_type = FNAMECMP_PARTIAL_DIR;
                statret = 0;
@@ -117,7 +117,7 @@ diff --git a/rsync.yo b/rsync.yo
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged
-@@ -1580,6 +1582,17 @@ the bf(--partial-dir) option, that directory will be used instead.  These
+@@ -1577,6 +1579,17 @@ the bf(--partial-dir) option, that directory will be used instead.  These
  potential alternate-basis files will be removed as the transfer progresses.
  This option conflicts with bf(--inplace) and bf(--append).
  

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 4e6bd45f6714f05bd21ad23e2779e7fbc3e3027b..c0804ada3adf095a4ab0771cba71d43af6316d2a 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -32,7 +32,7 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
-based-on: e71130fd7739562cd190a92d3f8bcbda02168892
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -470,7 +470,7 @@ diff --git a/generator.c b/generator.c
  static int phase = 0;
  static int dflt_perms;
  
-@@ -1556,9 +1706,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1557,9 +1707,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                }
                else if (delete_during && f_out != -1 && !phase
                    && !(file->flags & FLAG_MISSING_DIR)) {
@@ -486,7 +486,7 @@ diff --git a/generator.c b/generator.c
                                change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
                }
                goto cleanup;
-@@ -1842,8 +1995,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1843,8 +1996,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        goto cleanup;
                }
  #endif
@@ -502,7 +502,7 @@ diff --git a/generator.c b/generator.c
                rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
                        full_fname(fname));
                goto cleanup;
-@@ -2246,6 +2405,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -2247,6 +2406,12 @@ void generate_files(int f_out, const char *local_name)
        if (verbose > 2)
                rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
  
@@ -515,7 +515,7 @@ diff --git a/generator.c b/generator.c
        if (delete_before && !solo_file && cur_flist->used > 0)
                do_delete_pass();
        if (delete_during == 2) {
-@@ -2256,7 +2421,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2257,7 +2422,7 @@ void generate_files(int f_out, const char *local_name)
        }
        do_progress = 0;
  
@@ -524,7 +524,7 @@ diff --git a/generator.c b/generator.c
                whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",
-@@ -2298,7 +2463,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2299,7 +2464,7 @@ void generate_files(int f_out, const char *local_name)
                                                dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
                                        } else
                                                dirdev = MAKEDEV(0, 0);
@@ -533,7 +533,7 @@ diff --git a/generator.c b/generator.c
                                } else
                                        change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
                        }
-@@ -2345,7 +2510,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -2346,7 +2511,21 @@ void generate_files(int f_out, const char *local_name)
        } while ((cur_flist = cur_flist->next) != NULL);
  
        if (delete_during)

diff --git a/downdate.diff b/downdate.diff
index 2ca558ee15a01a52da4348f4547c58f3b52be773..e3f0969fe7803fd04b2aa94755953644dde2c876 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -19,7 +19,7 @@ diff --git a/generator.c b/generator.c
  extern int ignore_existing;
  extern int ignore_non_existing;
  extern int inplace;
-@@ -1784,6 +1785,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1785,6 +1786,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -32,7 +32,7 @@ diff --git a/generator.c b/generator.c
        fnamecmp_type = FNAMECMP_FNAME;
  
        if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
-@@ -2157,6 +2164,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -2158,6 +2165,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_existing = -ignore_existing;
                        ignore_non_existing = -ignore_non_existing;
                        update_only = -update_only;
@@ -40,7 +40,7 @@ diff --git a/generator.c b/generator.c
                        always_checksum = -always_checksum;
                        size_only = -size_only;
                        append_mode = -append_mode;
-@@ -2182,6 +2190,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -2183,6 +2191,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_existing = -ignore_existing;
                        ignore_non_existing = -ignore_non_existing;
                        update_only = -update_only;

diff --git a/dparam.diff b/dparam.diff
index ca94300ee3f164b9a37155bddf52eaafca673660..7360e1742d22a0232af471e2d23b094f339cac86 100644 (file)
--- a/dparam.diff
+++ b/dparam.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -156,7 +156,7 @@ diff --git a/rsync.yo b/rsync.yo
       --no-detach             do not detach from the parent
       --port=PORT             listen on alternate port number
       --log-file=FILE         override the "log file" setting
-@@ -2245,6 +2246,14 @@ The default is /etc/rsyncd.conf unless the daemon is running over
+@@ -2242,6 +2243,14 @@ The default is /etc/rsyncd.conf unless the daemon is running over
  a remote shell program and the remote user is not the super-user; in that case
  the default is rsyncd.conf in the current directory (typically $HOME).
  

diff --git a/drop-cache.diff b/drop-cache.diff
index 6404c11a89b1931818afd284847db27f4f82b845..39faffc6bfbe1b03dcd8f73a408e7e6780d3fdb0 100644 (file)
--- a/drop-cache.diff
+++ b/drop-cache.diff
@@ -63,7 +63,7 @@ Changes:
 * pass --drop-cache on to the remote server
 * make test works now
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c
@@ -98,7 +98,7 @@ diff --git a/cleanup.c b/cleanup.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -568,6 +568,7 @@ AC_FUNC_ALLOCA
+@@ -570,6 +570,7 @@ AC_FUNC_ALLOCA
  AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
      fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
@@ -204,9 +204,9 @@ diff --git a/rsync.yo b/rsync.yo
   -n, --dry-run               perform a trial run with no changes made
   -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
-@@ -1106,6 +1107,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
- filesystem. It seems to have problems seeking over null regions,
- and ends up corrupting the files.
+@@ -1103,6 +1104,10 @@ dit(bf(-S, --sparse)) Try to handle sparse files efficiently so they take
+ up less space on the destination.  Conflicts with bf(--inplace) because it's
+ not possible to overwrite data in a sparse fashion.
  
 +dit(bf(--drop-cache)) Tell the OS to drop the caching of the file data.  This
 +prevents rsync from filling up the filesystem cache.  This can sometimes help
@@ -243,15 +243,15 @@ diff --git a/t_unsafe.c b/t_unsafe.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
+ 
  extern int verbose;
- extern int dry_run;
  extern int module_id;
 +extern int drop_cache;
  extern int modify_window;
  extern int relative_paths;
  extern int preserve_times;
-@@ -43,6 +44,131 @@ char curr_dir[MAXPATHLEN];
+@@ -42,6 +43,131 @@ char curr_dir[MAXPATHLEN];
  unsigned int curr_dir_len;
  int curr_dir_depth; /* This is only set for a sanitizing daemon. */
  

diff --git a/fileflags.diff b/fileflags.diff
index 03262e88109ae1c34519f09715983dbf13811f1d..97e91a1a100f9e099bfa9589f4877bf250744fd1 100644 (file)
--- a/fileflags.diff
+++ b/fileflags.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 959bd708209d6cbb9c9c7aa34de7b8f9423da0de
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/fsync.diff b/fsync.diff
index e483e76b43ff336807c44d180108cfc153931a00..1df65cb5d2ea73bfcc6bd0d864cd698d575c2659 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -83,15 +83,15 @@ diff --git a/t_stub.c b/t_stub.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
+ 
  extern int verbose;
- extern int dry_run;
  extern int module_id;
 +extern int do_fsync;
  extern int modify_window;
  extern int relative_paths;
  extern int preserve_times;
-@@ -345,6 +346,13 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -344,6 +345,13 @@ int copy_file(const char *source, const char *dest, int ofd,
                        full_fname(source));
        }
  

diff --git a/ignore-case.diff b/ignore-case.diff
index 2a03dd8f6f45148dfd70bcb9cd902c9621e98137..5bd2da59b3a7ff5d064427a6db857870527c6c43 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,7 +12,7 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -258,7 +258,7 @@ diff --git a/rsync.yo b/rsync.yo
       --address=ADDRESS       bind address for outgoing socket to daemon
       --port=PORT             specify double-colon alternate port number
       --sockopts=OPTIONS      specify custom TCP options
-@@ -1522,6 +1523,10 @@ side will also be translated
+@@ -1519,6 +1520,10 @@ side will also be translated
  from the local to the remote character-set.  The translation happens before
  wild-cards are expanded.  See also the bf(--files-from) option.
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index b98349796bc515ad4f3938f3656fb760accab2bd..617f77c0db8925198fa1ac895c31f313246a8d61 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,7 +12,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -525,7 +525,7 @@ diff --git a/receiver.c b/receiver.c
  }
  
  static void handle_delayed_updates(char *local_name)
-@@ -739,7 +750,7 @@ int recv_files(int f_in, char *local_name)
+@@ -740,7 +751,7 @@ int recv_files(int f_in, char *local_name)
  
                /* recv file data */
                recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,

diff --git a/log-checksum.diff b/log-checksum.diff
index 313333b2979f3eaf22c55587c2a5b359d17a0586..683a4b32c8174601546fe8ead97a61855418161d 100644 (file)
--- a/log-checksum.diff
+++ b/log-checksum.diff
@@ -12,7 +12,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/nameconverter.diff b/nameconverter.diff
index f9d9150ea5308f44f4f11cf2f614ef4d84eb3361..5aa66359c357d8500b2d75716bec88090093a232 100644 (file)
--- a/nameconverter.diff
+++ b/nameconverter.diff
@@ -20,7 +20,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -334,7 +334,7 @@ diff --git a/uidlist.c b/uidlist.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -32,9 +32,10 @@ extern int preserve_times;
+@@ -31,9 +31,10 @@ extern int preserve_times;
  extern int human_readable;
  extern int preserve_xattrs;
  extern char *module_dir;
@@ -346,7 +346,7 @@ diff --git a/util.c b/util.c
  extern struct filter_list_struct daemon_filter_list;
  
  int sanitize_paths = 0;
-@@ -508,24 +509,44 @@ void kill_all(int sig)
+@@ -507,24 +508,44 @@ void kill_all(int sig)
  /** Turn a user name into a uid */
  int name_to_uid(const char *name, uid_t *uid_p)
  {

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index a2733c7c62d79aabe937c167679ca45a0cc4c63e..69f84d14977d7332fdba5ec2e7909f3feff3b949 100644 (file)
--- a/netgroup-auth.diff
+++ b/netgroup-auth.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/access.c b/access.c
 --- a/access.c
 +++ b/access.c

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index cb159ec6a29ab7c1d82d4f3ff7c849f7c0eb659c..7167befc8291b2d84502ea620ace89a0a032831a 100644 (file)
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -133,7 +133,7 @@ diff --git a/rsync.yo b/rsync.yo
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-@@ -1057,6 +1058,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
+@@ -1058,6 +1059,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  

diff --git a/openssl-support.diff b/openssl-support.diff
index 9457d330d9ec76fccd250b2d62e52945bb3f223d..70fde09330c4323b3cac98e978b68e8a3d8dc748 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -35,7 +35,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/preallocate.diff b/preallocate.diff
index 5f66bed09ba8553512b93935dbbf720930dd64ff..57b9ed260e129c078f51ff988ee60e055a1d4e3f 100644 (file)
--- a/preallocate.diff
+++ b/preallocate.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -39,7 +39,7 @@ diff --git a/compat.c b/compat.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -570,6 +570,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
+@@ -572,6 +572,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
@@ -47,7 +47,7 @@ diff --git a/configure.ac b/configure.ac
      seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \
      extattr_get_link sigaction sigprocmask setattrlist \
      utimensat)
-@@ -579,6 +580,42 @@ if test x"$ac_cv_func_iconv_open" != x"yes"; then
+@@ -581,6 +582,42 @@ if test x"$ac_cv_func_iconv_open" != x"yes"; then
      AC_CHECK_FUNC(libiconv_open, [ac_cv_func_iconv_open=yes; AC_DEFINE(HAVE_ICONV_OPEN, 1)])
  fi
  
@@ -246,9 +246,9 @@ diff --git a/rsync.yo b/rsync.yo
   -n, --dry-run               perform a trial run with no changes made
   -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
-@@ -1106,6 +1107,17 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
- filesystem. It seems to have problems seeking over null regions,
- and ends up corrupting the files.
+@@ -1103,6 +1104,17 @@ dit(bf(-S, --sparse)) Try to handle sparse files efficiently so they take
+ up less space on the destination.  Conflicts with bf(--inplace) because it's
+ not possible to overwrite data in a sparse fashion.
  
 +dit(bf(--preallocate)) This tells the receiver to allocate each destination
 +file to its eventual size before writing data to the file.  Rsync will only use
@@ -318,15 +318,15 @@ diff --git a/t_stub.c b/t_stub.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
+ #include "ifuncs.h"
  
  extern int verbose;
- extern int dry_run;
 +extern int preallocate_files;
  extern int module_id;
  extern int modify_window;
  extern int relative_paths;
-@@ -287,6 +288,9 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -286,6 +287,9 @@ int copy_file(const char *source, const char *dest, int ofd,
        int ifd;
        char buf[1024 * 8];
        int len;   /* Number of bytes read into `buf'. */
@@ -336,7 +336,7 @@ diff --git a/util.c b/util.c
  
        if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
                int save_errno = errno;
-@@ -320,6 +324,25 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -319,6 +323,25 @@ int copy_file(const char *source, const char *dest, int ofd,
                }
        }
  
@@ -362,7 +362,7 @@ diff --git a/util.c b/util.c
        while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
                if (full_write(ofd, buf, len) < 0) {
                        int save_errno = errno;
-@@ -329,6 +352,9 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -328,6 +351,9 @@ int copy_file(const char *source, const char *dest, int ofd,
                        errno = save_errno;
                        return -1;
                }
@@ -372,7 +372,7 @@ diff --git a/util.c b/util.c
        }
  
        if (len < 0) {
-@@ -345,6 +371,16 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -344,6 +370,16 @@ int copy_file(const char *source, const char *dest, int ofd,
                        full_fname(source));
        }
  

diff --git a/remote-option.diff b/remote-option.diff
index a6bdda70c581d8e3c76397f9a7239ae2267dbd83..5334888ecbf9e455ba6e8f26af798751df1ca804 100644 (file)
--- a/remote-option.diff
+++ b/remote-option.diff
@@ -11,7 +11,7 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -125,7 +125,7 @@ diff --git a/rsync.yo b/rsync.yo
       --out-format=FORMAT     output updates using the specified FORMAT
       --log-file=FILE         log what we're doing to the specified FILE
       --log-file-format=FMT   log updates using the specified FMT
-@@ -1083,16 +1084,16 @@ This is a good way to backup data without using a super-user, and to store
+@@ -1084,16 +1085,16 @@ This is a good way to backup data without using a super-user, and to store
  ACLs from incompatible systems.
  
  The bf(--fake-super) option only affects the side where the option is used.
@@ -150,7 +150,7 @@ diff --git a/rsync.yo b/rsync.yo
  
  This option is overridden by both bf(--super) and bf(--no-super).
  
-@@ -1358,6 +1359,36 @@ machine for use with the bf(--relative) option.  For instance:
+@@ -1355,6 +1356,36 @@ machine for use with the bf(--relative) option.  For instance:
  
  quote(tt(    rsync -avR --rsync-path="cd /a/b && rsync" host:c/d /e/))
  
@@ -187,7 +187,7 @@ diff --git a/rsync.yo b/rsync.yo
  dit(bf(-C, --cvs-exclude)) This is a useful shorthand for excluding a
  broad range of files that you often don't want to transfer between
  systems. It uses a similar algorithm to CVS to determine if
-@@ -1857,7 +1888,7 @@ option if you wish to override this.
+@@ -1854,7 +1885,7 @@ option if you wish to override this.
  Here's a example command that requests the remote side to log what is
  happening:
  

diff --git a/slow-down.diff b/slow-down.diff
index 59900ecf95d17c27bcc9980579eac7442ecc2420..29ebb83f0665fafb49b3e930932b35691478b224 100644 (file)
--- a/slow-down.diff
+++ b/slow-down.diff
@@ -14,7 +14,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 7d7e85e175b977dc68f2531cb08054f27fdc9d73..518ec2c366d5a89053236a83361f5be42c7030ad 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -666,6 +666,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -668,6 +668,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
  fi
  

diff --git a/soften-links.diff b/soften-links.diff
index a03a0ae87224181d95c07b64cc3db8a78b0ca42a..137de4563b8f086ce1430d984cb9ca7e0357af85 100644 (file)
--- a/soften-links.diff
+++ b/soften-links.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/source-backup.diff b/source-backup.diff
index 5a2a7f12bcde7426f38624cfa7332090ee81cbb8..2bfad203e256b55faecdc77d33c84b87dba82b5d 100644 (file)
--- a/source-backup.diff
+++ b/source-backup.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
 
 -- Matt McCutchen <hashproduct@gmail.com>
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -57,7 +57,7 @@ diff --git a/rsync.yo b/rsync.yo
       --del                   an alias for --delete-during
       --delete                delete extraneous files from dest dirs
       --delete-before         receiver deletes before transfer (default)
-@@ -1177,6 +1178,14 @@ dit(bf(--remove-source-files)) This tells rsync to remove from the sending
+@@ -1174,6 +1175,14 @@ dit(bf(--remove-source-files)) This tells rsync to remove from the sending
  side the files (meaning non-directories) that are a part of the transfer
  and have been successfully duplicated on the receiving side.
  

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index f8cf59186f15f767bfa06aac4c858f34e976a673..99a8bbd4b44a3fb095c12a3342519bcc1ef68076 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -30,7 +30,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -285,7 +285,7 @@ diff --git a/receiver.c b/receiver.c
        while (1) {
                cleanup_disable();
  
-@@ -737,6 +757,9 @@ int recv_files(int f_in, char *local_name)
+@@ -738,6 +758,9 @@ int recv_files(int f_in, char *local_name)
                else if (!am_server && verbose && do_progress)
                        rprintf(FINFO, "%s\n", fname);
  
@@ -295,7 +295,7 @@ diff --git a/receiver.c b/receiver.c
                /* recv file data */
                recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
                                       fname, fd2, F_LENGTH(file));
-@@ -751,6 +774,16 @@ int recv_files(int f_in, char *local_name)
+@@ -752,6 +775,16 @@ int recv_files(int f_in, char *local_name)
                        exit_cleanup(RERR_FILEIO);
                }
  
@@ -343,7 +343,7 @@ diff --git a/rsync.yo b/rsync.yo
       --protocol=NUM          force an older protocol version to be used
       --iconv=CONVERT_SPEC    request charset conversion of filenames
       --checksum-seed=NUM     set block/file checksum seed (advanced)
-@@ -2153,6 +2156,33 @@ file previously generated by bf(--write-batch).
+@@ -2150,6 +2153,33 @@ file previously generated by bf(--write-batch).
  If em(FILE) is bf(-), the batch data will be read from standard input.
  See the "BATCH MODE" section for details.
  

diff --git a/sparse-block.diff b/sparse-block.diff
index 173a52ddd88587459a93527771ff6b6a850576d4..743bcfff9b5af8b3f7c7d30964a06fd099d7a939 100644 (file)
--- a/sparse-block.diff
+++ b/sparse-block.diff
@@ -18,7 +18,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c
@@ -90,9 +90,9 @@ diff --git a/rsync.yo b/rsync.yo
   -n, --dry-run               perform a trial run with no changes made
   -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
-@@ -1106,6 +1107,15 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
- filesystem. It seems to have problems seeking over null regions,
- and ends up corrupting the files.
+@@ -1103,6 +1104,15 @@ dit(bf(-S, --sparse)) Try to handle sparse files efficiently so they take
+ up less space on the destination.  Conflicts with bf(--inplace) because it's
+ not possible to overwrite data in a sparse fashion.
  
 +dit(bf(--sparse-block=SIZE)) Change the block size used to handle sparse files
 +to SIZE bytes.  This option only has an effect if the bf(--sparse) (bf(-S))

diff --git a/stdout.diff b/stdout.diff
index 75d96230e3d6a489d74d19e5d9efd1eb147e86bf..d56ba63a431aa41a21e93f2177e43c7570582a5d 100644 (file)
--- a/stdout.diff
+++ b/stdout.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                            (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/time-limit.diff b/time-limit.diff
index 99e9d355672fe9b26050db9ed311c98cc7a476ad..82a14b0862de22e4c98b1d770d97702eef3b0b7a 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c
@@ -145,7 +145,7 @@ diff --git a/rsync.yo b/rsync.yo
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
-@@ -2127,6 +2129,19 @@ transfer was too fast, it will wait before sending the next data block. The
+@@ -2124,6 +2126,19 @@ transfer was too fast, it will wait before sending the next data block. The
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  
@@ -168,7 +168,7 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -124,6 +124,133 @@ NORETURN void overflow_exit(const char *str)
+@@ -123,6 +123,133 @@ NORETURN void overflow_exit(const char *str)
        exit_cleanup(RERR_MALLOC);
  }
  

diff --git a/transliterate.diff b/transliterate.diff
index 4b336f075568510b64e95161ea8ae905ad7f360e..6d56cff4433b0ddc0d0863024d49474057fd747b 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -13,7 +13,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -146,7 +146,7 @@ diff --git a/rsync.yo b/rsync.yo
       --checksum-seed=NUM     set block/file checksum seed (advanced)
   -4, --ipv4                  prefer IPv4
   -6, --ipv6                  prefer IPv6
-@@ -2191,6 +2192,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2188,6 +2189,22 @@ daemon uses the charset specified in its "charset" configuration parameter
  regardless of the remote charset you actually pass.  Thus, you may feel free to
  specify just the local charset for a daemon transfer (e.g. bf(--iconv=utf8)).
  

diff --git a/tru64.diff b/tru64.diff
index 631183780f3fe439b8e651d95d801e3fa75d9c28..0956806894342ca33f6acb756cbe608afe6522d4 100644 (file)
--- a/tru64.diff
+++ b/tru64.diff
@@ -6,7 +6,7 @@ To use this patch, run these commands for a successful build:
     ./configure                          (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/usermap.diff b/usermap.diff
index 6f400229ad6626d6e854ec4721be468e3d958a7e..95d124f7f39f5c9a19e8aceb4c1b2c364581856e 100644 (file)
--- a/usermap.diff
+++ b/usermap.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -169,7 +169,7 @@ diff --git a/rsync.yo b/rsync.yo
       --timeout=SECONDS       set I/O timeout in seconds
       --contimeout=SECONDS    set daemon connection timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
-@@ -1713,6 +1716,57 @@ from the source system is used instead.  See also the comments on the
+@@ -1710,6 +1713,57 @@ from the source system is used instead.  See also the comments on the
  the chroot setting affects rsync's ability to look up the names of the
  users and groups and what you can do about it.