diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2020-06-17 13:02:12 -0400 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2020-06-17 13:02:24 -0400 |
| commit | 609c0e26160f0f7672721e632e1f6f21d1b8fea2 (patch) | |
| tree | cefc1e1704609e7dd3138adcd7676bbb00c5bc77 /app-crypt | |
| parent | app-crypt/scrypt: add myself as proxy maintainer (diff) | |
| download | gentoo-609c0e26160f0f7672721e632e1f6f21d1b8fea2.tar.gz gentoo-609c0e26160f0f7672721e632e1f6f21d1b8fea2.tar.bz2 gentoo-609c0e26160f0f7672721e632e1f6f21d1b8fea2.zip | |
app-crypt/hashcat: pull upstream fix
https://github.com/hashcat/hashcat/issues/2455
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch | 53 | ||||
| -rw-r--r-- | app-crypt/hashcat/hashcat-6.0.0-r1.ebuild (renamed from app-crypt/hashcat/hashcat-6.0.0.ebuild) | 15 | ||||
| -rw-r--r-- | app-crypt/hashcat/hashcat-9999.ebuild | 12 |
3 files changed, 71 insertions, 9 deletions
diff --git a/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch new file mode 100644 index 000000000000..52120e0e05c4 --- /dev/null +++ b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch @@ -0,0 +1,53 @@ +diff --git a/docs/changes.txt b/docs/changes.txt +index 1527da46..420c2102 100644 +--- a/docs/changes.txt ++++ b/docs/changes.txt +@@ -1,3 +1,11 @@ ++* changes v6.0.0 -> v6.0.x ++ ++## ++## Improvements ++## ++ ++- OpenCL Runtime: Reinterpret return code CL_DEVICE_NOT_FOUND from clGetDeviceIDs() as non-fatal ++ + * changes v5.1.0 -> v6.0.0 + + ## +diff --git a/src/backend.c b/src/backend.c +index 80fdbb38..7f79879f 100644 +--- a/src/backend.c ++++ b/src/backend.c +@@ -5185,7 +5185,31 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx) + { + event_log_error (hashcat_ctx, "clGetDeviceIDs(): %s", val2cstr_cl (CL_rc)); + +- return -1; ++ // Special handling for CL_DEVICE_NOT_FOUND, see: https://github.com/hashcat/hashcat/issues/2455 ++ ++ #define IGNORE_DEVICE_NOT_FOUND 1 ++ ++ if (IGNORE_DEVICE_NOT_FOUND) ++ { ++ backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx; ++ ++ OCL_PTR *ocl = (OCL_PTR *) backend_ctx->ocl; ++ ++ const cl_int CL_err = ocl->clGetDeviceIDs (opencl_platform, CL_DEVICE_TYPE_ALL, DEVICES_MAX, opencl_platform_devices, &opencl_platform_devices_cnt); ++ ++ if (CL_err == CL_DEVICE_NOT_FOUND) ++ { ++ // we ignore this error ++ } ++ else ++ { ++ return -1; ++ } ++ } ++ else ++ { ++ return -1; ++ } + } + + opencl_platforms_devices[opencl_platforms_idx] = opencl_platform_devices; diff --git a/app-crypt/hashcat/hashcat-6.0.0.ebuild b/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild index 4c3c141fcb4d..eab3098c5c18 100644 --- a/app-crypt/hashcat/hashcat-6.0.0.ebuild +++ b/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild @@ -13,18 +13,23 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hashcat/hashcat.git" else - #this doesn't work for me, so it doesn't get keywords - #KEYWORDS="~amd64" + KEYWORDS="~amd64" SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi IUSE="brain video_cards_nvidia" -DEPEND="virtual/opencl +DEPEND=" app-arch/lzma brain? ( dev-libs/xxhash ) - video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )" + video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 + || ( dev-util/nvidia-cuda-toolkit + virtual/opencl ) + ) + !video_cards_nvidia? ( virtual/opencl )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-missing-not-fatal.patch" ) + src_prepare() { #remove bundled stuff rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers" @@ -39,7 +44,7 @@ src_prepare() { export PREFIX=/usr export LIBRARY_FOLDER="/usr/$(get_libdir)" export DOCUMENT_FOLDER="/usr/share/doc/${P}" - eapply_user + default } src_compile() { diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild index bc8b3fb95c51..32005fae3ae5 100644 --- a/app-crypt/hashcat/hashcat-9999.ebuild +++ b/app-crypt/hashcat/hashcat-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils pax-utils multilib @@ -18,10 +18,14 @@ else fi IUSE="brain video_cards_nvidia" -DEPEND="virtual/opencl +DEPEND=" app-arch/lzma brain? ( dev-libs/xxhash ) - video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )" + video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 + || ( dev-util/nvidia-cuda-toolkit + virtual/opencl ) + ) + !video_cards_nvidia? ( virtual/opencl )" RDEPEND="${DEPEND}" src_prepare() { @@ -38,7 +42,7 @@ src_prepare() { export PREFIX=/usr export LIBRARY_FOLDER="/usr/$(get_libdir)" export DOCUMENT_FOLDER="/usr/share/doc/${P}" - eapply_user + default } src_compile() { |