The patches for 3.3.0.

[rsync-patches.git] / transliterate.diff

diff --git a/transliterate.diff b/transliterate.diff
index 50ac6cf9c113c4839ce1fca54004034cc923e5fc..fc7d222b6d0824fc570bf060b2e69027da182168 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: 9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -104,7 +104,7 @@ diff --git a/options.c b/options.c
    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
    {"8-bit-output",    '8', POPT_ARG_VAL,    &allow_8bit_chars, 1, 0, 0 },
-@@ -2488,6 +2490,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2490,6 +2492,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -129,7 +129,7 @@ diff --git a/options.c b/options.c
        if (trust_sender || am_server || read_batch)
                trust_sender_args = trust_sender_filter = 1;
        else if (old_style_args || filesfrom_host != NULL)
-@@ -2956,6 +2976,12 @@ void server_options(char **args, int *argc_p)
+@@ -2958,6 +2978,12 @@ void server_options(char **args, int *argc_p)
        if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
                args[ac++] = "--no-implied-dirs";
  
@@ -153,7 +153,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --checksum-seed=NUM      set block/file checksum seed (advanced)
  --ipv4, -4               prefer IPv4
  --ipv6, -6               prefer IPv6
-@@ -3754,6 +3755,22 @@ expand it.
+@@ -3755,6 +3756,22 @@ expand it.
      free to specify just the local charset for a daemon transfer (e.g.
      `--iconv=utf8`).