CVS commit: pkgsrc/security/ecap_clamav_adapter

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Aug 30 11:57:13 UTC 2026

Modified Files:
        pkgsrc/security/ecap_clamav_adapter: distinfo
        pkgsrc/security/ecap_clamav_adapter/patches: patch-src_Xaction.cc

Log Message:
security/ecap_clamav_adapter: fix build on at least NetBSD/macppc 11.0.

...by adding a static_cast.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/ecap_clamav_adapter/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/ecap_clamav_adapter/patches/patch-src_Xaction.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/distinfo
diff -u pkgsrc/security/ecap_clamav_adapter/distinfo:1.5 pkgsrc/security/ecap_clamav_adapter/distinfo:1.6
--- pkgsrc/security/ecap_clamav_adapter/distinfo:1.5    Tue Oct 26 11:17:04 2021
+++ pkgsrc/security/ecap_clamav_adapter/distinfo        Sun Aug 30 11:57:13 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:17:04 nia Exp $
+$NetBSD: distinfo,v 1.6 2026/08/30 11:57:13 he Exp $
 
 BLAKE2s (ecap_clamav_adapter-2.0.0.tar.gz) = 48d9527cbbf0b9f107e9dab53908762f30b68927a682dec935e54a28d97a80ec
 SHA512 (ecap_clamav_adapter-2.0.0.tar.gz) = 882e66ad566220f68e59d41ea5c199af2745eaaa96610cdb7fe475811dbf87b01b5a6a97e6c9a729aecbf470aaae7082dbe502830aa88e86d32ae0d1acabde4b
@@ -7,5 +7,5 @@ SHA1 (patch-src_ClamAv.cc) = aa2e321e564
 SHA1 (patch-src_Pointers.h) = 9e9b562c12af401de15aeeddb595a9134d31e1d6
 SHA1 (patch-src_Service.cc) = e14a4b29539c25f679b4f207cdd659ae752c0fac
 SHA1 (patch-src_Service.h) = 5b4997278e7b67aa7ee4813ba5a7753e154cb2ae
-SHA1 (patch-src_Xaction.cc) = bca8f15a1985b952f10c94a8c0c9953c91e4e310
+SHA1 (patch-src_Xaction.cc) = 7490f4d037ff09edd9c1063852838b8095f17cf7
 SHA1 (patch-src_Xaction.h) = 59348fcc787fda5d0b80021526561faef44e285d

Index: pkgsrc/security/ecap_clamav_adapter/patches/patch-src_Xaction.cc
diff -u pkgsrc/security/ecap_clamav_adapter/patches/patch-src_Xaction.cc:1.1 pkgsrc/security/ecap_clamav_adapter/patches/patch-src_Xaction.cc:1.2
--- pkgsrc/security/ecap_clamav_adapter/patches/patch-src_Xaction.cc:1.1        Thu Jun 23 15:17:28 2016
+++ pkgsrc/security/ecap_clamav_adapter/patches/patch-src_Xaction.cc    Sun Aug 30 11:57:13 2026
@@ -1,7 +1,10 @@
-$NetBSD: patch-src_Xaction.cc,v 1.1 2016/06/23 15:17:28 prlw1 Exp $
+$NetBSD: patch-src_Xaction.cc,v 1.2 2026/08/30 11:57:13 he Exp $
 
 https://bugs.launchpad.net/bugs/1595562
 
+...and fix a type incompatibility by adding a static_cast.
+Fixes build on NetBSD/macppc 11.0, at least.
+
 --- src/Xaction.cc.orig        2015-11-09 01:33:00.000000000 +0000
 +++ src/Xaction.cc
 @@ -89,7 +89,7 @@ void Adapter::MyAnswer::deliver()
@@ -13,6 +16,15 @@ https://bugs.launchpad.net/bugs/1595562
      libecap::host::Xaction *aHostX):
      serviceRegistration(0),
      service(aService),
+@@ -302,7 +302,7 @@ libecap::Area Adapter::Xaction::abConten
+         // We are here because we are or were trickling. If we stopped trickling,
+         // we should not give more than we had trickled (until the final action).
+         const Size tricklingMax = (trickledSize > pos) ? trickledSize - pos : 0;
+-        bufSize = std::min(bufSize, tricklingMax);
++        bufSize = std::min(static_cast<Size>(bufSize), tricklingMax);
+         // fall through to also obey actAllow limits
+     }
+ 
 @@ -347,7 +347,7 @@ void Adapter::Xaction::noteVbContentDone
  
      vbFile->flush();