Fix patch conflicts.

diff --git a/db.diff b/db.diff
index 4871acb99f49bb51f5e5592f555b424cb8a23b71..f3c5177cbf7f93fdae85a06ff4eb01c12274397a 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: c3b553a93f7090bcbb89c08405f1a5f1c175c864
+based-on: 00a5ab236479ab1a2d2b0916c04bc916cfd47d0e
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -44,16 +44,16 @@ diff --git a/Makefile.in b/Makefile.in
  libdir=@libdir@/rsync
  mandir=@mandir@
  with_rrsync=@with_rrsync@
-@@ -34,7 +35,7 @@ SIMD_x86_64=simd-checksum-x86_64.o simd-checksum-avx2.o
- ASM_x86_64=lib/md5-asm-x86_64.o
+@@ -35,7 +36,7 @@ ASM_x86_64=lib/md5-asm-x86_64.o
  
  GENFILES=configure.sh aclocal.m4 config.h.in rsync.1 rsync.1.html \
--       rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html
-+       rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html rsyncdb.1 rsyncdb.1.html
+        rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html \
+-       rrsync.1 rrsync.1.html
++       rrsync.1 rrsync.1.html rsyncdb.1 rsyncdb.1.html
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
        lib/pool_alloc.h lib/mdigest.h lib/md-defines.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
-@@ -44,7 +45,7 @@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+@@ -45,7 +46,7 @@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
  OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
        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 \
@@ -62,7 +62,7 @@ diff --git a/Makefile.in b/Makefile.in
  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
+@@ -77,10 +78,12 @@ install: all
        -$(MKDIR_P) $(DESTDIR)$(bindir)
        $(INSTALLCMD) $(INSTALL_STRIP) -m 755 rsync$(EXEEXT) $(DESTDIR)$(bindir)
        $(INSTALLCMD) -m 755 $(srcdir)/rsync-ssl $(DESTDIR)$(bindir)
@@ -75,7 +75,7 @@ diff --git a/Makefile.in b/Makefile.in
        if test -f rsyncd.conf.5; then $(INSTALLMAN) -m 644 rsyncd.conf.5 $(DESTDIR)$(mandir)/man5; fi
        if test "$(with_rrsync)" = yes; then \
            $(INSTALLCMD) -m 755 rrsync $(DESTDIR)$(bindir); \
-@@ -104,10 +107,13 @@ rsync$(EXEEXT): $(OBJS)
+@@ -105,10 +108,13 @@ rsync$(EXEEXT): $(OBJS)
  rrsync: support/rrsync
        cp -p $(srcdir)/support/rrsync rrsync
  
@@ -90,7 +90,7 @@ diff --git a/Makefile.in b/Makefile.in
  loadparm.o: default-dont-compress.h daemon-parm.h
  
  flist.o: rounding.h
-@@ -118,6 +124,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
+@@ -119,6 +125,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
  help-rsync.h help-rsyncd.h: rsync.1.md help-from-md.awk
        $(AWK) -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
  
@@ -100,7 +100,7 @@ diff --git a/Makefile.in b/Makefile.in
  daemon-parm.h: daemon-parm.txt daemon-parm.awk
        $(AWK) -f $(srcdir)/daemon-parm.awk $(srcdir)/daemon-parm.txt
  
-@@ -255,7 +264,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
+@@ -256,7 +265,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
        $(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
  
  .PHONY: man
@@ -109,7 +109,7 @@ diff --git a/Makefile.in b/Makefile.in
  
  rsync.1: rsync.1.md md-convert version.h Makefile
        @$(srcdir)/maybe-make-man rsync.1.md
-@@ -269,9 +278,12 @@ rsyncd.conf.5: rsyncd.conf.5.md md-convert version.h Makefile
+@@ -270,11 +279,14 @@ rsyncd.conf.5: rsyncd.conf.5.md md-convert version.h Makefile
  rrsync.1: support/rrsync.1.md md-convert Makefile
        @$(srcdir)/maybe-make-man support/rrsync.1.md
  
@@ -118,11 +118,13 @@ diff --git a/Makefile.in b/Makefile.in
 +
  .PHONY: clean
  clean: cleantests
--      rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
-+      rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) rsyncdb$(EXEEXT) \
-               git-version.h rounding rounding.h *.old rsync*.1 rsync*.5 rsync*.html \
-               daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp
+       rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) @MAKE_RRSYNC@ \
+               git-version.h rounding rounding.h *.old rsync*.1 rsync*.5 @MAKE_RRSYNC_1@ \
+-              *.html daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp
++              *.html daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp rsyncdb$(EXEEXT)
  
+ .PHONY: cleantests
+ cleantests:
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c
@@ -179,7 +181,7 @@ diff --git a/cleanup.c b/cleanup.c
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -44,12 +44,15 @@ extern int numeric_ids;
+@@ -44,6 +44,8 @@ extern int numeric_ids;
  extern int filesfrom_fd;
  extern int remote_protocol;
  extern int protocol_version;
@@ -188,6 +190,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern int io_timeout;
  extern int no_detach;
  extern int write_batch;
+@@ -51,6 +53,7 @@ extern int old_style_args;
  extern int default_af_hint;
  extern int logfile_format_has_i;
  extern int logfile_format_has_o_or_i;
@@ -195,7 +198,7 @@ diff --git a/clientserver.c b/clientserver.c
  extern char *bind_address;
  extern char *config_file;
  extern char *logfile_format;
-@@ -843,6 +846,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -869,6 +872,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        log_init(1);
  
@@ -207,7 +210,7 @@ diff --git a/clientserver.c b/clientserver.c
  #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))
-@@ -1055,6 +1063,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -1081,6 +1089,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;
@@ -2809,7 +2812,7 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -383,6 +383,9 @@ has its own detailed description later in this man page.
+@@ -389,6 +389,9 @@ has its own detailed description later in this man page.
  --dry-run, -n            perform a trial run with no changes made
  --whole-file, -W         copy files whole (w/o delta-xfer algorithm)
  --checksum-choice=STR    choose the checksum algorithm (aka --cc)