From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 11 Dec 2018 18:22:54 +0000 (+0100)
Subject: - use options equivalent to old CL_SCAN_STDOPT; release 4
X-Git-Tag: auto/th/avscan-5.1.1-4
X-Git-Url: http://git.pld-linux.org/cgi-bin/gitweb.cgi?p=packages%2Favscan.git;a=commitdiff_plain;h=882fa69a7a6327c7ca6414f0869c0f48e9117998

- use options equivalent to old CL_SCAN_STDOPT; release 4
---

diff --git a/avscan-clamav.patch b/avscan-clamav.patch
index b7d46cf..9f91efc 100644
--- a/avscan-clamav.patch
+++ b/avscan-clamav.patch
@@ -4,9 +4,9 @@
  	guint options;
  	gchar *s;
  	const gchar *virus_name = NULL;
-+#ifdef CL_SCAN_GENERAL_ALLMATCHES
-+	struct cl_scan_options scan_options = {CL_SCAN_GENERAL_ALLMATCHES,
-+		                               0x3FF, // where is the convenience alias for all?
++#ifdef CL_SCAN_GENERAL_HEURISTICS
++	struct cl_scan_options scan_options = {CL_SCAN_GENERAL_HEURISTICS,
++		                               ~0,
 +					       0,
 +					       0,
 +					       0};
@@ -18,13 +18,13 @@
  	/* Scan this file */
  	status = (gint)cl_scandesc(
  		fd,
-+#ifdef CL_SCAN_GENERAL_ALLMATCHES
++#ifdef CL_SCAN_GENERAL_HEURISTICS
 +		path,
 +#endif
  		&virus_name,
  		&scanned_blocks,
  		d->engine,
-+#ifdef CL_SCAN_GENERAL_ALLMATCHES
++#ifdef CL_SCAN_GENERAL_HEURISTICS
 +		&scan_options
 +#else
  		(unsigned int)options
diff --git a/avscan.spec b/avscan.spec
index a780502..1814e0f 100644
--- a/avscan.spec
+++ b/avscan.spec
@@ -2,7 +2,7 @@ Summary:	AntiVirus Scanner
 Summary(pl.UTF-8):	Skaner antywirusowy
 Name:		avscan
 Version:	5.1.1
-Release:	3
+Release:	4
 License:	GPL v2 with OpenSSL exception
 Group:		X11/Applications
 Source0:	http://wolfsinger.com/~wolfpack/packages/%{name}-%{version}-openssl.tar.bz2