Fix hardened issues, bug#167731

Package-Manager: portage-2.1.4_rc10

4 files changed, 153 insertions, 5 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index a63872c4e107..4f12dd67cb1f 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.73 2007/11/16 16:29:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.74 2007/12/14 19:33:36 alonbl Exp $
+
+*johntheripper-1.7.2-r3 (14 Dec 2007)
+
+  14 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +johntheripper-1.7.2-r3.ebuild:
+  Fix hardened issues, bug#167731
 
   16 Nov 2007; Raúl Porcel <armin76@gentoo.org>
   johntheripper-1.7.2-r2.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index e4665f95cc63..812869933ea6 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -29,14 +29,18 @@ EBUILD johntheripper-1.7.2-r2.ebuild 3391 RMD160 224a979e4368489f1dbef9f73a4b082
 MD5 5886edc90980f09131dbc58b914c123a johntheripper-1.7.2-r2.ebuild 3391
 RMD160 224a979e4368489f1dbef9f73a4b082058d72959 johntheripper-1.7.2-r2.ebuild 3391
 SHA256 6801bd22830cbac9845d5d4e1459e97891bcc8fcf5f456b87cfd3ce558d93ce8 johntheripper-1.7.2-r2.ebuild 3391
+EBUILD johntheripper-1.7.2-r3.ebuild 3488 RMD160 018e372de194429ed2d40cdae0d96ff026799a9a SHA1 99bbad752ed497fd1700b84f0c1b4bff0620efbc SHA256 d0aed8d564940fba443f91da796eec334f2c42385b35f8f7863c14b69cc52d2d
+MD5 a7bb7ef6b4cee7d4920b2b9b266ef6f9 johntheripper-1.7.2-r3.ebuild 3488
+RMD160 018e372de194429ed2d40cdae0d96ff026799a9a johntheripper-1.7.2-r3.ebuild 3488
+SHA256 d0aed8d564940fba443f91da796eec334f2c42385b35f8f7863c14b69cc52d2d johntheripper-1.7.2-r3.ebuild 3488
 EBUILD johntheripper-1.7.2.ebuild 3450 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be SHA1 fbcb80c962759491b57f8762e4c4a46d6c45c46d SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750
 MD5 6fc9ea37ab7434784b13035bf1182356 johntheripper-1.7.2.ebuild 3450
 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be johntheripper-1.7.2.ebuild 3450
 SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750 johntheripper-1.7.2.ebuild 3450
-MISC ChangeLog 12770 RMD160 563f0e3b84086e9ecef988031f7d43c614edcb17 SHA1 52312308b733a6128e3a10059e042210dae9f1e2 SHA256 456d5790882bbc0c7820d21ade393f975fd2bd0a57265c395bea6be20ad8ea35
-MD5 c6c8c49a52923eb23995a307e07ce287 ChangeLog 12770
-RMD160 563f0e3b84086e9ecef988031f7d43c614edcb17 ChangeLog 12770
-SHA256 456d5790882bbc0c7820d21ade393f975fd2bd0a57265c395bea6be20ad8ea35 ChangeLog 12770
+MISC ChangeLog 12925 RMD160 90a1dd5ce71b84de45e18cf39c93ca7cef6e1110 SHA1 95ff884f5111bdc27db103d36634d1906a6fedf7 SHA256 712f178f72361cdd584c533699e8f18801c0da6c4498c5fd51d53369bc3bdf48
+MD5 847b88e78e263d34d2bcede202b39707 ChangeLog 12925
+RMD160 90a1dd5ce71b84de45e18cf39c93ca7cef6e1110 ChangeLog 12925
+SHA256 712f178f72361cdd584c533699e8f18801c0da6c4498c5fd51d53369bc3bdf48 ChangeLog 12925
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 MD5 1c3665b87d1e39c6799909da58f41b26 metadata.xml 160
 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf metadata.xml 160
@@ -47,3 +51,6 @@ SHA256 5a3ee378b5c0c084e34632ea0450bc953b17f20a99b2845a46ca4fdf19f11bdf files/di
 MD5 753fa3810f699a8a2221c89aa00af2eb files/digest-johntheripper-1.7.2-r2 482
 RMD160 540e941b341418e1a102eb85c53562d26087349c files/digest-johntheripper-1.7.2-r2 482
 SHA256 c1673181f0b25641de64a51a599c2a6e766ffd58c05a56173fbe70dcfe8faa70 files/digest-johntheripper-1.7.2-r2 482
+MD5 753fa3810f699a8a2221c89aa00af2eb files/digest-johntheripper-1.7.2-r3 482
+RMD160 540e941b341418e1a102eb85c53562d26087349c files/digest-johntheripper-1.7.2-r3 482
+SHA256 c1673181f0b25641de64a51a599c2a6e766ffd58c05a56173fbe70dcfe8faa70 files/digest-johntheripper-1.7.2-r3 482
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r3 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r3
new file mode 100644
index 000000000000..e2d7fb28a6db
--- /dev/null
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r3
@@ -0,0 +1,6 @@
+MD5 cb0dd31fc8ea39ee34cac779fd9bdf68 john-1.7.2-all-7.diff.gz 64450
+RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f john-1.7.2-all-7.diff.gz 64450
+SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c john-1.7.2-all-7.diff.gz 64450
+MD5 78a0294fba77ebd63bdb39837df917c8 john-1.7.2.tar.gz 809308
+RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac john-1.7.2.tar.gz 809308
+SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb john-1.7.2.tar.gz 809308
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
new file mode 100644
index 000000000000..9457cc1aff98
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r3.ebuild,v 1.1 2007/12/14 19:33:36 alonbl Exp $
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils
+
+MY_PBASE=${P/theripper/}
+MY_PNBASE=${PN/theripper/}
+S=${WORKDIR}/${MY_PBASE}
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+SRC_URI="http://www.openwall.com/john/f/${MY_PBASE}.tar.gz
+		http://www.openwall.com/john/contrib/${MY_PNBASE}-1.7.2-all-7.diff.gz"
+
+# banquise-to-bigpatch-17.patch.bz2"
+# based off /var/tmp/portage/johntheripper-1.6.40
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mmx altivec sse2 custom-cflags"
+
+RDEPEND=">=dev-libs/openssl-0.9.7"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff
+
+	for p in sha1-memset stackdef.S stackdef-2.S mkdir-sandbox; do
+		epatch "${FILESDIR}/${P}-${p}.patch"
+	done
+}
+
+src_compile() {
+	#
+	# upstream request to strip
+	# any flags, as he optimize the
+	# outputs
+	#
+	use custom-cflags || strip-flags
+	append-flags -fno-PIC -fno-PIE
+	append-ldflags -nopie
+
+	cd "${S}"/src
+
+	# Remove default OPT_NORMAL -funroll-loops bug#198659 for unknown archs
+	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS=\"-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
+		-DJOHN_SYSTEMWIDE_HOME=\\\"\\\\\\\"/etc/john\\\\\\\"\\\"\" \
+		LDFLAGS=\"${LDFLAGS}\" \
+		OPT_NORMAL=\"\""
+
+	if use x86 ; then
+		if use sse2 ; then
+			eval emake ${OPTIONS} linux-x86-sse2 || die "Make failed"
+		elif use mmx ; then
+			eval emake ${OPTIONS} linux-x86-mmx || die "Make failed"
+		else
+			eval emake ${OPTIONS} linux-x86-any || die "Make failed"
+		fi
+	elif use alpha ; then
+		eval emake ${OPTIONS} linux-alpha || die "Make failed"
+	elif use sparc; then
+		eval emake ${OPTIONS} linux-sparc  || die "Make failed"
+	elif use amd64; then
+		eval emake ${OPTIONS} linux-x86-64  || die "Make failed"
+	elif use ppc-macos; then
+		if use altivec; then
+			eval emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
+		else
+			eval emake ${OPTIONS} macosx-ppc32 || die "Make failed"
+		fi
+		# for Tiger this can be macosx-ppc64
+	elif use ppc64; then
+		if use altivec; then
+			eval emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
+		else
+			eval emake ${OPTIONS} linux-ppc64  || die "Make failed"
+		fi
+		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+		# as per the Makefile comments
+	elif use ppc; then
+		if use altivec; then
+			eval emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
+		else
+			eval emake ${OPTIONS} linux-ppc32 || die "Make failed"
+		fi
+	else
+		eval emake ${OPTIONS} generic || die "Make failed"
+	fi
+
+	# currently broken
+	#eval emake bench || die "make failed"
+}
+
+src_test() {
+	cd run
+	if  [ -f /etc/john/john.conf -o -f /etc/john/john.ini  ]; then
+		./john --test || die 'self test failed'
+	else
+		ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -m "${D}"/usr/sbin/john
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# for EGG only
+	dosym john /usr/sbin/undrop
+
+	#newsbin src/bench john-bench
+
+	# config files
+	insinto /etc/john
+	doins run/john.conf
+	doins run/*.chr run/password.lst
+
+	# documentation
+	dodoc doc/*
+}