| 1 |
commit: c498c9ba984eabf60d4cbf3a1064353a3804db19 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 16 03:47:31 2021 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 18 15:12:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c498c9ba |
| 7 |
|
| 8 |
app-crypt/hashcat: add 6.2.1 |
| 9 |
|
| 10 |
* Bump to 6.2.1 |
| 11 |
* Respect CC, CXX, AR |
| 12 |
* Style changes to make it easier to read argument lists to (e)make |
| 13 |
* Ostensibly support prefix |
| 14 |
* Debundling |
| 15 |
** Use system zlib (and minizip) |
| 16 |
** Use system unrar |
| 17 |
** Cannot use system lzma for now as the ebuild doesn't install all of |
| 18 |
the necessary files |
| 19 |
|
| 20 |
Closes: https://bugs.gentoo.org/745327 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 23 |
|
| 24 |
app-crypt/hashcat/Manifest | 1 + |
| 25 |
.../{hashcat-9999.ebuild => hashcat-6.2.1.ebuild} | 53 ++++++++++++++++++---- |
| 26 |
app-crypt/hashcat/hashcat-9999.ebuild | 53 ++++++++++++++++++---- |
| 27 |
3 files changed, 89 insertions(+), 18 deletions(-) |
| 28 |
|
| 29 |
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest |
| 30 |
index 6a7e552c332..fd53bc2775c 100644 |
| 31 |
--- a/app-crypt/hashcat/Manifest |
| 32 |
+++ b/app-crypt/hashcat/Manifest |
| 33 |
@@ -1 +1,2 @@ |
| 34 |
DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724 |
| 35 |
+DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563 |
| 36 |
|
| 37 |
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-6.2.1.ebuild |
| 38 |
similarity index 64% |
| 39 |
copy from app-crypt/hashcat/hashcat-9999.ebuild |
| 40 |
copy to app-crypt/hashcat/hashcat-6.2.1.ebuild |
| 41 |
index 4bcf042ea7e..dc3813e63de 100644 |
| 42 |
--- a/app-crypt/hashcat/hashcat-9999.ebuild |
| 43 |
+++ b/app-crypt/hashcat/hashcat-6.2.1.ebuild |
| 44 |
@@ -3,7 +3,7 @@ |
| 45 |
|
| 46 |
EAPI=7 |
| 47 |
|
| 48 |
-inherit pax-utils multilib |
| 49 |
+inherit pax-utils toolchain-funcs |
| 50 |
|
| 51 |
DESCRIPTION="World's fastest and most advanced password recovery utility" |
| 52 |
HOMEPAGE="https://github.com/hashcat/hashcat" |
| 53 |
@@ -20,6 +20,8 @@ fi |
| 54 |
IUSE="brain video_cards_nvidia" |
| 55 |
DEPEND=" |
| 56 |
app-arch/lzma |
| 57 |
+ app-arch/unrar |
| 58 |
+ sys-libs/zlib[minizip] |
| 59 |
brain? ( dev-libs/xxhash ) |
| 60 |
video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 |
| 61 |
|| ( dev-util/nvidia-cuda-toolkit |
| 62 |
@@ -29,24 +31,46 @@ DEPEND=" |
| 63 |
RDEPEND="${DEPEND}" |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
- #remove bundled stuff |
| 67 |
+ # remove bundled stuff |
| 68 |
rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers" |
| 69 |
rm -r deps/xxHash || die "Failed to remove bundled xxHash" |
| 70 |
+ # TODO: Gentoo's app-arch/lzma doesn't install the needed files |
| 71 |
#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK" |
| 72 |
#rm -r deps || die "Failed to remove bundled deps" |
| 73 |
- #do not strip |
| 74 |
+ |
| 75 |
+ # do not strip |
| 76 |
sed -i "/LFLAGS += -s/d" src/Makefile |
| 77 |
- #do not add random CFLAGS |
| 78 |
+ # do not add random CFLAGS |
| 79 |
sed -i "s/-O2//" src/Makefile || die |
| 80 |
- sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die |
| 81 |
- export PREFIX=/usr |
| 82 |
+ #sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die |
| 83 |
+ # respect CC, CXX, AR |
| 84 |
+ sed -i \ |
| 85 |
+ -e 's/:= gcc/:= $(CC)/' \ |
| 86 |
+ -e 's/:= g++/:= $(CXX)/' \ |
| 87 |
+ -e 's/:= ar/:= $(AR)/' \ |
| 88 |
+ src/Makefile || die |
| 89 |
+ |
| 90 |
+ export PREFIX="${EPREFIX}"/usr |
| 91 |
export LIBRARY_FOLDER="/usr/$(get_libdir)" |
| 92 |
- export DOCUMENT_FOLDER="/usr/share/doc/${P}" |
| 93 |
+ export DOCUMENT_FOLDER="/usr/share/doc/${PF}" |
| 94 |
+ |
| 95 |
default |
| 96 |
} |
| 97 |
|
| 98 |
src_compile() { |
| 99 |
- 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}" |
| 100 |
+ tc-export CC CXX AR |
| 101 |
+ |
| 102 |
+ emake \ |
| 103 |
+ SHARED=1 \ |
| 104 |
+ PRODUCTION=1 \ |
| 105 |
+ ENABLE_BRAIN=$(usex brain 1 0) \ |
| 106 |
+ USE_SYSTEM_LZMA=0 \ |
| 107 |
+ USE_SYSTEM_OPENCL=1 \ |
| 108 |
+ USE_SYSTEM_UNRAR=1 \ |
| 109 |
+ USE_SYSTEM_ZLIB=1 \ |
| 110 |
+ USE_SYSTEM_XXHASH=1 \ |
| 111 |
+ VERSION_PURE="${PV}" |
| 112 |
+ |
| 113 |
pax-mark -mr hashcat |
| 114 |
} |
| 115 |
|
| 116 |
@@ -68,5 +92,16 @@ src_test() { |
| 117 |
} |
| 118 |
|
| 119 |
src_install() { |
| 120 |
- 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 |
| 121 |
+ emake \ |
| 122 |
+ DESTDIR="${ED}" \ |
| 123 |
+ SHARED=1 \ |
| 124 |
+ PRODUCTION=1 \ |
| 125 |
+ ENABLE_BRAIN=$(usex brain 1 0) \ |
| 126 |
+ USE_SYSTEM_LZMA=0 \ |
| 127 |
+ USE_SYSTEM_OPENCL=1 \ |
| 128 |
+ USE_SYSTEM_UNRAR=1 \ |
| 129 |
+ USE_SYSTEM_ZLIB=1 \ |
| 130 |
+ USE_SYSTEM_XXHASH=1 \ |
| 131 |
+ VERSION_PURE="${PV}" \ |
| 132 |
+ install |
| 133 |
} |
| 134 |
|
| 135 |
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild |
| 136 |
index 4bcf042ea7e..dc3813e63de 100644 |
| 137 |
--- a/app-crypt/hashcat/hashcat-9999.ebuild |
| 138 |
+++ b/app-crypt/hashcat/hashcat-9999.ebuild |
| 139 |
@@ -3,7 +3,7 @@ |
| 140 |
|
| 141 |
EAPI=7 |
| 142 |
|
| 143 |
-inherit pax-utils multilib |
| 144 |
+inherit pax-utils toolchain-funcs |
| 145 |
|
| 146 |
DESCRIPTION="World's fastest and most advanced password recovery utility" |
| 147 |
HOMEPAGE="https://github.com/hashcat/hashcat" |
| 148 |
@@ -20,6 +20,8 @@ fi |
| 149 |
IUSE="brain video_cards_nvidia" |
| 150 |
DEPEND=" |
| 151 |
app-arch/lzma |
| 152 |
+ app-arch/unrar |
| 153 |
+ sys-libs/zlib[minizip] |
| 154 |
brain? ( dev-libs/xxhash ) |
| 155 |
video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 |
| 156 |
|| ( dev-util/nvidia-cuda-toolkit |
| 157 |
@@ -29,24 +31,46 @@ DEPEND=" |
| 158 |
RDEPEND="${DEPEND}" |
| 159 |
|
| 160 |
src_prepare() { |
| 161 |
- #remove bundled stuff |
| 162 |
+ # remove bundled stuff |
| 163 |
rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers" |
| 164 |
rm -r deps/xxHash || die "Failed to remove bundled xxHash" |
| 165 |
+ # TODO: Gentoo's app-arch/lzma doesn't install the needed files |
| 166 |
#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK" |
| 167 |
#rm -r deps || die "Failed to remove bundled deps" |
| 168 |
- #do not strip |
| 169 |
+ |
| 170 |
+ # do not strip |
| 171 |
sed -i "/LFLAGS += -s/d" src/Makefile |
| 172 |
- #do not add random CFLAGS |
| 173 |
+ # do not add random CFLAGS |
| 174 |
sed -i "s/-O2//" src/Makefile || die |
| 175 |
- sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die |
| 176 |
- export PREFIX=/usr |
| 177 |
+ #sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die |
| 178 |
+ # respect CC, CXX, AR |
| 179 |
+ sed -i \ |
| 180 |
+ -e 's/:= gcc/:= $(CC)/' \ |
| 181 |
+ -e 's/:= g++/:= $(CXX)/' \ |
| 182 |
+ -e 's/:= ar/:= $(AR)/' \ |
| 183 |
+ src/Makefile || die |
| 184 |
+ |
| 185 |
+ export PREFIX="${EPREFIX}"/usr |
| 186 |
export LIBRARY_FOLDER="/usr/$(get_libdir)" |
| 187 |
- export DOCUMENT_FOLDER="/usr/share/doc/${P}" |
| 188 |
+ export DOCUMENT_FOLDER="/usr/share/doc/${PF}" |
| 189 |
+ |
| 190 |
default |
| 191 |
} |
| 192 |
|
| 193 |
src_compile() { |
| 194 |
- 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}" |
| 195 |
+ tc-export CC CXX AR |
| 196 |
+ |
| 197 |
+ emake \ |
| 198 |
+ SHARED=1 \ |
| 199 |
+ PRODUCTION=1 \ |
| 200 |
+ ENABLE_BRAIN=$(usex brain 1 0) \ |
| 201 |
+ USE_SYSTEM_LZMA=0 \ |
| 202 |
+ USE_SYSTEM_OPENCL=1 \ |
| 203 |
+ USE_SYSTEM_UNRAR=1 \ |
| 204 |
+ USE_SYSTEM_ZLIB=1 \ |
| 205 |
+ USE_SYSTEM_XXHASH=1 \ |
| 206 |
+ VERSION_PURE="${PV}" |
| 207 |
+ |
| 208 |
pax-mark -mr hashcat |
| 209 |
} |
| 210 |
|
| 211 |
@@ -68,5 +92,16 @@ src_test() { |
| 212 |
} |
| 213 |
|
| 214 |
src_install() { |
| 215 |
- 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 |
| 216 |
+ emake \ |
| 217 |
+ DESTDIR="${ED}" \ |
| 218 |
+ SHARED=1 \ |
| 219 |
+ PRODUCTION=1 \ |
| 220 |
+ ENABLE_BRAIN=$(usex brain 1 0) \ |
| 221 |
+ USE_SYSTEM_LZMA=0 \ |
| 222 |
+ USE_SYSTEM_OPENCL=1 \ |
| 223 |
+ USE_SYSTEM_UNRAR=1 \ |
| 224 |
+ USE_SYSTEM_ZLIB=1 \ |
| 225 |
+ USE_SYSTEM_XXHASH=1 \ |
| 226 |
+ VERSION_PURE="${PV}" \ |
| 227 |
+ install |
| 228 |
} |
Archives