Fix bridges debuginfo

[skip changelog]

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,3 +1 @@
-/hashcat-5.1.0.tar.gz
-/hashcat-6.0.0.tar.gz
-/hashcat-6.1.1.tar.gz
+/hashcat-*.tar.xz

README.md

@@ -1,3 +0,0 @@
-# hashcat
-
-The hashcat package

changelog

@@ -0,0 +1,2 @@
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

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}

hashcat-build-fixes.patch

@@ -1,17 +1,17 @@
-From 2b730180e108289cea3c6ffb1cbb7fdc72d96a38 Mon Sep 17 00:00:00 2001
-From: Vitaly Zaitsev <vitaly@easycoding.org>
-Date: Wed, 17 Jun 2020 10:57:15 +0200
-Subject: [PATCH] Fedora build patches.
+From d4ebb8d60a87a638c20fa1de1b4560142a69feb5 Mon Sep 17 00:00:00 2001
+From: Carlos Rodriguez-Fernandez <carlosrodrifernandez@gmail.com>
+Date: Wed, 29 Oct 2025 12:15:25 -0700
+Subject: [PATCH] fixes
 
 ---
- src/Makefile | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
+ src/Makefile | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index c2441456..d9143d69 100644
+index 72986407c..49cbaf924 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -40,7 +40,7 @@ endif
+@@ -52,7 +52,7 @@ endif
  ## Makefile flags
  ##
  
@@ -20,7 +20,16 @@ index c2441456..d9143d69 100644
  
  ifneq ($(findstring clean,$(MAKECMDGOALS)),)
  MAKEFLAGS               += -j 1
-@@ -186,10 +186,7 @@ CFLAGS_ZLIB             += -DIOAPI_NO_64
+@@ -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,47 @@ index c2441456..d9143d69 100644
  else
  ifeq ($(DEBUG),1)
  ifneq ($(UNAME),Darwin)
-@@ -397,7 +394,7 @@ Only Linux, FreeBSD and Darwin can use the 'install' target
+@@ -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_kernels install_modules install_hashcat
-+install: install_shared install_library install_library_dev 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_kernels install_modules install_hashcat
+ install: install_docs install_shared install_tools                                     install_tunings install_kernels install_modules install_bridges install_hashcat
  endif
-@@ -457,7 +454,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/{} \;
 -	$(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_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)
- 	$(INSTALL) -m 755 -d                                                    $(DESTDIR)$(LIBRARY_FOLDER)
+@@ -892,7 +886,6 @@ endif
+ 
+ ifeq ($(IS_ARM),1)
+ CFLAGS_CROSS_LINUX      += -DSSE2NEON_SUPPRESS_WARNINGS
+-CFLAGS_CROSS_LINUX      += -I$(DEPS_SSE2NEON)
+ endif
+ 
+ ##
 -- 
-2.26.2
+2.51.0
 

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
+%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)
@@ -16,37 +16,47 @@
 %endif
 
 Name: hashcat
-Version: 6.1.1
-Release: 1%{?dist}
+Version: 7.1.2
+Release: %autorelease
+
+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
 
-License: MIT and Public Domain
-URL: https://github.com/%{name}/%{name}
-Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+# The official upstream tarball contains some non-free components.
+# We cannot use it on Fedora for legal reasons.
+# Use ./make_tarball.sh to generate a new stripped tarball.
+Source0: %{name}-%{version}-clean.tar.xz
+Source1: make_tarball.sh
 Patch0: %{name}-build-fixes.patch
 
-BuildRequires: bash-completion
 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(libargon2) = 20190702
 
-Requires: bash-completion
-%if 0%{?fedora}
-Recommends: mesa-libOpenCL%{?_isa}
-Recommends: pocl%{?_isa}
-Recommends: %{name}-doc = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
+Recommends: %{name}-doc
 
 # Upstream does not support Big Endian architectures.
-ExcludeArch: ppc64 s390x
+# 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 ppc64le
 
 %description
 Hashcat is the world's fastest and most advanced password recovery
@@ -73,7 +83,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
@@ -90,11 +100,12 @@ 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
 %doc README.md
-%{_datadir}/bash-completion/completions/%{name}
+%{_datadir}/bash-completion/
 %{_libdir}/lib%{name}.so.%{version}
 %{_libdir}/%{name}/
 %{_bindir}/%{name}
@@ -108,39 +119,4 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash-
 %doc example.dict example*.sh
 
 %changelog
-* Fri Jul 31 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 6.1.1-1
-- Updated to version 6.1.1.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jun 19 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 6.0.0-3
-- Backported upstream patch with NVIDIA OpenCL fixes.
-
-* Thu Jun 18 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 6.0.0-2
-- Fixed packaging issues, related to modules.
-
-* Wed Jun 17 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 6.0.0-1
-- Updated to version 6.0.0.
-
-* Tue Feb 25 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 5.1.0-7
-- Allow to install without mesa-libOpenCL.
-- Added pocl as a weak dependency on Fedora.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 24 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 5.1.0-4
-- Switched to regular build instead of debug.
-
-* Mon Feb 18 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 5.1.0-3
-- Fixed problem with dependencies on EPEL7.
-
-* Thu Feb 07 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 5.1.0-2
-- Moved documentation to a separate package.
-
-* Wed Feb 06 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 5.1.0-1
-- Initial SPEC release.
+%autochangelog

make_tarball.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/bash
+set -e
+
+NAME="hashcat"
+VERSION="$1"
+
+if [ -z "$VERSION" ]
+then
+    echo "Usage: ./make_tarball.sh {version}"
+    exit 1
+fi
+
+TARBALL_DIR="$NAME-$VERSION"
+TARBALL_ORIG="$NAME-$VERSION.tar.gz"
+TARBALL_NEW="$NAME-$VERSION-clean.tar.xz"
+
+echo "Downloading upstream tarball..."
+wget "https://github.com/hashcat/hashcat/archive/v$VERSION/$TARBALL_ORIG" -O "$TARBALL_ORIG" 2>/dev/null
+
+echo "Unpacking upstream tarball..."
+tar -xf "$TARBALL_ORIG"
+
+echo "Removing non-free components..."
+rm -rf "$TARBALL_DIR/deps/unrar"
+
+echo "Building a new tarball..."
+tar -cJf "$TARBALL_NEW" "$TARBALL_DIR"
+
+echo "Performing cleanup..."
+rm -f "$TARBALL_ORIG"
+rm -rf "$TARBALL_DIR"
+
+echo "Done."

plans/main.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt

sources

@@ -1 +1 @@
-SHA512 (hashcat-6.1.1.tar.gz) = 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
+SHA512 (hashcat-7.1.2-clean.tar.xz) = 39d525d8f835227a2d9a081ce5b96eabebeff15f10707115f94339f9edd55228885dcd151ace9132e937147318d44447dbb53f8c05b3048f5cb24d620a4f00af

tests/core/main.fmf

@@ -0,0 +1 @@
+summary: hashcat cli smoke test

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

tests/main.fmf

@@ -0,0 +1,4 @@
+summary: hashcat smoke test
+test: ./test.sh
+framework: beakerlib
+require: ["hashcat"]