From 1680e81416c7e5c3acd1b473cdabfadae9efca70 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 7 Jul 2005 23:16:54 +0000
Subject: [PATCH] Got rid of some patch fuzz.

---
 ODBC-dblog.diff | 10 +++++-----
 md5.diff        |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 7849999..379fa8b 100644
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -87,11 +87,11 @@ This patch adds the following options:
     after the session row is inserted (as is done when the session ID is
     automatically generates unique IDs).  Defaults to True.
 
---- orig/Makefile.in	2004-11-02 16:47:15
+--- orig/Makefile.in	2005-07-07 23:11:07
 +++ Makefile.in	2005-05-23 23:31:30
-@@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
- 	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
- 	zlib/zutil.o zlib/adler32.o
+@@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+ 	zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
 -	main.o checksum.o match.o syscall.o log.o backup.o
 +	main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
@@ -147,7 +147,7 @@ This patch adds the following options:
  		} else {
  			rprintf(FLOG, "rsync %s %s from %s (%s)\n",
  				am_sender ? "on" : "to",
---- orig/configure.in	2005-06-10 21:33:28
+--- orig/configure.in	2005-07-07 23:11:08
 +++ configure.in	2005-05-23 23:32:21
 @@ -92,6 +92,8 @@ AC_ARG_WITH(rsync-path,
  	[  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
diff --git a/md5.diff b/md5.diff
index 17f40da..f9c5cd3 100644
--- a/md5.diff
+++ b/md5.diff
@@ -1,4 +1,4 @@
---- orig/Makefile.in	2004-11-02 16:47:15
+--- orig/Makefile.in	2005-07-07 23:11:07
 +++ Makefile.in	2005-06-14 02:33:20
 @@ -26,7 +26,7 @@ VERSION=@VERSION@
  .SUFFIXES: .c .o
@@ -7,8 +7,8 @@
 -LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 +LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
  	lib/permstring.o lib/pool_alloc.o @LIBOBJS@
- ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
- 	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+ 	zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
 --- orig/checksum.c	2005-01-01 21:08:05
 +++ checksum.c	2005-06-14 02:43:38
 @@ -18,6 +18,7 @@
-- 
2.34.1