pool/john
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 213438 from openSUSE:Factory:PowerLE

Browse Source 
- Fix build on ppc64le
- added patches:
  * ppc64le.patch

OBS-URL: https://build.opensuse.org/request/show/213438
OBS-URL: https://build.opensuse.org/package/show/security/john?expand=0&rev=40
This commit is contained in:
Marcus Meissner
2014-01-10 12:10:44 +00:00
committed by Git OBS Bridge
parent 89ec81c5cd
commit a6ba09f80d
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
john.changes
View File

@@ -1,4 +1,11 @@
-------------------------------------------------------------------
Fri Jan 10 11:41:09 UTC 2014 - dvaleev@suse.com
- Fix build on ppc64le
- added patches:
* ppc64le.patch
-------------------------------------------------------------------
Mon Oct 28 13:23:53 UTC 2013 - schwab@suse.de
- Use the generic target for m68k

6
john.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package john
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,7 @@ Source4: %{name}.keyring
# Source5: http://www.openwall.com/john/g/%{name}-%{version}-jumbo-7.tar.bz2.sign
Source6: mailer.8
Source7: relbench.8
Patch0: ppc64le.patch
BuildRequires: openssl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define johndir /var/lib/john
@@ -47,6 +48,7 @@ number of other hash types are supported as well.
%prep
%setup -q
%patch0 -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
@@ -71,7 +73,7 @@ perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_HOME)\s.+$#$1\t\"%{johndir}\"#g' $RPM_
%ifarch ppc
TARGET=linux-ppc32
%endif
%ifarch ppc64
%ifarch ppc64 ppc64le
TARGET=linux-ppc64
%endif
%ifarch sparc sparcv9

16
ppc64le.patch Normal file
View File

@@ -0,0 +1,16 @@
Index: john-1.8.0/src/ppc64.h
===================================================================
--- john-1.8.0.orig/src/ppc64.h
+++ john-1.8.0/src/ppc64.h
@@ -20,7 +20,11 @@
#define ARCH_BITS 64
#define ARCH_BITS_LOG 6
#define ARCH_BITS_STR "64"
+#if defined(__LITTLE_ENDIAN__)
+#define ARCH_LITTLE_ENDIAN 1
+#else
#define ARCH_LITTLE_ENDIAN 0
+#endif
#define ARCH_INT_GT_32 0
#define ARCH_ALLOWS_UNALIGNED 0
#define ARCH_INDEX(x) ((unsigned int)(unsigned char)(x))