The patches for 3.1.0.
authorWayne Davison <wayned@samba.org>
Sun, 29 Sep 2013 03:01:17 +0000 (20:01 -0700)
committerWayne Davison <wayned@samba.org>
Sun, 29 Sep 2013 03:01:17 +0000 (20:01 -0700)
34 files changed:
acls.diff
adaptec_acl_mods.diff
atimes.diff
backup-deleted.diff
catch_crash_signals.diff
checksum-reading.diff
checksum-updating.diff
checksum-xattr.diff
copy-devices.diff
cvs-entries.diff
date-only.diff
db.diff
detect-renamed.diff
direct-io.diff
downdate.diff
fileflags.diff
filter-attribute-mods.diff
fsync.diff
ignore-case.diff
link-by-hash.diff
nameconverter.diff
netgroup-auth.diff
omit-dir-changes.diff
openssl-support.diff
slow-down.diff
slp.diff
soften-links.diff
source-backup.diff
source-filter_dest-filter.diff
sparse-block.diff
time-limit.diff
transliterate.diff
tru64.diff
write-devices.diff

index 5224567..869823e 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
index 4a1d782..8d68147 100644 (file)
@@ -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
index 83fee44..1cb4e2f 100644 (file)
@@ -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 {
index 4831363..02ae214 100644 (file)
@@ -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
index 48fe5d8..9fd61f8 100644 (file)
@@ -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
index ad42269..97d86af 100644 (file)
@@ -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
index 01c6edb..3e17a8d 100644 (file)
@@ -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:
index 08773bf..52f6fc6 100644 (file)
@@ -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
index b3a32a4..e84b5e6 100644 (file)
@@ -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
index e01ebcd..bf8c141 100644 (file)
@@ -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
index 563a160..335ad70 100644 (file)
@@ -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 361a9c6..0377d43 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);
  
index 631c972..ae9557c 100644 (file)
@@ -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
index 43f8a37..ff1af24 100644 (file)
@@ -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
index 1f8a1eb..c484aeb 100644 (file)
@@ -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
index 7af00fe..4a34e7d 100644 (file)
@@ -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
index 285ab2d..2d5c88e 100644 (file)
@@ -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
index f425394..1384fcb 100644 (file)
@@ -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
index 405761b..1beec6e 100644 (file)
@@ -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
index 05a5836..6d8eb18 100644 (file)
@@ -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
index 96b323a..9a15bf0 100644 (file)
@@ -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
index 800f728..bdbf75e 100644 (file)
@@ -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
index ad51e4b..45e50e8 100644 (file)
@@ -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
index 4243d74..714d57d 100644 (file)
@@ -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
index 2192329..5b93bb5 100644 (file)
@@ -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
index 1d667ec..a9703f1 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
index 6cdfdf7..7842eb3 100644 (file)
@@ -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
index a85a58f..8e94eab 100644 (file)
@@ -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
index 743f93b..0c25286 100644 (file)
@@ -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);
                }
  
index 23324ac..7afcfb9 100644 (file)
@@ -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) {
index cce4526..faecf5c 100644 (file)
@@ -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
index 3322824..91454f5 100644 (file)
@@ -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
index bb04c85..bddd1bc 100644 (file)
@@ -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
index bfe0a53..08c0202 100644 (file)
@@ -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 */