From e0884b6e1be965b9a34219e8a8249063d7917cea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:54:54 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 785fb2a2ac9d97f415c9c0d426484e7bc4788931 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Tue, 28 Oct 2025 22:22:15 -0700 Subject: [PATCH 2/5] Update to 7.1.2 (rhbz#2386082) --- .fmf/version | 1 + gating.yaml | 16 +++++++++++ hashcat-build-fixes.patch | 59 ++++++++++++++++++++++++++++----------- hashcat.spec | 17 ++++++++--- plans/main.fmf | 5 ++++ sources | 2 +- tests/core/main.fmf | 1 + tests/core/test.sh | 19 +++++++++++++ tests/main.fmf | 4 +++ 9 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/main.fmf create mode 100644 tests/core/main.fmf create mode 100755 tests/core/test.sh create mode 100644 tests/main.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..4b79bd1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index ba88c2a..657c212 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,17 +1,17 @@ -From 49d6ac344d249941a0592113259a2af82914e319 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Wed, 17 Jun 2020 10:57:15 +0200 -Subject: [PATCH] Fedora build patches. +From 1b530558da4019541863848937f58e66089c2b42 Mon Sep 17 00:00:00 2001 +From: Carlos Rodriguez-Fernandez +Date: Tue, 21 Oct 2025 21:23:00 -0700 +Subject: [PATCH] fixes --- - src/Makefile | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) + src/Makefile | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 64f54dbf6..c0d587b35 100644 +index 72986407c..4fe3d9eb7 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -43,7 +43,7 @@ endif +@@ -52,7 +52,7 @@ endif ## Makefile flags ## @@ -20,7 +20,16 @@ index 64f54dbf6..c0d587b35 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -233,10 +233,7 @@ endif +@@ -167,8 +167,6 @@ DEPS_UNRAR_PATH := $(LIBRARY_DEV_ROOT_FOLDER) + endif + endif + +-DEPS_SSE2NEON := deps/sse2neon +- + ## + ## Filenames for library and frontend + ## +@@ -275,10 +273,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,24 +41,40 @@ index 64f54dbf6..c0d587b35 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -505,7 +502,7 @@ endif +@@ -427,7 +422,6 @@ endif # Darwin + + ifeq ($(IS_ARM),1) + CFLAGS_NATIVE += -DSSE2NEON_SUPPRESS_WARNINGS +-CFLAGS_NATIVE += -I$(DEPS_SSE2NEON) + endif + + ifeq ($(UNAME),CYGWIN) +@@ -589,7 +583,7 @@ endif .PHONY: install ifeq ($(SHARED),1) --install: install_docs install_shared install_library install_library_dev install_tunings install_kernels install_modules install_hashcat -+install: install_shared install_library install_library_dev install_tunings install_kernels install_modules install_hashcat +-install: install_docs install_shared install_tools install_library install_library_dev install_tunings install_kernels install_modules install_bridges install_hashcat ++install: install_shared install_library install_library_dev install_tunings install_kernels install_modules install_bridges install_hashcat else - install: install_docs install_shared install_tunings install_kernels install_modules install_hashcat + install: install_docs install_shared install_tools install_tunings install_kernels install_modules install_bridges install_hashcat endif -@@ -578,7 +575,7 @@ install_kernels: install_shared +@@ -660,7 +654,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; - $(FIND) modules/ -mindepth 1 -type f -execdir $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; + $(FIND) modules/ -mindepth 1 -type f -execdir $(INSTALL) -m 755 {} $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; - .PHONY: install_library - install_library: $(HASHCAT_LIBRARY) + .PHONY: install_bridges + install_bridges: install_shared bridges +@@ -892,7 +886,6 @@ endif + + ifeq ($(IS_ARM),1) + CFLAGS_CROSS_LINUX += -DSSE2NEON_SUPPRESS_WARNINGS +-CFLAGS_CROSS_LINUX += -I$(DEPS_SSE2NEON) + endif + + ## -- -2.37.2 +2.51.0 diff --git a/hashcat.spec b/hashcat.spec index 23cfb36..b332271 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,10 +16,10 @@ %endif Name: hashcat -Version: 6.2.6 +Version: 7.1.2 Release: %autorelease -License: MIT AND LicenseRef-Fedora-Public-Domain +License: MIT AND LicenseRef-Fedora-Public-Domain AND BSD-2-Clause AND Apache-2.0 URL: https://github.com/%{name}/%{name} Summary: Advanced password recovery utility @@ -32,16 +32,24 @@ Patch0: %{name}-build-fixes.patch BuildRequires: opencl-headers BuildRequires: xxhash-devel +%ifarch aarch64 +BuildRequires: sse2neon-devel +%endif + BuildRequires: gcc BuildRequires: make %if %{with zlib} -BuildRequires: zlib-devel +BuildRequires: zlib-ng-compat-devel BuildRequires: minizip-compat-devel %else Provides: bundled(zlib) = 1.2.11 Provides: bundled(minizip) = 1.2.11 %endif +Provides: bundled(lzma-sdk) = 24.09 +Provides: bundled(scrypt-jane) +Provides: bundled(yescrypt) +Provides: bundled(libargo2) = 20190702 Recommends: %{name}-doc @@ -74,7 +82,7 @@ BuildArch: noarch %prep %autosetup -p1 -rm -rf deps/{OpenCL-Headers,xxHash} +rm -rf deps/{OpenCL-Headers,xxHash,sse2neon} %if %{with zlib} rm -rf deps/zlib %endif @@ -91,6 +99,7 @@ rm -f modules/.lock ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so mkdir -p %{buildroot}%{_datadir}/bash-completion/completions install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name} +find %{buildroot}%{_libdir}/%{name}/ -name '.gitkeep' -type f -delete %files %license docs/license.txt diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/sources b/sources index 403430d..776ee7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.6-clean.tar.xz) = 3c7bdf4209d28bf5bc62d43ea4bb44a158a0226769ec9e1e9b92571fdfd0f1f89ee581edddb6582491e5cc8f44becde13b9caf8a169ed766c79bc114dc204a9f +SHA512 (hashcat-7.1.2-clean.tar.xz) = 39d525d8f835227a2d9a081ce5b96eabebeff15f10707115f94339f9edd55228885dcd151ace9132e937147318d44447dbb53f8c05b3048f5cb24d620a4f00af diff --git a/tests/core/main.fmf b/tests/core/main.fmf new file mode 100644 index 0000000..78884f4 --- /dev/null +++ b/tests/core/main.fmf @@ -0,0 +1 @@ +summary: hashcat cli smoke test diff --git a/tests/core/test.sh b/tests/core/test.sh new file mode 100755 index 0000000..ffd8682 --- /dev/null +++ b/tests/core/test.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartTest + rlRun "hashcat --version" 0 "version info" + rlPhaseEnd + + rlPhaseStartTest + rlRun -s "hashcat --help" 0 "help" + rlAssertGrep "Usage" "$rlRun_LOG" + rlPhaseEnd + + rlPhaseStartTest + rlRun -s "hashcat --hash-info" 0 "hash info" + rlAssertGrep "Hash Info" "$rlRun_LOG" + rlPhaseEnd +rlJournalEnd diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..f61588b --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +summary: hashcat smoke test +test: ./test.sh +framework: beakerlib +require: ["hashcat"] \ No newline at end of file From c97bfc2aa017c34388f4400e3fad3757b4892720 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Tue, 28 Oct 2025 22:35:15 -0700 Subject: [PATCH 3/5] Correct bundled dep name --- hashcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index b332271..85156a1 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -49,7 +49,7 @@ Provides: bundled(minizip) = 1.2.11 Provides: bundled(lzma-sdk) = 24.09 Provides: bundled(scrypt-jane) Provides: bundled(yescrypt) -Provides: bundled(libargo2) = 20190702 +Provides: bundled(libargon2) = 20190702 Recommends: %{name}-doc From f2640fe2a862148c3f0788dc5e57a3440643a1eb Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 29 Oct 2025 14:56:40 -0700 Subject: [PATCH 4/5] Remove ppc64le build --- hashcat-build-fixes.patch | 4 ++-- hashcat.spec | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 657c212..9ac7917 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,6 +1,6 @@ -From 1b530558da4019541863848937f58e66089c2b42 Mon Sep 17 00:00:00 2001 +From 941717c93cd5383c48b5be213436beebb419bbca Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez -Date: Tue, 21 Oct 2025 21:23:00 -0700 +Date: Wed, 29 Oct 2025 12:15:25 -0700 Subject: [PATCH] fixes --- diff --git a/hashcat.spec b/hashcat.spec index 85156a1..3569ac3 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -7,7 +7,7 @@ %bcond_with zlib %endif -%global makeflags PREFIX=%{_prefix} LIBRARY_FOLDER=%{_libdir} SHARED_ROOT_FOLDER=%{_libdir} DOCUMENT_FOLDER=%{_docdir}/hashcat-doc SHARED=1 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 ENABLE_UNRAR=0 +%global makeflags PREFIX=%{_prefix} LIBRARY_FOLDER=%{_libdir} SHARED_ROOT_FOLDER=%{_libdir} DOCUMENT_FOLDER=%{_docdir}/hashcat-doc SHARED=1 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 ENABLE_UNRAR=0 MAINTAINER_MODE=1 %if %{with zlib} %global makeflags %(echo %{makeflags} USE_SYSTEM_ZLIB=1) @@ -54,8 +54,9 @@ Provides: bundled(libargon2) = 20190702 Recommends: %{name}-doc # Upstream does not support Big Endian architectures. +# Upstream source code does not longer build for ppc64le: https://bugzilla.redhat.com/show_bug.cgi?id=2407234 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} ppc64 s390x +ExcludeArch: %{ix86} ppc64 s390x ppc64le %description Hashcat is the world's fastest and most advanced password recovery From 53a410c00c3bad02f71f660efcf96aea500a3679 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 29 Oct 2025 18:40:18 -0700 Subject: [PATCH 5/5] Fix bridges debuginfo --- hashcat-build-fixes.patch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 9ac7917..737994a 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,14 +1,14 @@ -From 941717c93cd5383c48b5be213436beebb419bbca Mon Sep 17 00:00:00 2001 +From d4ebb8d60a87a638c20fa1de1b4560142a69feb5 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 29 Oct 2025 12:15:25 -0700 Subject: [PATCH] fixes --- - src/Makefile | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) + src/Makefile | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 72986407c..4fe3d9eb7 100644 +index 72986407c..49cbaf924 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,7 +52,7 @@ endif @@ -58,7 +58,7 @@ index 72986407c..4fe3d9eb7 100644 else install: install_docs install_shared install_tools install_tunings install_kernels install_modules install_bridges install_hashcat endif -@@ -660,7 +654,7 @@ install_kernels: install_shared +@@ -660,13 +654,13 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; @@ -67,6 +67,13 @@ index 72986407c..4fe3d9eb7 100644 .PHONY: install_bridges install_bridges: install_shared bridges + $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/bridges + $(FIND) bridges/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/bridges/{} \; +- $(FIND) bridges/ -mindepth 1 -type f -execdir $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/bridges/{} \; ++ $(FIND) bridges/ -mindepth 1 -type f -execdir $(INSTALL) -m 755 {} $(DESTDIR)$(SHARED_FOLDER)/bridges/{} \; + + .PHONY: install_library + install_library: $(HASHCAT_LIBRARY) @@ -892,7 +886,6 @@ endif ifeq ($(IS_ARM),1)