pool/hashcat
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Amend system-libs.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security/hashcat?expand=0&rev=26
This commit is contained in:
Jan Engelhardt 2024-06-06 18:19:33 +00:00 committed by Git OBS Bridge
parent 835dae66d8
commit ed1dff9723
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hashcat.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 6 18:12:31 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Amend system-libs.patch; system lzma-sdk (24.xx) is too new;
go back to using bundled lzma-sdk.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 7 20:42:32 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de> Sun May 7 20:42:32 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>

5
hashcat.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hashcat # spec file for package hashcat
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -37,6 +37,7 @@ BuildRequires: xxhash-devel
BuildRequires: pkgconfig(clzma) BuildRequires: pkgconfig(clzma)
BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(minizip)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Provides: bundled(lzma-sdk) = 21.02
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
%description %description
@ -79,7 +80,7 @@ find . -name .lock -type f -delete
%build %build
%global margs DOCUMENT_FOLDER="%_docdir/%name" our_CFLAGS="%optflags" LIBRARY_FOLDER="%_libdir" %global margs DOCUMENT_FOLDER="%_docdir/%name" our_CFLAGS="%optflags" LIBRARY_FOLDER="%_libdir"
%make_build %margs %make_build %margs -j1
%install %install
%make_install %margs %make_install %margs

29
system-libs.patch
View File

@ -1,12 +1,12 @@
--- ---
src/Makefile | 19 ++++++++++--------- src/Makefile | 13 +++++++------
1 file changed, 10 insertions(+), 9 deletions(-) 1 file changed, 7 insertions(+), 6 deletions(-)
Index: hashcat-6.2.6/src/Makefile Index: hashcat-6.2.6/src/Makefile
=================================================================== ===================================================================
--- hashcat-6.2.6.orig/src/Makefile --- hashcat-6.2.6.orig/src/Makefile
+++ hashcat-6.2.6/src/Makefile +++ hashcat-6.2.6/src/Makefile
@@ -3,17 +3,17 @@ @@ -3,7 +3,7 @@
## License.....: MIT ## License.....: MIT
## ##
@ -15,12 +15,11 @@ Index: hashcat-6.2.6/src/Makefile
DEBUG := 0 DEBUG := 0
PRODUCTION := 1 PRODUCTION := 1
PRODUCTION_VERSION := v6.2.6 PRODUCTION_VERSION := v6.2.6
ENABLE_CUBIN ?= 1 @@ -11,9 +11,9 @@ ENABLE_CUBIN ?= 1
ENABLE_BRAIN ?= 1 ENABLE_BRAIN ?= 1
ENABLE_UNRAR ?= 1 ENABLE_UNRAR ?= 1
-USE_SYSTEM_LZMA ?= 0 USE_SYSTEM_LZMA ?= 0
-USE_SYSTEM_ZLIB ?= 0 -USE_SYSTEM_ZLIB ?= 0
+USE_SYSTEM_LZMA ?= 1
+USE_SYSTEM_ZLIB ?= 1 +USE_SYSTEM_ZLIB ?= 1
USE_SYSTEM_OPENCL ?= 0 USE_SYSTEM_OPENCL ?= 0
-USE_SYSTEM_XXHASH ?= 0 -USE_SYSTEM_XXHASH ?= 0
@ -37,15 +36,6 @@ Index: hashcat-6.2.6/src/Makefile
INSTALL_FOLDER ?= $(PREFIX)/bin INSTALL_FOLDER ?= $(PREFIX)/bin
SHARED_ROOT_FOLDER ?= $(PREFIX)/share SHARED_ROOT_FOLDER ?= $(PREFIX)/share
@@ -119,7 +119,7 @@ LIBRARY_DEV_FOLDER ?= $(LIBRARY_DEV
ifeq ($(USE_SYSTEM_LZMA),0)
DEPS_LZMA_PATH := deps/LZMA-SDK/C
else
-DEPS_LZMA_PATH := $(LIBRARY_DEV_ROOT_FOLDER)
+DEPS_LZMA_PATH := /usr/include/clzma
endif
ifeq ($(USE_SYSTEM_ZLIB),0)
@@ -173,7 +173,7 @@ endif # MSYS2 @@ -173,7 +173,7 @@ endif # MSYS2
## Misc stuff ## Misc stuff
## ##
@ -72,12 +62,3 @@ Index: hashcat-6.2.6/src/Makefile
endif endif
else else
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
@@ -269,7 +270,7 @@ CFLAGS += -pipe -Iinclu
# LZMA
CFLAGS += -I$(DEPS_LZMA_PATH)
ifeq ($(USE_SYSTEM_LZMA),1)
-LFLAGS += -llzmasdk
+LFLAGS += -lclzma
endif
# ZLIB