CVS commit: pkgsrc/security/ecap_clamav_adapter

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Tue Apr 14 19:57:02 UTC 2020

Modified Files:
        pkgsrc/security/ecap_clamav_adapter: Makefile distinfo
Added Files:
        pkgsrc/security/ecap_clamav_adapter/patches: patch-src_ClamAv.cc

Log Message:
Adapt to ClamAv's scan options restructuring.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/ecap_clamav_adapter/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/ecap_clamav_adapter/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/ecap_clamav_adapter/patches/patch-src_ClamAv.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/ecap_clamav_adapter/Makefile
diff -u pkgsrc/security/ecap_clamav_adapter/Makefile:1.4 pkgsrc/security/ecap_clamav_adapter/Makefile:1.5
--- pkgsrc/security/ecap_clamav_adapter/Makefile:1.4    Sun Jan 26 17:32:02 2020
+++ pkgsrc/security/ecap_clamav_adapter/Makefile        Tue Apr 14 19:57:02 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2020/01/26 17:32:02 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/04/14 19:57:02 prlw1 Exp $
 
 DISTNAME=      ecap_clamav_adapter-2.0.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  http://www.measurement-factory.com/tmp/ecap/
 

Index: pkgsrc/security/ecap_clamav_adapter/distinfo
diff -u pkgsrc/security/ecap_clamav_adapter/distinfo:1.2 pkgsrc/security/ecap_clamav_adapter/distinfo:1.3
--- pkgsrc/security/ecap_clamav_adapter/distinfo:1.2    Thu Jun 23 15:17:28 2016
+++ pkgsrc/security/ecap_clamav_adapter/distinfo        Tue Apr 14 19:57:02 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.2 2016/06/23 15:17:28 prlw1 Exp $
+$NetBSD: distinfo,v 1.3 2020/04/14 19:57:02 prlw1 Exp $
 
 SHA1 (ecap_clamav_adapter-2.0.0.tar.gz) = 2aaf6c970db3622d1380d353c4c38b21b6aab769
 RMD160 (ecap_clamav_adapter-2.0.0.tar.gz) = 1869b60b4de16ef0202fd86c47c053413948674d
 SHA512 (ecap_clamav_adapter-2.0.0.tar.gz) = 882e66ad566220f68e59d41ea5c199af2745eaaa96610cdb7fe475811dbf87b01b5a6a97e6c9a729aecbf470aaae7082dbe502830aa88e86d32ae0d1acabde4b
 Size (ecap_clamav_adapter-2.0.0.tar.gz) = 383682 bytes
+SHA1 (patch-src_ClamAv.cc) = aa2e321e5647c1b27e9d03b893d6f010f69adf8f
 SHA1 (patch-src_Pointers.h) = 9e9b562c12af401de15aeeddb595a9134d31e1d6
 SHA1 (patch-src_Service.cc) = e14a4b29539c25f679b4f207cdd659ae752c0fac
 SHA1 (patch-src_Service.h) = 5b4997278e7b67aa7ee4813ba5a7753e154cb2ae

Added files:

Index: pkgsrc/security/ecap_clamav_adapter/patches/patch-src_ClamAv.cc
diff -u /dev/null pkgsrc/security/ecap_clamav_adapter/patches/patch-src_ClamAv.cc:1.1
--- /dev/null   Tue Apr 14 19:57:02 2020
+++ pkgsrc/security/ecap_clamav_adapter/patches/patch-src_ClamAv.cc     Tue Apr 14 19:57:02 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_ClamAv.cc,v 1.1 2020/04/14 19:57:02 prlw1 Exp $
+
+ClamAv restructured scan options flags from a single bitflag field
+to a structure containing multiple bitflag fields.
+
+--- src/ClamAv.cc.orig 2015-11-08 18:07:35.000000000 +0000
++++ src/ClamAv.cc
+@@ -44,7 +44,10 @@ void Adapter::ClamAv::scan(Answer &answe
+     // We assume that cl_*() functions used here are threadsafe.
+ 
+     const char *virname = 0;
+-    const int eScanResult = cl_scanfile(answer.fileName.c_str(), &virname, 0, engine, CL_SCAN_STDOPT);
++    struct cl_scan_options options;
++    memset(&options, 0, sizeof(options));
++    options.parse |= ~0; // enable all parsers
++    const int eScanResult = cl_scanfile(answer.fileName.c_str(), &virname, 0, engine, &options);
+ 
+     switch (eScanResult) {
+     case CL_CLEAN: