gentoo resync : 29.12.2022

4 files changed, 77 insertions, 2 deletions

diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index d1dac363171b..4420d1650635 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -1,3 +1,6 @@
+AUX yara-4.2-test.patch 450 BLAKE2B b15319c9921e88504057deead820a884b963e2c240c5486fcfbaf51d7139932bd220de65f8f476f8a264529ac08fbec5ad9e40565d50a3157bb3b3ca783ff26e SHA512 36604637a5de0d6a9553b92b6f6e732cce312b7fe65dcdf70ea70e0a552251f2dd2b5916cad8c78138b946ee4b0bf558324cf944eff519e37af3c83efe61177a
 DIST yara-4.2.0.tar.gz 1284059 BLAKE2B 735d161fde5f84199315f1ce6d31f1ad79488312bede85d2941a03cb97fe75c3c4db0b3cba75782d338a462d87e9d9ed57b393bbdb68decfb350a1bbd096258b SHA512 24ca707015c77d87126bcaac0991997f6b09403024765d615a06db47191a3f0177e1c1eb4a917ec8412876b61d28f4a708f36999ddd9214c3967968c71ae3b7c
-EBUILD yara-4.2.0.ebuild 1154 BLAKE2B d881ba15e2b3bfcde9ce490981af10e8a2828edcfd6a729d5ce69b763fd4f6be1bd1c13fb83bc79602ba6d0be4f2c2f52cd840f07419687d2e8293bb2df1370c SHA512 edb5a75ad5fdef624320c18950a11faf45e5a04152afc3ec4c7621d07e9eb3000c8bd82e695ff8d5226ecb5347c3ab155dca98482d6bf102c261cf5c10f7b799
+DIST yara-4.2.1.tar.gz 1285173 BLAKE2B dc290bf7fe85d468fd519e68a12d88097d817ca064a665397ba64768078a2d572b46e488eb48747ea1904207598b41a72a510b4b8e4e8601cf518cb6ab98c322 SHA512 036a35d713647b23998135da0d27c13a8876aa44e18e3c9dc99fa425273d7c4a953cbdc78f413f29e8bf818d84b340d0719e241d2a83b7165a16d97e952c45b0
+EBUILD yara-4.2.0-r1.ebuild 1229 BLAKE2B d8883b6c768bdd079dacbfd248323454632b4382e977a531d7845c5f43ab5d54252d660b6f707507892bc6df9c83e8aa2fd60ad614ab5105011f8dc9cf6721a4 SHA512 62d73483d08730a79a0539bf3b2c538c923be2150a6a3796c488bab1195bdd35d7d74ea077c98b16cb5198f8d2b5c75ee8da0cee62612e403997947ad8f6f115
+EBUILD yara-4.2.1.ebuild 1229 BLAKE2B d8883b6c768bdd079dacbfd248323454632b4382e977a531d7845c5f43ab5d54252d660b6f707507892bc6df9c83e8aa2fd60ad614ab5105011f8dc9cf6721a4 SHA512 62d73483d08730a79a0539bf3b2c538c923be2150a6a3796c488bab1195bdd35d7d74ea077c98b16cb5198f8d2b5c75ee8da0cee62612e403997947ad8f6f115
 MISC metadata.xml 1151 BLAKE2B a2f641c9c0f851884cc6482248446d7b509e4ca2c5cec26159063a0fec025b8928955cfefbdf87e26ace0d06a01a2cec7d1f3d10b09b99b1cf1040c09519adfa SHA512 5001e3a14dc458a6b27f69226fb346dc8bf07058270e20b81f325c0742300ccb6e241b3d3dc6f55eccc43b68f0fea74977d33d8bcca6d0612057f6015f857500
diff --git a/app-forensics/yara/files/yara-4.2-test.patch b/app-forensics/yara/files/yara-4.2-test.patch
new file mode 100644
index 000000000000..43a97030a4fd
--- /dev/null
+++ b/app-forensics/yara/files/yara-4.2-test.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/836790
+https://github.com/VirusTotal/yara/pull/1683
+--- a/tests/test-rules.c
++++ b/tests/test-rules.c
+@@ -3061,7 +3061,7 @@ void test_process_scan()
+     exit(EXIT_FAILURE);
+   }
+ 
+-  spawn("/bin/sh", "-c", "VAR='Hello, world!'; sleep 600; true");
++  spawn("/bin/sh", "-c", "VAR='Hello, world!'; sleep 600& PID=\$!; trap \"kill \$PID\" EXIT; wait; true");
+ 
+   counters.rules_matching = 0;
+   counters.rules_not_matching = 0;
diff --git a/app-forensics/yara/yara-4.2.0.ebuild b/app-forensics/yara/yara-4.2.0-r1.ebuild
index 8bac51561719..55e7f11069d5 100644
--- a/app-forensics/yara/yara-4.2.0.ebuild
+++ b/app-forensics/yara/yara-4.2.0-r1.ebuild
@@ -26,6 +26,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
 
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
+
 src_prepare() {
 	default
 	eautoreconf
@@ -51,5 +53,5 @@ src_install() {
 
 	# TODO: Allow tests to work against dyn. lib rather than building
 	# statically just for tests.
-	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.a' -o -name '*.la' -delete || die
 }
diff --git a/app-forensics/yara/yara-4.2.1.ebuild b/app-forensics/yara/yara-4.2.1.ebuild
new file mode 100644
index 000000000000..55e7f11069d5
--- /dev/null
+++ b/app-forensics/yara/yara-4.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A malware identification and classification tool"
+HOMEPAGE="http://virustotal.github.io/yara/"
+SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+LICENSE="Apache-2.0"
+SLOT="0/8"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:=
+	cuckoo? ( dev-libs/jansson:= )
+	magic? ( sys-apps/file:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable profiling) \
+		$(use_enable cuckoo) \
+		$(use_enable magic) \
+		$(use_enable dotnet) \
+		$(use_enable macho) \
+		$(use_enable dex) \
+		$(use_enable test static)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	# TODO: Allow tests to work against dyn. lib rather than building
+	# statically just for tests.
+	find "${ED}" -name '*.a' -o -name '*.la' -delete || die
+}