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 1512B1382C5 for ; Tue, 16 Jun 2020 19:21:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FBFCE086E; Tue, 16 Jun 2020 19:21:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2CFFEE086E for ; Tue, 16 Jun 2020 19:21:27 +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 C815C34E92D for ; Tue, 16 Jun 2020 19:21:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B4FA1EF for ; Tue, 16 Jun 2020 19:21:24 +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: <1592335270.3cbf866e088cb781a96d51f5a7e38af0a5275f20.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/hashcat/Manifest app-crypt/hashcat/hashcat-4.1.0.ebuild app-crypt/hashcat/hashcat-4.2.0.ebuild app-crypt/hashcat/hashcat-4.2.1.ebuild app-crypt/hashcat/hashcat-5.0.0.ebuild app-crypt/hashcat/hashcat-5.1.0.ebuild app-crypt/hashcat/hashcat-6.0.0.ebuild 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: 3cbf866e088cb781a96d51f5a7e38af0a5275f20 X-VCS-Branch: master Date: Tue, 16 Jun 2020 19:21:24 +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: 45feb8ed-a8ed-4d11-aafd-804174afbb9d X-Archives-Hash: 4d4d3f754139b7cb2a48e4fcb20d1bc0 commit: 3cbf866e088cb781a96d51f5a7e38af0a5275f20 Author: Rick Farina gentoo org> AuthorDate: Tue Jun 16 17:07:44 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Tue Jun 16 19:21:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cbf866e app-crypt/hashcat: no keyword bump work in progress Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Rick Farina gentoo.org> app-crypt/hashcat/Manifest | 5 +-- app-crypt/hashcat/hashcat-4.1.0.ebuild | 49 --------------------- app-crypt/hashcat/hashcat-4.2.0.ebuild | 50 --------------------- app-crypt/hashcat/hashcat-4.2.1.ebuild | 51 ---------------------- app-crypt/hashcat/hashcat-5.1.0.ebuild | 1 - .../{hashcat-5.0.0.ebuild => hashcat-6.0.0.ebuild} | 24 +++++++--- app-crypt/hashcat/hashcat-9999.ebuild | 1 - 7 files changed, 19 insertions(+), 162 deletions(-) diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest index 8d23660abb1..81244abeb2e 100644 --- a/app-crypt/hashcat/Manifest +++ b/app-crypt/hashcat/Manifest @@ -1,5 +1,2 @@ -DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2cb22618cf93b8b11dd1964f6741f409429ee904412f70301e4b2381b388bcab0296a30ea3a94569efe7aaaeec6 SHA512 c9e01847c89dd8521da8734ea324c69f1e9bfef50c059e9dc29d4b947fe090405774a57ae688f907698c7d9a2d1f087b730e0a994dc5ed0d5d937a9ef950dd73 -DIST hashcat-4.2.0.tar.gz 3965021 BLAKE2B ad208f2debe1e4ece893e4a277b199962aa98aab57a2e78aef1d4177dcf7fc03bf262657dfe0f51c2ae845c8ed92232de7131f909d63bdc91e9f14e0b9602bb6 SHA512 686975db24737a718b484dd84b66807dfbe9694f1832da648b3c3b9fc8b859cd5c4c4d0aebf04ae862de38656d92c989e4e9515a07bec19b3779d74350beb0bd -DIST hashcat-4.2.1.tar.gz 3966264 BLAKE2B 2034fff6aa8724cded0c8576cb4593d90f94eaea8f932e511ed82f2576ded2ffd6f686dac484e52a9ebb3029e90845469418ac414f2edf03e3fdc3350df8766f SHA512 a2cfc7e19e82b237892bacc79ca1a62a3b2ea598e4e5f60d4e275a0c128d865945595d8f918e3bb93bf62376f11f448ff53257faa12fd051dfc64973fbb6ed1e -DIST hashcat-5.0.0.tar.gz 4019964 BLAKE2B 5d33bb2b0d82018d8ea6a906bee48375376879a47e5ca8f880d6fad6c6763d1ef90d44b228257021603e560acadf3d8fbfcbafdbd41dbad3733141d3c3957762 SHA512 090f07a011961a2c9a9bdf31e8a5efae4b443b6b205e964a6cd74bed6efe8fae2377f22ce7728ad7e732e9f943cf30da88066fe0990d085547f1e2ba000a3d95 DIST hashcat-5.1.0.tar.gz 4266878 BLAKE2B 677554fc5d6c5a93d0f4955c2e3cb6a40913ca2f7d00a89cf0c00bb48cadcaca94d3fdf55b853208f9fda4ce1bcc13fed865c5128a7c429223bcf8b4b825a15b SHA512 90605c2bcd0ec275d2f6ec581899b95cdc320b1494613a19803192c8a08037a7829b3776ed42c58eb6551ec1a746f47f94ab5b273958ca74e0fc57315e209ece +DIST hashcat-6.0.0.tar.gz 5360568 BLAKE2B 9d44c94d136a4c4cf7254ee11dc978db6bb1159d66ea525777c0a3dae59149983c9e8220f50cdbe6c24e330c757f3519b48f920662582e914f80068723ba5acd SHA512 b508c77e1735c02bb59c427774a3f4fafdea37d09777ef2dcb6e5081cb993d02c4f46a6ab846dc97a8cef2b0f69bbc191e26b8f1608a299bc2c1a6b3d2474f96 diff --git a/app-crypt/hashcat/hashcat-4.1.0.ebuild b/app-crypt/hashcat/hashcat-4.1.0.ebuild deleted file mode 100644 index 71db0a6fe5d..00000000000 --- a/app-crypt/hashcat/hashcat-4.1.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils pax-utils multilib - -DESCRIPTION="World's fastest and most advanced password recovery utility" -HOMEPAGE="https://github.com/hashcat/hashcat" -SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="custom-cflags video_cards_nvidia" -DEPEND="virtual/opencl" -RDEPEND="${DEPEND}" - -src_prepare() { - #do not strip - sed -i "/LFLAGS += -s/d" src/Makefile - #do not add random CFLAGS - sed -i "s/-O2//" src/Makefile || die - export PREFIX=/usr - export LIBRARY_FOLDER="/usr/$(get_libdir)" - eapply_user -} - -src_compile() { - default - pax-mark -mr hashcat -} - -src_test() { - if use video_cards_nvidia; then - addwrite /dev/nvidia0 - addwrite /dev/nvidiactl - addwrite /dev/nvidia-uvm - 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 - #./hashcat -b -m 2500 || die "Test failed" - ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed" -} diff --git a/app-crypt/hashcat/hashcat-4.2.0.ebuild b/app-crypt/hashcat/hashcat-4.2.0.ebuild deleted file mode 100644 index b94ec8299ae..00000000000 --- a/app-crypt/hashcat/hashcat-4.2.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils pax-utils multilib - -DESCRIPTION="World's fastest and most advanced password recovery utility" -HOMEPAGE="https://github.com/hashcat/hashcat" -SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="video_cards_nvidia" -DEPEND="virtual/opencl - video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )" -RDEPEND="${DEPEND}" - -src_prepare() { - #do not strip - sed -i "/LFLAGS += -s/d" src/Makefile - #do not add random CFLAGS - sed -i "s/-O2//" src/Makefile || die - export PREFIX=/usr - export LIBRARY_FOLDER="/usr/$(get_libdir)" - eapply_user -} - -src_compile() { - default - pax-mark -mr hashcat -} - -src_test() { - if use video_cards_nvidia; then - addwrite /dev/nvidia0 - addwrite /dev/nvidiactl - addwrite /dev/nvidia-uvm - 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 - #./hashcat -b -m 2500 || die "Test failed" - ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed" -} diff --git a/app-crypt/hashcat/hashcat-4.2.1.ebuild b/app-crypt/hashcat/hashcat-4.2.1.ebuild deleted file mode 100644 index 6e73c7c2384..00000000000 --- a/app-crypt/hashcat/hashcat-4.2.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils pax-utils multilib - -DESCRIPTION="World's fastest and most advanced password recovery utility" -HOMEPAGE="https://github.com/hashcat/hashcat" -SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="video_cards_nvidia" -DEPEND="virtual/opencl - video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )" -RDEPEND="${DEPEND}" - -src_prepare() { - #do not strip - sed -i "/LFLAGS += -s/d" src/Makefile - #do not add random CFLAGS - sed -i "s/-O2//" src/Makefile || die - export PREFIX=/usr - export LIBRARY_FOLDER="/usr/$(get_libdir)" - export DOCUMENT_FOLDER="/usr/share/doc/${P}" - eapply_user -} - -src_compile() { - default - pax-mark -mr hashcat -} - -src_test() { - if use video_cards_nvidia; then - addwrite /dev/nvidia0 - addwrite /dev/nvidiactl - addwrite /dev/nvidia-uvm - 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 - #./hashcat -b -m 2500 || die "Test failed" - ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed" -} diff --git a/app-crypt/hashcat/hashcat-5.1.0.ebuild b/app-crypt/hashcat/hashcat-5.1.0.ebuild index d85c65f96f6..bc8b3fb95c5 100644 --- a/app-crypt/hashcat/hashcat-5.1.0.ebuild +++ b/app-crypt/hashcat/hashcat-5.1.0.ebuild @@ -12,7 +12,6 @@ SLOT="0" if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hashcat/hashcat.git" - KEYWORDS="" else KEYWORDS="~amd64" SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/app-crypt/hashcat/hashcat-5.0.0.ebuild b/app-crypt/hashcat/hashcat-6.0.0.ebuild similarity index 59% rename from app-crypt/hashcat/hashcat-5.0.0.ebuild rename to app-crypt/hashcat/hashcat-6.0.0.ebuild index 30255c39d17..4c3c141fcb4 100644 --- a/app-crypt/hashcat/hashcat-5.0.0.ebuild +++ b/app-crypt/hashcat/hashcat-6.0.0.ebuild @@ -1,24 +1,36 @@ # 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 DESCRIPTION="World's fastest and most advanced password recovery utility" HOMEPAGE="https://github.com/hashcat/hashcat" -SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +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" + SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi -IUSE="video_cards_nvidia" +IUSE="brain video_cards_nvidia" DEPEND="virtual/opencl app-arch/lzma + brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )" RDEPEND="${DEPEND}" src_prepare() { + #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" + #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 @@ -31,7 +43,7 @@ src_prepare() { } src_compile() { - emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=0 SYSTEM_LZMA_SDK=0 + emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}" pax-mark -mr hashcat } @@ -53,5 +65,5 @@ src_test() { } src_install() { - emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=0 SYSTEM_LZMA_SDK=0 install + emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}" install } diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild index d85c65f96f6..bc8b3fb95c5 100644 --- a/app-crypt/hashcat/hashcat-9999.ebuild +++ b/app-crypt/hashcat/hashcat-9999.ebuild @@ -12,7 +12,6 @@ SLOT="0" if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hashcat/hashcat.git" - KEYWORDS="" else KEYWORDS="~amd64" SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"