diff options
| author |   Dane Smith <c1pher@gentoo.org> | 2011-02-08 13:34:07 +0000 |
|---|---|---|
| committer | Dane Smith <c1pher@gentoo.org> | 2011-02-08 13:34:07 +0000 |
| commit | 3e2d195c4a51049821ad45529f63bb1c8eabba09 (patch) | |
| tree | 05e30d3a81bb4fa4cc50747d485dffcc7d7e8e51 /app-crypt/johntheripper | |
| parent | Fix temp files creation in keyfile plugin bug #349003 (diff) | |
| download | gentoo-2-3e2d195c4a51049821ad45529f63bb1c8eabba09.tar.gz gentoo-2-3e2d195c4a51049821ad45529f63bb1c8eabba09.tar.bz2 gentoo-2-3e2d195c4a51049821ad45529f63bb1c8eabba09.zip | |
Fix whitespace issues in app-crypt/johntheripper-1.7.6-r1 in a cleaner way wrt bug 350730.
(Portage version: 2.2.0_alpha4/cvs/Linux i686)
Diffstat (limited to 'app-crypt/johntheripper')
| -rw-r--r-- | app-crypt/johntheripper/ChangeLog | 7 | ||||
| -rw-r--r-- | app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index 6b7ab7307b2a..8d91c5fb7856 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/johntheripper # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.128 2011/02/08 12:50:10 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.129 2011/02/08 13:34:07 c1pher Exp $ + + 08 Feb 2011; Dane Smith <c1pher@gentoo.org> johntheripper-1.7.6-r1.ebuild: + Apply patch from Jeroen Roovers to fix too much / lack of enough + escaping as seen in bug 350730. No changes to installed files + therefore no revbump. 08 Feb 2011; Dane Smith <c1pher@gentoo.org> johntheripper-1.7.6-r1.ebuild: Revert back to ~hppa. The whitespace changes that caused issues on diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild index 7c4da8da56d6..29bcd256ae1e 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.8 2011/02/08 12:50:10 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild,v 1.9 2011/02/08 13:34:07 c1pher Exp $ EAPI="2" @@ -93,16 +93,16 @@ src_compile() { local OMP='' use custom-cflags || strip-flags - append-flags -fPIC -fPIE \ - '-DJOHN_SYSTEMWIDE=1' \ - '-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \ - '-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"' + echo '#define JOHN_SYSTEMWIDE 1' >> config.gentoo + echo '#define JOHN_SYSTEMWIDE_HOME "/etc/john"' >> config.gentoo + echo '#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"' >> config.gentoo + append-flags -fPIC -fPIE -include "${S}"/config.gentoo gcc-specs-pie && append-ldflags -nopie use openmp && OMP="-fopenmp" CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) # use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc - emake -C src/\ + emake -C src/ \ CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \ CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \ LDFLAGS="${LDFLAGS}" \ |