zerochaos 15/02/24 02:47:19
Modified: ChangeLog
Added: johntheripper-1.7.9-r10.ebuild
Removed: johntheripper-1.7.9-r9.ebuild
johntheripper-1.7.9-r6.ebuild
johntheripper-1.7.9-r5.ebuild
johntheripper-1.7.9-r2.ebuild
johntheripper-1.7.9-r3.ebuild
johntheripper-1.7.9-r1.ebuild
johntheripper-1.7.9-r8.ebuild
johntheripper-1.7.8.ebuild
johntheripper-1.7.9-r7.ebuild
johntheripper-1.7.6-r1.ebuild
johntheripper-1.7.9-r4.ebuild
johntheripper-1.7.9.ebuild
Log:
add missing dep on zlib, remove old ebuilds
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
DD11F94A)
Revision Changes Path
1.167 app-crypt/johntheripper/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/johntheripper/ChangeLog?rev=1.167&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/johntheripper/ChangeLog?rev=1.167&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/johntheripper/ChangeLog?r1=1.166&r2=1.167
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog 28 Jan 2015 19:13:24 -0000 1.166
+++ ChangeLog 24 Feb 2015 02:47:19 -0000 1.167
@@ -1,6 +1,18 @@
# ChangeLog for app-crypt/johntheripper
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.166
2015/01/28 19:13:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.167
2015/02/24 02:47:19 zerochaos Exp $
+
+*johntheripper-1.7.9-r10 (24 Feb 2015)
+
+ 24 Feb 2015; Rick Farina <[email protected]>
+ +johntheripper-1.7.9-r10.ebuild, -johntheripper-1.7.6-r1.ebuild,
+ -johntheripper-1.7.8.ebuild, -johntheripper-1.7.9-r1.ebuild,
+ -johntheripper-1.7.9-r2.ebuild, -johntheripper-1.7.9-r3.ebuild,
+ -johntheripper-1.7.9-r4.ebuild, -johntheripper-1.7.9-r5.ebuild,
+ -johntheripper-1.7.9-r6.ebuild, -johntheripper-1.7.9-r7.ebuild,
+ -johntheripper-1.7.9-r8.ebuild, -johntheripper-1.7.9-r9.ebuild,
+ -johntheripper-1.7.9.ebuild:
+ add missing dep on zlib, remove old ebuilds
28 Jan 2015; Michał Górny <[email protected]> johntheripper-1.7.6-r1.ebuild,
johntheripper-1.7.8.ebuild, johntheripper-1.7.9-r1.ebuild,
1.1 app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild?rev=1.1&content-type=text/plain
Index: johntheripper-1.7.9-r10.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild,v
1.1 2015/02/24 02:47:19 zerochaos Exp $
EAPI="5"
inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
MY_PN="john"
MY_P="${MY_PN}-${PV}"
JUMBO="jumbo-7"
DESCRIPTION="fast password cracker"
HOMEPAGE="http://www.openwall.com/john/";
SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
#Remove AltiVec USE flag. Appears to be an upstream issue.
IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mozilla mpi opencl openmp
cpu_flags_x86_sse2"
REQUIRED_USE="openmp? ( !minimal )
mpi? ( !minimal )
cuda? ( !minimal )
opencl? ( !minimal )
mozilla? ( !minimal )"
DEPEND="sys-libs/zlib
!minimal? ( >=dev-libs/openssl-0.9.7:0 )
mpi? ( virtual/mpi )
cuda? ( x11-drivers/nvidia-drivers
dev-util/nvidia-cuda-toolkit:= )
opencl? ( virtual/opencl )
mozilla? ( dev-libs/nss dev-libs/nspr )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
has_xop() {
echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
}
has_avx() {
echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
}
get_target() {
if use alpha; then
echo "linux-alpha"
elif use amd64; then
if has_xop; then
echo "linux-x86-64-xop"
elif has_avx; then
echo "linux-x86-64-avx"
else
echo "linux-x86-64"
fi
elif use ppc; then
#if use altivec; then
# echo "linux-ppc32-altivec"
#else
echo "linux-ppc32"
#fi
elif use ppc64; then
#if use altivec; then
# echo "linux-ppc32-altivec"
#else
echo "linux-ppc64"
#fi
# linux-ppc64-altivec is slightly slower than
linux-ppc32-altivec for most hash types.
# as per the Makefile comments
elif use sparc; then
echo "linux-sparc"
elif use x86; then
if has_xop; then
echo "linux-x86-xop"
elif has_avx; then
echo "linux-x86-avx"
elif use cpu_flags_x86_sse2; then
echo "linux-x86-sse2"
elif use cpu_flags_x86_mmx; then
echo "linux-x86-mmx"
else
echo "linux-x86-any"
fi
elif use ppc-macos; then
# force AltiVec, the non-altivec profile contains ancient compiler cruft
# if use altivec; then
echo "macosx-ppc32-altivec"
# else
# echo "macosx-ppc32"
# fi
# for Tiger this can be macosx-ppc64
elif use x86-macos; then
if use cpu_flags_x86_sse2; then
echo "macosx-x86-sse2"
else
echo "macosx-x86"
fi
elif use x86-solaris; then
echo "solaris-x86-any"
elif use x86-fbsd; then
if use cpu_flags_x86_sse2; then
echo "freebsd-x86-sse2"
elif use cpu_flags_x86_mmx; then
echo "freebsd-x86-mmx"
else
echo "freebsd-x86-any"
fi
elif use amd64-fbsd; then
echo "freebsd-x86-64"
else
echo "generic"
fi
}
get_john_objs() {
echo -n '${JOHN_COMMON_OBJS} '
if use opencl; then
echo -n '${OCL_OBJS} '
fi
if use cuda; then
echo -n '${CUDA_OBJS}'
fi
}
pkg_setup() {
if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
tc-has-openmp || die "Please switch to an openmp compatible
compiler"
fi
}
src_prepare() {
if ! use minimal; then
epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
if use mpi ; then
sed -e "s/^#CC = mpicc/CC = mpicc/" \
-e "s/^#MPIOBJ =/MPIOBJ =/" \
-i src/Makefile || die
fi
# fix typo in jumbo patch
sed -i 's:All15:All5:' run/john.conf || die
# fix compile on ppc (only needed for jumbo-7)
epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
fi
cd src
epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
if ! use minimal; then
sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e
"/LDFLAGS/s/-s//" \
-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g"
\
-i Makefile || die "sed Makefile failed"
sed -i 's#/usr/local#/opt#g' Makefile || die
fi
sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
if use cuda; then
cuda_src_prepare
sed \
-e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
-i Makefile || die
fi
if use mozilla; then
sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile
|| die
fi
}
src_compile() {
local OMP
use custom-cflags || strip-flags
echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >>
config.gentoo
echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >>
config.gentoo
append-flags -fPIC -fPIE
gcc-specs-pie && append-ldflags -nopie
use openmp && OMP="-fopenmp"
CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
if use mpi; then
CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
fi
#this stuff was all stolen from the Makefile, if build breaks, check
this first
if use opencl; then
GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
fi
if use cuda; then
GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
fi
emake -C src/ \
CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP}
${GPUCFLAGS}" \
LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
OPT_NORMAL="" \
OMPFLAGS="${OMP}" \
JOHN_OBJS="$(get_john_objs)" \
$(get_target)
}
src_test() {
if use opencl; then
cp src/opencl/*.cl run/
cp src/opencl_*.h run/
fi
pax-mark -mr run/john
if use opencl || use cuda; then
ewarn "GPU tests fail, skipping all tests..."
else
make -C src/ check
fi
}
src_install() {
# executables
dosbin run/john
newsbin run/mailer john-mailer
pax-mark -mr "${ED}usr/sbin/john" || die
dosym john /usr/sbin/unafs
dosym john /usr/sbin/unique
dosym john /usr/sbin/unshadow
# jumbo-patch additions
if ! use minimal; then
for s in \
keychain2john keepass2john pwsafe2john hccap2john \
racf2john zip2john rar2john pdf2john ssh2john undrop \
; do
dosym john /usr/sbin/$s
done
use mozilla && dosym john /usr/sbin/mozilla2john
dosbin run/calc_stat
dosbin run/genmkvpwd
dosbin run/mkvcalcproba
dosbin run/raw2dyna
dosbin run/tgtsnarf
insinto /etc/john
doins run/genincstats.rb run/stats
doins run/netscreen.py run/sap2john.pl
if use opencl; then
doins src/opencl/*.cl
doins src/opencl_*.h
fi
fi
# config files
insinto /etc/john
doins run/*.chr run/password.lst
doins run/*.conf
# documentation
dodoc doc/*
}
