Fix some build and test issues.

diff --git a/acls.diff b/acls.diff
index 869823e61d4b0fffd35fde8d9a17ca8b038dd8b8..8d855aff4d448fffcdc45b9efb53f6241c4c899a 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 8d681472eb60221d7a83b5dfa3f50e26eaa88ead..91f5e80726f879b9b39be894e473d1f07252d251 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 1cb4e2f7fa0b8721daac35bb235021cf7156809f..fb471063e67b20116911dc36d0192ba9941e2240 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -151,36 +151,38 @@ diff --git a/generator.c b/generator.c
        int64 len;
        int colwidth = human_readable ? 14 : 11;
  
-@@ -1124,10 +1130,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -1124,10 +1130,12 @@ static void list_file_entry(struct file_struct *f)
  
  #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
 -              rprintf(FINFO, "%s %*s %s %s -> %s\n",
-+              rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
++              rprintf(FINFO, "%s %*s %s%s%s %s -> %s\n",
                        permbuf, colwidth, human_num(len),
 -                      timestring(f->modtime), f_name(f, NULL),
 -                      F_SYMLINK(f));
 +                      timestring(f->modtime),
++                      atimes_ndx ? " " : "",
 +                      atimes_ndx ? timestring(atime) : "",
 +                      f_name(f, NULL), F_SYMLINK(f));
        } else
  #endif
        if (missing_args == 2 && f->mode == 0) {
-@@ -1135,9 +1142,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -1135,9 +1143,12 @@ static void list_file_entry(struct file_struct *f)
                        colwidth + 31, "*missing",
                        f_name(f, NULL));
        } else {
 -              rprintf(FINFO, "%s %*s %s %s\n",
-+              rprintf(FINFO, "%s %*s %s %s %s\n",
++              rprintf(FINFO, "%s %*s %s%s%s %s\n",
                        permbuf, colwidth, human_num(len),
 -                      timestring(f->modtime), f_name(f, NULL));
 +                      timestring(f->modtime),
++                      atimes_ndx ? " " : "",
 +                      atimes_ndx ? timestring(atime) : "",
 +                      f_name(f, NULL));
        }
  }
  
-@@ -2034,7 +2043,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+@@ -2034,7 +2045,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)
@@ -224,7 +226,7 @@ diff --git a/ifuncs.h b/ifuncs.h
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -720,7 +720,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -721,7 +721,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                        c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                        c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -523,14 +525,12 @@ new file mode 100644
 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"
- 
+@@ -27,7 +27,7 @@ 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 /'
+ 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]  *;####/##/## ##:##:## ;'
++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/backup-deleted.diff b/backup-deleted.diff
index 02ae2146d50ac2363cabda6d72d94bafa9f1948c..9f520bcd3b64a8c845bcf2f4c95668c3849d7acc 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -59,7 +59,7 @@ diff --git a/options.c b/options.c
    {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -2572,6 +2574,10 @@ void server_options(char **args, int *argc_p)
+@@ -2575,6 +2577,10 @@ void server_options(char **args, int *argc_p)
        }
  
        if (am_sender) {

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index ecbf8412282491706da48fd0b920b845db2338a9..ec8c17e29459edbd5ffb3fe72f5779a9d542f49f 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -322,7 +322,7 @@ diff --git a/options.c b/options.c
  
        if (preserve_times) {
                preserve_times = PRESERVE_FILE_TIMES;
-@@ -2564,6 +2626,10 @@ void server_options(char **args, int *argc_p)
+@@ -2567,6 +2629,10 @@ void server_options(char **args, int *argc_p)
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -333,7 +333,7 @@ diff --git a/options.c b/options.c
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -2572,7 +2638,14 @@ void server_options(char **args, int *argc_p)
+@@ -2575,7 +2641,14 @@ void server_options(char **args, int *argc_p)
                        goto oom;
                args[ac++] = arg;
        }

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 9fd61f8d758fa0f2cb0ddcf6260902f77312ee14..8e435f750cbeb53917f32a754a8857813d0aa4e5 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
@@ -41,7 +41,7 @@ diff --git a/errcode.h b/errcode.h
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -91,6 +91,7 @@ struct {
+@@ -92,6 +92,7 @@ struct {
        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },

diff --git a/checksum-reading.diff b/checksum-reading.diff
index 97d86af0e8e99bb6df8b0df813da136b81c7bd72..49e6957a154159cfb7939b470ff52589da416e36 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 52f6fc6e6a903f314d4ae10196f0cfab34eb476a..bceeb0f1e2cc2dbe01e85cb40aaba835415434a2 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 e84b5e6430b2703768120b1ecb68e93c581904a5..39b629ff972873b643db03503394984d5d5b3ad4 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -56,7 +56,7 @@ diff --git a/options.c b/options.c
    {"specials",         0,  POPT_ARG_VAL,    &preserve_specials, 1, 0, 0 },
    {"no-specials",      0,  POPT_ARG_VAL,    &preserve_specials, 0, 0, 0 },
    {"links",           'l', POPT_ARG_VAL,    &preserve_links, 1, 0, 0 },
-@@ -2736,6 +2739,9 @@ void server_options(char **args, int *argc_p)
+@@ -2739,6 +2742,9 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  

diff --git a/crtimes.diff b/crtimes.diff
index c8a8d3aefdeefa80db7ae5f2f521368491fc132f..bb14dd80e2d9086e6216218d6b3a25072789d234 100644 (file)
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -196,36 +196,38 @@ diff --git a/generator.c b/generator.c
        int64 len;
        int colwidth = human_readable ? 14 : 11;
  
-@@ -1135,10 +1150,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -1135,10 +1150,12 @@ static void list_file_entry(struct file_struct *f)
  
  #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
 -              rprintf(FINFO, "%s %*s %s %s -> %s\n",
-+              rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
++              rprintf(FINFO, "%s %*s %s%s%s %s -> %s\n",
                        permbuf, colwidth, human_num(len),
 -                      timestring(f->modtime), f_name(f, NULL),
 -                      F_SYMLINK(f));
 +                      timestring(f->modtime),
++                      crtimes_ndx ? " " : "",
 +                      crtimes_ndx ? timestring(crtime) : "",
 +                      f_name(f, NULL), F_SYMLINK(f));
        } else
  #endif
        if (missing_args == 2 && f->mode == 0) {
-@@ -1146,9 +1162,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -1146,9 +1163,12 @@ static void list_file_entry(struct file_struct *f)
                        colwidth + 31, "*missing",
                        f_name(f, NULL));
        } else {
 -              rprintf(FINFO, "%s %*s %s %s\n",
-+              rprintf(FINFO, "%s %*s %s %s %s\n",
++              rprintf(FINFO, "%s %*s %s%s%s %s\n",
                        permbuf, colwidth, human_num(len),
 -                      timestring(f->modtime), f_name(f, NULL));
 +                      timestring(f->modtime),
++                      crtimes_ndx ? " " : "",
 +                      crtimes_ndx ? timestring(crtime) : "",
 +                      f_name(f, NULL));
        }
  }
  
-@@ -1240,6 +1258,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1240,6 +1260,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        return;
                }
        }
@@ -268,7 +270,7 @@ diff --git a/ifuncs.h b/ifuncs.h
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -723,7 +723,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -724,7 +724,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
                        c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
                        c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
@@ -584,14 +586,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';
 +      }
 +}
 +
@@ -605,6 +606,7 @@ diff --git a/tls.c b/tls.c
 +      char mtimebuf[50];
 +      char crtimebuf[50];
        char linkbuf[4096];
++      int nsecs;
  
        if (do_lstat(fname, &buf) < 0)
                failed("stat", fname);
@@ -613,10 +615,11 @@ diff --git a/tls.c b/tls.c
  #ifdef SUPPORT_XATTRS
        if (am_root < 0)
                stat_xattr(fname, &buf);
-@@ -160,29 +190,11 @@ static void list_file(const char *fname)
+@@ -159,30 +189,17 @@ static void list_file(const char *fname)
+       }
  
        permstring(permbuf, buf.st_mode);
- 
+-
 -      if (buf.st_mtime) {
 -              int len;
 -              mt = gmtime(&buf.st_mtime);
@@ -629,17 +632,21 @@ diff --git a/tls.c b/tls.c
 -                      (int)mt->tm_hour,
 -                      (int)mt->tm_min,
 -                      (int)mt->tm_sec);
--#ifdef ST_MTIME_NSEC
+ #ifdef ST_MTIME_NSEC
 -              if (nsec_times) {
 -                      snprintf(datebuf + len, sizeof datebuf - len,
 -                              ".%09d", (int)buf.ST_MTIME_NSEC);
 -              }
--#endif
++      if (nsec_times)
++              nsecs = (int)buf.ST_MTIME_NSEC;
++      else
+ #endif
 -      } else {
 -              int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
 -              memset(datebuf, ' ', len);
 -              datebuf[len] = '\0';
 -      }
++              nsecs = -1;
 +      storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);
 +      if (display_crtimes)
 +              storetime(crtimebuf, sizeof crtimebuf, crtime, -1);
@@ -648,7 +655,7 @@ diff --git a/tls.c b/tls.c
  
        /* TODO: Perhaps escape special characters in fname? */
  
-@@ -193,13 +205,14 @@ static void list_file(const char *fname)
+@@ -193,13 +210,14 @@ static void list_file(const char *fname)
                    (long)minor(buf.st_rdev));
        } else
                printf("%15s", do_big_num(buf.st_size, 1, NULL));
@@ -665,7 +672,7 @@ diff --git a/tls.c b/tls.c
    {"link-times",      'l', POPT_ARG_NONE,   &link_times, 0, 0, 0 },
    {"link-owner",      'L', POPT_ARG_NONE,   &link_owner, 0, 0, 0 },
  #ifdef SUPPORT_XATTRS
-@@ -218,6 +231,7 @@ static void tls_usage(int ret)
+@@ -218,6 +236,7 @@ static void tls_usage(int ret)
    fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
    fprintf(F,"Trivial file listing program for portably checking rsync\n");
    fprintf(F,"\nOptions:\n");

diff --git a/cvs-entries.diff b/cvs-entries.diff
index bf8c141f8bd58ad92af174da3d172bbe0022023c..e6e99bb806a2c8bc7415ff92f35fe45c455f1979 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 335ad702f59034dc306f37c4c69f2578cda71705..5cc76dd560996b1f5868cd044134d4d166f70f27 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -63,7 +63,7 @@ diff --git a/options.c b/options.c
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
-@@ -2623,6 +2626,9 @@ void server_options(char **args, int *argc_p)
+@@ -2626,6 +2629,9 @@ void server_options(char **args, int *argc_p)
        else if (missing_args == 1 && !am_sender)
                args[ac++] = "--ignore-missing-args";
  

diff --git a/db.diff b/db.diff
index 0377d437e9d5e5cfdf8dedb931ce763e311dd927..6eaa52ea2828c726477403fc5064abf4cd5e012f 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index 226078bd28caf4f48b25e5274c7adbe1430bf816..7aa5159df7ea42e9432d40afc5c3ee5a35326a52 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -80,7 +80,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_NONE,   0, 'y', 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -2610,8 +2614,14 @@ void server_options(char **args, int *argc_p)
+@@ -2613,8 +2617,14 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";

diff --git a/detect-renamed.diff b/detect-renamed.diff
index ae9557cf6e74d6ecc25cfc6ea593cb068fe422b3..92ae7756ab3dfab26c42e428dd26b3daa5e5ecd5 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -626,7 +626,7 @@ diff --git a/options.c b/options.c
                                 delay_updates ? "delay-updates" : "partial-dir");
                        return 0;
                }
-@@ -2606,6 +2610,8 @@ void server_options(char **args, int *argc_p)
+@@ -2609,6 +2613,8 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";

diff --git a/direct-io.diff b/direct-io.diff
index ff1af242f5319bc7bcb81ef9d658bbb334d5195f..33d888c80ebc75066f64bbbf3513860c55a2197a 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/downdate.diff b/downdate.diff
index c484aebb5d68487530ee79c236bfd96fd7727705..476e73ff554bb0d9a0364988e300ff6e26d70cf4 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 4a34e7d8fcc8e9a6ca860c5ec01bee9e1227d3a8..908892cebe2f02f58ff03d88233f370b982cb56a 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -319,7 +319,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -720,7 +720,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -721,7 +721,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                        c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                        c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -341,7 +341,15 @@ diff --git a/main.c b/main.c
  
  extern int dry_run;
  extern int list_only;
-@@ -839,6 +842,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
+@@ -51,6 +54,7 @@ extern int copy_unsafe_links;
+ extern int keep_dirlinks;
+ extern int preserve_hard_links;
+ extern int protocol_version;
++extern int force_change;
+ extern int file_total;
+ extern int recurse;
+ extern int xfer_dirs;
+@@ -839,6 +843,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
         * points to an identical file won't be replaced by the referent. */
        copy_links = copy_dirlinks = copy_unsafe_links = 0;
  
@@ -462,7 +470,7 @@ diff --git a/options.c b/options.c
    {"ignore-errors",    0,  POPT_ARG_VAL,    &ignore_errors, 1, 0, 0 },
    {"no-ignore-errors", 0,  POPT_ARG_VAL,    &ignore_errors, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -2513,6 +2539,9 @@ void server_options(char **args, int *argc_p)
+@@ -2516,6 +2542,9 @@ void server_options(char **args, int *argc_p)
        if (xfer_dirs && !recurse && delete_mode && am_sender)
                args[ac++] = "--no-r";
  
@@ -472,7 +480,7 @@ diff --git a/options.c b/options.c
        if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
                if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
                        goto oom;
-@@ -2600,6 +2629,16 @@ void server_options(char **args, int *argc_p)
+@@ -2603,6 +2632,16 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--delete-excluded";
                if (force_delete)
                        args[ac++] = "--force";

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 2d5c88e95fa88ba7a31813592789691bb9dede8d..ac05ac06f0b2c656bd31f58e13bfb8c984e086e5 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/fsync.diff b/fsync.diff
index 1384fcb849a83bfc1b80fc0d990596878c9a669b..31e0a6c24d4b2199c9195236cf87085fe4a3360f 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -35,7 +35,7 @@ diff --git a/options.c b/options.c
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -2685,6 +2688,9 @@ void server_options(char **args, int *argc_p)
+@@ -2688,6 +2691,9 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = tmpdir;
                }
  

diff --git a/hfs-compression.diff b/hfs-compression.diff
index e7cf30179f736d354f423172b4e4389be53bef3c..a861b436bf3d48242462bcece0cfdfe0f3745327 100644 (file)
--- a/hfs-compression.diff
+++ b/hfs-compression.diff
@@ -43,7 +43,7 @@ diff --git a/generator.c b/generator.c
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;
-@@ -1744,6 +1745,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1746,6 +1747,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                        fname, fnamecmpbuf);
                        }
                        sx.st.st_size = F_LENGTH(fuzzy_file);
@@ -58,7 +58,7 @@ diff --git a/generator.c b/generator.c
                        statret = 0;
                        fnamecmp = fnamecmpbuf;
                }
-@@ -1911,6 +1920,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1913,6 +1922,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        if (read_batch)
                goto cleanup;
  
@@ -160,17 +160,15 @@ diff --git a/main.c b/main.c
  
  extern int dry_run;
  extern int list_only;
-@@ -53,7 +57,9 @@ extern int copy_dirlinks;
+@@ -53,6 +57,7 @@ extern int copy_dirlinks;
  extern int copy_unsafe_links;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
 +extern int preserve_hfs_compression;
  extern int protocol_version;
-+extern int force_change;
+ extern int force_change;
  extern int file_total;
- extern int recurse;
- extern int xfer_dirs;
-@@ -106,6 +112,7 @@ int daemon_over_rsh = 0;
+@@ -107,6 +112,7 @@ int daemon_over_rsh = 0;
  mode_t orig_umask = 0;
  int batch_gen_fd = -1;
  int sender_keeps_checksum = 0;
@@ -178,7 +176,7 @@ diff --git a/main.c b/main.c
  
  /* There's probably never more than at most 2 outstanding child processes,
   * but set it higher, just in case. */
-@@ -558,6 +565,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
+@@ -559,6 +565,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
        return 0; /* not reached */
  }
  
@@ -222,7 +220,7 @@ diff --git a/main.c b/main.c
  /* The receiving side operates in one of two modes:
   *
   * 1. it receives any number of files into a destination directory,
-@@ -616,6 +660,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -617,6 +660,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                                exit_cleanup(RERR_FILESELECT);
                        }
                        filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
@@ -232,7 +230,7 @@ diff --git a/main.c b/main.c
                        return NULL;
                }
                if (file_total > 1) {
-@@ -676,7 +723,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -677,7 +723,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                                full_fname(dest_path));
                        exit_cleanup(RERR_FILESELECT);
                }
@@ -243,7 +241,7 @@ diff --git a/main.c b/main.c
                return NULL;
        }
  
-@@ -696,6 +745,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -697,6 +745,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                        full_fname(dest_path));
                exit_cleanup(RERR_FILESELECT);
        }
@@ -304,7 +302,7 @@ diff --git a/options.c b/options.c
        if (block_size > MAX_BLOCK_SIZE) {
                snprintf(err_buf, sizeof err_buf,
                         "--block-size=%lu is too large (max: %u)\n", block_size, MAX_BLOCK_SIZE);
-@@ -2549,6 +2569,11 @@ void server_options(char **args, int *argc_p)
+@@ -2552,6 +2572,11 @@ void server_options(char **args, int *argc_p)
        if (preserve_fileflags)
                args[ac++] = "--fileflags";
  

diff --git a/ignore-case.diff b/ignore-case.diff
index 1beec6e7abf9b77fa20b82d7a1c73785f82603bd..7c48cfb09784ebe7555313493ab8e00cfe61604e 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -237,7 +237,7 @@ diff --git a/options.c b/options.c
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_VAL,    &eol_nulls, 1, 0, 0},
    {"no-from0",         0,  POPT_ARG_VAL,    &eol_nulls, 0, 0, 0},
-@@ -2635,6 +2639,9 @@ void server_options(char **args, int *argc_p)
+@@ -2638,6 +2642,9 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 6d8eb185daf155812ef124f15e9e37aff5f8808f..dea14ea8ae3a48dda198b2646f56c078496f5650 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -336,7 +336,7 @@ diff --git a/options.c b/options.c
        }
        if (daemon_filter_list.head && !am_sender) {
                filter_rule_list *elp = &daemon_filter_list;
-@@ -2714,6 +2738,12 @@ void server_options(char **args, int *argc_p)
+@@ -2717,6 +2741,12 @@ void server_options(char **args, int *argc_p)
        } else if (inplace)
                args[ac++] = "--inplace";
  

diff --git a/nameconverter.diff b/nameconverter.diff
index 9a15bf02fb21cbc72051a5bf08578d16036cadb2..85c032b7c36fe4234402dd7cbf377075b34db20a 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 bdbf75e9c9ef4d5a7d09508d2284e10ffd8ebce5..40f8fb6936eec7d5d1e0d9dfffaa82445ce337d8 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 45e50e81800d65376ed7be47747ef1dfbad4c775..8a6d97930ee1475332525c163bb4f0c09c49a131 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 714d57da0f7b2e08186b96a4e8b4a80a3aaa47f8..cbaa1a8497da7627d4d9475adcb0994c14fc1ff4 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -509,7 +509,7 @@ diff --git a/options.c b/options.c
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -2828,9 +2902,21 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
+@@ -2831,9 +2905,21 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
  {
        char *path;
  

diff --git a/slow-down.diff b/slow-down.diff
index 5b93bb5c22fae04ba50243097e1c361c8eee4a5e..bdb0f9fca05e57d62841c8b7fbd595e49a273cfc 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index a9703f11fe79657684bdb8640ad11cfd776602ba..3dc5f3f60ba80be13f0558e742a38e71663f8eb3 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -479,7 +479,7 @@ new file mode 100644
 +              exit_cleanup(RERR_SYNTAX);
 +      }
 +
-+      n = lp_numservices();
++      n = lp_num_modules();
 +
 +      if (0 == lp_slp_refresh())
 +              timeout = SLP_LIFETIME_MAXIMUM; /* don't expire, ever */

diff --git a/soften-links.diff b/soften-links.diff
index 7842eb36a735a4ca1f859e72913acdbf735a7893..9da4011a01b49f47a0fea4711b77e513f718f99d 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 8e94eab44ec36048252aa2792d554be9c3e80ffc..ad7b515fcf7e7052b22707931b1a1e75f201e035 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -37,7 +37,7 @@ diff --git a/options.c b/options.c
    {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -2614,6 +2617,8 @@ void server_options(char **args, int *argc_p)
+@@ -2617,6 +2620,8 @@ void server_options(char **args, int *argc_p)
                                goto oom;
                        args[ac++] = arg;
                }

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 0c252868483ad8c82f6a14542dbbfa346d07d7f2..5db5adf04a753c73e662f57df1d08e284ace1bb0 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -134,7 +134,7 @@ diff --git a/options.c b/options.c
        if (files_from) {
                char *h, *p;
                int q;
-@@ -2623,6 +2642,25 @@ void server_options(char **args, int *argc_p)
+@@ -2626,6 +2645,25 @@ void server_options(char **args, int *argc_p)
        else if (missing_args == 1 && !am_sender)
                args[ac++] = "--ignore-missing-args";
  

diff --git a/sparse-block.diff b/sparse-block.diff
index 7afcfb95e517c10cbe49aee80b01775c3b3f9c10..3e2324b8d1155fd91085b606a930f455b2bdc6ff 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c
@@ -66,7 +66,7 @@ diff --git a/options.c b/options.c
    {"preallocate",      0,  POPT_ARG_NONE,   &preallocate_files, 0, 0, 0},
    {"inplace",          0,  POPT_ARG_VAL,    &inplace, 1, 0, 0 },
    {"no-inplace",       0,  POPT_ARG_VAL,    &inplace, 0, 0, 0 },
-@@ -2546,6 +2549,12 @@ void server_options(char **args, int *argc_p)
+@@ -2549,6 +2552,12 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  

diff --git a/time-limit.diff b/time-limit.diff
index faecf5c2d0acf5465b59f975421ecfb3ded04bbc..0a378da0099928e7fb62add60d166a1202cd7aec 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c
@@ -116,7 +116,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2558,6 +2594,15 @@ void server_options(char **args, int *argc_p)
+@@ -2561,6 +2597,15 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  

diff --git a/transliterate.diff b/transliterate.diff
index 91454f564be78c876a33a88315c133e976d1b52e..6080b3d014f78a38aaaec9a7f61e91b9782bdc86 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -137,7 +137,7 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -2731,6 +2752,12 @@ void server_options(char **args, int *argc_p)
+@@ -2734,6 +2755,12 @@ void server_options(char **args, int *argc_p)
        if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
                args[ac++] = "--no-implied-dirs";
  

diff --git a/tru64.diff b/tru64.diff
index bddd1bc588f9b139ab8115674f6af67e3cd55712..7dc86a3aeddd784d837284278992b42bd49ba8db 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 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 08c02023bbb67607125d3f2b1fc9207e8a1c7d41..3ce67561eba86dcb355d983bd1dad12c2021ac21 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: bc58313bf7f42f0993f7279299e8137e0f14f01c
+based-on: 63f91976112b8b2118cc17eb5fc8142175566f4f
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -70,7 +70,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2731,6 +2739,9 @@ void server_options(char **args, int *argc_p)
+@@ -2734,6 +2742,9 @@ void server_options(char **args, int *argc_p)
        if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
                args[ac++] = "--no-implied-dirs";