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 }
