The patches for 3.2.0pre2.

diff --git a/acls.diff b/acls.diff
index 5f23547dc831a2721d7a8c6e61fcc70b6a12b75e..79debc300d2d0385a445806b5e58ec0a8e46ebe3 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 60c833013dc758951a8a428720b3a088ca4fdba7..881eee4725662c04d9b8045124a90595aba7e2d3 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/lib/sysacls.c b/lib/sysacls.c
 --- a/lib/sysacls.c
 +++ b/lib/sysacls.c

diff --git a/backup-deleted.diff b/backup-deleted.diff
index 4f550c2598f8bf77178c3d5c6c68fe531da5661a..3ee8bd5b5d762599e79b56d08af144c92c179930 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 b5caeb1d7c325a869eebaf93fffb7b08e288213c..4034f42bd815532b22a47240eff07f6efe23467d 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 123ad039ac310c6d05c51b61e816e51ab9bf3969..9f2997182a1893543e4afbee7be59249a495c688 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c

diff --git a/checksum-updating.diff b/checksum-updating.diff
index 43dc2a3a66d2beea19f4ec317af026b0a0fd0183..5307570def1663daa47526115c90c510daeefeaa 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -520,7 +520,7 @@ diff --git a/io.c b/io.c
  extern int protocol_version;
  extern int remove_source_files;
  extern int preserve_hard_links;
-@@ -1059,6 +1060,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
+@@ -1056,6 +1057,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
                                if (inc_recurse)
                                        flist->in_progress++;
                        }

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 6367a8af0061c60c52e48f2536aa799f277e79b2..d448b09128a6ac93da641b397a577793605651ef 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/clone-dest.diff b/clone-dest.diff
index 122a1c639fd15d4ec62a0cc0547639817d6e20ae..542cfacd374429f280d0acd5f0afe2c4da160cb5 100644 (file)
--- a/clone-dest.diff
+++ b/clone-dest.diff
@@ -13,7 +13,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/congestion.diff b/congestion.diff
index 04d4167424696c828838bf9d5c6abce3e605bf11..b1570ef79483a75d765485100860175da1aaabb5 100644 (file)
--- a/congestion.diff
+++ b/congestion.diff
@@ -27,7 +27,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
@@ -88,7 +88,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"dont compress",     P_STRING, P_LOCAL, &Vars.l.dont_compress,       NULL,0},
   {"early exec",        P_STRING, P_LOCAL, &Vars.l.early_exec,          NULL,0},
   {"exclude from",      P_STRING, P_LOCAL, &Vars.l.exclude_from,        NULL,0},
-@@ -554,6 +562,7 @@ FN_GLOBAL_BOOL(lp_haproxy_header, haproxy_header)
+@@ -554,6 +562,7 @@ FN_GLOBAL_BOOL(lp_proxy_protocol, proxy_protocol)
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_charset, charset)
  FN_LOCAL_STRING(lp_comment, comment)

diff --git a/copy-devices.diff b/copy-devices.diff
index 36429c2777a3ba59b5b2ebb0f871eebc05a55364..16502c1d8d0685b410f4f85966cbc650471f0c80 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: ff272503b0ff48c7a1260a0cff108319618d6cde
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/crtimes.diff b/crtimes.diff
index 76506381cf59c69fefb7bbb89e498716779a832e..7b0dfdb623431d551e958976d5224fa51543d89a 100644 (file)
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -268,7 +268,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -722,7 +722,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[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
                        c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
                        c[11] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';

diff --git a/cvs-entries.diff b/cvs-entries.diff
index ff0e2ea74e9cb0d189e14a5fec759635cda7845f..ef5390f93bcd36b558d595b6b1e6ce60c8501b7c 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 8d05056a86af15579ff6a761ee24c16561c2c3bd..798749cd9f2e57140d86fdcbd0b07963976a32e5 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index aacb82fa847d8150981eeebb6bd2bf9582d62c36..722bd34626ad83a1df57ea16f910f0fecc1d3e15 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: 775f64f4b8a9afdd73e1e4e8aba06944e58d1d14
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -2458,7 +2458,7 @@ diff --git a/loadparm.c b/loadparm.c
   {"dont compress",     P_STRING, P_LOCAL, &Vars.l.dont_compress,       NULL,0},
   {"early exec",        P_STRING, P_LOCAL, &Vars.l.early_exec,          NULL,0},
   {"exclude from",      P_STRING, P_LOCAL, &Vars.l.exclude_from,        NULL,0},
-@@ -554,6 +562,7 @@ FN_GLOBAL_BOOL(lp_haproxy_header, haproxy_header)
+@@ -554,6 +562,7 @@ FN_GLOBAL_BOOL(lp_proxy_protocol, proxy_protocol)
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_charset, charset)
  FN_LOCAL_STRING(lp_comment, comment)

diff --git a/detect-renamed.diff b/detect-renamed.diff
index aeb0c0fdc2e7582ab2ba9c9f403aa2a1f0908ce4..5cfa6d49e0f1b96fb5c72f164341eac661a0210f 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c

diff --git a/direct-io.diff b/direct-io.diff
index 5ef24ba7e63dc1ed29b11e67acd3d986f0aa11a8..52fb8dec360eef9e08e241d7e23bae3b7a0cd03b 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/downdate.diff b/downdate.diff
index a49c850cbe59884630cffe494f1d23dc8a722bea..a1c17efbd424c977803745b0f0298d9eebd362ee 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 3bbc4e7dfd595c9d73788eef647e89bfa9d3d0be..a108b350179a823f3275dfd5fe8cbc03192d2399 100644 (file)
--- a/fileflags.diff
+++ b/fileflags.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -307,7 +307,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -721,7 +721,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -720,7 +720,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                             : S_ISLNK(file->mode) ? 'U' : 'u';
                        c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
                        c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index d10f9daff7d2a32ab9c68754d28610d24ec6db53..831d59494991cffa021309aea5243078a537c407 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -349,7 +349,7 @@ diff --git a/rsync.1.md b/rsync.1.md
      See the `--perms` and `--executability` options for how the resulting
      permission value can be applied to the files in the transfer.
 @@ -2444,6 +2446,10 @@ your home directory (remove the '=' for that).
-     If you specify "--chown=foo:bar, this is exactly the same as specifying
+     If you specify "`--chown=foo:bar`", this is exactly the same as specifying
      "`--usermap=*:foo --groupmap=*:bar`", only easier.
  
 +    To change ownership of files matching a pattern, use an include filter with
@@ -359,7 +359,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  0.  `--timeout=TIMEOUT`
  
      This option allows you to set a maximum I/O timeout in seconds.  If no data
-@@ -3378,6 +3384,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3382,6 +3388,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
    rules that exclude things like "CVS" and "`*.o`" are marked as perishable,
    and will not prevent a directory that was removed on the source from being
    deleted on the destination.
@@ -375,7 +375,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  - An `x` indicates that a rule affects xattr names in xattr copy/delete
    operations (and is thus ignored when matching file/dir names).  If no
    xattr-matching rules are specified, a default xattr filtering rule is used
-@@ -3435,6 +3450,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3439,6 +3454,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
    rules in the file must not specify sides (via a modifier or a rule prefix
    such as `hide`).
  

diff --git a/fsync.diff b/fsync.diff
index c8e000bf05acc44d35280ee89a28b61ab3281fef..2372a27bc992ed9f78166e6e1071e0836cc54cc3 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 0b498d388d2d68d29f196c14fbb8c7f66c95fad7..1ab2eef9673be7bc2d419591cad134fd2c338e65 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/kerberos.diff b/kerberos.diff
index df3e1b8d4dbf5744de82733499277ac3d5c414a9..ab044f190a24f0aca2ef894d6a4a05094c741643 100644 (file)
--- a/kerberos.diff
+++ b/kerberos.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/link-by-hash.diff b/link-by-hash.diff
index fb373cfef3d81792e6d42eaa57093ab1a900c94f..ee304060a441976ad696f7f5ad21fff2c885c721 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/md5p8.diff b/md5p8.diff
index c83a0d3492836937007b11fe159c71d4ed0613a7..84c5abc56a3016c2140f3bee38d70e219e4e72c6 100644 (file)
--- a/md5p8.diff
+++ b/md5p8.diff
@@ -18,7 +18,7 @@ xxHash is still preferred (and faster), but this provides a reasonably
 fast fallback for the case where xxHash libraries are not available at
 build time.
 
-based-on: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -38,7 +38,7 @@ diff --git a/Makefile.in b/Makefile.in
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
  zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
-@@ -134,6 +134,9 @@ rounding.h: rounding.c rsync.h proto.h
+@@ -127,6 +127,9 @@ rounding.h: rounding.c rsync.h proto.h
  simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
        $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
  

diff --git a/nameconverter.diff b/nameconverter.diff
index ccca98680689e66e8a68b1f91530ec174c27969d..b544ea14c3fe8a6924ceddc1e9b7e32c8e525381 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 9cf74d197dbedd94035c614db1a408b140a5c930..d17c9d7c119810612ae9af1006b14c28305ed0ea 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 71fbd61247e0e5653aa5f26d377f94c8a3159fa5..3a74c077698686737d974715d16c5c8524f3ffe4 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/slow-down.diff b/slow-down.diff
index 522a2b07b52d3fcadcec85bc8a3b03415d1622dc..33736b0d4f4f3f064b633436806d40a1e26c861a 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 46d911abf31fa428adca73f062ea33c6f1cffb4f..0d4ff703b262b28d7cce4d293cc490b9080fb81d 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -102,18 +102,18 @@ diff --git a/loadparm.c b/loadparm.c
 +      int slp_refresh;
 +#endif
  
-       BOOL haproxy_header;
+       BOOL proxy_protocol;
  } global_vars;
-@@ -406,6 +409,9 @@ static struct parm_struct parm_table[] =
-  {"motd file",         P_STRING, P_GLOBAL,&Vars.g.motd_file,           NULL,0},
+@@ -407,6 +410,9 @@ static struct parm_struct parm_table[] =
   {"pid file",          P_STRING, P_GLOBAL,&Vars.g.pid_file,            NULL,0},
   {"port",              P_INTEGER,P_GLOBAL,&Vars.g.rsync_port,          NULL,0},
+  {"proxy protocol",    P_BOOL,   P_LOCAL, &Vars.g.proxy_protocol,      NULL,0},
 +#ifdef HAVE_LIBSLP
 + {"slp refresh",       P_INTEGER,P_GLOBAL,&Vars.g.slp_refresh,         NULL,0},
 +#endif
   {"socket options",    P_STRING, P_GLOBAL,&Vars.g.socket_options,      NULL,0},
-  {"haproxy header",    P_BOOL,   P_LOCAL, &Vars.g.haproxy_header,      NULL,0},
  
+  {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
 @@ -548,6 +554,9 @@ FN_GLOBAL_STRING(lp_socket_options, socket_options)
  
  FN_GLOBAL_INTEGER(lp_listen_backlog, listen_backlog)
@@ -122,7 +122,7 @@ diff --git a/loadparm.c b/loadparm.c
 +FN_GLOBAL_INTEGER(lp_slp_refresh, slp_refresh)
 +#endif
  
- FN_GLOBAL_BOOL(lp_haproxy_header, haproxy_header)
+ FN_GLOBAL_BOOL(lp_proxy_protocol, proxy_protocol)
  
 diff --git a/main.c b/main.c
 --- a/main.c

diff --git a/soften-links.diff b/soften-links.diff
index 5d7c2947e4f528c43899abead759c7c59134237b..25b12eb0c4210a0b3f179df33d3f29cba5ad59ba 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 12a1a287275f54653e840c9ae90387a8ce5bcb2c..756606be99b77c6530f1facbcdc82b31dfc4cd39 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 0775fe72180ed42733afcdcba172540a6045e815..07c1221b344b8d523a369faea51305bb8ff021f1 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 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 b0c7479fbbf9af8ba552007a4e9e5a91d9c6125c..8ea18f8dcc92b999d3406cd0f193ef75c5048f4f 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c

diff --git a/time-limit.diff b/time-limit.diff
index 00f0a81316bdaf802f3c23beded5d40a960945b8..17df078245c5d64ea00cc7c06dead4ce9cbe27ba 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c

diff --git a/transliterate.diff b/transliterate.diff
index 3adc58105bfacce4ce99744b3ce2859f8ec0fcf0..0369386c1b00cffe1136c1edd2917c642689bf5f 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/tru64.diff b/tru64.diff
index 049e9d097b016f7f2cf260e6635b84b19d2816ca..c4723a4eb8add5f41a7b41a9c82f574ad820b29f 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: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c

diff --git a/xxh3.diff b/xxh3.diff
index 8df2686c692f4b930cd9efb76e58c2b08b6078ea..dac14d5b989d4d8b3fec29477e841462a570e13f 100644 (file)
--- a/xxh3.diff
+++ b/xxh3.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: c528f8d5c8aa7b16b20cda72a9f4119699890c28
+based-on: 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c