Accepting request 360152 from security

- as follow on of previous "jumbo patch" need two powerpc changes:
  new john-1.7.9-powerpc_BE_need_rhash_u32_swap_copy.patch
  place ppc64le.patch after application of "jumbo patch" in spec
  allow to solve partially boo #940498  for ppc64le
  but still have 4 FAILED tests for ppc64 tracked upstream by
  http://www.openwall.com/lists/john-dev/2016/02/16/1

OBS-URL: https://build.opensuse.org/request/show/360152
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/john?expand=0&rev=28

john-1.7.9-powerpc_BE_need_rhash_u32_swap_copy.patch

@@ -0,0 +1,27 @@
+From: Michel Normand <normand@linux.vnet.ibm.com>
+Subject: john-1.7.9-powerpc BE need rhash u32 swap copy
+Date: Mon, 15 Feb 2016 17:56:13 +0100
+
+rhash_u32_swap_copy needs to be defined for CPU_BIG_ENDIAN
+patch required when  1.7.9 jumbo patch is applied
+as suggested in uptream ML
+http://www.openwall.com/lists/john-dev/2013/02/06/2
+
+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
+---
+ john-1.7.9-jumbo-7/src/gost_plug.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: john-1.8.0/john-1.7.9-jumbo-7/src/gost_plug.c
+===================================================================
+--- john-1.8.0.orig/john-1.7.9-jumbo-7/src/gost_plug.c
++++ john-1.8.0/john-1.7.9-jumbo-7/src/gost_plug.c
+@@ -531,7 +531,7 @@ int main()
+ }
+ #endif
+ 
+-#ifndef __GLIBC__
++#ifdef CPU_BIG_ENDIAN
+ void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) {
+ 	size_t i;
+ 	unsigned int *pO, *pI;

john.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 17 11:17:04 UTC 2016 - normand@linux.vnet.ibm.com
+
+- as follow on of previous "jumbo patch" need two powerpc changes:
+  new john-1.7.9-powerpc_BE_need_rhash_u32_swap_copy.patch
+  place ppc64le.patch after application of "jumbo patch" in spec
+  allow to solve partially boo #940498  for ppc64le
+  but still have 4 FAILED tests for ppc64 tracked upstream by
+  http://www.openwall.com/lists/john-dev/2016/02/16/1
+
 -------------------------------------------------------------------
 Thu Jun 25 14:12:06 UTC 2015 - astieger@suse.com
 

john.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package john
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,13 +27,14 @@ Source:         http://www.openwall.com/john/j/%{name}-%{version}.tar.xz
 Source1:        http://www.openwall.com/john/j/%{name}-%{version}.tar.xz.sign
 Source2:        %{name}.8.gz
 Source3:        %{name}-rpmlintrc
-Source4:        %{name}.keyring
 Source6:        mailer.8
 Source7:        relbench.8
 %define         jumboversion john-1.7.9-jumbo-7
 Source8:        %{jumboversion}.tar.bz2
 Source9:        %{jumboversion}.tar.bz2.sign
-Patch0:         ppc64le.patch
+Source10:       %name.keyring
+Patch0:         john-1.7.9-powerpc_BE_need_rhash_u32_swap_copy.patch
+Patch1:         ppc64le.patch
 BuildRequires:  openssl-devel
 %if 0%{?suse_version} == 1110 
 BuildRequires:  xz
@@ -56,6 +57,7 @@ number of other hash types are supported as well.
 cd %{jumboversion} && cp -a ./* ..
 cd ..
 rm -r %{jumboversion}
+%patch1 -p1
 # adapt the configs
 perl -pi -e "s#Wordlist = (.*)#Wordlist = %{johndir}/password.lst#g" $RPM_BUILD_DIR/%{name}-%{version}/run/john.conf
 perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h