The patches for 3.0.9pre1.

diff --git a/acls.diff b/acls.diff
index 1434f7037a7c4ec1b666249cf9b460b0c3adad67..07e68ef14e104a29312295d77f5fee6034652b53 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/acls.c b/acls.c
 --- a/acls.c
 +++ b/acls.c
@@ -40,7 +40,7 @@ diff --git a/acls.c b/acls.c
  static int calc_sacl_entries(const rsync_acl *racl)
  {
        /* A System ACL always gets user/group/other permission entries. */
-@@ -574,6 +587,96 @@ int get_acl(const char *fname, stat_x *sxp)
+@@ -580,6 +593,96 @@ int get_acl(const char *fname, stat_x *sxp)
        return 0;
  }
  
@@ -137,7 +137,7 @@ diff --git a/acls.c b/acls.c
  /* === Send functions === */
  
  /* Send the ida list over the file descriptor. */
-@@ -649,6 +752,11 @@ static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,
+@@ -655,6 +758,11 @@ static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,
   * This also frees the ACL data. */
  void send_acl(int f, stat_x *sxp)
  {
@@ -149,7 +149,7 @@ diff --git a/acls.c b/acls.c
        if (!sxp->acc_acl) {
                sxp->acc_acl = create_racl();
                rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
-@@ -666,6 +774,160 @@ void send_acl(int f, stat_x *sxp)
+@@ -672,6 +780,160 @@ void send_acl(int f, stat_x *sxp)
        }
  }
  
@@ -310,7 +310,7 @@ diff --git a/acls.c b/acls.c
  /* === Receive functions === */
  
  static uint32 recv_acl_access(int f, uchar *name_follows_ptr)
-@@ -787,6 +1049,11 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
+@@ -793,6 +1055,11 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
  /* Receive the ACL info the sender has included for this file-list entry. */
  void receive_acl(int f, struct file_struct *file)
  {

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index e0af3516b56d0cb6fd864c22d6f82d812efd4f60..1ea6b65e517fed7513143091097d50a18e03d4e8 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 c8a764c616eb9465e6cd3e64a2e683aa58b5b0f7..0a08350450c79d625cddd23a231be496658eb230 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index a930ee302fdda228e09f89c96c37f13b2e549e8f..2e5fb4aac6faea9b26cade7337acff356850365a 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 f30752b93fcb9344959f72e63fdaf148a48a3dd0..edbd76d87e204c3da684a0894d14b8fde30dcda0 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 7bb2ea22d2cf17b2436f36eb86d17e6ee2febe17..cd7e0f24563217fb8efd4515b9798583f5cd47d0 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index a3f6a34abe23d399b5c740ced95b6545337ec526..c22b7c83897e1c097e1ce2e033a7668057c4d1f5 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 077c60631a1b852d1b87642ff0080dccacfc7b12..2dbf448791f1593ad8418d8973c7685de9006f96 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 3a9b2d514825744400d6ef04511199b2e206d49a..98fb5338be4104030c41c0ab5219844a4cb0c1a2 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 dedb0c2f4d1ede3b0e7ca719cff18c6a15f45b50..abdf8d192357a68b173bbd2de8687ee0ae251685 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 2e3f149eeec8d3e7673a4106f92382aefddfc64d..220e4fb94151891961ac945f5d66952ccde7e5e9 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index b71a56ef0e89566d4d44d8f81435681edeaffc6c..033f5bf53b4e88f62ddb3d62226338be7e51f367 100644 (file)
--- a/db.diff
+++ b/db.diff
@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
 
     patch -p1 <patches/remote-option.diff
     patch -p1 <patches/db.diff
-    ./configure                               (optional if already run)
+    ./configure
     make
 
 based-on: patch/b3.0.x/remote-option
@@ -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,[
-@@ -1001,6 +1001,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
+@@ -1004,6 +1004,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
      fi
  fi
  

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index d3e812dd59f35b668cbb2e7a58c5861b452390b3..8c70176d53de4f2f6cc1186c3f78c8ba50ff5f1d 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -35,15 +35,7 @@ diff --git a/generator.c b/generator.c
                diff = u_strcmp(fmid->basename, f->basename);
                if (diff == 0) {
                        good_match = mid;
-@@ -589,7 +591,6 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev,
-       char *p, delbuf[MAXPATHLEN];
-       unsigned remainder;
-       int dlen, i, restore_dot = 0;
--      int save_uid_ndx = uid_ndx;
- 
-       if (!fbuf) {
-               change_local_filter_dir(NULL, 0, 0);
-@@ -2047,6 +2048,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -2046,6 +2048,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                fnamecmp = partialptr;
                fnamecmp_type = FNAMECMP_PARTIAL_DIR;
                statret = 0;

diff --git a/detect-renamed.diff b/detect-renamed.diff
index c0804ada3adf095a4ab0771cba71d43af6316d2a..b44bf4afa7d76de32b64deeae409b0fdf5ca55b6 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -348,7 +348,7 @@ diff --git a/generator.c b/generator.c
                if (delete_item(fname, fp->mode, flags) != DR_SUCCESS)
                        ret = DR_NOT_EMPTY;
        }
-@@ -456,13 +577,19 @@ static void do_delayed_deletions(char *delbuf)
+@@ -456,13 +577,18 @@ static void do_delayed_deletions(char *delbuf)
   * all the --delete-WHEN options.  Note that the fbuf pointer must point to a
   * MAXPATHLEN buffer with the name of the directory in it (the functions we
   * call will append names onto the end, but the old dir value will be restored
@@ -368,11 +368,10 @@ diff --git a/generator.c b/generator.c
 +      char *p, delbuf[MAXPATHLEN];
 +      unsigned remainder;
 +      int dlen, i, restore_dot = 0;
-+      int save_uid_ndx = uid_ndx;
  
        if (!fbuf) {
                change_local_filter_dir(NULL, 0, 0);
-@@ -476,17 +603,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -476,17 +602,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
                maybe_send_keepalive();
  
        if (io_error && !ignore_errors) {
@@ -400,7 +399,7 @@ diff --git a/generator.c b/generator.c
        if (one_file_system) {
                if (file->flags & FLAG_TOP_DIR)
                        filesystem_dev = *fs_dev;
-@@ -496,6 +628,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -496,6 +627,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  
        dirlist = get_dirlist(fbuf, dlen, 0);
  
@@ -415,7 +414,7 @@ diff --git a/generator.c b/generator.c
        /* If an item in dirlist is not found in flist, delete it
         * from the filesystem. */
        for (i = dirlist->used; i--; ) {
-@@ -508,6 +648,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -508,6 +647,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
                                        f_name(fp, NULL));
                        continue;
                }
@@ -426,7 +425,7 @@ diff --git a/generator.c b/generator.c
                /* Here we want to match regardless of file type.  Replacement
                 * of a file with one of another type is handled separately by
                 * a delete_item call with a DEL_MAKE_ROOM flag. */
-@@ -516,14 +660,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -516,14 +659,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
                        if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
                                flags |= DEL_NO_UID_WRITE;
                        f_name(fp, delbuf);
@@ -450,7 +449,7 @@ diff --git a/generator.c b/generator.c
        flist_free(dirlist);
  }
  
-@@ -556,9 +705,9 @@ static void do_delete_pass(void)
+@@ -556,9 +704,9 @@ static void do_delete_pass(void)
                 || !S_ISDIR(st.st_mode))
                        continue;
  
@@ -462,7 +461,7 @@ diff --git a/generator.c b/generator.c
  
        if (do_progress && !am_server)
                rprintf(FINFO, "                    \r");
-@@ -1269,6 +1418,7 @@ static void list_file_entry(struct file_struct *f)
+@@ -1269,6 +1417,7 @@ static void list_file_entry(struct file_struct *f)
        }
  }
  
@@ -470,7 +469,7 @@ diff --git a/generator.c b/generator.c
  static int phase = 0;
  static int dflt_perms;
  
-@@ -1557,9 +1707,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1557,9 +1706,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 +485,7 @@ diff --git a/generator.c b/generator.c
                                change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
                }
                goto cleanup;
-@@ -1843,8 +1996,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1843,8 +1995,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        goto cleanup;
                }
  #endif
@@ -502,7 +501,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;
-@@ -2247,6 +2406,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -2247,6 +2405,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 +514,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) {
-@@ -2257,7 +2422,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2257,7 +2421,7 @@ void generate_files(int f_out, const char *local_name)
        }
        do_progress = 0;
  
@@ -524,7 +523,7 @@ diff --git a/generator.c b/generator.c
                whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",
-@@ -2299,7 +2464,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2299,7 +2463,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 +532,7 @@ diff --git a/generator.c b/generator.c
                                } else
                                        change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
                        }
-@@ -2346,7 +2511,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -2346,7 +2510,21 @@ void generate_files(int f_out, const char *local_name)
        } while ((cur_flist = cur_flist->next) != NULL);
  
        if (delete_during)
@@ -645,7 +644,7 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -1178,6 +1178,32 @@ int handle_partial_dir(const char *fname, int create)
+@@ -1179,6 +1179,32 @@ int handle_partial_dir(const char *fname, int create)
        return 1;
  }
  

diff --git a/downdate.diff b/downdate.diff
index e3f0969fe7803fd04b2aa94755953644dde2c876..69fa0a3ffc3b5f879d7bd8ab8d03bf3e80ba52c1 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/dparam.diff b/dparam.diff
index 7360e1742d22a0232af471e2d23b094f339cac86..9b200ee08a012b6fbb0a3b776302b6774a06caf5 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c

diff --git a/drop-cache.diff b/drop-cache.diff
index 39faffc6bfbe1b03dcd8f73a408e7e6780d3fdb0..c7e08e0e24c47b35c07776c24ff183442c22e437 100644 (file)
--- a/drop-cache.diff
+++ b/drop-cache.diff
@@ -63,7 +63,13 @@ Changes:
 * pass --drop-cache on to the remote server
 * make test works now
 
-based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/drop-cache.diff
+    ./configure
+    make
+
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c

diff --git a/fileflags.diff b/fileflags.diff
index 97e91a1a100f9e099bfa9589f4877bf250744fd1..27027cbc40527f7fb64483c3a03821b0e0029b64 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -271,7 +271,7 @@ diff --git a/generator.c b/generator.c
                if (statret != 0 && basis_dir[0] != NULL) {
                        int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
                                              itemizing, code);
-@@ -1526,10 +1551,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1534,10 +1559,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                /* We need to ensure that the dirs in the transfer have writable
                 * permissions during the time we are putting files within them.
                 * This is then fixed after the transfer is done. */

diff --git a/fsync.diff b/fsync.diff
index 1df65cb5d2ea73bfcc6bd0d864cd698d575c2659..7073c37df565716ad94027a1b41f16282c56c4f3 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/ignore-case.diff b/ignore-case.diff
index 5bd2da59b3a7ff5d064427a6db857870527c6c43..ea5f7e08dd303076f7088363e8ada2edb3337b44 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 617f77c0db8925198fa1ac895c31f313246a8d61..f1c2307cfd2889b803a8e2c60ae7863e7239c022 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -9,10 +9,10 @@ To use this patch, run these commands for a successful build:
 
     patch -p1 <patches/link-by-hash.diff
     ./prepare-source
-    ./configure
+    ./configure                         (optional if already run)
     make
 
-based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/log-checksum.diff b/log-checksum.diff
index 683a4b32c8174601546fe8ead97a61855418161d..75130bef03a710aa49237dcad99da0bdf3c84245 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/nameconverter.diff b/nameconverter.diff
index 5aa66359c357d8500b2d75716bec88090093a232..55ef6c308e64ced9d8157468fdff4e0366d37fc9 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index 69f84d14977d7332fdba5ec2e7909f3feff3b949..e2d1fd985034df025f4c68a94ca39ca2452ed5e0 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 7167befc8291b2d84502ea620ace89a0a032831a..d07ab748935a3f9b9ba180169bacd2f16331c56f 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/openssl-support.diff b/openssl-support.diff
index 70fde09330c4323b3cac98e978b68e8a3d8dc748..777176592199a23998b345d677fdee9b46b94826 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/preallocate.diff b/preallocate.diff
index 57b9ed260e129c078f51ff988ee60e055a1d4e3f..7abd3dc3d5f2d74a983327b04f18e89d2fc9a1ed 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -101,32 +101,32 @@ diff --git a/options.c b/options.c
  int do_compression = 0;
  int def_compress_level = Z_DEFAULT_COMPRESSION;
  int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */
-@@ -223,6 +224,7 @@ static void print_rsync_version(enum logcode f)
-       char const *links = "no ";
-       char const *iconv = "no ";
-       char const *ipv6 = "no ";
-+      char const *preallocation = "no ";
-       STRUCT_STAT *dumstat;
- 
- #if SUBPROTOCOL_VERSION != 0
-@@ -256,6 +258,9 @@ static void print_rsync_version(enum logcode f)
- #ifdef CAN_SET_SYMLINK_TIMES
-       symtimes = "";
+@@ -217,6 +218,7 @@ static void print_rsync_version(enum logcode f)
+       char const *got_socketpair = "no ";
+       char const *have_inplace = "no ";
+       char const *hardlinks = "no ";
++      char const *prealloc = "no ";
+       char const *symtimes = "no ";
+       char const *acls = "no ";
+       char const *xattrs = "no ";
+@@ -238,6 +240,9 @@ static void print_rsync_version(enum logcode f)
+ #ifdef SUPPORT_HARD_LINKS
+       hardlinks = "";
  #endif
 +#ifdef SUPPORT_PREALLOCATION
-+      preallocation = "";
++      prealloc = "";
 +#endif
- 
-       rprintf(f, "%s  version %s  protocol version %d%s\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
+ #ifdef SUPPORT_ACLS
+       acls = "";
+ #endif
 @@ -269,8 +274,8 @@ static void print_rsync_version(enum logcode f)
                (int)(sizeof (int64) * 8));
        rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
                got_socketpair, hardlinks, links, ipv6, have_inplace);
 -      rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes\n",
 -              have_inplace, acls, xattrs, iconv, symtimes);
-+      rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %spreallocation\n",
-+              have_inplace, acls, xattrs, iconv, symtimes, preallocation);
++      rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc\n",
++              have_inplace, acls, xattrs, iconv, symtimes, prealloc);
  
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
@@ -318,14 +318,14 @@ diff --git a/t_stub.c b/t_stub.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -24,6 +24,7 @@
- #include "ifuncs.h"
- 
- extern int verbose;
+@@ -30,6 +30,7 @@ extern int relative_paths;
+ extern int preserve_times;
+ extern int human_readable;
+ extern int preserve_xattrs;
 +extern int preallocate_files;
- extern int module_id;
- extern int modify_window;
- extern int relative_paths;
+ extern char *module_dir;
+ extern unsigned int module_dirlen;
+ extern mode_t orig_umask;
 @@ -286,6 +287,9 @@ int copy_file(const char *source, const char *dest, int ofd,
        int ifd;
        char buf[1024 * 8];
@@ -379,7 +379,7 @@ diff --git a/util.c b/util.c
 +#ifdef PREALLOCATE_NEEDS_TRUNCATE
 +      /* Source file might have shrunk since we fstatted it.
 +       * Cut off any extra preallocated zeros from dest file. */
-+      if (offset < preallocated_len && ftruncate(ofd, offset) < 0) {
++      if (offset < preallocated_len && do_ftruncate(ofd, offset) < 0) {
 +              /* If we fail to truncate, the dest file may be wrong, so we
 +               * must trigger the "partial transfer" error. */
 +              rsyserr(FERROR_XFER, errno, "ftruncate %s", full_fname(dest));

diff --git a/remote-option.diff b/remote-option.diff
index 5334888ecbf9e455ba6e8f26af798751df1ca804..4b58ec66d97f8004dc67d11303fd77dcf342ea40 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/slow-down.diff b/slow-down.diff
index 29ebb83f0665fafb49b3e930932b35691478b224..4055b3d8005d4d9aaed3002d39ea87e32cf65c00 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 518ec2c366d5a89053236a83361f5be42c7030ad..e12b22a837e20ea8794c901d35e440c75905c1a3 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/soften-links.diff b/soften-links.diff
index 137de4563b8f086ce1430d984cb9ca7e0357af85..b2349a55baba4947c4316be1388d2a4acaa2c460 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 2bfad203e256b55faecdc77d33c84b87dba82b5d..96caca979786b5bd7e737a1875050bfc9369a178 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 99a8bbd4b44a3fb095c12a3342519bcc1ef68076..a8faa50111b79207d00ca7d2e577b98a61fbacdd 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/sparse-block.diff b/sparse-block.diff
index 743bcfff9b5af8b3f7c7d30964a06fd099d7a939..d9e3d497095e7dae13745cfe22da28f05fd60607 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c

diff --git a/stdout.diff b/stdout.diff
index d56ba63a431aa41a21e93f2177e43c7570582a5d..0418b35d89c95f2ceff6faa9d5932498f643023f 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 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 82a14b0862de22e4c98b1d770d97702eef3b0b7a..9f88a5112fc16bd49db37297bc8d5af225281814 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c

diff --git a/transliterate.diff b/transliterate.diff
index 6d56cff4433b0ddc0d0863024d49474057fd747b..dc166c590419622d18da3f6dba8bdf3213365ea6 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/tru64.diff b/tru64.diff
index 0956806894342ca33f6acb756cbe608afe6522d4..8d0ccfe58e47fcec5d9bee33ef6ae630030800fb 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/usermap.diff b/usermap.diff
index 95d124f7f39f5c9a19e8aceb4c1b2c364581856e..d48b2c1d8dafc08c0974a19d90de71be99681269 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: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
+based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c