From: Michał Górny Date: Tue, 24 Feb 2015 09:14:43 +0000 (+0000) Subject: Restore last stable ebuild. And add zlib there as well, just in case. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adcd6568f228ba85407c8596329e3c3f7fabbd17;p=gentoo.git Restore last stable ebuild. And add zlib there as well, just in case. Package-Manager: portage-2.2.17/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0xEFB4464E! --- diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index 8dce7f558823..7c7337e4f09c 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,11 @@ # 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.167 2015/02/24 02:47:19 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.168 2015/02/24 09:14:38 mgorny Exp $ + +*johntheripper-1.7.9-r6 (24 Feb 2015) + + 24 Feb 2015; Michał Górny +johntheripper-1.7.9-r6.ebuild: + Restore last stable ebuild. And add zlib there as well, just in case. *johntheripper-1.7.9-r10 (24 Feb 2015) diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index f09edcfe39a7..f28dcecb052d 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -8,22 +8,25 @@ AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 SHA256 cd7174313d4592f39274e47 DIST john-1.7.9-jumbo-7.diff.gz 1074044 SHA256 9e87e5660965e6e55214176299f67dd1b8a40820805441c62a57af6a6a4a19f5 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a WHIRLPOOL da09df93277d90580cd08de2981a9d45df89f9a82f901f8bdc43acc66b97b6eb5515e603dc691cc000852a0847b943a104dee1826a59a000e09488604224f15a DIST john-1.7.9.tar.bz2 717505 SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b WHIRLPOOL e217d3ae3bafaa0d2465402a1c98f05018da9a95ce61effc7f2f20af4aa9ef9a54a636fc7025dfc283e815f5ebd07fafd64e4b01564739fe97053dbeafbd2b13 EBUILD johntheripper-1.7.9-r10.ebuild 6546 SHA256 e7fa0927316ec9ba0fb9503ff301670905c515fdedcf96a9753c47aba76a41f9 SHA512 20a8ed5d36cbb174f62a6309501ac2e109684dd76c15575a736b3fb3ce3c3d6c2e90fbd5afb280725ea72977f6b9e3ee41508384599cd3c1cdda5d1d2f6ee5d0 WHIRLPOOL 01927b14562acb5b2e2b566fa082ae7a71e7accea8d1ddcdd64e5f1740d74975dd764b5fa2635e454a0d9da68d4572ab195ab438533d9b758941954492b500a1 -MISC ChangeLog 28512 SHA256 9b00565fea5459de85354c98055de7e460c27ec968215cc040c1547d340e3e1d SHA512 5638402415ee4da3ab13bee9a6768b73c1baabfd5377c49cb4208debebf833451c3f0ca6258521af8c78dc3fab7c9ed0da6ac501902368643fd65c9844af18db WHIRLPOOL f0179d2220b9d9a6d1dcfe90037b5675ffcf46ead15908f12f7baf2ffaae430f351097b4b64a1ed8bd2b1a76d66d3b3148d4efa7c977fb37a592142f7c55f1a9 +EBUILD johntheripper-1.7.9-r6.ebuild 6148 SHA256 a2164a8d9221eaf7dc68b6ed5e4374b9ddb274cb3dc4bf4f6e8629911cc6302c SHA512 f1e80f0ecdb5660e6c12bf97768f5eb3bf3c6aaeb5de2cd35252ea9439fe302d3db7e7bcb7b2ed4c34404bd75858f6a69cb67a35a24c8c991b814cf0a045a7f9 WHIRLPOOL 14638a966044e7d59a5d72e28e4b0409d6ebaa6760dd873bb6688f0b80923a99cc125639d7b92447fd5b1fcb15b5f70118ef7e9eb1809c539460d89da5bcc9bc +MISC ChangeLog 28703 SHA256 374cbf05dc93924e08b672c8266bf686248aab8593a11ec91de2f71f4f14458a SHA512 d88a87a673d00584eec8c901f6156ab4500a7307f889a297eb32f3cda7c94533c3b1e5a6c3602e36869513c25b469338b70c8acffb8f5334fc4ef06c9dfcbd1c WHIRLPOOL c08eb6745d969aad7598c51a65989c528059905859385f1b81f2a7d5ba3bd98b7cf206fbf4420fe86d78b3888c24be4a9206baa88281c899fe2f2978271366ea MISC metadata.xml 599 SHA256 50bd157b1e2a064b9b50b388938b5cda68b7eff31c859374b30f496474de5433 SHA512 4d5cab10cf182fa462bdbf8e9d700501dcfbde9a0cc553007a80698d5d96c158dc743001153bb624ac384a2a5b602eeaabfcbfd5d65a0ef038c68816311b67f1 WHIRLPOOL 62e1487da6e4d1588e4c6cd14dac1135e0cdd1eb3e2d46fafeef1e95ded22d48d6b0c8c03af3612a62dc9068f92fe2857adecad9d5f8cd4a10180994a46feff5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU6+ZBAAoJEKXdFCfdEflKJzIP/iXfUbPApGcNRuCDPBsYRd9+ -Qve+BomPQ0P4KPnP5ExewD9W904TXjBtaQgt7BQ4YoUd5I83P7CV/BW1EohLWUKk -AOKaQu7mKWogVWOYpVGuQviuGsNWaVQX8LQ+nB349Zq56rqi9JcTT7D7B1dJ3pzq -23VOlsMkVhOXQUMUcV5UjvRwMlGauvYo4ZdlDq0UaDgBendu+sqFhjLL8AIgCO7s -7etbxC4AbaP6Rl7hzDVw/EKcA5tAxF64jH+zEEfIW843QNJGF7le0poRQhtlcP9h -HNkIL5bdozjJKbUknU36+Tltf7kJaN9zr3S+polcGjHC44oyUK5DKBhtCK1OEQCy -bflHZ8rrL0aDRaCNeGUnHIqpoxn+VGeRV7+fTQGBXOTIpLCFCTdxJq1ED8xG5L1Q -a16/omHYQWGQS2tKZznpDw6kmOUDNA6hjphnGXyon3l/YnIYDHa8TmLlwxeTsPD4 -0yBXmePQH7u5xKtmZtZj4Lwcwgfhrjo+1hkOrheGcblGYIOxOlsCUiPK3+OhETX2 -8Zv0M5E7Jk6LBEfXPSWSVp5gpBrcnQH/bMsui7tyLLOAGpNp26iXa4dq2TIw06iz -s4QN0YxtN3hdt+rH/ZLqt4zQXaXNx0enmqgC9OaOWtBQkpL37vl7QdNmC/l2vOMe -w+N4QcEiJ6pU3g5sXgIJ -=5ooX +iQJ8BAEBCABmBQJU7EEDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJooP/RFnAyj48HKn7/KgumKBOH3P +tjPjqmkfCmKcQo4hjLNJgwjW9eUgFbD2XfTKrleyw7qPCLLG79EPb78Y2iNdzT6U +7bfCOLyqJnYG77/5DsP+PQoIS2YpLqUQohyJTHZ39Fn5OLNnBhZCwkGmDtWwbuEy +WAzSFtx+RIIrz5niV0Af15PLlKmDEmJsASUE0ZU+/gGDJl9JEsNByjQLDDmKCQKj +gSxctH+tmIUZIRv7taG/YaECCTQQL06Rp6VB8xOOWAl5ZRNe/2aXAwK0KhpkpL7J +pbpohcWDFIbGMpZVi9ilDlofj4lALDN9AT51LqHWIPSqynMwH/UrRMYCI5suoT/n +yZYwcdBTHJ5JlpevE8RS/NWsmLd2d99lXeCX94haka+7k9lYmLLd7LbZcB84Ppgc +4jgj776ObYC0xZl5vx6hJYwvKfjC4QTHMqgUZ5+XFeAAcmiIBndLw333QwL8pmFT +tOl5H0WoB4/HnRBQnlZ35ijOknFFWZDmNHa7LH/fV1A55NpdhxvhYRDXOY0seDRl +fgmZFo0DHT+VxKQ0V8J/JngKBCFScOhTaOfv344PpRbwbAuz3gLRfLGhePwcky0X +b0vJrEdkBzy0MIPaoexqh0NrwyuEvsY33ANT71+on1AzqKr1vXzYhhAEvUDTsH8n +JgccLpp2kGlFvZiGUU2W +=fzYN -----END PGP SIGNATURE----- diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild new file mode 100644 index 000000000000..afc553fd0cd2 --- /dev/null +++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild @@ -0,0 +1,251 @@ +# 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-r6.ebuild,v 1.16 2015/02/24 09:14:38 mgorny Exp $ + +EAPI="4" + +inherit 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 mpi opencl openmp cpu_flags_x86_sse2" +REQUIRED_USE="openmp? ( !minimal ) + mpi? ( !minimal ) + cuda? ( !minimal ) + opencl? ( !minimal )" + +RDEPEND="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 )" +DEPEND="${RDEPEND}" + +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 ; 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 +} + +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 + 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/* +}