diff -r a01e65d97743 -r 91cd1b1cd15b clamav/clamav.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clamav/clamav.patch Sun Nov 01 15:42:37 2009 +0100 @@ -0,0 +1,84 @@ +Index: clamav-milter/clamav-milter.c +--- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200 ++++ clamav-milter/clamav-milter.c 2009-04-09 17:25:12 +0200 +@@ -32,7 +32,7 @@ + #include + #endif + #include +-#include ++#include "milter/mfapi.h" + + #include "clamav.h" + +Index: clamav-milter/clamfi.c +--- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200 ++++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200 +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include "milter/mfapi.h" + + #include "shared/optparser.h" + #include "shared/output.h" +Index: clamav-milter/clamfi.h +--- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100 ++++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200 +@@ -22,7 +22,7 @@ + #define _CLAMFI_H + + #include "shared/optparser.h" +-#include ++#include "milter/mfapi.h" + + extern uint64_t maxfilesize; + extern int addxvirus; +Index: configure +--- configure.orig 2009-04-08 16:38:23 +0200 ++++ configure 2009-04-09 17:25:12 +0200 +@@ -20949,9 +20949,6 @@ + + save_LIBS="$LIBS" + CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" +- if test -d /usr/lib/libmilter ; then +- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" +- fi + LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" + { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5 + $as_echo_n "checking for mi_stop in -lmilter... " >&6; } +@@ -21191,7 +21188,7 @@ + + LIBS="$save_LIBS" + +-for ac_header in libmilter/mfapi.h ++for ac_header in milter/mfapi.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +Index: libclamav/others.c +--- libclamav/others.c.orig 2009-04-03 10:33:24 +0200 ++++ libclamav/others.c 2009-04-09 17:29:05 +0200 +@@ -176,8 +176,10 @@ + if(is_rar_initd) return; + is_rar_initd = 1; + ++#if 0 + rhandle = lt_dlfind("libclamunrar_iface", "unrar"); + if (!rhandle) ++#endif + return; + + if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || +Index: shared/output.c +--- shared/output.c.orig 2009-03-16 19:37:26 +0100 ++++ shared/output.c 2009-04-09 17:25:12 +0200 +@@ -67,7 +67,7 @@ + pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; + #endif + +-#ifdef C_LINUX ++#if 0 + #include + #include +