Александр Кириллов
2011-01-24 10:40:09 UTC
john-1.7.6-1 doesn't build out of the box
the reason being make removing symlinked arch.h before building the final
target.
The attached fix also includes contributed patches which add many more
hash formats,
e.g. raw-MD5.
AK
-------------- next part --------------
--- john.spec.20110124 2011-01-24 13:18:33.000000000 +0300
+++ john.spec 2011-01-24 13:19:45.000000000 +0300
@@ -4,7 +4,7 @@
Summary: John the Ripper password cracker
Name: john
Version: 1.7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/System
URL: http://www.openwall.com/john/
@@ -14,8 +14,11 @@
Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
Source: http://www.openwall.com/john/g/john-%{version}.tar.bz2
+Patch: ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.7.6-jumbo-9.diff.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: openssl-devel
+
%description
John the Ripper is a fast password cracker. Its primary purpose is to
detect weak Unix passwords, but a number of other hash types are
@@ -23,6 +26,7 @@
%prep
%setup
+%patch -p1
%{__perl} -pi.orig -e 's|^(\#define CFG_FULL_NAME)\s.+$|$1 "%{_sysconfdir}/john.conf"|' src/params.h
@@ -30,26 +34,26 @@
CFLAGS="-c %{optflags} -DJOHN_SYSTEMWIDE -fomit-frame-pointer"
%ifarch %{ix86}
%define _with_cpu_fallback 1
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" clean linux-x86-any
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" linux-x86-any
%{__mv} -f run/john run/john-non-mmx
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" clean linux-x86-mmx
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" linux-x86-mmx
#%{__mv} -f run/john run/john-non-sse
-#%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" clean linux-x86-sse2
+#%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" linux-x86-sse2
%endif
%ifarch x86_64
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-x86-64
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-x86-64
%endif
%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-alpha
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-alpha
%endif
%ifarch sparc sparcv9
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-sparc
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-sparc
%endif
%ifarch ppc
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-ppc32
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-ppc32
%endif
%ifarch ppc64
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-ppc64
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-ppc64
%endif
%install
@@ -86,6 +90,9 @@
%endif
%changelog
+* Sun Jan 23 2011 Alexander Kirillov - 1.7.6-2
+- Added jumbo patch
+
* Mon Jun 14 2010 Dag Wieers <dag at wieers.com> - 1.7.6-1 - 8921/dag
- Updated to release 1.7.6.
the reason being make removing symlinked arch.h before building the final
target.
The attached fix also includes contributed patches which add many more
hash formats,
e.g. raw-MD5.
AK
-------------- next part --------------
--- john.spec.20110124 2011-01-24 13:18:33.000000000 +0300
+++ john.spec 2011-01-24 13:19:45.000000000 +0300
@@ -4,7 +4,7 @@
Summary: John the Ripper password cracker
Name: john
Version: 1.7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/System
URL: http://www.openwall.com/john/
@@ -14,8 +14,11 @@
Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
Source: http://www.openwall.com/john/g/john-%{version}.tar.bz2
+Patch: ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.7.6-jumbo-9.diff.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: openssl-devel
+
%description
John the Ripper is a fast password cracker. Its primary purpose is to
detect weak Unix passwords, but a number of other hash types are
@@ -23,6 +26,7 @@
%prep
%setup
+%patch -p1
%{__perl} -pi.orig -e 's|^(\#define CFG_FULL_NAME)\s.+$|$1 "%{_sysconfdir}/john.conf"|' src/params.h
@@ -30,26 +34,26 @@
CFLAGS="-c %{optflags} -DJOHN_SYSTEMWIDE -fomit-frame-pointer"
%ifarch %{ix86}
%define _with_cpu_fallback 1
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" clean linux-x86-any
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" linux-x86-any
%{__mv} -f run/john run/john-non-mmx
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" clean linux-x86-mmx
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" linux-x86-mmx
#%{__mv} -f run/john run/john-non-sse
-#%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" clean linux-x86-sse2
+#%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS -DCPU_FALLBACK=1" linux-x86-sse2
%endif
%ifarch x86_64
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-x86-64
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-x86-64
%endif
%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-alpha
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-alpha
%endif
%ifarch sparc sparcv9
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-sparc
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-sparc
%endif
%ifarch ppc
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-ppc32
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-ppc32
%endif
%ifarch ppc64
-%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" clean linux-ppc64
+%{__make} %{?_smp_mflags} -C src CFLAGS="$CFLAGS" linux-ppc64
%endif
%install
@@ -86,6 +90,9 @@
%endif
%changelog
+* Sun Jan 23 2011 Alexander Kirillov - 1.7.6-2
+- Added jumbo patch
+
* Mon Jun 14 2010 Dag Wieers <dag at wieers.com> - 1.7.6-1 - 8921/dag
- Updated to release 1.7.6.