aboutsummaryrefslogtreecommitdiff
path: root/package/clamav
diff options
context:
space:
mode:
Diffstat (limited to 'package/clamav')
-rw-r--r--package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch4
-rw-r--r--package/clamav/Config.in6
-rw-r--r--package/clamav/clamav.hash2
-rw-r--r--package/clamav/clamav.mk6
4 files changed, 9 insertions, 9 deletions
diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
index e99a9742ec..d4be5c7b29 100644
--- a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
+++ b/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
@@ -12,6 +12,8 @@ This is a bit hacky, and would greatly benefit from a test in ./configure
instead, but does nicely as a quick fix for now.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: rebased for 0.103.0]
---
libclamav/mbox.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -20,7 +22,7 @@ diff --git a/libclamav/mbox.c b/libclamav/mbox.c
index 71f540c0a..4851297a9 100644
--- a/libclamav/mbox.c
+++ b/libclamav/mbox.c
-@@ -98,7 +98,7 @@
+@@ -91,7 +91,7 @@
#include <features.h>
#endif
diff --git a/package/clamav/Config.in b/package/clamav/Config.in
index 08f3e47461..990a818b5c 100644
--- a/package/clamav/Config.in
+++ b/package/clamav/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_CLAMAV
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
+ depends on !BR2_STATIC_LIBS # dlopen
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBMSPACK
- select BR2_PACKAGE_LIBTOOL
select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB
@@ -16,7 +16,7 @@ config BR2_PACKAGE_CLAMAV
http://www.clamav.net
-comment "clamav needs a toolchain w/ C++, threads, wchar"
- depends on !BR2_INSTALL_LIBSTDCPP \
+comment "clamav needs a toolchain w/ C++, dynamic library, threads, wchar"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
depends on BR2_USE_MMU
diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash
index b15460cecc..1b2325870d 100644
--- a/package/clamav/clamav.hash
+++ b/package/clamav/clamav.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 eebd426a68020ecad0d2084b8c763e6898ccfd5febcae833d719640bb3ff391b clamav-0.102.4.tar.gz
+sha256 7308c47b89b268af3b9f36140528927a49ff3e633a9c9c0aac2712d81056e257 clamav-0.103.1.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file
diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk
index 358228b861..4cd13fb827 100644
--- a/package/clamav/clamav.mk
+++ b/package/clamav/clamav.mk
@@ -4,17 +4,17 @@
#
################################################################################
-CLAMAV_VERSION = 0.102.4
+CLAMAV_VERSION = 0.103.1
CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \
COPYING.unrar COPYING.zlib
+CLAMAV_CPE_ID_VENDOR = clamav
CLAMAV_DEPENDENCIES = \
host-pkgconf \
libcurl \
libmspack \
- libtool \
openssl \
zlib \
$(TARGET_NLS_DEPENDENCIES)
@@ -38,8 +38,6 @@ CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)"
CLAMAV_CONF_OPTS = \
--with-dbdir=/var/lib/clamav \
- --with-ltdl-include=$(STAGING_DIR)/usr/include \
- --with-ltdl-lib=$(STAGING_DIR)/usr/lib \
--with-libcurl=$(STAGING_DIR)/usr \
--with-openssl=$(STAGING_DIR)/usr \
--with-system-libmspack=$(STAGING_DIR)/usr \