Diff from johntheripper-1.7.4.2.ebuild

johntheripper-1.7.6.diff (text/plain), 1.76 KB, created by Dane Smith (RETIRED) on 2010-07-18 19:45:58 UTC

--- /usr/portage/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild	2010-07-07 12:05:33.000000000 -0400
+++ johntheripper-1.7.6.ebuild	2010-07-18 15:38:41.834126295 -0400
@@ -9,14 +9,14 @@
 MY_PN="john"
 MY_P="${MY_PN}-${PV}"
 
-JUMBO="jumbo-3"
+JUMBO="jumbo-4"
 #MPI="mpi10"
 
 DESCRIPTION="fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/"
 
 SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
-	!minimal? ( ftp://ftp.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )"
+	!minimal? ( http://www.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )"
 #	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )
 
 LICENSE="GPL-2"
@@ -73,11 +73,11 @@
 	if ! use minimal; then
 		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
 	fi
-	local PATCHLIST="${PATCHLIST} cflags mkdir-sandbox"
+	local PATCHLIST="${PATCHLIST} 1.7.6-cflags 1.7.3.1-mkdir-sandbox"
 
 	cd src
 	for p in ${PATCHLIST}; do
-		epatch "${FILESDIR}/${PN}-1.7.3.1-${p}.patch"
+		epatch "${FILESDIR}/${PN}-${p}.patch"
 	done
 
 	if ! use minimal; then
@@ -89,14 +89,17 @@
 
 src_compile() {
 	use custom-cflags || strip-flags
-	append-flags -fPIC -fPIE
+	append-flags -fPIC -fPIE \
+		'-DJOHN_SYSTEMWIDE' \
+		'-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \
+		'-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"'
 	gcc-specs-pie && append-ldflags -nopie
 
 	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
 #	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
 	emake -C src/\
 		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
-		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"/usr/libexec/john\\\"\"" \
+		CFLAGS="-c -Wall ${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		OPT_NORMAL="" \
 		$(get_target) || die "emake failed"