Fix patch conflicts.

diff --git a/backup-deleted.diff b/backup-deleted.diff
index a25f11e4d8784631c09312d0bf9a46431d212e97..f72d34908d8bc3b9d78ead353d1e8e714041c180 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 59c2cedca489bfea508456a98f0088b50cf5659a..90a5d56eea652258672c78b9bb9c32babdce2dc2 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 e04406afa5cdc8df0b04555d12643805fcb385ac..ca89b933bb2936334106ba3ccd2c9ba1ca3ca114 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 8e76d0df0dddf69675f1689928b906cdc9402cc1..389735965605b375687f438be559f640533e7883 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 78d10e9d6bfc2749da0cd89cbd08fb6e475eb7aa..d478866a7e5c2541edf628bb57846983e49fb79e 100644 (file)
--- a/clone-dest.diff
+++ b/clone-dest.diff
@@ -13,13 +13,13 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -51,7 +51,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
- OBJS=$(OBJS1) $(OBJS2) $(OBJS3) @SIMD@ $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
+ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
  
 -TLS_OBJ = tls.o syscall.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
 +TLS_OBJ = tls.o syscall.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o lib/wildmatch.o @BUILD_POPT@

diff --git a/congestion.diff b/congestion.diff
index c5ed7f8f6dbbb66b757e1ea4f43b17b1504149bc..753ecfbe291b66d67a2952e773771c8b4b0ab430 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 aba727c07078d42474c120232c70a333c536e1f4..31484308cf2f5d3adb12fc88a993bb2f7aa06636 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 2dbbe16699eb07cd564c1b387893896d9f5eff0a..ede5aab13b968662b7abc1c3217b0ac78124084f 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/db.diff b/db.diff
index 52fa8649962312bbd537a1b0cf585b716e4f1398..01c66f37dcd9f5e411256623d4cff63be5be7b32 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -59,7 +59,7 @@ diff --git a/Makefile.in b/Makefile.in
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
 -      usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
 +      usage.o fileio.o batch.o clientname.o chmod.o db.o acls.o xattrs.o
- OBJS3=progress.o pipe.o @ASM@
+ OBJS3=progress.o pipe.o @ASM@ @SIMD@
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 @@ -76,10 +77,12 @@ install: all
@@ -104,8 +104,8 @@ diff --git a/Makefile.in b/Makefile.in
        $(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
  
  .PHONY: man
--man: rsync.1 rsync-ssl.1 rsyncd.conf.5 rrsync.1
-+man: rsync.1 rsync-ssl.1 rsyncd.conf.5 rrsync.1 rsyncdb.1
+-man: rsync.1 rsync-ssl.1 rsyncd.conf.5 @MAKE_RRSYNC_1@
++man: rsync.1 rsync-ssl.1 rsyncd.conf.5 @MAKE_RRSYNC_1@ rsyncdb.1
  
  rsync.1: rsync.1.md md-convert version.h Makefile
        @$(srcdir)/maybe-make-man $(srcdir) rsync.1.md
@@ -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 \
-@@ -1402,6 +1403,48 @@ if test x"$enable_acl_support" = x"no" || test x"$enable_xattr_support" = x"no"
+@@ -1406,6 +1407,48 @@ if test x"$enable_acl_support" = x"no" || test x"$enable_xattr_support" = x"no"
      fi
  fi
  

diff --git a/detect-renamed.diff b/detect-renamed.diff
index c7b9402ab1c8139f48e3fb91fbb4de7b00746322..270333d47aebc3bed19d9e55eb47d1c7b6375cb3 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 9c96872b4fa9159a7ea2add53286affe3661fec0..0c80e0d42cc7971c9e101add9078243f7b6b836b 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

diff --git a/downdate.diff b/downdate.diff
index 3dd6dc8b8de425a39922e52d4937cbb82f39b5f1..0a3529747f60506058fb4e52a0d2966526ebb92b 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

diff --git a/fileflags.diff b/fileflags.diff
index 5266b01cc7fa12fad8bb78ac756d849b600c9cfd..64a8aeedce63ac719ed292c2acf17dd620645662 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 ad08ae4d26b44c7993270d94e156569eda514934..dbc561f4fcab4b11ed5b663fe187abb8b2f58582 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/ignore-case.diff b/ignore-case.diff
index d9fd8a44a27480b441f9a8b6278a63974e849a01..5c07cfc9b72eac876f6c65e2eb5bd2d5e42ee6ef 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c

diff --git a/kerberos.diff b/kerberos.diff
index b97fee2b4fb65a3b114152efdf5829cdb7bdc018..1f051069d34e86ed6d9205de784e1b83aa18ce0d 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -17,8 +17,8 @@ diff --git a/Makefile.in b/Makefile.in
        util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
        usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
--OBJS3=progress.o pipe.o @ASM@
-+OBJS3=progress.o pipe.o gss-auth.o @ASM@
+-OBJS3=progress.o pipe.o @ASM@ @SIMD@
++OBJS3=progress.o pipe.o gss-auth.o @ASM@ @SIMD@
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
@@ -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
-@@ -938,6 +938,31 @@ if test x"$enable_iconv" != x"no"; then
+@@ -940,6 +940,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
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 8bcad601c5abf8d7b80d0c6a20d77375631ebb33..bd7e4015208edd796a57d5b95977e283ce1963a5 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -20,8 +20,8 @@ diff --git a/Makefile.in b/Makefile.in
        util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
        usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
--OBJS3=progress.o pipe.o @ASM@
-+OBJS3=progress.o pipe.o hashlink.o @ASM@
+-OBJS3=progress.o pipe.o @ASM@ @SIMD@
++OBJS3=progress.o pipe.o hashlink.o @ASM@ @SIMD@
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o

diff --git a/md5p8.diff b/md5p8.diff
index e28087d1320ba2d9cf7dc31041a55cf185eed714..968fab84c8a2cbe3e5683a550827b1441e275a9e 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 ee1b402741d87dbaed728caaa9f7bee39b25ebe5..5d70d6d6687e0d9f21dc22ddfb436de26f8cb478 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 45c37e52bbb9028ba14defe6562ab9ee8c48c985..80657418bfe99d2723307fe544e5a76ae4fcb7d5 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/slp.diff b/slp.diff
index e7255b6e764429b066a193ecbce4db511b5602aa..46ade148c8ac123e4a9e7bd02cbbde78188c4201 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -26,12 +26,12 @@ diff --git a/Makefile.in b/Makefile.in
 @@ -46,7 +48,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
        usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
- OBJS3=progress.o pipe.o @ASM@
+ OBJS3=progress.o pipe.o @ASM@ @SIMD@
 -DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
 +DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o $(SLPOBJ)
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
- OBJS=$(OBJS1) $(OBJS2) $(OBJS3) @SIMD@ $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
+ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
 @@ -99,7 +101,7 @@ install-strip:
        $(MAKE) INSTALL_STRIP='-s' install
  
@@ -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
-@@ -1006,6 +1006,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+@@ -1008,6 +1008,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 a593fe07a876ccfacb956326071a9d7652203ff6..5ae24805f07811b0bcdd7477b56927846fcb65f2 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 dc99299f447b97af526c11c6b2e1e98eb425c806..95773a337e2cf3e469d0567dd20d94074ebdd120 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 58f6276f7909fde18de0cd0a8672f1ef81e4c169..924069bbc2cd595ca257245c2776104175ba5ffc 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 03dc2fb1ce6a10723700a1f9bb9a90d9f1540dc2..658dc16899ca36911da40c830d9e51d185b9ac80 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 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 f3085c2d2088fc4dc770b6f785cad771409b5ddc..2e0683e91edd1f1f3fe9d73ae962d37797e78f87 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/NEWS.md b/NEWS.md
 --- a/NEWS.md
 +++ b/NEWS.md

diff --git a/transliterate.diff b/transliterate.diff
index eaf395c185426d911c46cb28f628b4521e0cb567..039568a90a27c3320fd228247f1abb742dd0dac8 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: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

diff --git a/xxh3-safety-check.diff b/xxh3-safety-check.diff
index a7c9bc37c7fbf9bf65b7003a7f0f97b588eafeeb..848617d3da8fffc0956b73cbbf3d64eb7193de51 100644 (file)
--- a/xxh3-safety-check.diff
+++ b/xxh3-safety-check.diff
@@ -6,7 +6,7 @@ To use this patch, run these commands for a successful build:
     patch -p1 <patches/xxh3-safety-check.diff
     make
 
-based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c