clamav/clamav.patch@19b611159e28 (annotated)
clamav/clamav.patch
Sun, 01 Nov 2009 15:44:56 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sun, 01 Nov 2009 15:44:56 +0100
- changeset 228
- 19b611159e28
- parent 226
- 91cd1b1cd15b
- child 229
- 6571d477ad5f
- permissions
- -rw-r--r--
Update to new vendor version and adjust patch accordingly.
| michael@228 | 1 | diff -Nau clamav-milter/clamav-milter.c.orig clamav-milter/clamav-milter.c |
| michael@226 | 2 | Index: clamav-milter/clamav-milter.c |
| michael@228 | 3 | --- clamav-milter/clamav-milter.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| michael@228 | 4 | +++ clamav-milter/clamav-milter.c 2009-11-01 15:26:46.212861448 +0100 |
| michael@226 | 5 | @@ -32,7 +32,7 @@ |
| michael@226 | 6 | #include <syslog.h> |
| michael@226 | 7 | #endif |
| michael@226 | 8 | #include <time.h> |
| michael@226 | 9 | -#include <libmilter/mfapi.h> |
| michael@226 | 10 | +#include "milter/mfapi.h" |
| michael@226 | 11 | |
| michael@226 | 12 | #include "clamav.h" |
| michael@226 | 13 | |
| michael@228 | 14 | diff -Nau clamav-milter/clamfi.c.orig clamav-milter/clamfi.c |
| michael@226 | 15 | Index: clamav-milter/clamfi.c |
| michael@228 | 16 | --- clamav-milter/clamfi.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| michael@228 | 17 | +++ clamav-milter/clamfi.c 2009-11-01 15:26:46.214251049 +0100 |
| michael@226 | 18 | @@ -29,7 +29,7 @@ |
| michael@226 | 19 | #include <unistd.h> |
| michael@226 | 20 | #include <ctype.h> |
| michael@226 | 21 | |
| michael@226 | 22 | -#include <libmilter/mfapi.h> |
| michael@226 | 23 | +#include "milter/mfapi.h" |
| michael@226 | 24 | |
| michael@226 | 25 | #include "shared/optparser.h" |
| michael@226 | 26 | #include "shared/output.h" |
| michael@228 | 27 | diff -Nau clamav-milter/clamfi.h.orig clamav-milter/clamfi.h |
| michael@226 | 28 | Index: clamav-milter/clamfi.h |
| michael@228 | 29 | --- clamav-milter/clamfi.h.orig 2009-07-06 15:21:58.000000000 +0200 |
| michael@228 | 30 | +++ clamav-milter/clamfi.h 2009-11-01 15:26:46.214882752 +0100 |
| michael@226 | 31 | @@ -22,7 +22,7 @@ |
| michael@226 | 32 | #define _CLAMFI_H |
| michael@226 | 33 | |
| michael@226 | 34 | #include "shared/optparser.h" |
| michael@226 | 35 | -#include <libmilter/mfapi.h> |
| michael@226 | 36 | +#include "milter/mfapi.h" |
| michael@226 | 37 | |
| michael@226 | 38 | extern uint64_t maxfilesize; |
| michael@226 | 39 | extern int addxvirus; |
| michael@228 | 40 | diff -Nau configure.orig configure |
| michael@226 | 41 | Index: configure |
| michael@228 | 42 | --- configure.orig 2009-10-28 16:34:13.000000000 +0100 |
| michael@228 | 43 | +++ configure 2009-11-01 15:29:06.145022137 +0100 |
| michael@228 | 44 | @@ -16692,9 +16692,6 @@ |
| michael@226 | 45 | |
| michael@226 | 46 | save_LIBS="$LIBS" |
| michael@226 | 47 | CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" |
| michael@226 | 48 | - if test -d /usr/lib/libmilter ; then |
| michael@226 | 49 | - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" |
| michael@226 | 50 | - fi |
| michael@226 | 51 | LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" |
| michael@228 | 52 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 |
| michael@226 | 53 | $as_echo_n "checking for mi_stop in -lmilter... " >&6; } |
| michael@228 | 54 | @@ -16842,7 +16839,7 @@ |
| michael@228 | 55 | fi |
| michael@226 | 56 | |
| michael@226 | 57 | LIBS="$save_LIBS" |
| michael@228 | 58 | - for ac_header in libmilter/mfapi.h |
| michael@228 | 59 | + for ac_header in milter/mfapi.h |
| michael@228 | 60 | do : |
| michael@228 | 61 | ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" |
| michael@228 | 62 | if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then : |
| michael@228 | 63 | diff -Nau libclamav/others.c.orig libclamav/others.c |
| michael@226 | 64 | Index: libclamav/others.c |
| michael@228 | 65 | --- libclamav/others.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| michael@228 | 66 | +++ libclamav/others.c 2009-11-01 15:26:46.257883269 +0100 |
| michael@228 | 67 | @@ -177,8 +177,10 @@ |
| michael@226 | 68 | if(is_rar_initd) return; |
| michael@226 | 69 | is_rar_initd = 1; |
| michael@226 | 70 | |
| michael@226 | 71 | +#if 0 |
| michael@226 | 72 | rhandle = lt_dlfind("libclamunrar_iface", "unrar"); |
| michael@226 | 73 | if (!rhandle) |
| michael@226 | 74 | +#endif |
| michael@226 | 75 | return; |
| michael@226 | 76 | |
| michael@226 | 77 | if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || |
| michael@228 | 78 | diff -Nau shared/output.c.orig shared/output.c |
| michael@226 | 79 | Index: shared/output.c |
| michael@228 | 80 | --- shared/output.c.orig 2009-10-28 16:34:13.000000000 +0100 |
| michael@228 | 81 | +++ shared/output.c 2009-11-01 15:26:46.259056039 +0100 |
| michael@226 | 82 | @@ -67,7 +67,7 @@ |
| michael@226 | 83 | pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; |
| michael@226 | 84 | #endif |
| michael@226 | 85 | |
| michael@226 | 86 | -#ifdef C_LINUX |
| michael@226 | 87 | +#if 0 |
| michael@226 | 88 | #include <libintl.h> |
| michael@226 | 89 | #include <locale.h> |
| michael@226 | 90 |
