aboutsummaryrefslogtreecommitdiffstats
path: root/main/clamav
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2019-08-28 21:55:11 +0200
committerCarlo Landmeter <clandmeter@alpinelinux.org>2019-08-29 14:56:54 +0000
commit5bb204ff60776c4dfcfd6cab8310d72325d5641f (patch)
treec74f700de3de2147de476c2f5d3fa8eeb9af6921 /main/clamav
parente95641e73cf460a80a52344695b0989afdfab021 (diff)
downloadaports-5bb204ff60776c4dfcfd6cab8310d72325d5641f.tar.bz2
aports-5bb204ff60776c4dfcfd6cab8310d72325d5641f.tar.xz
main/clamav: upgrade to 0.101.4
add fix for test units with the big help from upstream clamav developer Micah Snyder <micasnyd@cisco.com>
Diffstat (limited to 'main/clamav')
-rw-r--r--main/clamav/APKBUILD8
-rw-r--r--main/clamav/fix-unrar-debug.patch11
2 files changed, 16 insertions, 3 deletions
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index e37035f862..32707a2aa4 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=clamav
-pkgver=0.100.3
+pkgver=0.101.4
pkgrel=0
pkgusers="clamav"
pkggroups="clamav"
@@ -30,6 +30,7 @@ source="https://www.clamav.net/downloads/production/$pkgname-$pkgver.tar.gz
freshclam.logrotate
0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch
+ fix-unrar-debug.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -239,11 +240,12 @@ milter() {
"$subpkgdir"/etc/clamav/clamav-milter.conf
}
-sha512sums="948bb7538233d01533c9ce9a2fc0bec2d7b45924759dd6280cf8e853dcb6d2a443f2bdaafeb9d45170456fdc06485b462bf01c3bd69767423fba5a75f05415e0 clamav-0.100.3.tar.gz
+sha512sums="fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3 clamav-0.101.4.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"
+7eeac468d1e2bc6fde8d1e4cbe0b7fad646d41798fe860718bf0a8ed6026920222daae125804a58f8add02487bf9c9e72a618f87441b20782910668915c99a75 0001-libclamav-explicitly-use-top_srcdir-.git-dir.patch
+4717b0ba0fc420638bc213f2374264db4bb4e9a9e3a2d4cb5104e5a63f150979a9706965414f375782e4861fbb8615fc99d49dfb847ae7e0e6b91e52110cf034 fix-unrar-debug.patch"
diff --git a/main/clamav/fix-unrar-debug.patch b/main/clamav/fix-unrar-debug.patch
new file mode 100644
index 0000000000..98e6095485
--- /dev/null
+++ b/main/clamav/fix-unrar-debug.patch
@@ -0,0 +1,11 @@
+--- 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);