clamav: update to latest

4 files changed, 46 insertions, 8 deletions

diff --git a/package/clamav/Makefile b/package/clamav/Makefile
index dec13a95f..f64051fac 100644
--- a/package/clamav/Makefile
+++ b/package/clamav/Makefile
@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		clamav
-PKG_VERSION:=		0.99.2
+PKG_VERSION:=		0.103.0
 PKG_RELEASE:=		1
-PKG_HASH:=		167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a
+PKG_HASH:=		32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546
 PKG_DESCR:=		anti-virus software
 PKG_SECTION:=		sys/misc
-PKG_DEPENDS:=		libressl zlib libpcre
-PKG_BUILDDEP:=		libressl zlib pcre
-PKG_NEEDS:=		threads
+PKG_DEPENDS:=		libressl zlib libpcre libncurses libcurl libmspack
+PKG_BUILDDEP:=		libressl zlib pcre ncurses curl libmspack
+PKG_NEEDS:=		c++ threads
 PKG_URL:=		http://www.clamav.net/
 PKG_SITES:=		http://www.clamav.net/downloads/production/
 
@@ -24,6 +24,7 @@ $(eval $(call PKG_template,CLAMAV,clamav,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP
 TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ENV+=		ac_cv_c_mmap_private=yes
 CONFIGURE_ARGS+=	--enable-mempool \
+			--with-system-libmspack \
 			--disable-xml \
 			--disable-check \
 			--with-openssl="$(STAGING_TARGET_DIR)/usr" \
diff --git a/package/clamav/patches/patch-clamdscan_proto_c b/package/clamav/patches/patch-clamdscan_proto_c
index c7120c9d5..a1d18ce41 100644
--- a/package/clamav/patches/patch-clamdscan_proto_c
+++ b/package/clamav/patches/patch-clamdscan_proto_c
@@ -1,6 +1,6 @@
---- clamav-0.98.7.orig/clamdscan/proto.c	2015-04-22 21:49:57.000000000 +0200
-+++ clamav-0.98.7/clamdscan/proto.c	2015-11-11 19:22:21.000000000 +0100
-@@ -36,6 +36,7 @@
+--- clamav-0.103.0.orig/clamdscan/proto.c	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/clamdscan/proto.c	2021-01-28 04:40:12.604606645 +0100
+@@ -39,6 +39,7 @@
  #include <errno.h>
  #include <stdlib.h>
  #include <sys/types.h>
diff --git a/package/clamav/patches/patch-libclamav_mbox_c b/package/clamav/patches/patch-libclamav_mbox_c
new file mode 100644
index 000000000..86e81131a
--- /dev/null
+++ b/package/clamav/patches/patch-libclamav_mbox_c
@@ -0,0 +1,11 @@
+--- clamav-0.103.0.orig/libclamav/mbox.c	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/libclamav/mbox.c	2021-01-28 04:48:50.156979494 +0100
+@@ -91,7 +91,7 @@
+ #include <features.h>
+ #endif
+ 
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__)
+ #define HAVE_BACKTRACE
+ #endif
+ #endif
diff --git a/package/libmspack/Makefile b/package/libmspack/Makefile
new file mode 100644
index 000000000..b877fb16a
--- /dev/null
+++ b/package/libmspack/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libmspack
+PKG_VERSION:=		0.10.1alpha
+PKG_RELEASE:=		1
+PKG_HASH:=		bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e
+PKG_DESCR:=		cab extractor
+PKG_SECTION:=		libs/misc
+PKG_SITES:=		https://www.cabextract.org.uk/libmspack/
+PKG_OPTS:=		dev
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBMSPACK,libmspack,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+libmspack-install:
+	$(INSTALL_DIR) $(IDIR_LIBMSPACK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libmspack*.so* \
+		$(IDIR_LIBMSPACK)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk