hashcat: 5.0.0 -> 5.1.0

This commit is contained in:
Vladyslav M 2019-05-28 11:51:43 +03:00
parent cf178af4f8
commit b39e516708
No known key found for this signature in database
GPG Key ID: 3B1AD98E3D65BD4D
2 changed files with 5 additions and 27 deletions

View File

@ -1,23 +1,23 @@
{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }:
stdenv.mkDerivation rec {
name = "hashcat-${version}";
version = "5.0.0";
pname = "hashcat";
version = "5.1.0";
src = fetchurl {
url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
sha256 = "13xh1lmzdppvx8wr8blqhdr8vpa24j099kz2xzb9pcnqy26dk4kh";
sha256 = "0f73y4cg8c7a6q7x34qvpfi4g3lw6j9bnn0a13g43aqyiskflfr8";
};
patches = [ ./use-installed-xxhash.patch ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ opencl-headers xxHash ];
makeFlags = [
"PREFIX=${placeholder "out"}"
"OPENCL_HEADERS_KHRONOS=${opencl-headers}/include"
"COMPTIME=1337"
"VERSION_TAG=${version}"
"USE_SYSTEM_OPENCL=1"
"USE_SYSTEM_XXHASH=1"
];
postFixup = ''

View File

@ -1,22 +0,0 @@
diff --git a/src/Makefile b/src/Makefile
index 3a1cd680..576353fe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -189,7 +189,7 @@ endif
# brain and xxHash
ifeq ($(ENABLE_BRAIN),1)
CFLAGS += -DWITH_BRAIN
-CFLAGS += -Ideps/git/xxHash
+LFLAGS += -lxxhash
endif
##
@@ -313,7 +313,7 @@ WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o)
WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o)
ifeq ($(ENABLE_BRAIN),1)
-OBJS_XXHASH := xxhash
+OBJS_XXHASH :=
NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.STATIC.o)
NATIVE_SHARED_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.SHARED.o)