- updated to latest snap, rel 2

[packages/john.git] / john.spec

diff --git a/john.spec b/john.spec
index 2aa0743a876dcdc5e8ca847245dc1cb7304da4d0..5073e62ccd4cb2b6969784fcfd3423f65a6d81b7 100644 (file)
--- a/john.spec
+++ b/john.spec
@@ -1,35 +1,36 @@
 #
 # TODO:
-# - investigate build-time vs runtime detection
+# - investigate build-time vs runtime CPU features detection
 #
 # Conditional build:
-%bcond_without opencl          # OpenCL support (in jumbo version)
-%bcond_without openmp          # OpenMP support (in jumbo version)
+%bcond_without opencl          # OpenCL support
+%bcond_without openmp          # OpenMP support
 
-%define                snap            20181101
-%define                githash         d73288b91d92f3bd670c18d3853ddaf0e02159f0
+%define                snap            20211017
+%define                githash         9298dec7259141f15729fa289411c5033a2fe3aa
+%define                rel             2
 
 Summary:       Password cracker
 Summary(pl.UTF-8):     Łamacz haseł
 Name:          john
-Version:       1.8.0
-Release:       2.%{snap}.1
+Version:       1.9.0
+Release:       1.%{snap}.%{rel}
 License:       GPL v2
 Group:         Applications/System
-Source0:       https://github.com/magnumripper/JohnTheRipper/archive/%{githash}/john-%{snap}.tar.gz
-# Source0-md5: a75c1108111c5181b471a9f4a9dab898
+Source0:       https://github.com/magnumripper/JohnTheRipper/archive/%{githash}/%{name}-%{snap}.tar.gz
+# Source0-md5: 50e53c990a5083d0ccb4d1175c1a7d3d
 Patch0:                %{name}-mailer.patch
 Patch1:                jumbo-optflags.patch
-Patch4:                %{name}-x32.patch
+Patch2:                %{name}-x32.patch
 URL:           http://www.openwall.com/john/
-BuildRequires: rpmbuild(macros) >= 1.213
-BuildRequires: autoconf >= 2.69
-BuildRequires: tar >= 1:1.22
 %{?with_opencl:BuildRequires:  OpenCL-devel}
+BuildRequires: autoconf >= 2.69
 BuildRequires: bzip2-devel
 %{?with_openmp:BuildRequires:  gcc >= 6:4.2}
 BuildRequires: gmp-devel
 %{?with_openmp:BuildRequires:  libgomp-devel}
+BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: tar >= 1:1.22
 # for SIPdump and vncpcap2john binaries, which are not packaged
 #BuildRequires:        libpcap-devel
 BuildRequires: openssl-devel >= 0.9.7
@@ -59,11 +60,11 @@ na różnych uniksach, obsługiwane są także skróty Kerberos/AFS oraz
 Windows NT/2000/XP LM, a także kilka innych przy użyciu łat.
 
 %prep
-%setup -q -n JohnTheRipper-%{githash}
+%setup -q -n john-%{githash}
 %patch0 -p1
 %patch1 -p1
 %ifarch x32
-%patch4 -p1
+%patch2 -p1
 %endif
 
 %build