From e62e58ce7835ef5150d7216ec7ab87d0cf3ecd9e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 27 Dec 2021 15:57:38 -0800 Subject: [PATCH] Fix patch conflicts. --- backup-deleted.diff | 2 +- catch_crash_signals.diff | 2 +- checksum-reading.diff | 2 +- checksum-xattr.diff | 2 +- clone-dest.diff | 4 ++-- congestion.diff | 2 +- copy-devices.diff | 2 +- date-only.diff | 2 +- db.diff | 10 +++++----- detect-renamed.diff | 2 +- direct-io.diff | 2 +- downdate.diff | 2 +- fileflags.diff | 2 +- filter-attribute-mods.diff | 2 +- ignore-case.diff | 2 +- kerberos.diff | 8 ++++---- link-by-hash.diff | 6 +++--- md5p8.diff | 2 +- omit-dir-changes.diff | 2 +- slow-down.diff | 2 +- slp.diff | 8 ++++---- soften-links.diff | 2 +- source-backup.diff | 2 +- source-filter_dest-filter.diff | 2 +- sparse-block.diff | 2 +- stderr-compat.diff | 2 +- transliterate.diff | 2 +- xxh3-safety-check.diff | 2 +- 28 files changed, 41 insertions(+), 41 deletions(-) diff --git a/backup-deleted.diff b/backup-deleted.diff index a25f11e..f72d349 100644 --- 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 59c2ced..90a5d56 100644 --- 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 e04406a..ca89b93 100644 --- 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 8e76d0d..3897359 100644 --- 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 78d10e9..d478866 100644 --- 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 c5ed7f8..753ecfb 100644 --- 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 aba727c..3148430 100644 --- 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 2dbbe16..ede5aab 100644 --- 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 52fa864..01c66f3 100644 --- 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 c7b9402..270333d 100644 --- 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 9c96872..0c80e0d 100644 --- 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 3dd6dc8..0a35297 100644 --- 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 5266b01..64a8aee 100644 --- 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 ad08ae4..dbc561f 100644 --- 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 d9fd8a4..5c07cfc 100644 --- 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 b97fee2..1f05106 100644 --- 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 8bcad60..bd7e401 100644 --- 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 e28087d..968fab8 100644 --- 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 ee1b402..5d70d6d 100644 --- 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 45c37e5..8065741 100644 --- 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 e7255b6..46ade14 100644 --- 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 a593fe0..5ae2480 100644 --- 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 dc99299..95773a3 100644 --- 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 -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 58f6276..924069b 100644 --- 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 03dc2fb..658dc16 100644 --- 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 f3085c2..2e0683e 100644 --- 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 eaf395c..039568a 100644 --- 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 a7c9bc3..848617d 100644 --- 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