Your message dated Mon, 04 Feb 2019 17:08:04 +0000
with message-id <[email protected]>
and subject line Bug#920865: fixed in havp 0.93-1
has caused the Debian Bug report #920865,
regarding havp: add support for clamav 0.101
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
920865: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=920865
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: havp
Version: 0.92a-4
Severity: important
tags: patch
havp does not compile against new clamav. The patch attached does solve
the issue.
Sebastian
From: Sebastian Andrzej Siewior <[email protected]>
Date: Tue, 29 Jan 2019 23:21:02 +0100
Subject: [PATCH] havp: Update to clamav 0.101
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The API changed slightly: The cl_scanfile() expects now a struct which
options set. CL_SCAN_GENERAL_ALLMATCHES enables all-match mode.
The ~0 for parse enables all possible parses like PE/PDF/…
The heuristic part (which needs to be enabled) matches to the old
behaviour which blocked encrypted archives or doc files.
Signed-off-by: Sebastian Andrzej Siewior <[email protected]>
---
havp/scanners/clamlibscanner.cpp | 22 +++++++++++++++++-----
havp/scanners/clamlibscanner.h | 2 +-
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/havp/scanners/clamlibscanner.cpp b/havp/scanners/clamlibscanner.cpp
index f851552..0abd5b0 100644
--- a/havp/scanners/clamlibscanner.cpp
+++ b/havp/scanners/clamlibscanner.cpp
@@ -204,7 +204,7 @@ int ClamLibScanner::ReloadDatabase()
string ClamLibScanner::Scan( const char *FileName )
{
#ifdef CL_INIT_DEFAULT
- int ret = cl_scanfile(FileName, &virname, NULL, engine, scanopts);
+ int ret = cl_scanfile(FileName, &virname, NULL, engine, &cl_options);
#else
int ret = cl_scanfile(FileName, &virname, NULL, engine, &limits, scanopts);
#endif
@@ -280,20 +280,32 @@ ClamLibScanner::ClamLibScanner()
}
//Set scanning options
- scanopts = CL_SCAN_STDOPT;
+ memset(&cl_options, 0, sizeof(struct cl_scan_options));
+
+ cl_options.general = CL_SCAN_GENERAL_ALLMATCHES;
+ cl_options.parse = ~0;
+
+ /* scanopts = CL_SCAN_STDOPT; */
if ( Params::GetConfigBool("CLAMBLOCKMAX") )
{
- scanopts = scanopts | CL_SCAN_BLOCKMAX;
+ /* cl_options = cl_options | CL_SCAN_BLOCKMAX; */
+ cl_options.heuristic |= CL_SCAN_HEURISTIC_EXCEEDS_MAX;
}
if ( Params::GetConfigBool("CLAMBLOCKENCRYPTED") )
{
- scanopts = scanopts | CL_SCAN_BLOCKENCRYPTED;
+ /* scanopts = scanopts | CL_SCAN_BLOCKENCRYPTED; */
+ cl_options.heuristic |= CL_SCAN_HEURISTIC_ENCRYPTED_ARCHIVE;
+ cl_options.heuristic |= CL_SCAN_HEURISTIC_ENCRYPTED_DOC;
}
if ( Params::GetConfigBool("CLAMBLOCKBROKEN") )
{
- scanopts = scanopts | CL_SCAN_BLOCKBROKEN;
+ /* scanopts = scanopts | CL_SCAN_BLOCKBROKEN; */
+ cl_options.heuristic |= CL_SCAN_HEURISTIC_BROKEN;
+
}
+ if (cl_options.heuristic != 0)
+ cl_options.general |= CL_SCAN_GENERAL_HEURISTICS;
//Set up archive limits
#ifndef CL_INIT_DEFAULT
diff --git a/havp/scanners/clamlibscanner.h b/havp/scanners/clamlibscanner.h
index f9c63e6..8d2f952 100644
--- a/havp/scanners/clamlibscanner.h
+++ b/havp/scanners/clamlibscanner.h
@@ -42,7 +42,7 @@ struct cl_limits limits;
struct cl_stat dbstat;
char dbdir[255];
-int scanopts;
+struct cl_scan_options cl_options;
public:
--
2.20.1
--- End Message ---
--- Begin Message ---
Source: havp
Source-Version: 0.93-1
We believe that the bug you reported is fixed in the latest version of
havp, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Scott Kitterman <[email protected]> (supplier of updated havp package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 04 Feb 2019 11:35:28 -0500
Source: havp
Architecture: source
Version: 0.93-1
Distribution: experimental
Urgency: medium
Maintainer: ClamAV Team <[email protected]>
Changed-By: Scott Kitterman <[email protected]>
Closes: 920865
Changes:
havp (0.93-1) experimental; urgency=medium
.
[ Sebastian Andrzej Siewior ]
* Add support for clamav 0.101 (Closes: #920865).
.
[ Scott Kitterman ]
* New upstream release
* Set minimum libclamav version to ensure it builds against the
version in experimental
Checksums-Sha1:
921017b6f116d77e1aae388b01d59a54c6595866 2051 havp_0.93-1.dsc
87a25bf1ec662d1c1bff28ffc5e82c512d354e5d 135367 havp_0.93.orig.tar.gz
a79aaf6d3b21c2955d00840b10baa86aebdf019c 21208 havp_0.93-1.debian.tar.xz
ab7ff0be77558216a5baef5600ddd3130e0c1977 4920 havp_0.93-1_source.buildinfo
Checksums-Sha256:
c23987e8bc08b21ea35339a5f7559950dbaa4ebbb010749b516879ed60c6e310 2051
havp_0.93-1.dsc
22b753d888d64a4e345c1de25e958fbad9ccfcaf6f2126e908ed2fd8d9d05704 135367
havp_0.93.orig.tar.gz
a6877053a9a5bfd39a9d0c1aeeebe9eea5baea4843235ac465bff63437516f08 21208
havp_0.93-1.debian.tar.xz
fd4aa6c6dc100521874f97c8e8b2e3a8dabf2a9f9364f88d308977e3fedbac73 4920
havp_0.93-1_source.buildinfo
Files:
7cca7e0006cdbe3407038c3e8205abd5 2051 net optional havp_0.93-1.dsc
0bfac9d9b12a3bdc33759691e67ccb7f 135367 net optional havp_0.93.orig.tar.gz
7691a7503a77a5216c64ab4af496a16f 21208 net optional havp_0.93-1.debian.tar.xz
bc2e169fd5b7c20a9c0fd603d4f58f96 4920 net optional havp_0.93-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJcWGvcAAoJEHjX3vua1ZrxM9AP/192hMBAzfmVTVrwaQkhtjwB
/6qaKksT3oMEB4PkB4IbRsHpX6kHcQWKoLHT/gTL8VFRwSA4FyxX+jEkxEAE31xb
orGf//Bp9RPaScxw5VlP5mo+Qvn/PtTYdnyyPnuJgksMYhBMLSWEwm3GgevB5CW8
VQSrf3/pwWu927CG4FhWyIMFxzlqLpbSo6BDkf1d2QLSrEo9hL1mvMjyGSclzNoQ
Lw9wZqwla4gTSOeXqWA0A11Gr1NVBb8RzZ/pLoivfT/sXVyJTto+CJVf1STxhoto
xXdDVISMP3v+Ijw5u1jQx/bd+CSlUPTzhZZRA3mwgA5HhruWr34+pKEiWipfqS+0
w4nFdFuoVomubPDqcrqoX+OeJyxAEqIK/Z4mUl6R506G37s5U991sVjhc3ceJRvQ
XULWp0KLVTkOh37ewjIVD4+FaoYXaJRMoJ+qUBbDbegKmU3MPT3kCidSqu1G0+6R
XVcCkZ6CxbGir+/cb6SjPT0aDyoY42H1nboxFu5eP6lASJhbD5LnlNobRmi9gcqq
zNMpxzyHhMjq5CEZeW0U1vQl/Milx0MLymCgw+Rllvy5PW1igMKdv6tWRMk8emyY
n/HjkIbZXjPWAYhOpfma7bkg1689HN2005ElfV+D44sWeNq5lVuGCf5AZwpj011B
4DOvAGN9bpSZXAEO53hn
=UJ4Q
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Pkg-clamav-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-clamav-devel
