[gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/
Date: Tue, 18 May 2021 15:12:05 +0000 (UTC)	[thread overview]
Message-ID: <1621350724.c498c9ba984eabf60d4cbf3a1064353a3804db19.zerochaos@gentoo> (raw)

commit:     c498c9ba984eabf60d4cbf3a1064353a3804db19
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 03:47:31 2021 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May 18 15:12:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c498c9ba

app-crypt/hashcat: add 6.2.1

* Bump to 6.2.1
* Respect CC, CXX, AR
* Style changes to make it easier to read argument lists to (e)make
* Ostensibly support prefix
* Debundling
** Use system zlib (and minizip)
** Use system unrar
** Cannot use system lzma for now as the ebuild doesn't install all of
  the necessary files

Closes: https://bugs.gentoo.org/745327
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/hashcat/Manifest                         |  1 +
 .../{hashcat-9999.ebuild => hashcat-6.2.1.ebuild}  | 53 ++++++++++++++++++----
 app-crypt/hashcat/hashcat-9999.ebuild              | 53 ++++++++++++++++++----
 3 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 6a7e552c332..fd53bc2775c 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1 +1,2 @@
 DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
+DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563

diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-6.2.1.ebuild
similarity index 64%
copy from app-crypt/hashcat/hashcat-9999.ebuild
copy to app-crypt/hashcat/hashcat-6.2.1.ebuild
index 4bcf042ea7e..dc3813e63de 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pax-utils multilib
+inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
@@ -20,6 +20,8 @@ fi
 IUSE="brain video_cards_nvidia"
 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
@@ -29,24 +31,46 @@ DEPEND="
 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
+
+	# do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
+	# do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	# respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
 	default
 }
 
 src_compile() {
-	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}"
+	tc-export CC CXX AR
+
+	emake \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
 	pax-mark -mr hashcat
 }
 
@@ -68,5 +92,16 @@ src_test() {
 }
 
 src_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
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=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 4bcf042ea7e..dc3813e63de 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pax-utils multilib
+inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
@@ -20,6 +20,8 @@ fi
 IUSE="brain video_cards_nvidia"
 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
@@ -29,24 +31,46 @@ DEPEND="
 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
+
+	# do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
+	# do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	# respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
 	default
 }
 
 src_compile() {
-	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}"
+	tc-export CC CXX AR
+
+	emake \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
 	pax-mark -mr hashcat
 }
 
@@ -68,5 +92,16 @@ src_test() {
 }
 
 src_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
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}" \
+		install
 }

next             reply	other threads:[~2021-05-18 15:30 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-18 15:12 Rick Farina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-27 17:20 [gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/ Patrick Lauer
2023-08-24  2:12 Rick Farina
2023-08-19 22:40 Rick Farina
2023-08-19 22:40 Rick Farina
2022-12-03  1:37 Sam James
2021-12-03  3:19 Sam James
2021-12-03  3:19 Sam James
2021-05-29  7:02 Sam James
2021-05-18 15:12 Rick Farina
2020-06-16 19:21 Rick Farina
2020-04-01 21:15 Marek Szuba
2019-01-07 19:45 Rick Farina
2018-11-08 15:56 Rick Farina
2018-11-05 20:06 Richard Farina
2018-10-23 20:22 Richard Farina
2018-08-03 20:30 Richard Farina
2018-02-23 17:30 Richard Farina
2017-12-07 16:08 Richard Farina
2017-11-24  6:06 Matt Turner
2017-10-04  7:47 Michał Górny
2017-03-03 16:44 Richard Farina
2017-01-18 17:59 Richard Farina
2016-09-03 21:32 Richard Farina
2016-09-02  4:05 Richard Farina

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6a7e552c33 dfblob:fd53bc2775 dfblob:4bcf042ea7
dfblob:dc3813e63d dfblob:4bcf042ea7 dfblob:dc3813e63d )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-crypt/hashcat/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1621350724.c498c9ba984eabf60d4cbf3a1064353a3804db19.zerochaos@gentoo \
    --to=zerochaos@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox