Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 277811 | Differences between
and this patch

Collapse All | Expand All

(-)a/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild (-30 / +19 lines)
Lines 5-12 Link Here
5
EAPI=1
5
EAPI=1
6
inherit eutils flag-o-matic toolchain-funcs pax-utils
6
inherit eutils flag-o-matic toolchain-funcs pax-utils
7
7
8
JUMBO='all-3'
8
JUMBO='all-5'
9
MPI='mpi8-small'
9
MPI='mpi10'
10
10
11
MY_PN="${PN/theripper/}"
11
MY_PN="${PN/theripper/}"
12
MY_P="${MY_PN/theripper/}-${PV}"
12
MY_P="${MY_PN/theripper/}-${PV}"
Lines 16-23 DESCRIPTION="fast password cracker" Link Here
16
HOMEPAGE="http://www.openwall.com/john/"
16
HOMEPAGE="http://www.openwall.com/john/"
17
17
18
SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
18
SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
19
	!minimal? ( ftp://ftp.openwall.com/john/contrib/historical/${MY_P}-${JUMBO}.diff.gz )
19
	!minimal? ( ftp://ftp.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )
20
	mpi? ( http://bindshell.net/tools/johntheripper/${MY_P}-${MPI}.patch.gz )"
20
	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )"
21
21
22
LICENSE="GPL-2"
22
LICENSE="GPL-2"
23
SLOT="0"
23
SLOT="0"
Lines 63-110 get_target() { Link Here
63
	fi
63
	fi
64
}
64
}
65
65
66
#pkg_setup() {
67
#	if use mpi && built_with_use sys-cluster/mpich2 threads; then
68
#		die 'cannot work with sys-cluster/mpich2 USE=threads'
69
#		#http://bindshell.net/tools/johntheripper/
70
#	fi
71
#}
72
73
src_unpack() {
66
src_unpack() {
74
	unpack ${A}
67
	unpack ${A}
75
	cd "${S}"
68
	cd "${S}"
76
	PATCHLIST=""
69
	PATCHLIST="stackdef.S"
77
	if use mpi ; then
70
	if use mpi ; then
78
		epatch "${WORKDIR}"/${MY_P}-${MPI}.patch
71
		epatch "${WORKDIR}"/${MY_P}-${MPI}.patch
79
		# avoid the conflict on JOHN_VERSION until a better compromise is made
80
		sed -i 's/_mpi"/"/' src/params.h
81
	fi
72
	fi
82
	if ! use minimal ; then
73
	if ! use minimal ; then
83
		epatch "${WORKDIR}"/${MY_P}-${JUMBO}.diff
74
		epatch "${WORKDIR}"/${MY_P}-${JUMBO}.diff
84
		PATCHLIST=stackdef.S
75
		PATCHLIST="${PATCHLIST} ${JUMBO}-stackdef.S"
85
	fi
76
	fi
86
	PATCHLIST="${PATCHLIST} params.h mkdir-sandbox"
77
	PATCHLIST="${PATCHLIST} cflags mkdir-sandbox"
87
78
88
	cd "${S}/src"
79
	cd "${S}/src"
89
	for p in ${PATCHLIST}; do
80
	for p in ${PATCHLIST}; do
90
		epatch "${FILESDIR}/${P}-${p}.patch"
81
		epatch "${FILESDIR}/${P}-${p}.patch"
91
	done
82
	done
92
83
93
	sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" -i Makefile || die "sed Makefile failed"
84
	if ! use minimal ; then
85
		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
86
			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
87
			-i Makefile || die "sed Makefile failed"
88
	fi
94
}
89
}
95
90
96
src_compile() {
91
src_compile() {
97
	cd "${S}/src"
98
99
	use custom-cflags || strip-flags
92
	use custom-cflags || strip-flags
100
	append-flags -fno-PIC -fno-PIE
93
	append-flags -fPIC -fPIE
101
	append-ldflags -nopie
94
	append-ldflags -nopie
102
95
103
	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
96
	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
104
	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
97
	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
105
	emake \
98
	emake -C src/\
106
		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
99
		CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
107
		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
100
		CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"${ROOT}/etc/john\\\"\" -DJOHN_SYSTEMWIDE_EXEC=\"\\\"${ROOT}/usr/libexec/john\\\"\"" \
108
		LDFLAGS="${LDFLAGS}" \
101
		LDFLAGS="${LDFLAGS}" \
109
		OPT_NORMAL="" \
102
		OPT_NORMAL="" \
110
		$(get_target) \
103
		$(get_target) \
Lines 140-157 src_install() { Link Here
140
	# jumbo-patch additions
133
	# jumbo-patch additions
141
	if ! use minimal ; then
134
	if ! use minimal ; then
142
		dosym john /usr/sbin/undrop
135
		dosym john /usr/sbin/undrop
143
		# >=all-4
136
		dosbin run/calc_stat
144
		#dosbin run/calc_stat
137
		dosbin run/genmkvpwd
145
		#dosbin run/genmkvpwd
138
		dosbin run/mkvcalcproba
146
		#dosbin run/mkvcalcproba
147
		insinto /etc/john
139
		insinto /etc/john
148
		# >=all-4
140
		doins run/genincstats.rb run/stats
149
		#doins run/genincstats.rb run/stats
150
		doins run/netscreen.py run/sap_prepare.pl
141
		doins run/netscreen.py run/sap_prepare.pl
151
	fi
142
	fi
152
143
153
	#newsbin src/bench john-bench
154
155
	# config files
144
	# config files
156
	insinto /etc/john
145
	insinto /etc/john
157
	doins run/john.conf
146
	doins run/john.conf

Return to bug 277811