You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
73 lines
2.4 KiB
73 lines
2.4 KiB
Index: clamav-milter/clamav-milter.c |
|
--- clamav-milter/clamav-milter.c.orig 2019-10-01 19:24:08.000000000 +0200 |
|
+++ clamav-milter/clamav-milter.c 2019-10-03 07:45:12.050836000 +0200 |
|
@@ -35,7 +35,7 @@ |
|
#include <syslog.h> |
|
#endif |
|
#include <time.h> |
|
-#include <libmilter/mfapi.h> |
|
+#include "milter/mfapi.h" |
|
|
|
#include "clamav.h" |
|
|
|
Index: clamav-milter/clamfi.c |
|
--- clamav-milter/clamfi.c.orig 2019-10-01 19:24:08.000000000 +0200 |
|
+++ clamav-milter/clamfi.c 2019-10-03 07:45:12.051026000 +0200 |
|
@@ -32,7 +32,7 @@ |
|
#include <ctype.h> |
|
#include <errno.h> |
|
|
|
-#include <libmilter/mfapi.h> |
|
+#include "milter/mfapi.h" |
|
|
|
#include "libclamav/clamav.h" |
|
#include "shared/optparser.h" |
|
Index: clamav-milter/clamfi.h |
|
--- clamav-milter/clamfi.h.orig 2019-10-01 19:24:08.000000000 +0200 |
|
+++ clamav-milter/clamfi.h 2019-10-03 07:45:12.051134000 +0200 |
|
@@ -23,7 +23,7 @@ |
|
#define _CLAMFI_H |
|
|
|
#include "shared/optparser.h" |
|
-#include <libmilter/mfapi.h> |
|
+#include "milter/mfapi.h" |
|
|
|
extern uint64_t maxfilesize; |
|
extern int addxvirus; |
|
Index: configure |
|
--- configure.orig 2019-10-01 19:24:08.000000000 +0200 |
|
+++ configure 2019-10-03 07:45:12.054330000 +0200 |
|
@@ -24694,9 +24694,6 @@ |
|
|
|
save_LIBS="$LIBS" |
|
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS" |
|
- if test -d /usr/lib/libmilter ; then |
|
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" |
|
- fi |
|
LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" |
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 |
|
$as_echo_n "checking for mi_stop in -lmilter... " >&6; } |
|
@@ -24844,7 +24841,7 @@ |
|
fi |
|
|
|
LIBS="$save_LIBS" |
|
- for ac_header in libmilter/mfapi.h |
|
+ for ac_header in milter/mfapi.h |
|
do : |
|
ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" |
|
if test "x$ac_cv_header_libmilter_mfapi_h" = xyes; then : |
|
Index: libclamav/others.c |
|
--- libclamav/others.c.orig 2019-10-03 07:45:12.054672000 +0200 |
|
+++ libclamav/others.c 2019-10-03 07:45:45.215470000 +0200 |
|
@@ -175,9 +175,11 @@ |
|
|
|
if (have_rar) return; |
|
|
|
+#if 0 |
|
rhandle = lt_dlfind("libclamunrar_iface", "unrar"); |
|
if (!rhandle) |
|
return; |
|
+#endif |
|
|
|
if (!(cli_unrar_open = (cl_unrar_error_t(*)(const char *, void **, char **, uint32_t *, uint8_t))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || |
|
!(cli_unrar_peek_file_header = (cl_unrar_error_t(*)(void *, unrar_metadata_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_peek_file_header")) ||
|
|
|