clamav/clamav.patch@9dacbd1d1aa2 (annotated)
clamav/clamav.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- parent 234
- b0dde56e4a08
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@226 | 1 | Index: clamav-milter/clamav-milter.c |
| michael@498 | 2 | --- clamav-milter/clamav-milter.c.orig 2009-10-28 16:34:13 +0100 |
| michael@498 | 3 | +++ clamav-milter/clamav-milter.c 2009-11-08 10:27:04 +0100 |
| michael@226 | 4 | @@ -32,7 +32,7 @@ |
| michael@226 | 5 | #include <syslog.h> |
| michael@226 | 6 | #endif |
| michael@226 | 7 | #include <time.h> |
| michael@226 | 8 | -#include <libmilter/mfapi.h> |
| michael@226 | 9 | +#include "milter/mfapi.h" |
| michael@226 | 10 | |
| michael@226 | 11 | #include "clamav.h" |
| michael@226 | 12 | |
| michael@226 | 13 | Index: clamav-milter/clamfi.c |
| michael@498 | 14 | --- clamav-milter/clamfi.c.orig 2009-10-28 16:34:13 +0100 |
| michael@498 | 15 | +++ clamav-milter/clamfi.c 2009-11-08 10:27:04 +0100 |
| michael@226 | 16 | @@ -29,7 +29,7 @@ |
| michael@226 | 17 | #include <unistd.h> |
| michael@226 | 18 | #include <ctype.h> |
| michael@226 | 19 | |
| michael@226 | 20 | -#include <libmilter/mfapi.h> |
| michael@226 | 21 | +#include "milter/mfapi.h" |
| michael@226 | 22 | |
| michael@226 | 23 | #include "shared/optparser.h" |
| michael@226 | 24 | #include "shared/output.h" |
| michael@226 | 25 | Index: clamav-milter/clamfi.h |
| michael@498 | 26 | --- clamav-milter/clamfi.h.orig 2009-07-06 15:21:58 +0200 |
| michael@498 | 27 | +++ clamav-milter/clamfi.h 2009-11-08 10:27:04 +0100 |
| michael@226 | 28 | @@ -22,7 +22,7 @@ |
| michael@226 | 29 | #define _CLAMFI_H |
| michael@226 | 30 | |
| michael@226 | 31 | #include "shared/optparser.h" |
| michael@226 | 32 | -#include <libmilter/mfapi.h> |
| michael@226 | 33 | +#include "milter/mfapi.h" |
| michael@226 | 34 | |
| michael@226 | 35 | extern uint64_t maxfilesize; |
| michael@226 | 36 | extern int addxvirus; |
| michael@226 | 37 | Index: configure |
| michael@498 | 38 | --- configure.orig 2009-10-28 16:34:13 +0100 |
| michael@498 | 39 | +++ configure 2009-11-08 10:27:32 +0100 |
| michael@234 | 40 | @@ -16692,9 +16692,6 @@ |
| michael@226 | 41 | |
| michael@226 | 42 | save_LIBS="$LIBS" |
| michael@226 | 43 | CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" |
| michael@226 | 44 | - if test -d /usr/lib/libmilter ; then |
| michael@226 | 45 | - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" |
| michael@226 | 46 | - fi |
| michael@226 | 47 | LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" |
| michael@234 | 48 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 |
| michael@226 | 49 | $as_echo_n "checking for mi_stop in -lmilter... " >&6; } |
| michael@498 | 50 | @@ -16842,7 +16839,7 @@ |
| michael@234 | 51 | fi |
| michael@226 | 52 | |
| michael@226 | 53 | LIBS="$save_LIBS" |
| michael@234 | 54 | - for ac_header in libmilter/mfapi.h |
| michael@234 | 55 | + for ac_header in milter/mfapi.h |
| michael@234 | 56 | do : |
| michael@498 | 57 | ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" |
| michael@234 | 58 | if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then : |
| michael@226 | 59 | Index: libclamav/others.c |
| michael@498 | 60 | --- libclamav/others.c.orig 2009-10-28 16:34:13 +0100 |
| michael@498 | 61 | +++ libclamav/others.c 2009-11-08 10:27:04 +0100 |
| michael@234 | 62 | @@ -177,8 +177,10 @@ |
| michael@226 | 63 | if(is_rar_initd) return; |
| michael@226 | 64 | is_rar_initd = 1; |
| michael@226 | 65 | |
| michael@226 | 66 | +#if 0 |
| michael@226 | 67 | rhandle = lt_dlfind("libclamunrar_iface", "unrar"); |
| michael@226 | 68 | if (!rhandle) |
| michael@226 | 69 | +#endif |
| michael@226 | 70 | return; |
| michael@226 | 71 | |
| michael@226 | 72 | if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || |
| michael@226 | 73 | Index: shared/output.c |
| michael@498 | 74 | --- shared/output.c.orig 2009-10-28 16:34:13 +0100 |
| michael@498 | 75 | +++ shared/output.c 2009-11-08 10:27:04 +0100 |
| michael@226 | 76 | @@ -67,7 +67,7 @@ |
| michael@226 | 77 | pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; |
| michael@226 | 78 | #endif |
| michael@226 | 79 | |
| michael@226 | 80 | -#ifdef C_LINUX |
| michael@226 | 81 | +#if 0 |
| michael@226 | 82 | #include <libintl.h> |
| michael@226 | 83 | #include <locale.h> |
| michael@226 | 84 |
