yara py-yara: updated to 4.2.3

YARA v4.2.3
BUGFIX: Fix security issue that can lead to arbitrary code execution.
BUGFIX: Fix incorrect logic in expressions like <quantifier> of <string_set> in (start..end

6 files changed, 29 insertions, 25 deletions

diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile
index 507e2f57155..d2b6de95e03 100644
--- a/security/py-yara/Makefile
+++ b/security/py-yara/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/11/28 18:57:19 adam Exp $
+
+.include "../../security/yara/Makefile.common"
 
 DISTNAME=	yara-python-${YARA_VERSION}
 PKGNAME=	${PYPKGPREFIX}-yara-${YARA_VERSION}
-PKGREVISION=	1
 CATEGORIES=	security python
 GITHUB_PROJECT=	yara-python
 
-MASTER_SITES=	${MASTER_SITE_GITHUB:=VirusTotal/}
-
-COMMENT=	Yara python bindings
+COMMENT=	Yara Python bindings
 LICENSE=	apache-2.0
 
-.include "../../security/yara/Makefile.common"
+PYSETUPBUILDARGS=	--dynamic-linking
+
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} tests.py
+
 .include "../../security/yara/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-yara/PLIST b/security/py-yara/PLIST
index d3048b9953f..612f12bb3a6 100644
--- a/security/py-yara/PLIST
+++ b/security/py-yara/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2017/06/07 20:46:34 wiz Exp $
-${PYSITELIB}/yara.so
+@comment $NetBSD: PLIST,v 1.4 2022/11/28 18:57:19 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/yara.so
diff --git a/security/py-yara/distinfo b/security/py-yara/distinfo
index da5d0cd4ebb..3174326ccc3 100644
--- a/security/py-yara/distinfo
+++ b/security/py-yara/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 11:17:51 nia Exp $
+$NetBSD: distinfo,v 1.15 2022/11/28 18:57:19 adam Exp $
 
-BLAKE2s (yara-python-4.1.0.tar.gz) = 5c2e2a78b58aec3cb837797217e2e8aaadc757f99a4499dee1e89a2094af7299
-SHA512 (yara-python-4.1.0.tar.gz) = 8b9ce780b6639ab2ee5222adec888c7e0fb6be81c7c64a8b33b033de3f261f9707aa208b7a3a86749f6e86a83fe6d73941c816857faf6eb714399d1f50239b51
-Size (yara-python-4.1.0.tar.gz) = 33717 bytes
+BLAKE2s (yara-python-4.2.3.tar.gz) = aa46b829505087358246258600d22d0b1b7d4dc54c392ef642a9f9d4d8f5c7b9
+SHA512 (yara-python-4.2.3.tar.gz) = 588875d820f4e1b2aa5c6bbe83814ba2756f5ed301ba652efd280d5ca9745f7388f1f9eaa3875d11de5644ce9c41dcb76eebbee86269f8d6723c7d16ffa134be
+Size (yara-python-4.2.3.tar.gz) = 34465 bytes
diff --git a/security/yara/Makefile b/security/yara/Makefile
index a6c07b5e182..46ec8b615a7 100644
--- a/security/yara/Makefile
+++ b/security/yara/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2021/05/30 01:22:05 khorben Exp $
+# $NetBSD: Makefile,v 1.13 2022/11/28 18:57:19 adam Exp $
 
-DISTNAME=	yara-4.1.1
+.include "../../security/yara/Makefile.common"
+
+DISTNAME=	yara-${YARA_VERSION}
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GITHUB:=VirusTotal/}
 
 COMMENT=	Pattern matching swiss knife for malware researchers
 LICENSE=	modified-bsd
 
-USE_TOOLS+=	pkg-config automake autoreconf flex
+USE_FEATURES+=	strnlen
 USE_LIBTOOL=	yes
+USE_TOOLS+=	automake autoreconf flex pkg-config
 GNU_CONFIGURE=	yes
-USE_FEATURES+=	strnlen
+TEST_TARGET=	check
 
 PKGCONFIG_OVERRIDE+=	libyara/yara.pc.in
 
@@ -18,5 +20,4 @@ pre-configure:
 	cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../security/yara/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/yara/Makefile.common b/security/yara/Makefile.common
index 8620e66270f..bde871942c4 100644
--- a/security/yara/Makefile.common
+++ b/security/yara/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.13 2021/05/30 01:16:28 khorben Exp $
+# $NetBSD: Makefile.common,v 1.14 2022/11/28 18:57:19 adam Exp $
 #
 # used by security/yara/Makefile
 # used by security/py-yara/Makefile
 
-YARA_VERSION=	4.1.0
+YARA_VERSION=	4.2.3
+MASTER_SITES=	${MASTER_SITE_GITHUB:=VirusTotal/}
 GITHUB_TAG=	v${YARA_VERSION}
 
 MAINTAINER=	khorben@defora.org
diff --git a/security/yara/distinfo b/security/yara/distinfo
index a8e6f2aa739..f6ae7963f74 100644
--- a/security/yara/distinfo
+++ b/security/yara/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 11:18:06 nia Exp $
+$NetBSD: distinfo,v 1.18 2022/11/28 18:57:19 adam Exp $
 
-BLAKE2s (yara-4.1.1.tar.gz) = 330ff1c1b222bdbf5f559dc3734c1b2fcba1a79c23cb1634ba52e86b8a3f7501
-SHA512 (yara-4.1.1.tar.gz) = b4b3d004181f4a5c7f35103082977f72155b1a80bcde84c09c68951b57c9b6cbb1304591172de72bdbd0b5a36c98a4671c5e4d428dfde809df717c32df4e2922
-Size (yara-4.1.1.tar.gz) = 935770 bytes
+BLAKE2s (yara-4.2.3.tar.gz) = fcd5a273fb2f1b7835f9bd80a8963bedf2bc67fa78b971abbcd971571e3fef74
+SHA512 (yara-4.2.3.tar.gz) = 1df23837d14d3f9f72db901190e7412241514a8914d72b753df32ad8a44c7a49ad8f14941a95de83754e4d1dd0f23d712d8e6a43916343341b92cb1bc66f3c09
+Size (yara-4.2.3.tar.gz) = 1288334 bytes
 SHA1 (patch-configure.ac) = 1640083582087e1377d1ee378610e35cd09e08d5