packages: john/john.spec, john/optflags.patch - updated to 1.7.9 (no jumbo ...

[qboosh]

Author: qboosh                       Date: Sun Nov 27 10:07:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.7.9 (no jumbo path for this version yet)
- updated optflags patch

---- Files affected:
packages/john:
   john.spec (1.67 -> 1.68) , optflags.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/john/john.spec
diff -u packages/john/john.spec:1.67 packages/john/john.spec:1.68
--- packages/john/john.spec:1.67	Sun Jul  3 12:10:37 2011
+++ packages/john/john.spec	Sun Nov 27 11:07:06 2011
@@ -35,16 +35,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}
@@ -196,6 +196,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2011/11/27 10:07:06  qboosh
+- updated to 1.7.9 (no jumbo path for this version yet)
+- updated optflags patch
+
 Revision 1.67  2011/07/03 10:10:37  adamg
 - store jumbo patch in df
 - solve conflict between optflags and jumbo patches

================================================================
Index: packages/john/optflags.patch
diff -u packages/john/optflags.patch:1.1 packages/john/optflags.patch:1.2
--- packages/john/optflags.patch:1.1	Fri Nov  5 12:21:48 2010
+++ packages/john/optflags.patch	Sun Nov 27 11:07:06 2011
@@ -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 = \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/john/john.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/john/optflags.patch?r1=1.1&r2=1.2&f=u