From 2f02f703321397e7a5f2453832df67d0fc62a6be Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 27 Nov 2011 10:07:06 +0000
Subject: [PATCH 1/1] - updated to 1.7.9 (no jumbo path for this version yet) -
 updated optflags patch

Changed files:
    john.spec -> 1.68
    optflags.patch -> 1.2
---
 john.spec      |  8 ++++----
 optflags.patch | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/john.spec b/john.spec
index 4508f38..7f23199 100644
--- a/john.spec
+++ b/john.spec
@@ -34,16 +34,16 @@
 Summary:	Password cracker
 Summary(pl.UTF-8):	Łamacz haseł
 Name:		john
-Version:	1.7.8
+Version:	1.7.9
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2
-# Source0-md5:	e6d7f261829610d6949c706ebac0517c
+# Source0-md5:	45f54fc59386ecd67daaef9f19781d93
 Patch0:		%{name}-mailer.patch
 Patch1:		optflags.patch
-Patch2:		http://www.openwall.com/john/g/%{name}-%{version}-jumbo-2.diff.gz
-# Patch2-md5:	445bbcc9049a632c18359cb7a0fdfb27
+Patch2:		http://www.openwall.com/john/g/%{name}-1.7.8-jumbo-8.diff.gz
+# Patch2-md5:	96cb581fd8447f3f96614fd365896b07
 Patch3:		%{name}-jumbo-optflags.patch
 URL:		http://www.openwall.com/john/
 %{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7}
diff --git a/optflags.patch b/optflags.patch
index 2a99689..ec7db27 100644
--- a/optflags.patch
+++ b/optflags.patch
@@ -1,15 +1,18 @@
---- john-1.7.6/src/Makefile~	2010-06-14 00:12:37.000000000 +0300
-+++ john-1.7.6/src/Makefile	2010-11-05 13:09:41.713609665 +0200
-@@ -19,11 +19,12 @@
- #OMPFLAGS = -fopenmp
+--- john-1.7.9/src/Makefile.orig	2011-11-23 01:19:21.000000000 +0100
++++ john-1.7.9/src/Makefile	2011-11-27 11:01:56.437966014 +0100
+@@ -20,7 +20,7 @@
+ #OMPFLAGS = -fopenmp -msse2
  # Sun Studio with OpenMP (set the OMP_NUM_THREADS env var at runtime)
  #OMPFLAGS = -xopenmp
 -CFLAGS = -c -Wall -O2 -fomit-frame-pointer $(OMPFLAGS)
 +CFLAGS = -c $(OPTFLAGS) -fomit-frame-pointer $(OMPFLAGS)
+ # CFLAGS for use on the main john.c file only
+ CFLAGS_MAIN = $(CFLAGS)
  ASFLAGS = -c $(OMPFLAGS)
- LDFLAGS = -s $(OMPFLAGS)
+@@ -28,6 +28,7 @@
  OPT_NORMAL = -funroll-loops
- OPT_INLINE = -finline-functions
+ # Remove the "-Os" if you're using an ancient version of gcc
+ OPT_INLINE = -Os -funroll-loops -finline-functions
 +OPTFLAGS = -Wall -O2
  
  JOHN_OBJS = \
-- 
2.44.0