Version bump, fixes bug 174356 (thanks to Ed Wiget). Also cleaned out some old versions.

(Portage version: 2.1.2.3)

9 files changed, 89 insertions, 157 deletions

diff --git a/app-crypt/ophcrack/ChangeLog b/app-crypt/ophcrack/ChangeLog
index 488d16e4cdfa..8d4653bf5bba 100644
--- a/app-crypt/ophcrack/ChangeLog
+++ b/app-crypt/ophcrack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/ophcrack
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.9 2007/03/29 20:27:50 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.10 2007/04/15 19:52:27 ikelos Exp $
+
+*ophcrack-2.3.4 (15 Apr 2007)
+
+  15 Apr 2007; Mike Auty <ikelos@gentoo.org>
+  -files/ophcrack-2.2-linuxtools-install-path.patch,
+  -files/ophcrack-2.3.1-linuxtools-install-path.patch, -ophcrack-2.2.ebuild,
+  -ophcrack-2.3.1.ebuild, +ophcrack-2.3.4.ebuild:
+  Version bump, fixes bug 174356 (thanks to Ed Wiget). Also cleaned out some
+  old versions.
 
   29 Mar 2007; Peter Weller <welp@gentoo.org> ophcrack-2.3.3.ebuild:
   Keyworded on amd64 wrt bug 171015
diff --git a/app-crypt/ophcrack/files/digest-ophcrack-2.2 b/app-crypt/ophcrack/files/digest-ophcrack-2.2
deleted file mode 100644
index a143db216a3b..000000000000
--- a/app-crypt/ophcrack/files/digest-ophcrack-2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a5542fc3de4d24ecb62a01154f0f74b9 SSTIC04-10k.zip 364228
-RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SSTIC04-10k.zip 364228
-SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259 SSTIC04-10k.zip 364228
-MD5 00181247b0ef30d0fd138341a6f883ff SSTIC04-5k.zip 701900757
-RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SSTIC04-5k.zip 701900757
-SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f SSTIC04-5k.zip 701900757
-MD5 61c131859a483426637b5133bbfe709b ophcrack-2.2.tar.gz 148443
-RMD160 47af8b59460b28b617e99946e33bd453723bda44 ophcrack-2.2.tar.gz 148443
-SHA256 cb30073eb982f149478ca2923b6412d1a4a8db1ae4f0ba9a632fb7b62598d91b ophcrack-2.2.tar.gz 148443
diff --git a/app-crypt/ophcrack/files/digest-ophcrack-2.3.1 b/app-crypt/ophcrack/files/digest-ophcrack-2.3.1
deleted file mode 100644
index a4fa536d7836..000000000000
--- a/app-crypt/ophcrack/files/digest-ophcrack-2.3.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a5542fc3de4d24ecb62a01154f0f74b9 SSTIC04-10k.zip 364228
-RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SSTIC04-10k.zip 364228
-SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259 SSTIC04-10k.zip 364228
-MD5 00181247b0ef30d0fd138341a6f883ff SSTIC04-5k.zip 701900757
-RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SSTIC04-5k.zip 701900757
-SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f SSTIC04-5k.zip 701900757
-MD5 a4ba5310218f6155d58720ee2e925133 ophcrack-2.3.1.tar.gz 164484
-RMD160 e8eee53e8a49a55270161ee9b86332b129c6a468 ophcrack-2.3.1.tar.gz 164484
-SHA256 b8ad977b2c1835f6ce705ef6c2faf13a0dbf98445b72b60c7697fb5077503a3d ophcrack-2.3.1.tar.gz 164484
diff --git a/app-crypt/ophcrack/files/digest-ophcrack-2.3.4 b/app-crypt/ophcrack/files/digest-ophcrack-2.3.4
new file mode 100644
index 000000000000..5c067e0e4a74
--- /dev/null
+++ b/app-crypt/ophcrack/files/digest-ophcrack-2.3.4
@@ -0,0 +1,15 @@
+MD5 a5542fc3de4d24ecb62a01154f0f74b9 SSTIC04-10k.zip 364228
+RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SSTIC04-10k.zip 364228
+SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259 SSTIC04-10k.zip 364228
+MD5 00181247b0ef30d0fd138341a6f883ff SSTIC04-5k.zip 701900757
+RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SSTIC04-5k.zip 701900757
+SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f SSTIC04-5k.zip 701900757
+MD5 241ef8905e168ae6e318835fe45157de bkhive-1.1.0.tar.gz 15986
+RMD160 d288a3978488ad42b829e070b7071cc92391e035 bkhive-1.1.0.tar.gz 15986
+SHA256 89d25a4655d87726a8ab513c2604faecd52df1b8dc8a7c53e447eed1bf0e9b86 bkhive-1.1.0.tar.gz 15986
+MD5 bd4da8109d5f14b168c962b6110be6cc ophcrack-2.3.4.tar.gz 168131
+RMD160 f3a92b559a3f054dd55a8fbe20897e6728e9ab22 ophcrack-2.3.4.tar.gz 168131
+SHA256 b5ee4b550d47f13858f81a0957e1630a0a4690242670a781b5bdd6fa30af0cc0 ophcrack-2.3.4.tar.gz 168131
+MD5 81a9d7ea4daa40bffa5647b38629f2c5 samdump2-1.1.0.tar.gz 18897
+RMD160 a2e5916899e69897cd504fa8e1672f11b90b5e7d samdump2-1.1.0.tar.gz 18897
+SHA256 b08fbd80ef6960f56dbb67c5a59addff08d6ea7d5b34ccc7ccf004b5820f1d1e samdump2-1.1.0.tar.gz 18897
diff --git a/app-crypt/ophcrack/files/ophcrack-2.2-linuxtools-install-path.patch b/app-crypt/ophcrack/files/ophcrack-2.2-linuxtools-install-path.patch
deleted file mode 100644
index 0424f0b9ac6d..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-2.2-linuxtools-install-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr ophcrack-2.2/Makefile.am ophcrack-2.1.new/Makefile.am
---- ophcrack-2.2/Makefile.am	2005-03-31 15:09:50.000000000 +0100
-+++ ophcrack-2.2.new/Makefile.am	2005-11-07 17:24:46.000000000 +0000
-@@ -36,10 +36,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
-diff -uNr ophcrack-2.2/Makefile.in ophcrack-2.1.new/Makefile.in
---- ophcrack-2.2/Makefile.in	2005-03-31 15:10:16.000000000 +0100
-+++ ophcrack-2.2.new/Makefile.in	2005-11-07 17:25:09.000000000 +0000
-@@ -383,10 +383,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
diff --git a/app-crypt/ophcrack/files/ophcrack-2.3.1-linuxtools-install-path.patch b/app-crypt/ophcrack/files/ophcrack-2.3.1-linuxtools-install-path.patch
deleted file mode 100644
index 4d9cdeda1f90..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-2.3.1-linuxtools-install-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr ophcrack-2.3.1.orig/Makefile.am ophcrack-2.3.1/Makefile.am
---- ophcrack-2.3.1.orig/Makefile.am	2005-03-31 15:09:50.000000000 +0100
-+++ ophcrack-2.3.1/Makefile.am	2005-11-07 17:24:46.000000000 +0000
-@@ -36,10 +36,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
-diff -uNr ophcrack-2.3.1.orig/Makefile.in ophcrack-2.3.1/Makefile.in
---- ophcrack-2.3.1.orig/Makefile.in	2005-03-31 15:10:16.000000000 +0100
-+++ ophcrack-2.3.1/Makefile.in	2005-11-07 17:25:09.000000000 +0000
-@@ -383,10 +383,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
diff --git a/app-crypt/ophcrack/ophcrack-2.2.ebuild b/app-crypt/ophcrack/ophcrack-2.2.ebuild
deleted file mode 100644
index 54427c239ed6..000000000000
--- a/app-crypt/ophcrack/ophcrack-2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.2.ebuild,v 1.3 2006/12/20 01:37:44 ikelos Exp $
-
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-		 !ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
-		 ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ophsmall"
-
-DEPEND="app-arch/unzip
-		dev-libs/openssl
-		net-libs/netwib"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-linuxtools-install-path.patch
-}
-
-src_install() {
-	make install DESTDIR=${D}
-
-	TABLENAME="5000"
-	use ophsmall && TABLENAME="10000"
-
-	dodir /usr/share/${PN}/${TABLENAME}
-	mv ${WORKDIR}/table* ${D}/usr/share/${PN}/${TABLENAME}
-}
diff --git a/app-crypt/ophcrack/ophcrack-2.3.1.ebuild b/app-crypt/ophcrack/ophcrack-2.3.1.ebuild
deleted file mode 100644
index d32950661f04..000000000000
--- a/app-crypt/ophcrack/ophcrack-2.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.3.1.ebuild,v 1.2 2006/12/20 01:37:44 ikelos Exp $
-
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-		 !ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
-		 ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ophsmall"
-
-DEPEND="app-arch/unzip
-		dev-libs/openssl
-		net-libs/netwib"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-linuxtools-install-path.patch
-}
-
-src_install() {
-	make install DESTDIR=${D}
-
-	TABLENAME="5000"
-	use ophsmall && TABLENAME="10000"
-
-	dodir /usr/share/${PN}/${TABLENAME}
-	mv ${WORKDIR}/table* ${D}/usr/share/${PN}/${TABLENAME}
-}
diff --git a/app-crypt/ophcrack/ophcrack-2.3.4.ebuild b/app-crypt/ophcrack/ophcrack-2.3.4.ebuild
new file mode 100644
index 000000000000..e9fe98a109bf
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-2.3.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.3.4.ebuild,v 1.1 2007/04/15 19:52:27 ikelos Exp $
+
+inherit toolchain-funcs eutils
+
+BKHIVE_VER="1.1.0"
+SAMDUMP_VER="1.1.0"
+
+DESCRIPTION="A time-memory-trade-off-cracker"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/bkhive-${BKHIVE_VER}.tar.gz
+	mirror://sourceforge/${PN}/samdump2-${SAMDUMP_VER}.tar.gz
+	!ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
+	ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ophsmall"
+
+DEPEND="app-arch/unzip
+		dev-libs/openssl
+		net-libs/netwib"
+RDEPEND=""
+
+src_compile() {
+	# Make samdump2
+	einfo "Compiling samdump2"
+	cd ${WORKDIR}/samdump2-${SAMDUMP_VER}
+	MAKEOPTS="-j1" emake || die "Failed to make samdump"
+
+	# Make bkhive2
+	einfo "Compiling bkhive"
+	cd ${WORKDIR}/bkhive-${BKHIVE_VER}
+	MAKEOPTS="-j1" emake || die "Failed to make bkhive2"
+
+	# Make the program
+	einfo "Compiling ophcrack"
+	cd ${S}
+	econf
+	emake || die "Failed to make ophcrack"
+
+	# Don't try to install the prebuilt binaries,
+	# they'll cause an access violation
+	rm -fr ${S}/linux_tools
+}
+
+src_install() {
+	make install DESTDIR=${D}
+
+	cd ${WORKDIR}/bkhive-${BKHIVE_VER}
+	make install DESTDIR=${D} PREFIX=/usr/
+
+	cd ${WORKDIR}/samdump2-${SAMDUMP_VER}
+	make install DESTDIR=${D} PREFIX=/usr/
+
+	TABLENAME="5000"
+	use ophsmall && TABLENAME="10000"
+
+	dodir /usr/share/${PN}/${TABLENAME}
+	mv ${WORKDIR}/table* ${D}/usr/share/${PN}/${TABLENAME}
+}