main/clamav: upgrade to 0.98

4 files changed, 5 insertions, 45 deletions

diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index c1e1b834e..fd1dcab2b 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=clamav
-pkgver=0.97.8
-pkgrel=2
+pkgver=0.98
+pkgrel=0
 pkgusers="clamav"
 pkggroups="clamav"
 pkgdesc="An anti-virus toolkit for UNIX"
@@ -20,7 +20,6 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	clamd.confd
 	freshclam.initd
 	freshclam.confd
-	clamav-0.95.1-nls.patch
 	clamd.logrotate
 	freshclam.logrotate
 	"
@@ -178,27 +177,24 @@ daemon() {
 		"$pkgdir"/etc/logrotate.d/clamd || return 1
 }
 
-md5sums="ac52bcbad3ea72eac08fedb9772f648b  clamav-0.97.8.tar.gz
+md5sums="ca0b8c930efcb8be1d47592d268006c5  clamav-0.98.tar.gz
 b4523253843761d7a7e5fa765b3fb2b9  clamd.initd
 e8a03fad6ce603631e8fe71a24d387c6  clamd.confd
 401fe30d9af2fea3151f938b26ff01c0  freshclam.initd
 e48466ddfb56f66c623b83e58777b778  freshclam.confd
-0d08fd29656bd4b018ecf8ce9706ac55  clamav-0.95.1-nls.patch
 ae1e48ab56a0fff1acdde023c1f6f350  clamd.logrotate
 226824214c021b2366f0be1289561d17  freshclam.logrotate"
-sha256sums="d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12  clamav-0.97.8.tar.gz
+sha256sums="113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6  clamav-0.98.tar.gz
 5f8847600cacc35de56ea61c7a8d0761e5a351ccfd507fd3e07160170269e055  clamd.initd
 4d978313004f66d871564b873df27c5459d3cc504788b179e41edba0f04b74dc  clamd.confd
 f69a8741f0165a1edd7558ce6c3ea8411fc2bc6e433a1636c25c366a057134d0  freshclam.initd
 75551ce7e04bbef4a889bc94a357b160d9da88f06eba32df594ba3cbb2c81ed1  freshclam.confd
-4aa3ba46cdea229355f90e2c6533c0f3c91f52ce869f7bc6dcc870a29450e312  clamav-0.95.1-nls.patch
 ec5e60f7efca02ed151f625e9a44404346991ed6608c6e2088db2436bbd03d49  clamd.logrotate
 84006ac3d2e8dc2e13a01f5e313c20e4978cdc93d831c181e0075badcbf4ada0  freshclam.logrotate"
-sha512sums="e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda  clamav-0.97.8.tar.gz
+sha512sums="532f9fa2616065879b3ecace2672fad26cf3863943e0ecb8835fbed7e5907600ef50b8df820a08a6586bf77c9bf7c6e50af671f31b7c3ee372c31745a173099f  clamav-0.98.tar.gz
 5f64211605db7fc91785331d6bb768cf71fe7579e40c82624e3fd71e4738e41d48cd4e7984e2ddbcc932aa27d3d77fb121de40e2ecdb123b81f58f277b184df2  clamd.initd
 59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794  clamd.confd
 e192f89d6591c0601f828da368a8a21eb7ed14c50757630896fbbb3582c2660ad562760b28979904f1a4a21eecc320f2e6f7f0c7b673f89c6d2af83d2d4b280c  freshclam.initd
 ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08  freshclam.confd
-8363ba0e69918ce2cbfef3adf3406d3f73d29adacc1f1382f11c1ef3b55baba96ee581beb5f9eaafbfbad1e00ffb0e4af39cd09b597cdba1e3ab2db39a3c5a04  clamav-0.95.1-nls.patch
 57e5b0c0dc6dc078e0102829e5d36882cff9ae5dd0637c31c7a23ef274dd0a4d967bc036f74c42b4690af511bc0a43fdb6d19b0c307506432577d82de7beff78  clamd.logrotate
 f1cd8df6d47824009a6df130bd60bf5e9f9deaef87fbeaceec8fe71e6c8b2772b5dba017390a2190deee851723256f06e9aef2182b0a2881119f22ba68740554  freshclam.logrotate"
diff --git a/main/clamav/clamav-0.95.1-nls.patch b/main/clamav/clamav-0.95.1-nls.patch
deleted file mode 100644
index 82ae88f57..000000000
--- a/main/clamav/clamav-0.95.1-nls.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shared/output.c-orig	2009-04-04 10:17:42 +0000
-+++ shared/output.c	2009-04-04 10:18:30 +0000
-@@ -67,7 +67,7 @@
- pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if defined(C_LINUX) && defined(HAVE_LIBINTL_H)
- #include <libintl.h>
- #include <locale.h>
-
diff --git a/main/ltrace/fix-crash-on-int3-after-symcall.patch b/main/ltrace/fix-crash-on-int3-after-symcall.patch
deleted file mode 100644
index 5e0a7911c..000000000
--- a/main/ltrace/fix-crash-on-int3-after-symcall.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -upr ltrace-0.6.0.orig/handle_event.c ltrace-0.6.0/handle_event.c
---- ltrace-0.6.0.orig/handle_event.c	2011-01-07 21:29:30.000000000 +0200
-+++ ltrace-0.6.0/handle_event.c	2012-01-06 05:14:04.000000000 +0200
-@@ -617,6 +617,10 @@ handle_breakpoint(Event *event) {
- 	}
- 
- 	if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) {
-+		if (sbp->libsym == NULL) {
-+			continue_after_breakpoint(event->proc, sbp);
-+			return;
-+		}
- 		if (strcmp(sbp->libsym->name, "") == 0) {
- 			debug(2, "Hit _dl_debug_state breakpoint!\n");
- 			arch_check_dbg(event->proc);
diff --git a/main/ltrace/host-os-uclibc.patch b/main/ltrace/host-os-uclibc.patch
deleted file mode 100644
index 47c19d903..000000000
--- a/main/ltrace/host-os-uclibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig	2013-08-16 07:04:27.384509376 +0000
-+++ ./configure.ac	2013-08-16 07:04:44.284842572 +0000
-@@ -32,7 +32,7 @@
- AC_CANONICAL_HOST
- 
- case "${host_os}" in
--    linux-gnu*)	HOST_OS="linux-gnu" ;;
-+    linux-gnu*|linux-uclibc)	HOST_OS="linux-gnu" ;;
-     *)		AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
- esac
- AC_SUBST(HOST_OS)