main/clamav: upgrade to 0.102.0

enable clamonacc build (On-Access Scanning migrated out of `clamd` and
into new utility named `clamonacc`
add patch to fix build clamav-milter

4 files changed, 39 insertions, 61 deletions

diff --git a/main/clamav/0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch b/main/clamav/0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch
deleted file mode 100644
index c180427726..0000000000
--- a/main/clamav/0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3e0878adc26b39ecd6c2bf74dad129ee8636fac9 Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@alpinelinux.org>
-Date: Fri, 16 Feb 2018 02:11:09 +0000
-Subject: [PATCH] libclamav: explicitly use top_srcdir .git dir
-
-This will prevent git from picking up a ref from parent git repository
-and setting this as libclamav REVISION/version.
----
- libclamav/Makefile.am | 2 +-
- libclamav/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
-index 1c4c007c0..5d22b6483 100644
---- a/libclamav/Makefile.am
-+++ b/libclamav/Makefile.am
-@@ -616,7 +616,7 @@ version.h: version.h.tmp
- version.h.tmp:
- 	$(AM_V_GEN) test -f version.h || touch version.h;\
- 	rm -f $@;\
--	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\
-+	REVISION="$$(LANG=C git --git-dir "$(top_srcdir)"/.git describe --always 2>/dev/null || echo "exported")";\
- 	if test "$$REVISION" = "exported"; then\
- 	    REVISION="";\
- 	fi;\
-diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
-index 6e19dcd9e..acace3394 100644
---- a/libclamav/Makefile.in
-+++ b/libclamav/Makefile.in
-@@ -3777,7 +3777,7 @@ version.h: version.h.tmp
- version.h.tmp:
- 	$(AM_V_GEN) test -f version.h || touch version.h;\
- 	rm -f $@;\
--	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\
-+	REVISION="$$(LANG=C git --git-dir "$(top_srcdir)"/.git describe --always 2>/dev/null || echo "exported")";\
- 	if test "$$REVISION" = "exported"; then\
- 	    REVISION="";\
- 	fi;\
--- 
-2.16.1
-
diff --git a/main/clamav/111.patch b/main/clamav/111.patch
new file mode 100644
index 0000000000..1bf7dc354d
--- /dev/null
+++ b/main/clamav/111.patch
@@ -0,0 +1,30 @@
+From a19f41ab53b5fef2b887cf4563d5ee607ae57197 Mon Sep 17 00:00:00 2001
+From: Tuomo Soini <tis@foobar.fi>
+Date: Thu, 3 Oct 2019 00:56:36 +0300
+Subject: [PATCH] configure.ac: fix building of clamav milter
+
+Signed-off-by: Tuomo Soini <tis@foobar.fi>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73633d0359..eec327f49f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -108,6 +108,7 @@ m4_include([m4/reorganization/libs/bzip.m4])
+ m4_include([m4/reorganization/libs/unrar.m4])
+ 
+ m4_include([m4/reorganization/libs/systemd.m4])
++m4_include([m4/reorganization/milter/enable.m4])
+ m4_include([m4/reorganization/milter/check.m4])
+ m4_include([m4/reorganization/clamdtop.m4])
+ 
+@@ -147,7 +148,6 @@ m4_include([m4/reorganization/code_checks/ipv6.m4])
+ m4_include([m4/reorganization/code_checks/dns.m4])
+ m4_include([m4/reorganization/code_checks/fanotify.m4])
+ m4_include([m4/reorganization/code_checks/setpgrp.m4])
+-m4_include([m4/reorganization/milter/enable.m4])
+ m4_include([m4/reorganization/utility_checks/id.m4])
+ m4_include([m4/reorganization/utility_checks/yp.m4])
+ m4_include([m4/reorganization/usergroup.m4])
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index a0b024b0ed..c213e2a65f 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=clamav
-pkgver=0.101.4
-pkgrel=1
+pkgver=0.102.0
+pkgrel=0
 pkgusers="clamav"
 pkggroups="clamav"
 pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
@@ -16,7 +16,7 @@ depends_dev="openssl-dev"
 install="freshclam.pre-install
 	clamav-daemon.pre-install clamav-daemon.pre-upgrade"
 makedepends="ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers $depends_dev
-	libmilter-dev fts-dev"
+	libmilter-dev fts-dev curl-dev autoconf automake libtool"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libunrar $pkgname-libs
 	$pkgname-daemon $pkgname-scanner $pkgname-db::noarch freshclam
 	$pkgname-daemon-openrc:daemon_rc:noarch freshclam-openrc:freshclam_rc:noarch
@@ -29,8 +29,7 @@ source="https://www.clamav.net/downloads/production/$pkgname-$pkgver.tar.gz
 	clamd.logrotate
 	freshclam.logrotate
 
-	0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch
-	fix-unrar-debug.patch
+	111.patch
 	"
 
 builddir="$srcdir/$pkgname-$pkgver"
@@ -67,6 +66,7 @@ builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	update_config_sub
 	default_prepare
+	autoreconf -ifv
 }
 
 build() {
@@ -87,7 +87,8 @@ build() {
 		--enable-clamdtop \
 		--enable-bigstack \
 		--with-pcre \
-		--enable-milter
+		--enable-milter \
+		--enable-clamonacc
 	make
 }
 
@@ -240,12 +241,11 @@ milter() {
 		"$subpkgdir"/etc/clamav/clamav-milter.conf
 }
 
-sha512sums="fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3  clamav-0.101.4.tar.gz
+sha512sums="7228f5f572e5ca32a458c262a5d297694059de04cb4a64364dd92e1d2e4560d58263d05bfb2053641ea7521c4040bef5a49b3cea27e77b907c95195cf4a54d84  clamav-0.102.0.tar.gz
 ed81be79bf9a25eec071312252121cc76c96838407377b75077bf94922055f1de99f327982ac4dccd5be85003baa95385e5d002fabab32bb851bb30178475edd  clamd.initd
 59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794  clamd.confd
 00daed8afb67a6e4a29893340246c8840cce970dd9103d26557ecdd26ef60b12551d2291c214fc657faaaa339484052079347411b0cad65e3a33ece56d57cf16  freshclam.initd
 ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08  freshclam.confd
 3ae493dd1610a819402c015f6b8c0f080f926b72dc43d2bded60030bf6a55040e4b88e0f64d3aae299dc1133d7e1b89855e7346b4665a64e8b82592f7b75cf6a  clamd.logrotate
 30cff378bc28c76b795e00c92ae5ee623f3abe4a19bed61dd8403c96e72658bb02b7f040d26a6258104af754464d25ea7d9646918c4b47d2ba9a8cbf4687056c  freshclam.logrotate
-7eeac468d1e2bc6fde8d1e4cbe0b7fad646d41798fe860718bf0a8ed6026920222daae125804a58f8add02487bf9c9e72a618f87441b20782910668915c99a75  0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch
-4717b0ba0fc420638bc213f2374264db4bb4e9a9e3a2d4cb5104e5a63f150979a9706965414f375782e4861fbb8615fc99d49dfb847ae7e0e6b91e52110cf034  fix-unrar-debug.patch"
+b7bb194ea2dc5602c0ba928f35ac2bce38c20c6e36997eece316bf82e9d7a519984a351558675c30de13a7a90d8c6af76fe324cc5a9dc0f0a93d10da75ecf25a  111.patch"
diff --git a/main/clamav/fix-unrar-debug.patch b/main/clamav/fix-unrar-debug.patch
deleted file mode 100644
index 98e6095485..0000000000
--- a/main/clamav/fix-unrar-debug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libclamunrar_iface/unrar_iface.cpp	2019-08-28 18:09:01.840609079 +0000
-+++ b/libclamunrar_iface/unrar_iface.cpp	2019-08-28 18:08:49.567175407 +0000
-@@ -341,7 +341,7 @@
- 
-     unrar_dbgmsg("unrar_peek_file_header:   Name:          %s\n", headerData.FileName);
-     unrar_dbgmsg("unrar_peek_file_header:   Directory?:    %u\n", file_metadata->is_dir);
--    unrar_dbgmsg("unrar_peek_file_header:   Target Dir:    %ls\n", headerData.DirTarget);
-+    unrar_dbgmsg("unrar_peek_file_header:   Target Dir:    %u\n", headerData.DirTarget);
-     unrar_dbgmsg("unrar_peek_file_header:   RAR Version:   %u\n", headerData.UnpVer);
-     unrar_dbgmsg("unrar_peek_file_header:   Packed Size:   %lld\n", file_metadata->pack_size);
-     unrar_dbgmsg("unrar_peek_file_header:   Unpacked Size: %lld\n", file_metadata->unpack_size);