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