From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C15A1382C5 for ; Wed, 17 Jun 2020 17:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B877FE0A65; Wed, 17 Jun 2020 17:02:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91E61E0A65 for ; Wed, 17 Jun 2020 17:02:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94A0734F328 for ; Wed, 17 Jun 2020 17:02:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C288175 for ; Wed, 17 Jun 2020 17:02:27 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1592413344.609c0e26160f0f7672721e632e1f6f21d1b8fea2.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/, app-crypt/hashcat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch app-crypt/hashcat/hashcat-6.0.0-r1.ebuild app-crypt/hashcat/hashcat-6.0.0.ebuild app-crypt/hashcat/hashcat-9999.ebuild X-VCS-Directories: app-crypt/hashcat/files/ app-crypt/hashcat/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 609c0e26160f0f7672721e632e1f6f21d1b8fea2 X-VCS-Branch: master Date: Wed, 17 Jun 2020 17:02:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 308bbd1c-3a11-4e22-8c78-beedb9490029 X-Archives-Hash: df3fec0ee2bb1f5e399df3464af4ac4a commit: 609c0e26160f0f7672721e632e1f6f21d1b8fea2 Author: Rick Farina gentoo org> AuthorDate: Wed Jun 17 17:02:12 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Wed Jun 17 17:02:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609c0e26 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 gentoo.org> .../files/hashcat-6.0.0-missing-not-fatal.patch | 53 ++++++++++++++++++++++ ...ashcat-6.0.0.ebuild => hashcat-6.0.0-r1.ebuild} | 15 ++++-- 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 00000000000..52120e0e05c --- /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 similarity index 88% rename from app-crypt/hashcat/hashcat-6.0.0.ebuild rename to app-crypt/hashcat/hashcat-6.0.0-r1.ebuild index 4c3c141fcb4..eab3098c5c1 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 bc8b3fb95c5..32005fae3ae 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() {