[packages/john] - jumbo patch up to 1.7.9-jumbo-6

[adamg]

commit 7b8fa69c6970b489b234028411b0d77b88d3f1da
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Sat Jul 14 18:04:19 2012 +0200

    - jumbo patch up to 1.7.9-jumbo-6

 john-jumbo-optflags.patch | 14 +++++++-------
 john.spec                 |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/john-jumbo-optflags.patch b/john-jumbo-optflags.patch
index 005f739..ef176f5 100644
--- a/john-jumbo-optflags.patch
+++ b/john-jumbo-optflags.patch
@@ -1,14 +1,14 @@
 --- john-1.7.8/src/Makefile~	2011-07-03 12:05:54.182086313 +0200
 +++ john-1.7.8/src/Makefile	2011-07-03 12:06:36.707718399 +0200
 @@ -32,7 +32,7 @@
- # icc with OpenMP (for make target linux-x86-64-icc)
- #OMPFLAGS = -openmp
- 
--CFLAGS = -c -Wall -O2 -fomit-frame-pointer -I/usr/local/include $(OMPFLAGS)
-+CFLAGS = -c $(OPTFLAGS) -fomit-frame-pointer -I/usr/local/include $(OMPFLAGS)
+ NSS_LDFLAGS = `pkg-config --libs nss`
+ endif
+
+-CFLAGS = -c -Wall -O2 -fomit-frame-pointer -I/usr/local/include $(HAVE_NSS) $(OMPFLAGS) $(JOHN_CFLAGS) $(AMDAPP)
++CFLAGS = -c $(OPTFLAGS) -fomit-frame-pointer -I/usr/local/include $(HAVE_NSS) $(OMPFLAGS) $(JOHN_CFLAGS) $(AMDAPP)
  # -DHAVE_SKEY
- ASFLAGS = -c $(OMPFLAGS)
- LDFLAGS = -s -L/usr/local/lib -L/usr/local/ssl/lib -lcrypto -lssl -lm $(OMPFLAGS)
+ # CFLAGS for use on the main john.c file only
+ CFLAGS_MAIN = $(CFLAGS)
 @@ -41,6 +41,7 @@
  OPT_NORMAL = -funroll-loops
  # Remove the "-Os" if you're using an ancient version of gcc
diff --git a/john.spec b/john.spec
index 1803f52..5abd0bb 100644
--- a/john.spec
+++ b/john.spec
@@ -42,8 +42,8 @@ Source0:	http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2
 # Source0-md5:	45f54fc59386ecd67daaef9f19781d93
 Patch0:		%{name}-mailer.patch
 Patch1:		optflags.patch
-Patch2:		http://www.openwall.com/john/g/%{name}-1.7.9-jumbo-5.diff.gz
-# Patch2-md5:	68cacb612f20c71eed6c24cbaf28148a
+Patch2:		http://www.openwall.com/john/g/%{name}-1.7.9-jumbo-6.diff.gz
+# Patch2-md5:	685c759ec6f865ea81f40a487cd56882
 Patch3:		%{name}-jumbo-optflags.patch
 URL:		http://www.openwall.com/john/
 %{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7}