Accepting request 32145 from security

Copy from security/john based on submit request 32145 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/32145
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/john?expand=0&rev=5
This commit is contained in:
OBS User autobuild 2010-02-11 20:10:18 +00:00 committed by Git OBS Bridge
parent 13b82294af
commit e7aa86860a
2 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 8 22:44:32 UTC 2010 - jengelh@medozas.de
- only build MMX variant on >= i586
- guard TARGET=linux-x86-any with %ix86
- enable building on sparcv9
-------------------------------------------------------------------
Mon Sep 28 23:59:28 CEST 2009 - lrupp@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package john (Version 1.7.3.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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
@ -23,7 +23,7 @@ Url: http://www.openwall.com/john/
License: GPLv2+
Group: Productivity/Security
Version: 1.7.3.4
Release: 1
Release: 2
Summary: Detects Weak Passwords
Source: %{name}-%{version}.tar.bz2
Source2: %{name}.8.gz
@ -47,7 +47,7 @@ Authors:
Solar Designer <solar@false.com>
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{name}-%{version}
# 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
@ -59,21 +59,23 @@ perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_HOME)\s.+$#$1\t\"%{johndir}\"#g' $RPM_
%build
%ifarch alpha
TARGET=linux-alpha
TARGET=linux-alpha
%endif
%ifarch ia64
TARGET=linux-ia64
%endif
%ifarch %ix86
%ifnarch i386 i486
TARGET=linux-x86-mmx
%endif
%endif
%ifarch ppc
TARGET=linux-ppc32
%endif
%ifarch ppc64
TARGET=linux-ppc64
%endif
%ifarch sparc
%ifarch sparc sparcv9
TARGET=linux-sparc
%endif
%ifarch sparc64
@ -82,9 +84,11 @@ perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_HOME)\s.+$#$1\t\"%{johndir}\"#g' $RPM_
%ifarch x86_64
TARGET=linux-x86-64
%endif
%ifarch %ix86
if test -z "$TARGET"; then
TARGET=linux-x86-any
fi
%endif
export TARGET
pushd src
make clean $TARGET %{cflags}