commit: e4a047dfad96a7e759e041e406675300dd5532cd Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Aug 20 15:08:58 2023 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Sun Aug 20 17:45:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a047df
app-crypt/hashcat: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/32388 .../hashcat/files/hashcat-6.2.4-brainless.patch | 41 ---------------------- .../files/hashcat-6.2.4-pocl-quoting-include.patch | 34 ------------------ 2 files changed, 75 deletions(-) diff --git a/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch b/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch deleted file mode 100644 index 66d85d45c0b2..000000000000 --- a/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/hashcat/hashcat/pull/2961#event-5251978340 -From 0d5aed883b45cf3c218cb71916b08d56ae3d25a3 Mon Sep 17 00:00:00 2001 -From: Miezhiko <miezh...@gmail.com> -Date: Thu, 2 Sep 2021 17:52:27 +0400 -Subject: [PATCH] Fix compilation without brain - -Signed-off-by: Miezhiko <miezh...@gmail.com> ---- - src/hashcat.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/hashcat.c b/src/hashcat.c -index 163d7408d..bf936ccc0 100644 ---- a/src/hashcat.c -+++ b/src/hashcat.c -@@ -922,7 +922,10 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx) - - // clean up - -+ #ifdef WITH_BRAIN - brain_ctx_destroy (hashcat_ctx); -+ #endif -+ - bitmap_ctx_destroy (hashcat_ctx); - combinator_ctx_destroy (hashcat_ctx); - cpt_ctx_destroy (hashcat_ctx); -@@ -1090,13 +1093,13 @@ int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, const char *install_folder - } - } - #endif -- #endif - - /** - * brain - */ - - if (brain_ctx_init (hashcat_ctx) == -1) return -1; -+ #endif - - /** - * logfile diff --git a/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch b/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch deleted file mode 100644 index c2c834f712e6..000000000000 --- a/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fixes POCL include error. - -https://github.com/hashcat/hashcat/commit/8c14fd85eaf98f4cda3acf8f917edae696a3bb71 -https://github.com/hashcat/hashcat/issues/2950 - -From: Jens Steube <jens.ste...@gmail.com> -Date: Sun, 5 Sep 2021 10:55:59 +0200 -Subject: [PATCH] POCL: Added a workaround for an issue in POCL that uses a - quote character as part of the path itself given to a path for the -I option - ---- a/src/backend.c -+++ b/src/backend.c -@@ -11365,7 +11365,19 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) - } - else - { -- build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I \"%s\" ", folder_config->cpath_real); -+ if (device_param->opencl_platform_vendor_id == VENDOR_ID_POCL) -+ { -+ // POCL doesn't like quotes in the include path, see: -+ // https://github.com/hashcat/hashcat/issues/2950 -+ // Maybe related: -+ // https://github.com/pocl/pocl/issues/962 -+ -+ build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I %s ", folder_config->cpath_real); -+ } -+ else -+ { -+ build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I \"%s\" ", folder_config->cpath_real); -+ } - } - - /* currently disabled, hangs NEO drivers since 20.09. -
