clamav/clamav.patch@f5f6e93f3dc6
clamav/clamav.patch
Mon, 02 Nov 2009 22:29:58 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 02 Nov 2009 22:29:58 +0100
- changeset 233
- f5f6e93f3dc6
- parent 229
- 6571d477ad5f
- child 234
- b0dde56e4a08
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
1 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 2009-04-09 17:25:12 +0200
4 @@ -32,7 +32,7 @@
5 #include <syslog.h>
6 #endif
7 #include <time.h>
8 -#include <libmilter/mfapi.h>
9 +#include "milter/mfapi.h"
11 #include "clamav.h"
13 Index: clamav-milter/clamfi.c
14 --- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200
15 +++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200
16 @@ -29,7 +29,7 @@
17 #include <unistd.h>
18 #include <ctype.h>
20 -#include <libmilter/mfapi.h>
21 +#include "milter/mfapi.h"
23 #include "shared/optparser.h"
24 #include "shared/output.h"
25 Index: clamav-milter/clamfi.h
26 --- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100
27 +++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200
28 @@ -22,7 +22,7 @@
29 #define _CLAMFI_H
31 #include "shared/optparser.h"
32 -#include <libmilter/mfapi.h>
33 +#include "milter/mfapi.h"
35 extern uint64_t maxfilesize;
36 extern int addxvirus;
37 Index: configure
38 --- configure.orig 2009-04-08 16:38:23 +0200
39 +++ configure 2009-04-09 17:25:12 +0200
40 @@ -20949,9 +20949,6 @@
42 save_LIBS="$LIBS"
43 CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
44 - if test -d /usr/lib/libmilter ; then
45 - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
46 - fi
47 LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
48 { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
49 $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
50 @@ -21191,7 +21188,7 @@
52 LIBS="$save_LIBS"
54 -for ac_header in libmilter/mfapi.h
55 +for ac_header in milter/mfapi.h
56 do
57 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
58 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
59 Index: libclamav/others.c
60 --- libclamav/others.c.orig 2009-04-03 10:33:24 +0200
61 +++ libclamav/others.c 2009-04-09 17:29:05 +0200
62 @@ -176,8 +176,10 @@
63 if(is_rar_initd) return;
64 is_rar_initd = 1;
66 +#if 0
67 rhandle = lt_dlfind("libclamunrar_iface", "unrar");
68 if (!rhandle)
69 +#endif
70 return;
72 if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
73 Index: shared/output.c
74 --- shared/output.c.orig 2009-03-16 19:37:26 +0100
75 +++ shared/output.c 2009-04-09 17:25:12 +0200
76 @@ -67,7 +67,7 @@
77 pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
78 #endif
80 -#ifdef C_LINUX
81 +#if 0
82 #include <libintl.h>
83 #include <locale.h>
