comparison: clamav/clamav.patch
clamav/clamav.patch
- changeset 414
- fd611cde817f
- parent 233
- f5f6e93f3dc6
- child 498
- c6b0e6c7f67d
equal
deleted
inserted
replaced
| 3:1350b6d4ef7d | 4:5067a9ba5dda |
|---|---|
| 1 diff -Nau clamav-milter/clamav-milter.c.orig clamav-milter/clamav-milter.c | |
| 1 Index: clamav-milter/clamav-milter.c | 2 Index: clamav-milter/clamav-milter.c |
| 2 --- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200 | 3 --- clamav-milter/clamav-milter.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| 3 +++ clamav-milter/clamav-milter.c 2009-04-09 17:25:12 +0200 | 4 +++ clamav-milter/clamav-milter.c 2009-11-01 15:26:46.212861448 +0100 |
| 4 @@ -32,7 +32,7 @@ | 5 @@ -32,7 +32,7 @@ |
| 5 #include <syslog.h> | 6 #include <syslog.h> |
| 6 #endif | 7 #endif |
| 7 #include <time.h> | 8 #include <time.h> |
| 8 -#include <libmilter/mfapi.h> | 9 -#include <libmilter/mfapi.h> |
| 9 +#include "milter/mfapi.h" | 10 +#include "milter/mfapi.h" |
| 10 | 11 |
| 11 #include "clamav.h" | 12 #include "clamav.h" |
| 12 | 13 |
| 14 diff -Nau clamav-milter/clamfi.c.orig clamav-milter/clamfi.c | |
| 13 Index: clamav-milter/clamfi.c | 15 Index: clamav-milter/clamfi.c |
| 14 --- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200 | 16 --- clamav-milter/clamfi.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| 15 +++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200 | 17 +++ clamav-milter/clamfi.c 2009-11-01 15:26:46.214251049 +0100 |
| 16 @@ -29,7 +29,7 @@ | 18 @@ -29,7 +29,7 @@ |
| 17 #include <unistd.h> | 19 #include <unistd.h> |
| 18 #include <ctype.h> | 20 #include <ctype.h> |
| 19 | 21 |
| 20 -#include <libmilter/mfapi.h> | 22 -#include <libmilter/mfapi.h> |
| 21 +#include "milter/mfapi.h" | 23 +#include "milter/mfapi.h" |
| 22 | 24 |
| 23 #include "shared/optparser.h" | 25 #include "shared/optparser.h" |
| 24 #include "shared/output.h" | 26 #include "shared/output.h" |
| 27 diff -Nau clamav-milter/clamfi.h.orig clamav-milter/clamfi.h | |
| 25 Index: clamav-milter/clamfi.h | 28 Index: clamav-milter/clamfi.h |
| 26 --- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100 | 29 --- clamav-milter/clamfi.h.orig 2009-07-06 15:21:58.000000000 +0200 |
| 27 +++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200 | 30 +++ clamav-milter/clamfi.h 2009-11-01 15:26:46.214882752 +0100 |
| 28 @@ -22,7 +22,7 @@ | 31 @@ -22,7 +22,7 @@ |
| 29 #define _CLAMFI_H | 32 #define _CLAMFI_H |
| 30 | 33 |
| 31 #include "shared/optparser.h" | 34 #include "shared/optparser.h" |
| 32 -#include <libmilter/mfapi.h> | 35 -#include <libmilter/mfapi.h> |
| 33 +#include "milter/mfapi.h" | 36 +#include "milter/mfapi.h" |
| 34 | 37 |
| 35 extern uint64_t maxfilesize; | 38 extern uint64_t maxfilesize; |
| 36 extern int addxvirus; | 39 extern int addxvirus; |
| 40 diff -Nau configure.orig configure | |
| 37 Index: configure | 41 Index: configure |
| 38 --- configure.orig 2009-04-08 16:38:23 +0200 | 42 --- configure.orig 2009-10-28 16:34:13.000000000 +0100 |
| 39 +++ configure 2009-04-09 17:25:12 +0200 | 43 +++ configure 2009-11-01 15:29:06.145022137 +0100 |
| 40 @@ -20949,9 +20949,6 @@ | 44 @@ -16692,9 +16692,6 @@ |
| 41 | 45 |
| 42 save_LIBS="$LIBS" | 46 save_LIBS="$LIBS" |
| 43 CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" | 47 CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" |
| 44 - if test -d /usr/lib/libmilter ; then | 48 - if test -d /usr/lib/libmilter ; then |
| 45 - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" | 49 - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" |
| 46 - fi | 50 - fi |
| 47 LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" | 51 LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" |
| 48 { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5 | 52 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 |
| 49 $as_echo_n "checking for mi_stop in -lmilter... " >&6; } | 53 $as_echo_n "checking for mi_stop in -lmilter... " >&6; } |
| 50 @@ -21191,7 +21188,7 @@ | 54 @@ -16842,9 +16839,9 @@ |
| 55 fi | |
| 51 | 56 |
| 52 LIBS="$save_LIBS" | 57 LIBS="$save_LIBS" |
| 53 | 58 - for ac_header in libmilter/mfapi.h |
| 54 -for ac_header in libmilter/mfapi.h | 59 + for ac_header in milter/mfapi.h |
| 55 +for ac_header in milter/mfapi.h | 60 do : |
| 56 do | 61 - ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" |
| 57 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 62 + ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" |
| 58 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 63 if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then : |
| 64 cat >>confdefs.h <<_ACEOF | |
| 65 #define HAVE_LIBMILTER_MFAPI_H 1 | |
| 66 diff -Nau libclamav/others.c.orig libclamav/others.c | |
| 59 Index: libclamav/others.c | 67 Index: libclamav/others.c |
| 60 --- libclamav/others.c.orig 2009-04-03 10:33:24 +0200 | 68 --- libclamav/others.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| 61 +++ libclamav/others.c 2009-04-09 17:29:05 +0200 | 69 +++ libclamav/others.c 2009-11-01 15:26:46.257883269 +0100 |
| 62 @@ -176,8 +176,10 @@ | 70 @@ -177,8 +177,10 @@ |
| 63 if(is_rar_initd) return; | 71 if(is_rar_initd) return; |
| 64 is_rar_initd = 1; | 72 is_rar_initd = 1; |
| 65 | 73 |
| 66 +#if 0 | 74 +#if 0 |
| 67 rhandle = lt_dlfind("libclamunrar_iface", "unrar"); | 75 rhandle = lt_dlfind("libclamunrar_iface", "unrar"); |
| 68 if (!rhandle) | 76 if (!rhandle) |
| 69 +#endif | 77 +#endif |
| 70 return; | 78 return; |
| 71 | 79 |
| 72 if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || | 80 if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || |
| 81 diff -Nau shared/output.c.orig shared/output.c | |
| 73 Index: shared/output.c | 82 Index: shared/output.c |
| 74 --- shared/output.c.orig 2009-03-16 19:37:26 +0100 | 83 --- shared/output.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| 75 +++ shared/output.c 2009-04-09 17:25:12 +0200 | 84 +++ shared/output.c 2009-11-01 15:26:46.259056039 +0100 |
| 76 @@ -67,7 +67,7 @@ | 85 @@ -67,7 +67,7 @@ |
| 77 pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; | 86 pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; |
| 78 #endif | 87 #endif |
| 79 | 88 |
| 80 -#ifdef C_LINUX | 89 -#ifdef C_LINUX |
