From f65c0fdf4cae9d87185786d95123a4d2b077f0ad6a7b57af05b77d76c977de0e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 15 May 2021 14:18:24 +0000
Subject: [PATCH] - Update to release 6.2.1

OBS-URL: https://build.opensuse.org/package/show/security/hashcat?expand=0&rev=19
---
 hashcat.changes   |  6 ++++++
 hashcat.spec      |  6 +++---
 system-libs.patch | 29 +++++++++++++++++------------
 v6.2.0.tar.gz     |  3 ---
 v6.2.1.tar.gz     |  3 +++
 5 files changed, 29 insertions(+), 18 deletions(-)
 delete mode 100644 v6.2.0.tar.gz
 create mode 100644 v6.2.1.tar.gz

diff --git a/hashcat.changes b/hashcat.changes
index a0d1de6..cad3047 100644
--- a/hashcat.changes
+++ b/hashcat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat May 15 13:28:22 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 6.2.1
+  * Build procedure changes allowing not to use unrar
+
 -------------------------------------------------------------------
 Fri May 14 18:54:03 UTC 2021 - Martin Hauke <mardnh@gmx.de>
 
diff --git a/hashcat.spec b/hashcat.spec
index bc470dd..b27a0b6 100644
--- a/hashcat.spec
+++ b/hashcat.spec
@@ -17,15 +17,15 @@
 
 
 Name:           hashcat
-%define lname	libhashcat6_2_0
-Version:        6.2.0
+%define lname	libhashcat6_2_1
+Version:        6.2.1
 Release:        0
 Summary:        CPU-based password recovery utility
 License:        GPL-2.0-or-later AND MIT
 Group:          Productivity/Security
 URL:            https://hashcat.net/
 
-Source:         https://github.com/hashcat/hashcat/archive/refs/tags/v%{version}.tar.gz
+Source:         https://github.com/hashcat/hashcat/archive/refs/tags/v%version.tar.gz
 Source9:        %name-rpmlintrc
 Patch1:         system-libs.patch
 BuildRequires:  fdupes
diff --git a/system-libs.patch b/system-libs.patch
index e418e91..eb2a8ab 100644
--- a/system-libs.patch
+++ b/system-libs.patch
@@ -1,8 +1,12 @@
-diff --git a/src/Makefile b/src/Makefile
-index bd16932..114aa1d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,16 +3,16 @@
+---
+ src/Makefile |   19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+Index: hashcat-6.2.1/src/Makefile
+===================================================================
+--- hashcat-6.2.1.orig/src/Makefile
++++ hashcat-6.2.1/src/Makefile
+@@ -3,17 +3,17 @@
  ## License.....: MIT
  ##
  
@@ -10,9 +14,10 @@ index bd16932..114aa1d 100644
 +SHARED                  ?= 1
  DEBUG                   := 0
  PRODUCTION              := 1
- PRODUCTION_VERSION      := v6.2.0
+ PRODUCTION_VERSION      := v6.2.1
  ENABLE_CUBIN            ?= 1
  ENABLE_BRAIN            ?= 1
+ ENABLE_UNRAR            ?= 1
 -USE_SYSTEM_LZMA         ?= 0
 -USE_SYSTEM_ZLIB         ?= 0
 +USE_SYSTEM_LZMA         ?= 1
@@ -23,7 +28,7 @@ index bd16932..114aa1d 100644
  ## do not change, requires some hacks
  USE_SYSTEM_UNRAR        ?= 0
  
-@@ -100,7 +100,7 @@ VERSION_PURE            := $(shell echo "$(VERSION_TAG)" | $(SED) 's/.*v\([\.0-9
+@@ -101,7 +101,7 @@ VERSION_PURE            := $(shell echo
  ##
  
  DESTDIR                 ?=
@@ -32,7 +37,7 @@ index bd16932..114aa1d 100644
  
  INSTALL_FOLDER          ?= $(PREFIX)/bin
  SHARED_ROOT_FOLDER      ?= $(PREFIX)/share
-@@ -117,7 +117,7 @@ LIBRARY_DEV_FOLDER      ?= $(LIBRARY_DEV_ROOT_FOLDER)/hashcat
+@@ -118,7 +118,7 @@ LIBRARY_DEV_FOLDER      ?= $(LIBRARY_DEV
  ifeq ($(USE_SYSTEM_LZMA),0)
  DEPS_LZMA_PATH          := deps/LZMA-SDK/C
  else
@@ -41,7 +46,7 @@ index bd16932..114aa1d 100644
  endif
  
  ifeq ($(USE_SYSTEM_ZLIB),0)
-@@ -169,7 +169,7 @@ endif # MSYS2
+@@ -172,7 +172,7 @@ endif # MSYS2
  ## Misc stuff
  ##
  
@@ -50,7 +55,7 @@ index bd16932..114aa1d 100644
  
  ##
  ## General compiler and linker options
-@@ -177,6 +177,7 @@ COMPTIME                := $(shell date +%s)
+@@ -180,6 +180,7 @@ COMPTIME                := $(shell date
  
  LFLAGS                  := $(LDFLAGS)
  
@@ -58,7 +63,7 @@ index bd16932..114aa1d 100644
  ifeq ($(PRODUCTION),0)
  CFLAGS                  += -W
  CFLAGS                  += -Wall
-@@ -219,7 +220,7 @@ endif
+@@ -224,7 +225,7 @@ endif
  ifeq ($(DEBUG),0)
  CFLAGS                  += -O2
  ifneq ($(UNAME),Darwin)
@@ -67,7 +72,7 @@ index bd16932..114aa1d 100644
  endif
  else
  ifeq ($(DEBUG),1)
-@@ -245,7 +246,7 @@ CFLAGS                  += -pipe -Iinclude/ -IOpenCL/
+@@ -250,7 +251,7 @@ CFLAGS                  += -pipe -Iinclu
  # LZMA
  CFLAGS                  += -I$(DEPS_LZMA_PATH)
  ifeq ($(USE_SYSTEM_LZMA),1)
diff --git a/v6.2.0.tar.gz b/v6.2.0.tar.gz
deleted file mode 100644
index 71deb0f..0000000
--- a/v6.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a5258838d6ed083d6cb500e4d8dd7197873079deb6cabae4bd0f89736d21314
-size 5806510
diff --git a/v6.2.1.tar.gz b/v6.2.1.tar.gz
new file mode 100644
index 0000000..a256c17
--- /dev/null
+++ b/v6.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4994e9ee8ef050881d5c7986b2b95a3abf2114f79e4dbaa28a537f8e2ad5c93b
+size 5815254