gentoo auto-resync : 24:06:2023 - 01:25:35

4 files changed, 0 insertions, 80 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 81401d8beddf..4f44cdcb9944 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index c559e09a4e2d..85c1bc1ab498 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -1,5 +1,3 @@
-AUX yara-4.2-test.patch 450 BLAKE2B b15319c9921e88504057deead820a884b963e2c240c5486fcfbaf51d7139932bd220de65f8f476f8a264529ac08fbec5ad9e40565d50a3157bb3b3ca783ff26e SHA512 36604637a5de0d6a9553b92b6f6e732cce312b7fe65dcdf70ea70e0a552251f2dd2b5916cad8c78138b946ee4b0bf558324cf944eff519e37af3c83efe61177a
-AUX yara-4.2.3-libmagic.patch 2690 BLAKE2B 904f2b47c16f5134f48ac8765b7cbe119e807ea113ccf6d62767ea67f9ebd7347884eab924591cf2c48802f984978fd504bef61c09717b0baaef55d212447880 SHA512 45a610e89fa9f2e1555291b2254baa8381beb3ef404223222cb5075660a43540cebab2529dd1542d2cebf52ad42e71715f332322f721451fe49a896313e79839
 DIST yara-4.3.1.tar.gz 2179177 BLAKE2B 071bd2201653b094f828a5ea1ca2dd08fb0e3e8ea0439784bd949fc9ebfeb3c1aa9408581c8808d2d648d988c3aaab676d61605b53446efa12d838898b7ffe16 SHA512 93a2243d54397e76175fa0106451965b7f3a1f1918307c2bae6193f3725b69f60f70c3901a12c1690368f5b37e973a65c63a299624a521d204b12b48d5efe496
 DIST yara-4.3.2.tar.gz 2179265 BLAKE2B cfcc18dbd4c69f5f640ef755a8d4efe5f7ec8e313153955644fbd2adc03d1c73cddc042e95c0c0629fd58780922eb3dc1c72a5ca1bd9ff767a9e3f41f1652c98 SHA512 dc77ec46a30ca2fff33b639166fc554c9c6d9e955642774e23da3ea7dbb25fe154cfd4ef83c9808920193028b9099258a63b3f1b9a66864a1f3905f0a8e8053f
 EBUILD yara-4.3.1.ebuild 1269 BLAKE2B 3b9f001bb80ec39e7b3a77f270add2dfb6c339c53223bb14cabc1c5289787e5eee11c6b7347ec3098de72f1fc02a180e4ba22c6f80f00c46988c408cea5a2f2f SHA512 df58e0bd84dfcbfa2f74f1c647f510be06994d6dd3bd33f1ddf3952f285710d91dd0f90fd011f43ae51dea9df03f8254efc1e70380f30bd40d207c978f16bc06
diff --git a/app-forensics/yara/files/yara-4.2-test.patch b/app-forensics/yara/files/yara-4.2-test.patch
deleted file mode 100644
index 43a97030a4fd..000000000000
--- a/app-forensics/yara/files/yara-4.2-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/yara-4.2.3-libmagic.patch b/app-forensics/yara/files/yara-4.2.3-libmagic.patch
deleted file mode 100644
index 96d98b8821c5..000000000000
--- a/app-forensics/yara/files/yara-4.2.3-libmagic.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Bug: https://bugs.gentoo.org/889182
-Bug: https://github.com/VirusTotal/yara/pull/1845
-
-From 0939464c359b4718779b9f071029624df98bae39 Mon Sep 17 00:00:00 2001
-From: Hilko Bengen <bengen@hilluzination.de>
-Date: Thu, 29 Dec 2022 00:06:40 +0100
-Subject: [PATCH] test-magic: Update expected strings
-
-As of file 5.44, some PE-related strings and MIME types have been
-updated, causing the test to fail.
-
-See [Debian bug#1027031](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1027031)
----
- tests/test-magic.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-magic.c b/tests/test-magic.c
-index ff2f34c86..1d685e3dd 100644
---- a/tests/test-magic.c
-+++ b/tests/test-magic.c
-@@ -23,8 +23,10 @@ int main(int argc, char** argv)
- 
-   assert_true_rule_blob(
-       "import \"magic\" rule test { condition: \
--      magic.type() contains \"MS-DOS executable\" and \
--      magic.mime_type() == \"application/x-dosexec\" }",
-+      ( magic.type() contains \"MS-DOS executable\" or \
-+        magic.type() contains \"PE32+ executable\" ) and                                                      \
-+      ( magic.mime_type() == \"application/x-dosexec\" or \
-+        magic.mime_type() == \"application/vnd.microsoft.portable-executable\" ) }",
-       PE32_FILE);
- 
-   // Test case for https://github.com/VirusTotal/yara/issues/1663
-Bug: https://github.com/VirusTotal/yara/pull/1853
-
-From 1b5d787701e124a829af03cdb0009e48dc492aba Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon, 2 Jan 2023 20:37:59 +0100
-Subject: [PATCH] test-magic: Update expected strings (#1853)
-
-As of file 5.44, some PE-related strings and MIME types have been
-updated, causing the test to fail. This commit extends the fix in
-0939464c359b4718779b9f071029624df98bae39 to cover more cases.
-
-closes #1853
-
-See [Gentoo bug#889182](https://bugs.gentoo.org/889182)
----
- tests/test-magic.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test-magic.c b/tests/test-magic.c
-index 1d685e3d..0a327ee4 100644
---- a/tests/test-magic.c
-+++ b/tests/test-magic.c
-@@ -24,7 +24,8 @@ int main(int argc, char** argv)
-   assert_true_rule_blob(
-       "import \"magic\" rule test { condition: \
-       ( magic.type() contains \"MS-DOS executable\" or \
--        magic.type() contains \"PE32+ executable\" ) and                                                      \
-+        magic.type() contains \"PE32+ executable\" or \
-+        magic.type() contains \"PE32 executable\") and \
-       ( magic.mime_type() == \"application/x-dosexec\" or \
-         magic.mime_type() == \"application/vnd.microsoft.portable-executable\" ) }",
-       PE32_FILE);