commit: 9bc34f39a8d6ec1841b6578545c28ca632c03ac5 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Jun 20 10:43:41 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Jun 23 21:28:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc34f39
app-forensics/yara: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31554 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-forensics/yara/files/yara-4.2-test.patch | 13 ----- app-forensics/yara/files/yara-4.2.3-libmagic.patch | 65 ---------------------- 2 files changed, 78 deletions(-) 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 <[email protected]> -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 <[email protected]> -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);
