diff options
author | 2004-05-24 00:21:54 +0000 | |
---|---|---|
committer | 2004-05-24 00:21:54 +0000 | |
commit | 4316ef790e097148386fa17545f21d93453d26fa (patch) | |
tree | 568a3d2b89c6f778e678c04c90b06961e587daad /app-crypt/johntheripper | |
parent | arm KEYWORD (diff) | |
download | historical-4316ef790e097148386fa17545f21d93453d26fa.tar.gz historical-4316ef790e097148386fa17545f21d93453d26fa.tar.bz2 historical-4316ef790e097148386fa17545f21d93453d26fa.zip |
fixed patches
Diffstat (limited to 'app-crypt/johntheripper')
-rw-r--r-- | app-crypt/johntheripper/ChangeLog | 8 | ||||
-rw-r--r-- | app-crypt/johntheripper/Manifest | 6 | ||||
-rw-r--r-- | app-crypt/johntheripper/files/digest-johntheripper-1.6.37 | 2 | ||||
-rw-r--r-- | app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1 | 2 | ||||
-rw-r--r-- | app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild (renamed from app-crypt/johntheripper/johntheripper-1.6.37.ebuild) | 18 |
5 files changed, 24 insertions, 12 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index 75219a646820..c2b5b223ca03 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/johntheripper # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.13 2004/05/22 01:42:11 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.14 2004/05/24 00:21:54 dragonheart Exp $ + +*johntheripper-1.6.37-r1 (24 May 2004) + + 24 May 2004; Daniel Black <dragonheart@gentoo.org> + +johntheripper-1.6.37-r1.ebuild, -johntheripper-1.6.37.ebuild: + Fixed patches *johntheripper-1.6.37 (22 May 2004) diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index a2cde91436f5..55989915d9a6 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -1,11 +1,11 @@ MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310 MD5 5b37d0e2e0a8877fa7fc60da0944b9c7 johntheripper-1.6-r1.ebuild 2070 MD5 00a2a9ef4ac96b131bc282e8169d9a44 johntheripper-1.6.ebuild 1324 -MD5 9c381d61776cc43f2705ebd2b0080131 ChangeLog 3108 +MD5 3f4fa897d8dcdcc4a87593868bad8102 ChangeLog 3283 MD5 fe87e4a8741406098cb221bfe0068c0f johntheripper-1.6-r3.ebuild 2616 -MD5 0376d194f2fb3dcc832e50019c0fb8b8 johntheripper-1.6.37.ebuild 2917 +MD5 7c82c10b100e19cb5420028a7ed27fde johntheripper-1.6.37-r1.ebuild 3094 MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123 MD5 d2a0df18590c71836e4c423af635353f files/digest-johntheripper-1.6-r1 456 MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168 MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126 -MD5 9dc996878baccd1d86e53687e6ec0bc4 files/digest-johntheripper-1.6.37 132 +MD5 1dd4c27265865a55a86ed4dd274b42a4 files/digest-johntheripper-1.6.37-r1 135 diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37 deleted file mode 100644 index 3db926e21093..000000000000 --- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9403233b640927295c05b0564ff1f678 john-1.6.37.tar.gz 139372 -MD5 945a200a3b0553c1d6476da3806f4736 john-1.6.37-gentoo.patch 166266 diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1 new file mode 100644 index 000000000000..85696da78745 --- /dev/null +++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.37-r1 @@ -0,0 +1,2 @@ +MD5 9403233b640927295c05b0564ff1f678 john-1.6.37.tar.gz 139372 +MD5 0bfc67cfee9f15ba7946c2db64d4ecc3 john-1.6.37-r1-gentoo.patch 165486 diff --git a/app-crypt/johntheripper/johntheripper-1.6.37.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild index adf542cd2a06..a429e055fc60 100644 --- a/app-crypt/johntheripper/johntheripper-1.6.37.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.37.ebuild,v 1.1 2004/05/22 01:42:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild,v 1.1 2004/05/24 00:21:54 dragonheart Exp $ inherit eutils flag-o-matic @@ -9,7 +9,7 @@ S=${WORKDIR}/${MY_P} DESCRIPTION="fast password cracker" HOMEPAGE="http://www.openwall.com/john/" SRC_URI="http://www.openwall.com/john/b/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-gentoo.patch" + mirror://gentoo/${PF/theripper/}-gentoo.patch" # # john-{$PV}-gentoo.patch is a heavly hacked combination of: @@ -21,6 +21,7 @@ SRC_URI="http://www.openwall.com/john/b/${MY_P}.tar.gz # ftp://ftp.openwall.com/pub/projects/john/contrib/john-1.6.31-eggpatch-8.diff.gz # + SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~sparc ~ppc ~alpha ~mips ~hppa" @@ -38,13 +39,18 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} - epatch ${DISTDIR}/${MY_P}-gentoo.patch + epatch ${DISTDIR}/${PF/theripper/}-gentoo.patch } src_compile() { cd src - sed -i -e "s:-march=i486::" -e "s:-Wall -O2:${CFLAGS}:" \ + sed -i -e "s:^\(CFLAGS =.*\):\1 ${CFLAGS}:" \ Makefile + + sed -i -e 's:^#define CFG_ALT_NAME.*:#define CFG_ALT_NAME "/etc/john.ini":' \ + -e 's:^#define WORDLIST_NAME.*:#define WORDLIST_NAME "/usr/share/john/password.lst":' \ + params.h + local OPTIONS="EGG=true" use kerberos && OPTIONS="${OPTIONS} KERBEROS=true" use ntlm && OPTIONS="${OPTIONS} NTLM=true" @@ -52,10 +58,10 @@ src_compile() { use mysql && OPTIONS="${OPTIONS} MYSQL=true" if use x86 ; then - local K6=is-flag "-march=k6-3" || is-flag "-march=k6-2" || is-flag "-march=k6" if use mmx ; then emake ${OPTIONS} linux-x86-mmx-elf || die "Make failed" - elif ${K6} ; then + elif is-flag "-march=k6-3" || is-flag "-march=k6-2" \ + || is-flag "-march=k6"; then emake ${OPTIONS} linux-x86-k6-elf || die "Make failed" else emake ${OPTIONS} generic || die "Make failed" |