Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1693320181206620"
MIME-Version: 1.0
Date: Tue, 29 Aug 2023 14:43:01 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/security/clamav
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: taca@netbsd.org
Message-Id: <20230829144301.CD3D5FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1693320181206620
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Tue Aug 29 14:43:01 UTC 2023

Modified Files:
	pkgsrc/security/clamav: Makefile Makefile.common distinfo options.mk

Log Message:
security/clamav: update to 0.103.10

pkgsrc change:

* Do not always include mail/libmilter/buildlink3.mk in Makefile.
* Use clamav-unit-test PKG_OPTIONS instead of deprecated unit-test.
* pkglint clenn up.

0.103.10

ClamAV 0.103.10 is a critical patch release with the following fixes:

- Upgrade the bundled UnRAR library (libclamunrar) to version 6.2.10.
  - GitHub pull request: https://github.com/Cisco-Talos/clamav/pull/1009


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/security/clamav/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/clamav/Makefile.common
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/clamav/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/clamav/options.mk

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


--_----------=_1693320181206620
Content-Disposition: inline
Content-Length: 3807
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/clamav/Makefile
diff -u pkgsrc/security/clamav/Makefile:1.88 pkgsrc/security/clamav/Makefile:1.89
--- pkgsrc/security/clamav/Makefile:1.88	Wed Apr 19 08:08:40 2023
+++ pkgsrc/security/clamav/Makefile	Tue Aug 29 14:43:01 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.88 2023/04/19 08:08:40 adam Exp $
+# $NetBSD: Makefile,v 1.89 2023/08/29 14:43:01 taca Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT=	Anti-virus toolkit
@@ -40,7 +39,7 @@ NOT_PAX_MPROTECT_SAFE+=	bin/clamscan
 NOT_PAX_MPROTECT_SAFE+=	bin/freshclam
 
 CFLAGS.SunOS+=		-D__EXTENSIONS__
-.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*)
+.if ${PKGSRC_COMPILER:Mclang} || ${CC_VERSION:Mgcc-[6-9]*} || ${CC_VERSION:Mgcc-1[0-9].*}
 CFLAGS.SunOS+=		-D_XOPEN_SOURCE=600
 .endif
 
@@ -91,7 +90,6 @@ post-install:
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../mail/libmilter/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/security/clamav/Makefile.common
diff -u pkgsrc/security/clamav/Makefile.common:1.25 pkgsrc/security/clamav/Makefile.common:1.26
--- pkgsrc/security/clamav/Makefile.common:1.25	Mon Feb 20 13:41:19 2023
+++ pkgsrc/security/clamav/Makefile.common	Tue Aug 29 14:43:01 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.25 2023/02/20 13:41:19 taca Exp $
+# $NetBSD: Makefile.common,v 1.26 2023/08/29 14:43:01 taca Exp $
 #
 # used by security/clamav/Makefile
 # used by security/clamav-doc/Makefile
 
-DISTNAME=	clamav-0.103.8
+DISTNAME=	clamav-0.103.10
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/downloads/production/
 

Index: pkgsrc/security/clamav/distinfo
diff -u pkgsrc/security/clamav/distinfo:1.44 pkgsrc/security/clamav/distinfo:1.45
--- pkgsrc/security/clamav/distinfo:1.44	Mon Feb 20 13:41:19 2023
+++ pkgsrc/security/clamav/distinfo	Tue Aug 29 14:43:01 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2023/02/20 13:41:19 taca Exp $
+$NetBSD: distinfo,v 1.45 2023/08/29 14:43:01 taca Exp $
 
-BLAKE2s (clamav-0.103.8.tar.gz) = 61135f6d9ac19b0fb66537e56759e6afd2f247e797bbf2898ea8563165abb235
-SHA512 (clamav-0.103.8.tar.gz) = 8e030fef5788cf4df8f4d878363df1e5d9abcaa209b9f998f57334ede481d755b33958b5e9bb82be9643cb7442814711e4c9978314cadd7eb9161fee03b74439
-Size (clamav-0.103.8.tar.gz) = 16524716 bytes
+BLAKE2s (clamav-0.103.10.tar.gz) = b3c19d4d3f55f17d10e4afd45c8f74df36abfbb9c62793fa7a10cb0a325c21c0
+SHA512 (clamav-0.103.10.tar.gz) = fceda0297f32b0741a978e365a9fb9fe1c24c0d5027ee41665516917fbff405c01621cb0894bcfa70bc0884332987e1ecaa096a344580b67c3b401f2a77bc78c
+Size (clamav-0.103.10.tar.gz) = 16538627 bytes
 SHA1 (patch-Makefile.in) = 51e0f42323f07b7ae0cb35a640469dce4e1a2041
 SHA1 (patch-aa) = c07a7b6e883f384ce278964645f0658c0d986ab5
 SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf

Index: pkgsrc/security/clamav/options.mk
diff -u pkgsrc/security/clamav/options.mk:1.8 pkgsrc/security/clamav/options.mk:1.9
--- pkgsrc/security/clamav/options.mk:1.8	Mon Feb 20 13:41:19 2023
+++ pkgsrc/security/clamav/options.mk	Tue Aug 29 14:43:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2023/02/20 13:41:19 taca Exp $
+# $NetBSD: options.mk,v 1.9 2023/08/29 14:43:01 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	clamav-milter clamav-experimental clamav-unit-test
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--enable-experimental
 .endif
 
 # Enable unit test
-.if ${PKG_OPTIONS:Munit-test}
+.if ${PKG_OPTIONS:Mclamav-unit-test}
 CONFIGURE_ARGS+=		--enable-check
 TEST_TARGET=			check
 # unit test's Makefile depends on gmake.


--_----------=_1693320181206620--