Fix merge conflict.

diff --git a/db.diff b/db.diff
index 2f13770013a2f72f3ea210a13677404ba92098c2..fa7791e6628e9d72168112b0df6dde6594f645a6 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: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
+based-on: 9f9240b661c5f381831b62d72b6ea928a91ff43a
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -51,7 +51,7 @@ diff --git a/Makefile.in b/Makefile.in
 -       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
  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 version.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 \
 @@ -43,7 +44,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 \
@@ -85,8 +85,8 @@ diff --git a/Makefile.in b/Makefile.in
  $(OBJS): $(HEADERS)
  $(CHECK_OBJS): $(HEADERS)
  tls.o xattrs.o: lib/sysxattrs.h
--usage.o: latest-year.h help-rsync.h help-rsyncd.h git-version.h default-cvsignore.h
-+usage.o: latest-year.h help-rsync.h help-rsyncd.h help-rsyncdb.h git-version.h default-cvsignore.h
+-usage.o: version.h latest-year.h help-rsync.h help-rsyncd.h git-version.h default-cvsignore.h
++usage.o: version.h latest-year.h help-rsync.h help-rsyncd.h help-rsyncdb.h git-version.h default-cvsignore.h
  loadparm.o: default-dont-compress.h daemon-parm.h
  
  flist.o: rounding.h
@@ -2843,7 +2843,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -261,12 +261,16 @@ enum msgcode {
+@@ -271,12 +271,16 @@ enum msgcode {
        MSG_IO_ERROR=22,/* the sending side had an I/O error */
        MSG_IO_TIMEOUT=33,/* tell client about a daemon's timeout value */
        MSG_NOOP=42,    /* a do-nothing message (legacy protocol-30 only) */
@@ -2860,7 +2860,7 @@ diff --git a/rsync.h b/rsync.h
  #define NDX_DONE -1
  #define NDX_FLIST_EOF -2
  #define NDX_DEL_STATS -3
-@@ -1419,7 +1423,8 @@ extern short info_levels[], debug_levels[];
+@@ -1428,7 +1432,8 @@ extern short info_levels[], debug_levels[];
  #define DEBUG_CHDIR (DEBUG_BIND+1)
  #define DEBUG_CONNECT (DEBUG_CHDIR+1)
  #define DEBUG_CMD (DEBUG_CONNECT+1)
@@ -3182,7 +3182,7 @@ new file mode 100644
 diff --git a/usage.c b/usage.c
 --- a/usage.c
 +++ b/usage.c
-@@ -131,6 +131,16 @@ static void print_info_flags(enum logcode f)
+@@ -132,6 +132,16 @@ static void print_info_flags(enum logcode f)
  #endif
                        "crtimes",
  
@@ -3199,7 +3199,7 @@ diff --git a/usage.c b/usage.c
        "*Optimizations",
  
  #ifndef HAVE_SIMD
-@@ -250,6 +260,14 @@ void daemon_usage(enum logcode F)
+@@ -251,6 +261,14 @@ void daemon_usage(enum logcode F)
    rprintf(F,"daemon-specific rsync options.  See also the rsyncd.conf(5) man page.\n");
  }
  

diff --git a/md5p8.diff b/md5p8.diff
index a0094a15476e6706b432f59c8d78f8517593436c..d73a6173cb4a8d494bd9a06a184eb0a15a2ad4ad 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: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
+based-on: 9f9240b661c5f381831b62d72b6ea928a91ff43a
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -42,7 +42,7 @@ diff --git a/Makefile.in b/Makefile.in
  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
  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 version.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 \
 +LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o lib/md5p8.o \
        lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@