- jumbo patch up to 1.7.9-jumbo-7

diff --git a/john-jumbo-optflags.patch b/john-jumbo-optflags.patch
index ef176f594b714387d7f4ebcfa818a065e13951d8..d31b8ab3d5670f2adee8fbe00a95c74a8ac8b618 100644 (file)
--- a/john-jumbo-optflags.patch
+++ b/john-jumbo-optflags.patch
@@ -4,8 +4,8 @@
  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)
+-CFLAGS = -c -Wall -O2 -fomit-frame-pointer -Wdeclaration-after-statement -I/usr/local/include $(HAVE_NSS) $(OMPFLAGS) $(JOHN_CFLAGS) $(AMDAPP)
++CFLAGS = -c $(OPTFLAGS) -fomit-frame-pointer -Wdeclaration-after-statement -I/usr/local/include $(HAVE_NSS) $(OMPFLAGS) $(JOHN_CFLAGS) $(AMDAPP)
  # -DHAVE_SKEY
  # CFLAGS for use on the main john.c file only
  CFLAGS_MAIN = $(CFLAGS)

diff --git a/john.spec b/john.spec
index c64451de5212dcfa31b15da6c47898a128c324c5..00c8881cb0fbca4b8ad7045a6cd58c76662a3205 100644 (file)
--- 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-6.diff.gz
-# Patch2-md5:  685c759ec6f865ea81f40a487cd56882
+Patch2:                http://www.openwall.com/john/g/%{name}-1.7.9-jumbo-7.diff.gz
+# Patch2-md5:  b953fcb7f743eeeb5f938a28c352b8ef
 Patch3:                %{name}-jumbo-optflags.patch
 URL:           http://www.openwall.com/john/
 %{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7}