Fix patch conflicts.

diff --git a/backup-deleted.diff b/backup-deleted.diff
index f63db15d567570848fff209f780a6c0bf5ce0391..e3f7bd5ff304f3a4c5cbb8ddeaa3c749096635ab 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 c0d91ccac00cbedc71d0516528ac28bc93529cdc..9e1499670a4bbe40f0eca3de3eb8aab796bc9c65 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
@@ -65,7 +65,7 @@ diff --git a/main.c b/main.c
  }
  
  void write_del_stats(int f)
-@@ -1632,6 +1635,14 @@ void remember_children(UNUSED(int val))
+@@ -1634,6 +1637,14 @@ void remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -80,7 +80,7 @@ diff --git a/main.c b/main.c
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1687,6 +1698,12 @@ static void rsync_panic_handler(UNUSED(int whatsig))
+@@ -1687,6 +1698,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
@@ -90,10 +90,19 @@ diff --git a/main.c b/main.c
 +      logfile_close();
 +      _exit(RERR_WECRASHED);
 +}
++
+ static void unset_env_var(const char *var)
+ {
+ #ifdef HAVE_UNSETENV
+@@ -1703,7 +1721,6 @@ static void unset_env_var(const char *var)
+ #endif
+ }
  
+-
  int main(int argc,char *argv[])
  {
-@@ -1711,6 +1728,11 @@ int main(int argc,char *argv[])
+       int ret;
+@@ -1727,6 +1744,11 @@ int main(int argc,char *argv[])
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);

diff --git a/checksum-reading.diff b/checksum-reading.diff
index 48e55a0cf6c49f74c3d9556729e35a095e5c131b..0ee1889cbce20805f7a9c2870603df7f474bbe83 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
@@ -29,7 +29,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern int io_timeout;
  extern int no_detach;
  extern int write_batch;
-@@ -1033,6 +1035,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -1067,6 +1069,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        } else if (am_root < 0) /* Treat --fake-super from client as --super. */
                am_root = 2;
  

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 249d2f1de33cae4b207c4ac0e1001a463ddb4331..11639568be2f69581a2cfd1ef3ab6cfa8ae27f57 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 00d5f53876557164c2bc101671c56675038244ed..d45da202788689073529c3009c6d6446a4f5d348 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/congestion.diff b/congestion.diff
index 542e718d0adf60d1bdcdfb2094c00ba3e66fc9de..0252d79f0d86e2f6703f5df19ad98ac073b286bc 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt

diff --git a/copy-devices.diff b/copy-devices.diff
index 2a886938bbebe80ddbb252934d209f125ffdd053..bf39a3880de0062f7b01bc410f543edb82857029 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/date-only.diff b/date-only.diff
index a4d8034a9f8e56143113c06de81363f58596bbe5..69a0b8200382edb30c2a35736555c0b9c919b950 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index cb7873908ffe0d6c50e56a11ab4d6a586c0afb94..5534471adf8f99c7be4bc07dee4530c1ac39cc47 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -195,7 +195,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *bind_address;
  extern char *config_file;
  extern char *logfile_format;
-@@ -809,6 +812,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -843,6 +846,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        log_init(1);
  
@@ -204,10 +204,10 @@ diff --git a/clientserver.c b/clientserver.c
 +              db_lax = lp_db_lax(i);
 +      }
 +
- #ifdef HAVE_PUTENV
+ #if defined HAVE_SETENV || defined HAVE_PUTENV
        if ((*lp_early_exec(module_id) || *lp_prexfer_exec(module_id)
          || *lp_postxfer_exec(module_id) || *lp_name_converter(module_id))
-@@ -1021,6 +1029,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -1055,6 +1063,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        am_server = 1; /* Don't let someone try to be tricky. */
        quiet = 0;
@@ -227,7 +227,7 @@ diff --git a/configure.ac b/configure.ac
      netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \
      sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
      popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \
-@@ -1473,6 +1474,48 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
+@@ -1474,6 +1475,48 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
      fi
  fi
  

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 8148546e3915adb48b2897342d63bbfa5c5f4167..9ebcd416b87fb2207e366ff1c39f881b49d9b25e 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 9638c25450a634d8ce271beee7d268a22b12c68c..58091216a8e0eac81aba00644c8009dcc0550e49 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/downdate.diff b/downdate.diff
index 122d091244781498c84aa0880ce11b8a89a3590b..a0da1b9336199e18aea00100e14b0f869ac4d063 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index f5c51ff89d79b4ee2652d4cbeea0057680950c5e..9f3c0067ed64ebc4eaf329779d6d4e96702de3db 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index 34e8785978a379198d277e2f0811e8a1223f8965..2d2f554078c224c9868f23af477ce6595be418ab 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/fsync.diff b/fsync.diff
index 255d17af3334ce1a357c81fa5454ba15d1fbb6e4..ff4052dcb870934af3c37d8926bd03e2f9b41af7 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 711fece597a8a9a21ecfe8715df3304b2b0cc93c..ac0ac6a22d8e45deccef2a90d5d49cc5d7c26add 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/kerberos.diff b/kerberos.diff
index cce4ce05d8bcd3f14170b4cf697bd3bc22bcffc4..67f545c4cff38df4ee514f019c257ae988583007 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
                if (strcmp(line,"@RSYNCD: OK") == 0)
                        break;
  
-@@ -685,7 +696,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -719,7 +730,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        }
  
        read_only = lp_read_only(i); /* may also be overridden by auth_server() */
@@ -78,7 +78,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1009,6 +1009,31 @@ if test x"$enable_iconv" != x"no"; then
+@@ -1010,6 +1010,31 @@ if test x"$enable_iconv" != x"no"; then
        AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.])
  fi
  
@@ -463,7 +463,7 @@ new file mode 100644
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1575,7 +1575,7 @@ static int start_client(int argc, char *argv[])
+@@ -1577,7 +1577,7 @@ static int start_client(int argc, char *argv[])
         * remote shell command, we need to do the RSYNCD protocol first */
        if (daemon_connection) {
                int tmpret;

diff --git a/link-by-hash.diff b/link-by-hash.diff
index c8a0d1c77fbe86e142b0f54227adc6a06a3f0920..95775b5bb4abb8ec28b1a0e39f74408431327f8f 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -84,7 +84,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *logfile_format;
  extern char *files_from;
  extern char *tmpdir;
-@@ -665,6 +666,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -699,6 +700,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                return -1;
        }
  

diff --git a/md5p8.diff b/md5p8.diff
index 1e64578a982ab9af0a2a5f896047631a6d5e1a4a..9e59d7114c8fd0c0855139689621e927b4adb97d 100644 (file)
--- a/md5p8.diff
+++ b/md5p8.diff
@@ -27,7 +27,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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index 9b6034176546134485c55b52e04a190f154c07dc..95876cc004ca5e090a217268e8d033091f86a252 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 0c3b1ddf1e74e1d6f1c9265f973333d956b0b234..7ddba720c08862f2a2b0d23c0b8371945741d3b0 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index 84a4aae9b4465e4c6e26a68318bdd69d8056ca66..092cf832de7a2564f809186b66a4f9c29d6a5d66 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -44,7 +44,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1456,6 +1456,13 @@ int daemon_main(void)
+@@ -1490,6 +1490,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do getnameinfo on the
         * local address??? */
  
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1077,6 +1077,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -1078,6 +1078,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
  fi
  

diff --git a/soften-links.diff b/soften-links.diff
index a43cc1d8c245a78166b2ab17c24badcf02e5941e..708e695813401395240202bbd433c0001e69b83f 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 525f7c48621bf1323011288939a717555f4538c1..f90d5a61370d6335ff31880d4f834940a84a65f1 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 e71e130bbde9a1b5ffd42b0964d3826d96e02ab0..7165c08dee966ba924710f647259c8f114465b86 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 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 ce170b9177d81718ddb13bf720cd324d87c5cafb..9f110db9a99e8f6daa930f94272a19c7b04f1dde 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/fileio.c b/fileio.c
 --- a/fileio.c
 +++ b/fileio.c

diff --git a/stderr-compat.diff b/stderr-compat.diff
index 451c46c735e66f8db3186a5bf262014e4cdce502..158fd50a5816407a58e459c92a4d2ed32aad6312 100644 (file)
--- a/stderr-compat.diff
+++ b/stderr-compat.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/NEWS.md b/NEWS.md
 --- a/NEWS.md
 +++ b/NEWS.md

diff --git a/transliterate.diff b/transliterate.diff
index e9fcd2febae73e7ece9065954d691254c72fd471..717e476b28e73d362041a663eee04973201abc31 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: 603cf476ef5a1155203037d2127341cdbb8646d7
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c