The patches for 3.1.0.

diff --git a/acls.diff b/acls.diff
index 522456751c1255b94a66fbd41b283dd0d47b6289..869823e61d4b0fffd35fde8d9a17ca8b038dd8b8 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 4a1d7829a25bf4722884e29a95f2cae0ea0e5976..8d681472eb60221d7a83b5dfa3f50e26eaa88ead 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 83fee4424fab40314504febc3076daada4f0b05e..1cb4e2f7fa0b8721daac35bb235021cf7156809f 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -520,27 +520,49 @@ new file mode 100644
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
+diff --git a/testsuite/daemon.test b/testsuite/daemon.test
+--- a/testsuite/daemon.test
++++ b/testsuite/daemon.test
+@@ -26,8 +26,8 @@ outfile="$scratchdir/rsync.out"
+ 
+ SSH="src/support/lsh.sh --no-cd"
+ FILE_REPL='s/^\([^d][^ ]*\) *\(..........[0-9]\) /\1 \2 /'
+-DIR_REPL='s/^\(d[^ ]*\)  *[0-9][.,0-9]* /\1         DIR /'
+-LS_REPL='s;[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9];####/##/## ##:##:##;'
++DIR_REPL='s/^\(d[^ ]*\)  *[0-9][.,0-9]*  */\1         DIR /'
++LS_REPL='s;[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]  *;####/##/## ##:##:## ;'
+ 
+ build_rsyncd_conf
+ 
 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
 --- a/testsuite/rsync.fns
 +++ b/testsuite/rsync.fns
-@@ -219,6 +219,10 @@ checkit() {
+@@ -219,6 +219,14 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
-+    if test x$TLS_ARGS = x--atimes; then
++    case "x$TLS_ARGS" in
++    *--atimes*)
 +      ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
-+    fi
++      ;;
++    *)
++      ;;
++    esac
 +
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -226,10 +230,13 @@ checkit() {
+@@ -226,10 +234,17 @@ checkit() {
        failed="$failed status=$status"
      fi
  
-+    if test x$TLS_ARGS != x--atimes; then
++    case "x$TLS_ARGS" in
++    *--atimes*)
++      ;;
++    *)
 +      ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
-+    fi
++      ;;
++    esac
 +
      echo "-------------"
      echo "check how the directory listings compare with diff:"
@@ -561,7 +583,7 @@ diff --git a/tls.c b/tls.c
  static void failed(char const *what, char const *where)
  {
        fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -116,12 +118,37 @@ static void failed(char const *what, char const *where)
+@@ -116,13 +118,38 @@ static void failed(char const *what, char const *where)
        exit(1);
  }
  
@@ -579,14 +601,13 @@ diff --git a/tls.c b/tls.c
 +                      (int)mt->tm_hour,
 +                      (int)mt->tm_min,
 +                      (int)mt->tm_sec);
-+              if (nsecs >= 0) {
-+                      snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs);
-+              }
++              if (nsecs >= 0 && len >= 0)
++                      snprintf(dest + len, destsize - len, ".%09d", nsecs);
 +      } else {
 +              int has_nsecs = nsecs >= 0 ? 1 : 0;
-+              int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
-+              memset(datebuf, ' ', len);
-+              datebuf[len] = '\0';
++              int len = MIN(19 + 9*has_nsecs, (int)destsize - 1);
++              memset(dest, ' ', len);
++              dest[len] = '\0';
 +      }
 +}
 +
@@ -599,8 +620,10 @@ diff --git a/tls.c b/tls.c
 +      char mtimebuf[50];
 +      char atimebuf[50];
        char linkbuf[4096];
++      int nsecs;
  
        if (do_lstat(fname, &buf) < 0)
+               failed("stat", fname);
 @@ -159,30 +186,17 @@ static void list_file(const char *fname)
        }
  
@@ -624,7 +647,7 @@ diff --git a/tls.c b/tls.c
 -                              ".%09d", (int)buf.ST_MTIME_NSEC);
 -              }
 +      if (nsec_times)
-+              nsecs = (int)buf.ST_MTIME_NSEC
++              nsecs = (int)buf.ST_MTIME_NSEC;
 +      else
  #endif
 -      } else {

diff --git a/backup-deleted.diff b/backup-deleted.diff
index 483136392649073dac2a7a4dc672917b8347bcb5..02ae2146d50ac2363cabda6d72d94bafa9f1948c 100644 (file)
--- a/backup-deleted.diff
+++ b/backup-deleted.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 48fe5d84b0f4f26eb22481d502880660cf268b15..9fd61f8d758fa0f2cb0ddcf6260902f77312ee14 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 ad42269934dc72a4febb501e5b0e5b7b53d40321..97d86af0e8e99bb6df8b0df813da136b81c7bd72 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c

diff --git a/checksum-updating.diff b/checksum-updating.diff
index 01c6edb49c077aaaded1f48a872521e7f0e6633e..3e17a8d7e6e60f965d8bb5f5f98ac5df7d351304 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -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);
-@@ -893,7 +894,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -894,7 +895,7 @@ int recv_files(int f_in, int f_out, char *local_name)
                case 2:
                        break;
                case 1:

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 08773bf131d4029306c399ac00ff680948116112..52f6fc6e6a903f314d4ae10196f0cfab34eb476a 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 b3a32a4c10071b81fdf8e97861e7e3a50c7b6810..e84b5e6430b2703768120b1ecb68e93c581904a5 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 e01ebcdb5f858acbbb9d58909f7bca8ca691b7b7..bf8c141f8bd58ad92af174da3d172bbe0022023c 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/date-only.diff b/date-only.diff
index 563a160b187afe4f93685ffa83ec47c03a988a17..335ad702f59034dc306f37c4c69f2578cda71705 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index 361a9c649d28cf762c5e98795d5902af5061a066..0377d437e9d5e5cfdf8dedb931ce763e311dd927 100644 (file)
--- a/db.diff
+++ b/db.diff
@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -2809,7 +2809,7 @@ diff --git a/receiver.c b/receiver.c
        while (1) {
                cleanup_disable();
  
-@@ -865,6 +879,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -866,6 +880,8 @@ int recv_files(int f_in, int f_out, char *local_name)
                                do_unlink(partialptr);
                                handle_partial_dir(partialptr, PDIR_DELETE);
                        }
@@ -2818,7 +2818,7 @@ diff --git a/receiver.c b/receiver.c
                } else if (keep_partial && partialptr) {
                        if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
                                rprintf(FERROR,
-@@ -878,6 +894,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -879,6 +895,8 @@ int recv_files(int f_in, int f_out, char *local_name)
                                recv_ok = -1;
                        else if (delay_updates && recv_ok) {
                                bitbag_set_bit(delayed_bits, ndx);
@@ -2827,7 +2827,7 @@ diff --git a/receiver.c b/receiver.c
                                recv_ok = 2;
                        } else
                                partialptr = NULL;
-@@ -941,6 +959,9 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -942,6 +960,9 @@ int recv_files(int f_in, int f_out, char *local_name)
        if (phase == 2 && delay_updates) /* for protocol_version < 29 */
                handle_delayed_updates(local_name);
  

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 631c972937723cd1330d9c6123a15f5346c31089..ae9557cf6e74d6ecc25cfc6ea593cb068fe422b3 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -38,7 +38,7 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c

diff --git a/direct-io.diff b/direct-io.diff
index 43f8a37c6caa6a650cb9f8b1547317d01decd5c5..ff1af242f5319bc7bcb81ef9d658bbb334d5195f 100644 (file)
--- a/direct-io.diff
+++ b/direct-io.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/downdate.diff b/downdate.diff
index 1f8a1eb881ffbebf195e64ad4a7e99f09c6d29ff..c484aebb5d68487530ee79c236bfd96fd7727705 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 7af00fe36e8fdab311a80b8edf07561dc8cebf32..4a34e7d8fcc8e9a6ca860c5ec01bee9e1227d3a8 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 285ab2da9dc8b354e26128a451afad6ff49e9aad..2d5c88e95fa88ba7a31813592789691bb9dede8d 100644 (file)
--- a/filter-attribute-mods.diff
+++ b/filter-attribute-mods.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/fsync.diff b/fsync.diff
index f4253941e0bb977f81680e5aee0f613379d4f460..1384fcb849a83bfc1b80fc0d990596878c9a669b 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 405761b71b99d12c26278ea1c94fa484ee8e6e5b..1beec6e7abf9b77fa20b82d7a1c73785f82603bd 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 05a58361811da834f9056e7f23875c0e6b73c8cf..6d8eb185daf155812ef124f15e9e37aff5f8808f 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/nameconverter.diff b/nameconverter.diff
index 96b323af6b87bfe17e7212d2120b07ee71a90039..9a15bf02fb21cbc72051a5bf08578d16036cadb2 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/authenticate.c b/authenticate.c
 --- a/authenticate.c
 +++ b/authenticate.c

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index 800f728d46f31162529734be382c41029ef10c3d..bdbf75e9c9ef4d5a7d09508d2284e10ffd8ebce5 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 ad51e4bff6386393cc55e95f60c3fc452376e2f5..45e50e81800d65376ed7be47747ef1dfbad4c775 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 4243d74e2af8d26f7a6be907e82329dbb5b59ec0..714d57da0f7b2e08186b96a4e8b4a80a3aaa47f8 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/slow-down.diff b/slow-down.diff
index 21923298b940a5fa30d0a7a6a1c90138e096daf3..5b93bb5c22fae04ba50243097e1c361c8eee4a5e 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 1d667ec723d3f0c212cba4233e2128542522e619..a9703f11fe79657684bdb8640ad11cfd776602ba 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 6cdfdf773747a5610a001800d96fda0d2283cc97..7842eb36a735a4ca1f859e72913acdbf735a7893 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 a85a58fcb15d871dce80bc249de79e8d38f8e072..8e94eab44ec36048252aa2792d554be9c3e80ffc 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 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 743f93bc61b01ffc19573a33557c972dd12f2031..0c252868483ad8c82f6a14542dbbfa346d07d7f2 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -293,7 +293,7 @@ diff --git a/receiver.c b/receiver.c
        while (1) {
                cleanup_disable();
  
-@@ -841,6 +861,9 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -842,6 +862,9 @@ int recv_files(int f_in, int f_out, char *local_name)
                else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
                        rprintf(FINFO, "%s\n", fname);
  
@@ -303,7 +303,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));
-@@ -855,6 +878,16 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -856,6 +879,16 @@ int recv_files(int f_in, int f_out, char *local_name)
                        exit_cleanup(RERR_FILEIO);
                }
  

diff --git a/sparse-block.diff b/sparse-block.diff
index 23324ac08538d253abdc9c82ba1b33c80c8dc768..7afcfb95e517c10cbe49aee80b01775c3b3f9c10 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c
@@ -30,7 +30,7 @@ diff --git a/fileio.c b/fileio.c
  
  static OFF_T sparse_seek = 0;
  
-@@ -127,7 +128,7 @@ int write_file(int f, char *buf, int len)
+@@ -130,7 +131,7 @@ int write_file(int f, char *buf, int len)
        while (len > 0) {
                int r1;
                if (sparse_files > 0) {

diff --git a/time-limit.diff b/time-limit.diff
index cce45263c5c3de485308379ec411e1f5fc560b38..faecf5c2d0acf5465b59f975421ecfb3ded04bbc 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c

diff --git a/transliterate.diff b/transliterate.diff
index 332282407d7b99fd9268db206a04b913d38893c8..91454f564be78c876a33a88315c133e976d1b52e 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/tru64.diff b/tru64.diff
index bb04c8599510800fa4ebad2100e548fdba1b44fd..bddd1bc588f9b139ab8115674f6af67e3cd55712 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: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/write-devices.diff b/write-devices.diff
index bfe0a53ecf3d78ddd129cd843166153ddc084943..08c02023bbb67607125d3f2b1fc9207e8a1c7d41 100644 (file)
--- a/write-devices.diff
+++ b/write-devices.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 This patch has not yet been tested by me (Wayne), but was provided
 Darryl Dixon.  Thanks!
 
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: bc58313bf7f42f0993f7279299e8137e0f14f01c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -248,7 +248,7 @@ diff --git a/receiver.c b/receiver.c
                /* If we're not preserving permissions, change the file-list's
                 * mode based on the local permissions and some heuristics. */
                if (!preserve_perms) {
-@@ -827,7 +842,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -828,7 +843,7 @@ int recv_files(int f_in, int f_out, char *local_name)
                }
  
                if (fd2 == -1) {
@@ -257,7 +257,7 @@ diff --git a/receiver.c b/receiver.c
                        if (fd1 != -1)
                                close(fd1);
                        if (inc_recurse)
-@@ -842,8 +857,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -843,8 +858,7 @@ int recv_files(int f_in, int f_out, char *local_name)
                        rprintf(FINFO, "%s\n", fname);
  
                /* recv file data */