Fix patch conflict.

diff --git a/db.diff b/db.diff
index 932e885ff125747cd79411b99ce5989f485c2c2c..1b0d7e154d2f752404fc54865e10bf831f9b0bd8 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: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: dfe3b77cb5c51358749e8613ba90210c2595fc99
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -44,18 +44,16 @@ diff --git a/Makefile.in b/Makefile.in
  libdir=@libdir@/rsync
  mandir=@mandir@
  
-@@ -32,8 +33,9 @@ SHELL=/bin/sh
- SIMD_x86_64=simd-checksum-x86_64.o
+@@ -33,7 +34,7 @@ SIMD_x86_64=simd-checksum-x86_64.o
  ASM_x86_64=lib/md5-asm-x86_64.o
  
-+GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync-ssl.1
- GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync.1.html \
+ 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
  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
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
-@@ -43,7 +45,7 @@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.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 \
        util.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 \
@@ -64,7 +62,7 @@ diff --git a/Makefile.in b/Makefile.in
  OBJS3=progress.o pipe.o @ASM@
  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 \
-@@ -75,10 +77,12 @@ install: all
+@@ -75,10 +76,12 @@ install: all
        -$(MKDIR_P) $(DESTDIR)$(bindir)
        $(INSTALLCMD) $(INSTALL_STRIP) -m 755 rsync$(EXEEXT) $(DESTDIR)$(bindir)
        $(INSTALLCMD) -m 755 $(srcdir)/rsync-ssl $(DESTDIR)$(bindir)
@@ -77,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
  
  install-ssl-daemon: stunnel-rsyncd.conf
-@@ -96,10 +100,13 @@ install-strip:
+@@ -96,10 +99,13 @@ install-strip:
  rsync$(EXEEXT): $(OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
@@ -92,7 +90,7 @@ diff --git a/Makefile.in b/Makefile.in
  exclude.o: default-cvsignore.h
  loadparm.o: default-dont-compress.h daemon-parm.h
  
-@@ -111,6 +118,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
+@@ -111,6 +117,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
  
@@ -102,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
  
-@@ -235,7 +245,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
+@@ -235,7 +244,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
@@ -111,7 +109,7 @@ diff --git a/Makefile.in b/Makefile.in
  
  rsync.1: rsync.1.md md2man version.h Makefile
        @$(srcdir)/maybe-make-man $(srcdir) rsync.1.md
-@@ -246,9 +256,12 @@ rsync-ssl.1: rsync-ssl.1.md md2man version.h Makefile
+@@ -246,9 +255,12 @@ rsync-ssl.1: rsync-ssl.1.md md2man version.h Makefile
  rsyncd.conf.5: rsyncd.conf.5.md md2man version.h Makefile
        @$(srcdir)/maybe-make-man $(srcdir) rsyncd.conf.5.md
  
@@ -123,7 +121,7 @@ diff --git a/Makefile.in b/Makefile.in
 -      rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
 +      rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) rsyncdb$(EXEEXT) \
                rounding rounding.h *.old rsync*.1 rsync*.5 rsync*.html \
-               daemon-parm.h help-*.h default-*.h
+               daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp
  
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c