Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: pu
Tags: stretch
Severity: normal
Please find attached the proposed update to havp for Stretch as
part of the clamav transition, #924278.
Sebastian
diff -Nru havp-0.92a/debian/changelog havp-0.92a/debian/changelog
--- havp-0.92a/debian/changelog 2015-08-01 08:34:46.000000000 +0200
+++ havp-0.92a/debian/changelog 2019-03-10 17:30:34.000000000 +0100
@@ -1,3 +1,10 @@
+havp (0.92a-4+deb9u1) stretch; urgency=medium
+
+ * Add support for clamav 0.101 (Closes: #920865).
+ * Bump libclamav-dev build-depends to match
+
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Sun, 10 Mar 2019
17:30:34 +0100
+
havp (0.92a-4) unstable; urgency=medium
[ Andreas Cadhalpun ]
diff -Nru havp-0.92a/debian/control havp-0.92a/debian/control
--- havp-0.92a/debian/control 2015-07-31 22:54:50.000000000 +0200
+++ havp-0.92a/debian/control 2019-03-10 17:30:34.000000000 +0100
@@ -7,7 +7,7 @@
Andreas Cadhalpun <andreas.cadhal...@googlemail.com>,
Rene Mayrhofer <rene.mayrho...@gibraltar.at>
Homepage: http://www.server-side.de/
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libssl-dev,
libclamav-dev, docbook-to-man, po-debconf
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libssl-dev,
libclamav-dev (>= 0.101.1), docbook-to-man, po-debconf
Vcs-Git: git://anonscm.debian.org/pkg-clamav/havp.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-clamav/havp.git
Standards-Version: 3.9.6
diff -Nru havp-0.92a/debian/.git-dpm havp-0.92a/debian/.git-dpm
--- havp-0.92a/debian/.git-dpm 2015-07-31 22:54:50.000000000 +0200
+++ havp-0.92a/debian/.git-dpm 2019-03-10 17:30:01.000000000 +0100
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-9fb907bcffedcc78e1ac357dfaffed7211131e34
-9fb907bcffedcc78e1ac357dfaffed7211131e34
+a9be56684d967d6af910ad00d31061d363d63d2e
+a9be56684d967d6af910ad00d31061d363d63d2e
6fdc197f9802b586cf612b30fa6eb1a89d3ff9c8
6fdc197f9802b586cf612b30fa6eb1a89d3ff9c8
havp_0.92a.orig.tar.gz
diff -Nru havp-0.92a/debian/patches/0009-Enable-LFS-fix-autoreconf.patch
havp-0.92a/debian/patches/0009-Enable-LFS-fix-autoreconf.patch
--- havp-0.92a/debian/patches/0009-Enable-LFS-fix-autoreconf.patch
2015-07-31 22:54:50.000000000 +0200
+++ havp-0.92a/debian/patches/0009-Enable-LFS-fix-autoreconf.patch
2019-03-10 17:30:01.000000000 +0100
@@ -15,9 +15,9 @@
Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
---
- configure.in | 28 ++++++-------
- havp/default.h | 108 ++++++++++++++++++++++++++++++++++++++++++++++++
- havp/default.h.in | 121 ------------------------------------------------------
+ configure.in | 28 +++++------
+ havp/default.h | 108 +++++++++++++++++++++++++++++++++++++++++
+ havp/default.h.in | 121 ----------------------------------------------
3 files changed, 122 insertions(+), 135 deletions(-)
create mode 100644 havp/default.h
delete mode 100644 havp/default.h.in
diff -Nru havp-0.92a/debian/patches/0010-havp-Update-to-clamav-0.101.patch
havp-0.92a/debian/patches/0010-havp-Update-to-clamav-0.101.patch
--- havp-0.92a/debian/patches/0010-havp-Update-to-clamav-0.101.patch
1970-01-01 01:00:00.000000000 +0100
+++ havp-0.92a/debian/patches/0010-havp-Update-to-clamav-0.101.patch
2019-03-10 17:30:01.000000000 +0100
@@ -0,0 +1,83 @@
+From a9be56684d967d6af910ad00d31061d363d63d2e Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
+Date: Tue, 29 Jan 2019 23:21:02 +0100
+Subject: 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 <sebast...@breakpoint.cc>
+---
+ 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:
+
diff -Nru havp-0.92a/debian/patches/series havp-0.92a/debian/patches/series
--- havp-0.92a/debian/patches/series 2015-07-31 22:54:50.000000000 +0200
+++ havp-0.92a/debian/patches/series 2019-03-10 17:30:01.000000000 +0100
@@ -7,3 +7,4 @@
0007-remove-the-VIA-header-completely-if-disabled.patch
0008-config-update-link-for-transparent-proxy-mini-howto.patch
0009-Enable-LFS-fix-autoreconf.patch
+0010-havp-Update-to-clamav-0.101.patch
