Fix patch conflict.

diff --git a/db.diff b/db.diff
index be0f58a793cb0f37ec02cddaed61a87522522bc9..f56a1853563f4cc0dfe099291ffcf6f95b62be1a 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: a8fc8fc2d22ba7243b96decb91c586682a05e4a1
+based-on: 89827e49bcc0296d93aab73a53bb8c7c88baf202
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -67,7 +67,7 @@ diff --git a/Makefile.in b/Makefile.in
 @@ -78,10 +80,12 @@ install: all
        -${MKDIR_P} ${DESTDIR}${bindir}
        ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
-       ${INSTALLCMD} -m 755 rsync-ssl ${DESTDIR}${bindir}
+       ${INSTALLCMD} -m 755 $(srcdir)/rsync-ssl ${DESTDIR}${bindir}
 +      rsync -ilt rsyncdb$(EXEEXT) ${DESTDIR}${bindir}/
        -${MKDIR_P} ${DESTDIR}${mandir}/man1
        -${MKDIR_P} ${DESTDIR}${mandir}/man5
@@ -136,7 +136,7 @@ diff --git a/checksum.c b/checksum.c
  extern const char *checksum_choice;
  
  struct name_num_obj valid_checksums = {
-@@ -327,6 +328,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -329,6 +330,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
                        MD5_Update(&m5, (uchar *)map_ptr(buf, i, remainder), remainder);
  
                MD5_Final((uchar *)sum, &m5);
@@ -145,7 +145,7 @@ diff --git a/checksum.c b/checksum.c
                break;
          }
          case CSUM_MD4:
-@@ -366,6 +369,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+@@ -368,6 +371,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
                        mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
  
                mdfour_result(&m, (uchar *)sum);