From 81d8c1f8a6d12b420c8378b50b12b2b70bc4d7a1 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Wed, 1 Aug 2007 04:37:59 +0000 Subject: Place lists at correct location, bug#187320, thanks to Paul Taylor Package-Manager: portage-2.1.3 --- app-crypt/johntheripper/ChangeLog | 8 +- app-crypt/johntheripper/Manifest | 22 ++-- .../files/digest-johntheripper-1.7.2-r1 | 6 - .../files/digest-johntheripper-1.7.2-r2 | 6 + .../johntheripper/johntheripper-1.7.2-r1.ebuild | 128 --------------------- .../johntheripper/johntheripper-1.7.2-r2.ebuild | 125 ++++++++++++++++++++ 6 files changed, 149 insertions(+), 146 deletions(-) delete mode 100644 app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1 create mode 100644 app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r2 delete mode 100644 app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild create mode 100644 app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild (limited to 'app-crypt/johntheripper') diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index f0b6fe289db5..6a8ed175a8e5 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.58 2007/07/20 14:28:08 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.59 2007/08/01 04:37:59 alonbl Exp $ + +*johntheripper-1.7.2-r2 (01 Aug 2007) + + 01 Aug 2007; Alon Bar-Lev + -johntheripper-1.7.2-r1.ebuild, +johntheripper-1.7.2-r2.ebuild: + Place lists at correct location, bug#187320, thanks to Paul Taylor 20 Jul 2007; Alon Bar-Lev johntheripper-1.7.2-r1.ebuild: diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index fe6845a83ec3..44ff6345bb21 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -21,18 +21,18 @@ SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8 files/jo DIST john-1.7-all-4.diff.gz 50311 RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 SHA1 6050745204b38a7dd9fc41889de2b87866c8b528 SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909 DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb -EBUILD johntheripper-1.7.2-r1.ebuild 3374 RMD160 ed29d6ea2e96115fc5e8e91750eb0ce207d340a1 SHA1 6b7958ee0f903213e64d5bfe695f6349671dd710 SHA256 780dafc3d2657501e3a7893ee4e1a89b3879deb762e687b77d07ff311df13304 -MD5 717ef7ca4edbcc14654d939371699b36 johntheripper-1.7.2-r1.ebuild 3374 -RMD160 ed29d6ea2e96115fc5e8e91750eb0ce207d340a1 johntheripper-1.7.2-r1.ebuild 3374 -SHA256 780dafc3d2657501e3a7893ee4e1a89b3879deb762e687b77d07ff311df13304 johntheripper-1.7.2-r1.ebuild 3374 +EBUILD johntheripper-1.7.2-r2.ebuild 3338 RMD160 b912e1dfb1a677a39fb5b792fc51272369793ffe SHA1 eb194e285d370f7d48e1fbea00022ed9ff456d0d SHA256 4f34f6b2807e750890e4961f1ab8b2e81c177b592e5e3ac5b7fbf8bcbb1e2e95 +MD5 fc1e26d4a4eb1dae4f2d31bb5b71a08a johntheripper-1.7.2-r2.ebuild 3338 +RMD160 b912e1dfb1a677a39fb5b792fc51272369793ffe johntheripper-1.7.2-r2.ebuild 3338 +SHA256 4f34f6b2807e750890e4961f1ab8b2e81c177b592e5e3ac5b7fbf8bcbb1e2e95 johntheripper-1.7.2-r2.ebuild 3338 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 10729 RMD160 e341ed2650c9dc8f2a69c85348785d21a166a38e SHA1 722e4497a7d74990461f18ae2cb545537ac0c307 SHA256 3404e0580c8d89bbae9ea3fd5215708059034388f1b54e2d279d13d68e580625 -MD5 2721dfcaee41fe2fcddcde214b8c135c ChangeLog 10729 -RMD160 e341ed2650c9dc8f2a69c85348785d21a166a38e ChangeLog 10729 -SHA256 3404e0580c8d89bbae9ea3fd5215708059034388f1b54e2d279d13d68e580625 ChangeLog 10729 +MISC ChangeLog 10952 RMD160 978f2d5fad92d5ab03411181259471b2f0e6b58f SHA1 057cbf27c2d2cd14b01fb2688678531bcfaa408b SHA256 abe4621ef18b08d272a815466af9643835df28db792929e75862518e9054bf0e +MD5 c23a981a98f6f646c39c63821a8748b2 ChangeLog 10952 +RMD160 978f2d5fad92d5ab03411181259471b2f0e6b58f ChangeLog 10952 +SHA256 abe4621ef18b08d272a815466af9643835df28db792929e75862518e9054bf0e ChangeLog 10952 MISC metadata.xml 254 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 SHA1 5d59fd95cef5bc44213823f07599ab4a3040e659 SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6 MD5 873a096e13940bcb1684c3d5f4bdb30b metadata.xml 254 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 metadata.xml 254 @@ -40,6 +40,6 @@ SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6 metadata MD5 fa3d5f08df3d277ee771715466395974 files/digest-johntheripper-1.7.2 476 RMD160 e159515fd92bd054565f086b4749eaacd71b5473 files/digest-johntheripper-1.7.2 476 SHA256 1f98f59d509b03c8a18445cdf030bb234507f090938041a3e6c7433b8cb80149 files/digest-johntheripper-1.7.2 476 -MD5 753fa3810f699a8a2221c89aa00af2eb files/digest-johntheripper-1.7.2-r1 482 -RMD160 540e941b341418e1a102eb85c53562d26087349c files/digest-johntheripper-1.7.2-r1 482 -SHA256 c1673181f0b25641de64a51a599c2a6e766ffd58c05a56173fbe70dcfe8faa70 files/digest-johntheripper-1.7.2-r1 482 +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 diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1 deleted file mode 100644 index e2d7fb28a6db..000000000000 --- a/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r1 +++ /dev/null @@ -1,6 +0,0 @@ -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/files/digest-johntheripper-1.7.2-r2 b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r2 new file mode 100644 index 000000000000..e2d7fb28a6db --- /dev/null +++ b/app-crypt/johntheripper/files/digest-johntheripper-1.7.2-r2 @@ -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-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild deleted file mode 100644 index 849ff262f4b6..000000000000 --- a/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# 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-r1.ebuild,v 1.3 2007/07/20 14:28:08 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" - -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; do - epatch "${FILESDIR}/${P}-${p}.patch" - done -} - -src_compile() { - # - # upstream request to strip - # any flags, as he optimize the - # outputs - # - strip-flags - - cd "${S}"/src - # Note this program uses AS and LD incorrectly - 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}\"" - - 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 - - # share - insinto /usr/share/john/ - doins run/*.chr run/password.lst - - # documentation - dodoc doc/* -} diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild new file mode 100644 index 000000000000..021b069d16e7 --- /dev/null +++ b/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild @@ -0,0 +1,125 @@ +# 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-r2.ebuild,v 1.1 2007/08/01 04:37:59 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" + +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; do + epatch "${FILESDIR}/${P}-${p}.patch" + done +} + +src_compile() { + # + # upstream request to strip + # any flags, as he optimize the + # outputs + # + strip-flags + + cd "${S}"/src + # Note this program uses AS and LD incorrectly + 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}\"" + + 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/* +} -- cgit v1.2.3-65-gdbad