diff -r 3695593c147a -r c6b0e6c7f67d clamav/clamav.patch
--- a/clamav/clamav.patch	Thu Aug 09 18:53:48 2012 +0200
+++ b/clamav/clamav.patch	Thu Aug 09 18:55:01 2012 +0200
@@ -1,7 +1,6 @@
-diff -Nau clamav-milter/clamav-milter.c.orig clamav-milter/clamav-milter.c
 Index: clamav-milter/clamav-milter.c
---- clamav-milter/clamav-milter.c.orig	2009-10-28 16:34:13.000000000 +0100
-+++ clamav-milter/clamav-milter.c	2009-11-01 15:26:46.212861448 +0100
+--- clamav-milter/clamav-milter.c.orig	2009-10-28 16:34:13 +0100
++++ clamav-milter/clamav-milter.c	2009-11-08 10:27:04 +0100
 @@ -32,7 +32,7 @@
  #include <syslog.h>
  #endif
@@ -11,10 +10,9 @@
  
  #include "clamav.h"
  
-diff -Nau clamav-milter/clamfi.c.orig clamav-milter/clamfi.c
 Index: clamav-milter/clamfi.c
---- clamav-milter/clamfi.c.orig	2009-10-28 16:34:13.000000000 +0100
-+++ clamav-milter/clamfi.c	2009-11-01 15:26:46.214251049 +0100
+--- clamav-milter/clamfi.c.orig	2009-10-28 16:34:13 +0100
++++ clamav-milter/clamfi.c	2009-11-08 10:27:04 +0100
 @@ -29,7 +29,7 @@
  #include <unistd.h>
  #include <ctype.h>
@@ -24,10 +22,9 @@
  
  #include "shared/optparser.h"
  #include "shared/output.h"
-diff -Nau clamav-milter/clamfi.h.orig clamav-milter/clamfi.h
 Index: clamav-milter/clamfi.h
---- clamav-milter/clamfi.h.orig	2009-07-06 15:21:58.000000000 +0200
-+++ clamav-milter/clamfi.h	2009-11-01 15:26:46.214882752 +0100
+--- clamav-milter/clamfi.h.orig	2009-07-06 15:21:58 +0200
++++ clamav-milter/clamfi.h	2009-11-08 10:27:04 +0100
 @@ -22,7 +22,7 @@
  #define _CLAMFI_H
  
@@ -37,10 +34,9 @@
  
  extern uint64_t maxfilesize;
  extern int addxvirus;
-diff -Nau configure.orig configure
 Index: configure
---- configure.orig	2009-10-28 16:34:13.000000000 +0100
-+++ configure	2009-11-01 15:29:06.145022137 +0100
+--- configure.orig	2009-10-28 16:34:13 +0100
++++ configure	2009-11-08 10:27:32 +0100
 @@ -16692,9 +16692,6 @@
  
          save_LIBS="$LIBS"
@@ -51,22 +47,18 @@
      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
  $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
-@@ -16842,9 +16839,9 @@
+@@ -16842,7 +16839,7 @@
  fi
  
      LIBS="$save_LIBS"
 -    for ac_header in libmilter/mfapi.h
 +    for ac_header in milter/mfapi.h
  do :
--  ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
-+  ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
+   ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
  if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMILTER_MFAPI_H 1
-diff -Nau libclamav/others.c.orig libclamav/others.c
 Index: libclamav/others.c
---- libclamav/others.c.orig	2009-10-28 16:34:13.000000000 +0100
-+++ libclamav/others.c	2009-11-01 15:26:46.257883269 +0100
+--- libclamav/others.c.orig	2009-10-28 16:34:13 +0100
++++ libclamav/others.c	2009-11-08 10:27:04 +0100
 @@ -177,8 +177,10 @@
      if(is_rar_initd) return;
      is_rar_initd = 1;
@@ -78,10 +70,9 @@
  	return;
  
      if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
-diff -Nau shared/output.c.orig shared/output.c
 Index: shared/output.c
---- shared/output.c.orig	2009-10-28 16:34:13.000000000 +0100
-+++ shared/output.c	2009-11-01 15:26:46.259056039 +0100
+--- shared/output.c.orig	2009-10-28 16:34:13 +0100
++++ shared/output.c	2009-11-08 10:27:04 +0100
 @@ -67,7 +67,7 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif