1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/clamav/clamav.patch Sun Nov 01 15:42:37 2009 +0100
1.3 @@ -0,0 +1,84 @@
1.4 +Index: clamav-milter/clamav-milter.c
1.5 +--- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200
1.6 ++++ clamav-milter/clamav-milter.c 2009-04-09 17:25:12 +0200
1.7 +@@ -32,7 +32,7 @@
1.8 + #include <syslog.h>
1.9 + #endif
1.10 + #include <time.h>
1.11 +-#include <libmilter/mfapi.h>
1.12 ++#include "milter/mfapi.h"
1.13 +
1.14 + #include "clamav.h"
1.15 +
1.16 +Index: clamav-milter/clamfi.c
1.17 +--- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200
1.18 ++++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200
1.19 +@@ -29,7 +29,7 @@
1.20 + #include <unistd.h>
1.21 + #include <ctype.h>
1.22 +
1.23 +-#include <libmilter/mfapi.h>
1.24 ++#include "milter/mfapi.h"
1.25 +
1.26 + #include "shared/optparser.h"
1.27 + #include "shared/output.h"
1.28 +Index: clamav-milter/clamfi.h
1.29 +--- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100
1.30 ++++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200
1.31 +@@ -22,7 +22,7 @@
1.32 + #define _CLAMFI_H
1.33 +
1.34 + #include "shared/optparser.h"
1.35 +-#include <libmilter/mfapi.h>
1.36 ++#include "milter/mfapi.h"
1.37 +
1.38 + extern uint64_t maxfilesize;
1.39 + extern int addxvirus;
1.40 +Index: configure
1.41 +--- configure.orig 2009-04-08 16:38:23 +0200
1.42 ++++ configure 2009-04-09 17:25:12 +0200
1.43 +@@ -20949,9 +20949,6 @@
1.44 +
1.45 + save_LIBS="$LIBS"
1.46 + CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
1.47 +- if test -d /usr/lib/libmilter ; then
1.48 +- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
1.49 +- fi
1.50 + LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
1.51 + { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
1.52 + $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
1.53 +@@ -21191,7 +21188,7 @@
1.54 +
1.55 + LIBS="$save_LIBS"
1.56 +
1.57 +-for ac_header in libmilter/mfapi.h
1.58 ++for ac_header in milter/mfapi.h
1.59 + do
1.60 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.61 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
1.62 +Index: libclamav/others.c
1.63 +--- libclamav/others.c.orig 2009-04-03 10:33:24 +0200
1.64 ++++ libclamav/others.c 2009-04-09 17:29:05 +0200
1.65 +@@ -176,8 +176,10 @@
1.66 + if(is_rar_initd) return;
1.67 + is_rar_initd = 1;
1.68 +
1.69 ++#if 0
1.70 + rhandle = lt_dlfind("libclamunrar_iface", "unrar");
1.71 + if (!rhandle)
1.72 ++#endif
1.73 + return;
1.74 +
1.75 + if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
1.76 +Index: shared/output.c
1.77 +--- shared/output.c.orig 2009-03-16 19:37:26 +0100
1.78 ++++ shared/output.c 2009-04-09 17:25:12 +0200
1.79 +@@ -67,7 +67,7 @@
1.80 + pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
1.81 + #endif
1.82 +
1.83 +-#ifdef C_LINUX
1.84 ++#if 0
1.85 + #include <libintl.h>
1.86 + #include <locale.h>
1.87 +
