public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2016-06-03 11:03 Anthony G. Basile
  0 siblings, 0 replies; 26+ messages in thread
From: Anthony G. Basile @ 2016-06-03 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f96e8a6179b60e178a285748cf8b116c0285d26e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 11:05:21 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 11:05:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96e8a61

app-crypt/johntheripper: add libressl support

Package-Manager: portage-2.2.28

 app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
index b455023..071fe1a 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ 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"
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
@@ -29,7 +29,10 @@ REQUIRED_USE="openmp? ( !minimal )
 	mozilla? ( !minimal )"
 
 DEPEND="sys-libs/zlib
-	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+	!minimal? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	mpi? ( virtual/mpi )
 	cuda? ( x11-drivers/nvidia-drivers
 		dev-util/nvidia-cuda-toolkit:= )


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2018-11-02 20:24 Craig Andrews
  0 siblings, 0 replies; 26+ messages in thread
From: Craig Andrews @ 2018-11-02 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c996083d50cfa494da3796d5a444cfd60f559319
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 20:09:51 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 20:09:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c996083d

app-crypt/johntheripper: add github remote-id to metadata.xml

Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-crypt/johntheripper/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index ea96d4b1927..e03a2537ac5 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -10,6 +10,9 @@
     <email>crypto@gentoo.org</email>
     <name>Crypto</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">magnumripper/JohnTheRipper</remote-id>
+  </upstream>
   <use>
     <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
     <flag name="mozilla"> Support mozilla password cracking</flag>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2018-11-02 20:24 Craig Andrews
  0 siblings, 0 replies; 26+ messages in thread
From: Craig Andrews @ 2018-11-02 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     4e6a1b34a384121bdc50113abc0ab6fd67b19596
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 20:08:07 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 20:08:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6a1b34

app-crypt/johntheripper: Use https urls

Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild | 8 ++++----
 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 8 ++++----
 app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
index fc6fab5d528..09066589c34 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 JUMBO="jumbo-7"
 
 DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
+HOMEPAGE="https://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 )"
+SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index b8eed231b1b..916f7b51ca6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 JUMBO="jumbo-7"
 
 DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
+HOMEPAGE="https://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 )"
+SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index 81c08300e9a..e3e30d7db42 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 JUMBO="jumbo-7"
 
 DESCRIPTION="fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
+HOMEPAGE="https://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 )"
+SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2018-11-27 17:52 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2018-11-27 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     398e2f24d09ff76b0a27a5f7e28726a82140f914
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 17:52:34 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 17:52:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398e2f24

app-crypt/johntheripper: fix for bug #664050

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 916f7b51ca6..142838097ae 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -234,7 +234,8 @@ src_install() {
 	dosbin run/john
 	newsbin run/mailer john-mailer
 
-	pax-mark -mr "${ED}usr/sbin/john" || die
+	die
+	pax-mark -mr "${ED}/usr/sbin/john" || die
 
 	dosym john /usr/sbin/unafs
 	dosym john /usr/sbin/unique


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2018-12-13 15:34 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2018-12-13 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1043886cdc560fa69bb9b9b33b154825c3f46d30
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 15:34:08 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 15:34:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1043886c

app-crypt/johntheripper: bug #672188

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 142838097ae..8cc549fa4bf 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -234,7 +234,6 @@ src_install() {
 	dosbin run/john
 	newsbin run/mailer john-mailer
 
-	die
 	pax-mark -mr "${ED}/usr/sbin/john" || die
 
 	dosym john /usr/sbin/unafs


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2018-12-18 21:40 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2018-12-18 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a3208a3d2c8e955b4b65c64099b0e8af3c95fa8d
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 19:01:16 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 21:40:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3208a3d

app-crypt/johntheripper: 1.8.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/Manifest                   |   1 +
 .../johntheripper/johntheripper-1.7.9-r10.ebuild   | 268 ---------------------
 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 142 +++++++++++
 3 files changed, 143 insertions(+), 268 deletions(-)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index c8ee3743082..6be3684eb5f 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,2 +1,3 @@
 DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
 DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
+DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
deleted file mode 100644
index 09066589c34..00000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://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 ~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 libressl 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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl: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/*
-}

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
new file mode 100644
index 00000000000..d3365af2702
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cuda eutils flag-o-matic toolchain-funcs multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="https://www.openwall.com/john/"
+
+SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
+IUSE="custom-cflags openmp ${CPU_FLAGS}"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-64-xop"
+		elif use cpu_flags_x86_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		echo "linux-ppc32"
+	elif use ppc64; then
+		echo "linux-ppc64"
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-xop"
+		elif use cpu_flags_x86_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
+		echo "macosx-ppc32-altivec"
+	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
+}
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	cat <<- EOF >> config.gentoo || die
+	#define JOHN_SYSTEMWIDE 1
+	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
+	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
+EOF
+
+	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)"
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP}" \
+		LDFLAGS="${LDFLAGS} ${OMP}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		$(get_target)
+}
+
+src_test() {
+	make -C src/ check
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ] && [ "${REPLACING_VERSIONS}" != "1.8.0" ]; then
+		ewarn "This package no longer includes jumbo.  If you want jumbo please install app-crypt/johntheripper-jumbo instead."
+	fi
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2018-12-18 21:40 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2018-12-18 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5c709711434c65390363fd1689cb0ffb33d0f698
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 21:34:31 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 21:40:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c709711

app-crypt/johntheripper: blocker jtr-jumbo

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 3 ++-
 app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild  | 3 ++-
 app-crypt/johntheripper/johntheripper-1.8.0.ebuild     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 8cc549fa4bf..49d18cec623 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -27,7 +27,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	opencl? ( !minimal )
 	mozilla? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+	sys-libs/zlib
 	!minimal? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index e3e30d7db42..48f23d519a6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -26,7 +26,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	cuda? ( !minimal )
 	opencl? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+	sys-libs/zlib
 	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 	mpi? ( virtual/mpi )
 	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index d3365af2702..8cd2dafa182 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -20,7 +20,8 @@ CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
 RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	!app-crypt/johntheripper-jumbo"
 
 S="${WORKDIR}/${MY_P}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-07  6:26 Sergei Trofimovich
  0 siblings, 0 replies; 26+ messages in thread
From: Sergei Trofimovich @ 2019-05-07  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     cb255c22fff480da57f72c438b7bd175df96ed58
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue May  7 05:37:59 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May  7 06:26:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb255c22

app-crypt/johntheripper: stable 1.8.0 for sparc, bug #684632

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8cd2dafa182..95f542e6070 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-08  6:25 Sergei Trofimovich
  0 siblings, 0 replies; 26+ messages in thread
From: Sergei Trofimovich @ 2019-05-08  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     e9caf875c70e809f4141bb05afc8545234d89053
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed May  8 06:02:53 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May  8 06:25:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9caf875

app-crypt/johntheripper: stable 1.8.0 for hppa, bug #684632

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 95f542e6070..be659715e6c 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-08 14:38 Tobias Klausmann
  0 siblings, 0 replies; 26+ messages in thread
From: Tobias Klausmann @ 2019-05-08 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     2f8b2e772ec5685607392f1aa98daac67bc3fef9
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 14:37:33 2019 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed May  8 14:37:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8b2e77

app-crypt/johntheripper-1.8.0-r0: alpha stable

Bug: http://bugs.gentoo.org/684632
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index be659715e6c..113d8b20589 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-12 21:57 Sergei Trofimovich
  0 siblings, 0 replies; 26+ messages in thread
From: Sergei Trofimovich @ 2019-05-12 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7905c9d4089d73cfdc9b04f61c17edecafa85551
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 21:55:10 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 12 21:55:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7905c9d4

app-crypt/johntheripper: stable 1.8.0 for ppc, bug #684632

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 113d8b20589..8f4eb2530f3 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-12 22:03 Sergei Trofimovich
  0 siblings, 0 replies; 26+ messages in thread
From: Sergei Trofimovich @ 2019-05-12 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     0ab62c2044190a85f19184ded86f722b500839b7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 21:59:40 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 12 21:59:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab62c20

app-crypt/johntheripper: stable 1.8.0 for ppc64, bug #684632

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8f4eb2530f3..8b94cc7e2a6 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-13 17:02 Mikle Kolyada
  0 siblings, 0 replies; 26+ messages in thread
From: Mikle Kolyada @ 2019-05-13 17:02 UTC (permalink / raw
  To: gentoo-commits

commit:     c61d370a575fb50fe4fc2c045e7a37307c23f5cd
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 17:01:56 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 13 17:01:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61d370a

app-crypt/johntheripper: amd64 stable wrt bug #684632

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8b94cc7e2a6..1593f7f20f0 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-15 15:17 Mikle Kolyada
  0 siblings, 0 replies; 26+ messages in thread
From: Mikle Kolyada @ 2019-05-15 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d9f865f37a26e41352d736abbd0a74079ef915fa
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 15:16:51 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 15 15:16:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f865f3

app-crypt/johntheripper: x86 stable wrt bug #684632

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 1593f7f20f0..31ecee30655 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-05-15 15:17 Mikle Kolyada
  0 siblings, 0 replies; 26+ messages in thread
From: Mikle Kolyada @ 2019-05-15 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     8c5c30e0024a9408dc07180fe27e691bd15a6b5f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 15:17:21 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 15 15:17:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5c30e0

app-crypt/johntheripper: arm stable wrt bug #684632

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 31ecee30655..78b619fda5a 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2019-06-05 21:19 Andreas Sturmlechner
  0 siblings, 0 replies; 26+ messages in thread
From: Andreas Sturmlechner @ 2019-06-05 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7cbaa258c6e1668bf08558fcfc894d5c97270acf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 15:28:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 21:17:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbaa258

app-crypt/johntheripper: Drop 1.7.9*

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-crypt/johntheripper/Manifest                   |   2 -
 .../johntheripper/johntheripper-1.7.9-r11.ebuild   | 274 ---------------------
 .../johntheripper/johntheripper-1.7.9-r6.ebuild    | 251 -------------------
 app-crypt/johntheripper/metadata.xml               |   5 -
 4 files changed, 532 deletions(-)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 6be3684eb5f..b522016fa04 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1 @@
-DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
-DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
deleted file mode 100644
index 49d18cec623..00000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://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 ~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 libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )
-	mozilla? ( !minimal )"
-
-RDEPEND="!app-crypt/johntheripper-jumbo
-	sys-libs/zlib
-	!minimal? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers
-		dev-util/nvidia-cuda-toolkit:= )
-	opencl? ( virtual/opencl )
-	mozilla? ( dev-libs/nss dev-libs/nspr )"
-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 && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		eapply "${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)
-		eapply "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src || die
-	eapply -p0 "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-	eapply -p2 "${FILESDIR}/${PN}-1.7.9-clang.patch"
-	eapply_user
-
-	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
-	cat <<- EOF >> config.gentoo || die
-	#define JOHN_SYSTEMWIDE 1
-	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
-	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
-EOF
-
-	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/*
-}

diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
deleted file mode 100644
index 48f23d519a6..00000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://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 ~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="!app-crypt/johntheripper-jumbo
-	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/*
-}

diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index e03a2537ac5..40069f63efa 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -13,9 +13,4 @@
   <upstream>
     <remote-id type="github">magnumripper/JohnTheRipper</remote-id>
   </upstream>
-  <use>
-    <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
-    <flag name="mozilla"> Support mozilla password cracking</flag>
-    <flag name="opencl">Enable opencl support for speeding up cracking on capable devices</flag>
-  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2021-01-07  8:20 Fabian Groffen
  0 siblings, 0 replies; 26+ messages in thread
From: Fabian Groffen @ 2021-01-07  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f75d11e7b907039f5e3391e162f2ea1f714b8992
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 08:11:12 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 08:11:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75d11e7

app-crypt/johntheripper: drop handling for x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index aa12fcaa1a5..cd23cb4e246 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,12 +56,8 @@ get_target() {
 		fi
 	elif use ppc-macos; then
 		echo "macosx-ppc32-altivec"
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
+	elif use x64-macos; then
+		echo "macosx-x86-64"
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2021-04-03 23:07 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2021-04-03 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a4c7bfb337eae28f7245395e8f620629449e0bba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 22:59:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 22:59:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c7bfb3

app-crypt/johntheripper: eutils--, multilib--

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index cd23cb4e246..048b15c1c8d 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cuda eutils flag-o-matic toolchain-funcs multilib
+inherit cuda flag-o-matic toolchain-funcs
 
 MY_PN="john"
 MY_P="${MY_PN}-${PV}"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2021-11-19 11:33 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2021-11-19 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     239efd8867d84f16504655a5c09da419fe32d8cb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 11:16:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 11:32:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239efd88

app-crypt/johntheripper: use 'emake'

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 48bf0ae95f66..5b712e92fe3a 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -112,7 +112,7 @@ EOF
 }
 
 src_test() {
-	make -C src/ check
+	emake -C src/ check
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2022-01-05 10:01 David Seifert
  0 siblings, 0 replies; 26+ messages in thread
From: David Seifert @ 2022-01-05 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1d882ca6dd9af72446614decd0d572109e941dea
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  5 10:01:18 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan  5 10:01:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d882ca6

app-crypt/johntheripper: remove amd64-fbsd

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 5b712e92fe3a..700c4d5a8787 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,16 +61,6 @@ get_target() {
 		echo "macosx-x86-64"
 	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


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2022-05-14 21:30 David Seifert
  0 siblings, 0 replies; 26+ messages in thread
From: David Seifert @ 2022-05-14 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     46bbe20c98cdf559e95138156a7951fb91cc48ed
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:05 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bbe20c

app-crypt/johntheripper: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 700c4d5a8787..1d4e84fe706c 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -66,10 +66,12 @@ get_target() {
 	fi
 }
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2023-08-19 22:40 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2023-08-19 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     cc9c531cd3971202190d53065f781887cd748a47
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 22:25:38 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:40:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc9c531c

app-crypt/johntheripper: revbump dep changes

Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../{johntheripper-1.8.0-r1.ebuild => johntheripper-1.8.0-r2.ebuild}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
similarity index 100%
rename from app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
rename to app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild


^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2023-08-19 22:40 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2023-08-19 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ff099bbf517fb5ed6aff6331740587c6f33e4096
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 22:20:42 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:40:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff099bbf

app-crypt/johntheripper: move deps around

Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 6a6fca918868..c9ec0d145876 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cuda flag-o-matic toolchain-funcs
 
@@ -19,9 +19,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-lin
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	virtual/libcrypt:="
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	!app-crypt/johntheripper-jumbo"
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2023-08-21 20:56 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2023-08-21 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     bc46c1859c437b578758a64110b0e9cc2f6facba
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 20:53:23 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 20:55:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc46c185

app-crypt/johntheripper: add new use flags

Closes: https://bugs.gentoo.org/702748
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index d7bd1317da50..354432e452ae 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
 DEPEND="virtual/libcrypt:="
@@ -29,7 +29,11 @@ get_target() {
 	if use alpha; then
 		echo "linux-alpha"
 	elif use amd64; then
-		if use cpu_flags_x86_xop; then
+		if use cpu_flags_x86_avx512f; then
+			echo "linux-x86-64-avx512"
+		elif use cpu_flags_x86_avx2; then
+			echo "linux-x86-64-avx2"
+		elif use cpu_flags_x86_xop; then
 			echo "linux-x86-64-xop"
 		elif use cpu_flags_x86_avx; then
 			echo "linux-x86-64-avx"
@@ -43,7 +47,11 @@ get_target() {
 	elif use sparc; then
 		echo "linux-sparc"
 	elif use x86; then
-		if use cpu_flags_x86_xop; then
+		if use cpu_flags_x86_avx512f; then
+			echo "linux-x86-64-avx512"
+		elif use cpu_flags_x86_avx2; then
+			echo "linux-x86-64-avx2"
+		elif use cpu_flags_x86_xop; then
 			echo "linux-x86-xop"
 		elif use cpu_flags_x86_avx; then
 			echo "linux-x86-avx"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2023-08-21 20:56 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2023-08-21 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     606dbe9a4e28d1348975f098a34472ab8a0207b1
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 20:54:29 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 20:55:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606dbe9a

app-crypt/johntheripper: destabilize 1.9.0

Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index 354432e452ae..fabbd858c1cf 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
@ 2023-08-21 20:56 Rick Farina
  0 siblings, 0 replies; 26+ messages in thread
From: Rick Farina @ 2023-08-21 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ea67777340b877aa4ec6095bb4cda2fe397349dc
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 20:42:17 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 20:55:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea677773

app-crypt/johntheripper: add 1.9.0

Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 app-crypt/johntheripper/Manifest                   |   1 +
 app-crypt/johntheripper/johntheripper-1.9.0.ebuild | 129 +++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index b522016fa042..682d048011a4 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1 +1,2 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
+DIST john-1.9.0.tar.xz 8944932 BLAKE2B 57f5b83a541a7048e34d87dbee2f8f56953ef8a98bf7163b981064289d38452d11e59f1fb48a98a4f5f61d5f33866987f7c8515bf9900d742c09b7ac3e61376e SHA512 26e9a245e9f050344ae8c3320e1e24dad6bc2b73e99cc041a50c2d124b2c898c93d048727451ab8a2ba1c8aa4d8d462a8c0c9fea7de39f3479a0c170a5e9ad60

diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
new file mode 100644
index 000000000000..d7bd1317da50
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="https://www.openwall.com/john/"
+
+SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
+IUSE="custom-cflags openmp ${CPU_FLAGS}"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}
+	!app-crypt/johntheripper-jumbo"
+
+S="${WORKDIR}/${MY_P}"
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-64-xop"
+		elif use cpu_flags_x86_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		echo "linux-ppc32"
+	elif use ppc64; then
+		echo "linux-ppc64"
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-xop"
+		elif use cpu_flags_x86_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
+		echo "macosx-ppc32-altivec"
+	elif use x64-macos; then
+		echo "macosx-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	cat <<- EOF >> config.gentoo || die
+	#define JOHN_SYSTEMWIDE 1
+	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
+	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
+EOF
+
+	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)"
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP}" \
+		LDFLAGS="${LDFLAGS} ${OMP}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		$(get_target)
+}
+
+src_test() {
+	emake -C src/ check
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ] && [ "${REPLACING_VERSIONS}" != "1.8.0" ]; then
+		ewarn "This package no longer includes jumbo.  If you want jumbo please install app-crypt/johntheripper-jumbo instead."
+	fi
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2023-08-21 20:56 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-13 15:34 [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/ Rick Farina
  -- strict thread matches above, loose matches on Subject: below --
2023-08-21 20:56 Rick Farina
2023-08-21 20:56 Rick Farina
2023-08-21 20:56 Rick Farina
2023-08-19 22:40 Rick Farina
2023-08-19 22:40 Rick Farina
2022-05-14 21:30 David Seifert
2022-01-05 10:01 David Seifert
2021-11-19 11:33 Sam James
2021-04-03 23:07 Sam James
2021-01-07  8:20 Fabian Groffen
2019-06-05 21:19 Andreas Sturmlechner
2019-05-15 15:17 Mikle Kolyada
2019-05-15 15:17 Mikle Kolyada
2019-05-13 17:02 Mikle Kolyada
2019-05-12 22:03 Sergei Trofimovich
2019-05-12 21:57 Sergei Trofimovich
2019-05-08 14:38 Tobias Klausmann
2019-05-08  6:25 Sergei Trofimovich
2019-05-07  6:26 Sergei Trofimovich
2018-12-18 21:40 Rick Farina
2018-12-18 21:40 Rick Farina
2018-11-27 17:52 Rick Farina
2018-11-02 20:24 Craig Andrews
2018-11-02 20:24 Craig Andrews
2016-06-03 11:03 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox