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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 956AA15800A for ; Sat, 19 Aug 2023 22:40:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B89272BC016; Sat, 19 Aug 2023 22:40:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C8DA2BC014 for ; Sat, 19 Aug 2023 22:40:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD3DD3411C4 for ; Sat, 19 Aug 2023 22:40:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26800FD0 for ; Sat, 19 Aug 2023 22:40:43 +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: <1692484833.8b6731cea6f8c4971781a877565919a718af13b1.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/hashcat/hashcat-9999.ebuild X-VCS-Directories: app-crypt/hashcat/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 8b6731cea6f8c4971781a877565919a718af13b1 X-VCS-Branch: master Date: Sat, 19 Aug 2023 22:40:43 +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: 31fa8af6-9394-4665-be83-a2999870e087 X-Archives-Hash: ed614d3907e96e80c1fe6736b71ade85 commit: 8b6731cea6f8c4971781a877565919a718af13b1 Author: Rick Farina gentoo org> AuthorDate: Sat Aug 19 22:16:28 2023 +0000 Commit: Rick Farina gentoo org> CommitDate: Sat Aug 19 22:40:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6731ce app-crypt/hashcat: sync live Signed-off-by: Rick Farina gentoo.org> app-crypt/hashcat/hashcat-9999.ebuild | 47 ++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild index 1adb6223b74a..add467bdd498 100644 --- a/app-crypt/hashcat/hashcat-9999.ebuild +++ b/app-crypt/hashcat/hashcat-9999.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit pax-utils toolchain-funcs DESCRIPTION="World's fastest and most advanced password recovery utility" HOMEPAGE="https://github.com/hashcat/hashcat" -LICENSE="MIT" -SLOT="0" -if [ "${PV}" = "9999" ]; then +if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hashcat/hashcat.git" else @@ -17,33 +15,42 @@ else SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi +LICENSE="MIT" +SLOT="0" IUSE="brain video_cards_nvidia" -DEPEND=" - app-arch/lzma + +DEPEND="app-arch/lzma app-arch/unrar sys-libs/zlib[minizip] brain? ( dev-libs/xxhash ) - video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 - || ( dev-util/nvidia-cuda-toolkit - virtual/opencl ) - ) + 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() { - # remove bundled stuff + # Remove bundled stuff rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers" rm -r deps/xxHash || die "Failed to remove bundled xxHash" + # TODO: Gentoo's app-arch/lzma doesn't install the needed files #rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK" #rm -r deps || die "Failed to remove bundled deps" - # do not strip - sed -i "/LFLAGS += -s/d" src/Makefile - # do not add random CFLAGS + # Do not strip + sed -i "/LFLAGS += -s/d" src/Makefile || die + + # Do not add random CFLAGS sed -i "s/-O2//" src/Makefile || die + #sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die - # respect CC, CXX, AR + + # Respect CC, CXX, AR sed -i \ -e 's/:= gcc/:= $(CC)/' \ -e 's/:= g++/:= $(CXX)/' \ @@ -80,14 +87,14 @@ src_test() { addwrite /dev/nvidia0 addwrite /dev/nvidiactl addwrite /dev/nvidia-uvm - if [ ! -w /dev/nvidia0 ]; then + + if [[ ! -w /dev/nvidia0 ]]; then einfo "To run these tests, portage likely must be in the video group." einfo "Please run \"gpasswd -a portage video\" if the tests will fail" fi - #elif use vidia_cards_fglrx; then - # addwrite /dev/ati fi - #this always exits with 255 despite success + + # This always exits with 255 despite success #./hashcat -b -m 2500 || die "Test failed" LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed" }