security/hashcat: upgrade to 6.2.6

This release adds new backend support for Metal, the OpenCL replacement API on Apple, many new hash-modes, and some bug fixes.
freebsd · Sep 2, 2022 · 0662f00 · 0662f00
1 parent 4d36e80
commit 0662f00
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 18 deletions.
diff --git a/security/hashcat/Makefile b/security/hashcat/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	hashcat
-PORTVERSION=	6.2.5
+PORTVERSION=	6.2.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
 
@@ -16,21 +15,25 @@ NOT_FOR_ARCHS_REASON=	fails to compile: compiling for big-endian architecture no
 
 BUILD_DEPENDS=	minizip:archivers/minizip
 
-USES=		compiler:c11 gmake iconv localbase shebangfix
+USES=		compiler:c11 gmake iconv localbase python shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup:opencl Cyan4973:xxhash
 GH_PROJECT=	OpenCL-Headers:opencl xxHash:xxhash
 GH_SUBDIR=	deps/git/OpenCL-Headers:opencl deps/git/xxHash:xxhash
 GH_TAGNAME=	1d3dc4e:opencl c0e86bc:xxhash
+PYTHON_NO_DEPENDS=	yes
 
-SHEBANG_FILES=	extra/tab_completion/install
+SHEBANG_FILES=	extra/tab_completion/install tools/*.py
 
 MAKE_ARGS+=	SHARED=1 \
 		CC="${CC}" \
 		LFLAGS_NATIVE="${LDFLAGS} -lpthread -lm" \
-		CFLAGS_NATIVE="${CFLAGS} -Iinclude -IOpenCL -Ideps/LZMA-SDK/C -Ideps/git/OpenCL-Headers"
+		CFLAGS_NATIVE="${CFLAGS} -Iinclude -IOpenCL -Ideps/LZMA-SDK/C \
+						-Ideps/git/OpenCL-Headers"
 ALL_TARGET=	default
+CFLAGS_aarch64+=	-march=armv8-a+crc+crypto
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		BRAIN DOCS
@@ -39,8 +42,6 @@ BRAIN_DESC=		Build Hashcat Brain
 BRAIN_MAKE_ARGS_OFF=	ENABLE_BRAIN=0
 BRAIN_CFLAGS=		-DWITH_BRAIN -Ideps/git/xxHash
 
-CFLAGS_aarch64+=	-march=armv8-a+crc+crypto
-
 pre-install:
 	${STRIP_CMD} ${WRKSRC}/libhashcat.so.${PORTVERSION}
 	${STRIP_CMD} ${WRKSRC}/modules/*.so

diff --git a/security/hashcat/distinfo b/security/hashcat/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1637867377
-SHA256 (hashcat-hashcat-v6.2.5_GH0.tar.gz) = 6f6899d7ad899659f7b43a4d68098543ab546d2171f8e51d691d08a659378969
-SIZE (hashcat-hashcat-v6.2.5_GH0.tar.gz) = 6341872
+TIMESTAMP = 1662143219
+SHA256 (hashcat-hashcat-v6.2.6_GH0.tar.gz) = b25e1077bcf34908cc8f18c1a69a2ec98b047b2cbcf0f51144dcf3ba1e0b7b2a
+SIZE (hashcat-hashcat-v6.2.6_GH0.tar.gz) = 14234640
 SHA256 (KhronosGroup-OpenCL-Headers-1d3dc4e_GH0.tar.gz) = 21ddb21f6643e5c76aec7a78c9c2aaac6f5e4c82cd4603b437c899026c833977
 SIZE (KhronosGroup-OpenCL-Headers-1d3dc4e_GH0.tar.gz) = 59767
 SHA256 (Cyan4973-xxHash-c0e86bc_GH0.tar.gz) = 7dc0343140d92f19d5b436591bdb8313b6cb2c686bccb7ff5caafcbc136fe468

diff --git a/security/hashcat/files/patch-src_Makefile b/security/hashcat/files/patch-src_Makefile
@@ -1,17 +1,26 @@
---- src/Makefile.orig	2021-05-14 17:08:08 UTC
+--- src/Makefile.orig	2022-09-02 14:58:13 UTC
 +++ src/Makefile
-@@ -80,7 +80,9 @@ endif
- ifeq ($(UNAME),FreeBSD)
+@@ -82,7 +82,9 @@ CXX                     := c++
+ ifneq (,$(filter $(UNAME),FreeBSD NetBSD))
  CC                      := cc
  CXX                     := c++
 -SED                     := gsed
-+CXXLIB			:= -lc++
++CXXLIB                  := -lc++
 +SED                     := /usr/bin/sed
 +SED_IN_PLACE            := -i ""
  endif
 
  ##
-@@ -586,10 +588,10 @@ endif
+@@ -213,7 +215,7 @@ ifneq ($(CC),clang)
+ ifeq ($(ENABLE_UNRAR),1)
+ ifeq ($(USE_SYSTEM_UNRAR),0)
+ ifneq ($(CC),clang)
+-CFLAGS_UNRAR            += -Wno-class-memaccess
++#CFLAGS_UNRAR            += -Wno-class-memaccess
+ CFLAGS_UNRAR            += -Wno-misleading-indentation
+ endif
+ CFLAGS_UNRAR            += -Wno-missing-braces
+@@ -651,10 +653,10 @@ $(HASHCAT_FRONTEND): src/main.c $(HASHCAT_LIBRARY)
 
  ifeq ($(SHARED),1)
  $(HASHCAT_FRONTEND): src/main.c $(HASHCAT_LIBRARY)
@@ -20,7 +29,7 @@
  else
  $(HASHCAT_FRONTEND): src/main.c obj/combined.NATIVE.a
 -	$(CC)    $(CCFLAGS) $(CFLAGS_NATIVE) $^ -o $@                    $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
-+	$(CC)    $(CCFLAGS) $(CFLAGS_NATIVE) $^ -o $@                    $(LFLAGS_NATIVE) ${CXXLIB} -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" -lc++
++	$(CC)    $(CCFLAGS) $(CFLAGS_NATIVE) $^ -o $@                    $(LFLAGS_NATIVE) ${CXXLIB} -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
  endif
 
  ##
diff --git a/security/hashcat/files/patch-src_terminal.c b/security/hashcat/files/patch-src_terminal.c
@@ -0,0 +1,11 @@
+--- src/terminal.c.orig	2022-09-02 14:58:13 UTC
++++ src/terminal.c
+@@ -490,7 +490,7 @@ int tty_fix ()
+ }
+ #endif
+
+-#if defined (__APPLE__) || defined (__FreeBSD__)
++#if defined (__APPLE__)
+ static struct termios savemodes;
+ static int havemodes = 0;
+