diff options
Diffstat (limited to 'recipes-scanners/clamav/files/libclamav_fix.patch')
-rw-r--r-- | recipes-scanners/clamav/files/libclamav_fix.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-scanners/clamav/files/libclamav_fix.patch b/recipes-scanners/clamav/files/libclamav_fix.patch new file mode 100644 index 0000000..84e87e6 --- /dev/null +++ b/recipes-scanners/clamav/files/libclamav_fix.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | Index: git/libclamav/Makefile.in | ||
2 | =================================================================== | ||
3 | --- git.orig/libclamav/Makefile.in | ||
4 | +++ git/libclamav/Makefile.in | ||
5 | @@ -1328,7 +1328,7 @@ libclamav_nocxx_la_SOURCES = bytecode_no | ||
6 | libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ZLIB_CFLAGS@ @PCRE_CPPFLAGS@ | ||
7 | libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@ @LIBLTDL@ $(XML_LIBS) $(IFACELIBADD) $(MSPACKLIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@ | ||
8 | libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) $(MSPACKDEP) libclamav_internal_utils.la | ||
9 | -libclamav_la_CFLAGS = $(MSPACK_CFLAGS) $(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ZLIB_CFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ | ||
10 | +libclamav_la_CFLAGS = $(MSPACK_CFLAGS) $(AM_CFLAGS) $(YARA_CFLAGS) @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ZLIB_CFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ | ||
11 | libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \ | ||
12 | @LIBICONV@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ \ | ||
13 | -no-undefined $(am__append_8) | ||
14 | Index: git/libclamav/others.c | ||
15 | =================================================================== | ||
16 | --- git.orig/libclamav/others.c | ||
17 | +++ git/libclamav/others.c | ||
18 | @@ -132,10 +132,6 @@ static lt_dlhandle lt_dlfind(const char | ||
19 | lt_dlhandle rhandle; | ||
20 | unsigned i; | ||
21 | |||
22 | - if (lt_dladdsearchdir(SEARCH_LIBDIR)) { | ||
23 | - cli_dbgmsg("lt_dladdsearchdir failed for %s\n", SEARCH_LIBDIR); | ||
24 | - } | ||
25 | - | ||
26 | searchpath = lt_dlgetsearchpath(); | ||
27 | if (!searchpath) | ||
28 | searchpath = ""; | ||
29 | Index: git/clamav-config.in | ||
30 | =================================================================== | ||
31 | --- git.orig/clamav-config.in | ||
32 | +++ git/clamav-config.in | ||
33 | @@ -59,7 +59,7 @@ while test $# -gt 0; do | ||
34 | ;; | ||
35 | |||
36 | --libs) | ||
37 | - echo -L@libdir@ @LIBCLAMAV_LIBS@ | ||
38 | + echo @LIBCLAMAV_LIBS@ | ||
39 | ;; | ||
40 | |||
41 | *) | ||