version bump and some minor improvements

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

5 files changed, 188 insertions, 6 deletions

diff --git a/app-crypt/oclhashcat-plus-bin/ChangeLog b/app-crypt/oclhashcat-plus-bin/ChangeLog
index b7549ba4a8ec..d16c01279083 100644
--- a/app-crypt/oclhashcat-plus-bin/ChangeLog
+++ b/app-crypt/oclhashcat-plus-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/oclhashcat-plus-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.8 2013/03/11 14:39:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.9 2013/04/23 02:36:58 zerochaos Exp $
+
+*oclhashcat-plus-bin-0.14 (23 Apr 2013)
+
+  23 Apr 2013; Rick Farina <zerochaos@gentoo.org>
+  +oclhashcat-plus-bin-0.14.ebuild, metadata.xml,
+  oclhashcat-plus-bin-0.13.ebuild:
+  version bump and some minor improvements
 
   11 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   -oclhashcat-plus-bin-0.081.ebuild, -oclhashcat-plus-bin-0.09.ebuild,
diff --git a/app-crypt/oclhashcat-plus-bin/Manifest b/app-crypt/oclhashcat-plus-bin/Manifest
index a915309b76c1..55961f2a73b1 100644
--- a/app-crypt/oclhashcat-plus-bin/Manifest
+++ b/app-crypt/oclhashcat-plus-bin/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST oclHashcat-plus-0.13.7z 22397251 SHA256 374e612979a9e10ecf01d2f2a892f8f0af00ca8cfcfbcba5e6e36eb2aae27228 SHA512 3e259ad7abb1a42b1bed30de2ccc1d3f81d0ce420b27e4969332abbbe460287e3b3420c253cc7a82e060daa7411464927edb4f084e8e671ae60553c234f097de WHIRLPOOL 075f6eab5b03e24964ce4793435189bd950678f12276cd45f49e12f57b6d638c1d6acdb91d2d8397963de5a83b44383103c41438ac21a67d6e51d4c68149d399
-EBUILD oclhashcat-plus-bin-0.13.ebuild 2715 SHA256 d52efdc3fb67c3a08bffcc5ca66af0a180ade546f8b44c4c61b2c5d1661e25f1 SHA512 ebf700afef6a7ef60432357007bd83527f9bf1fd76a743946dddf863e450d43f35d6f1a6bfb1a04b2183de1a39ab3ed60cc7dc19478af2b18fd2181f2684f58b WHIRLPOOL cad0b96518e909f2165acae27cc39e73bf1bbf5fd628e47d6210e667abeff393bebb4f29403befc9ba5a5a807f1224f2959b15943d5cc36c97a526e712ea637c
-MISC ChangeLog 1564 SHA256 2331219efab3d5d7ecd9cdcac40438af600f4fa3927a2c93e8534b4159a76840 SHA512 89c9151ce974c7b35d7f97e2d631f8157ef6fd8923c889b2e29c99b2a93d6186e6c3402fb1bd4a014d6c35506459786d2c5cfd08be3dadcfd20f4764255b7e60 WHIRLPOOL 07ec561f2ac374d45a1c0bc6e8214feaa07477d9c6369e37e4c369e367a947ebf981b33e3ed4d44606dfc863125e24e2a0698edc6d4f91c38a144ca580e5e657
-MISC metadata.xml 248 SHA256 c48f1d43aa5eb2f3374c54e1be22241c09bc94d9fd2156794be28f7b09af4bac SHA512 111d13c282e9834bd2899c214b1fc05d4bfe4448c30656187f2435f23c5dbab92e6ffc6d0f69efad8494b7f2e1ec364343061a8b58ca3043e3d4a337e461123f WHIRLPOOL 4c25451092f8d779d15b189778bf51a968e73b49c4027254c8596d19c588464170a3b66302d740a2cf7fdc1a0cd47d7dbb3c1c9e3e026f8dfca0fb9db585c814
+DIST oclHashcat-plus-0.14.7z 43411331 SHA256 4e5ee82bdb72ecd0ebc7795414a89d2755ed35dfc26fcbf92648e46dd223056e SHA512 8f6f548eb7de0dc9285f214757a9400976a696085a5ae61c583c0a3d73fcdb8326345054dda132414c2d44cdaa3207abebb47968defbb290e77fd496fd62861d WHIRLPOOL 9cf03c51a5b65326f08acf78987397035641cd6c38b86bb00620d3880958ccfc48fde24eff8f41b40a2c022ef3478e22c203d8eb8037c545b797956473c80a94
+EBUILD oclhashcat-plus-bin-0.13.ebuild 3234 SHA256 63e654d0301ada5cf4f75d3f44c5574469c59eeeb6e04d1b579c72e861a3ac66 SHA512 63a985f843a9ad81024271a159d0f96fc19d5782d71642e3b9b23ee11a4e2adcddc4e511edf99c8c126e09c7d087d1af393b77fec07dbd483e5f37306f99020f WHIRLPOOL c03ea9766a5e562def520ed86d5c5e3fa58346b88502c6c6ea90e62f5d25c4e788c301246e4d5f918d8a0fd6bc7818966d0d02b71d679c95b6c4861c2e4e382c
+EBUILD oclhashcat-plus-bin-0.14.ebuild 4011 SHA256 8894e6b859f6fdefd63db7a5b23b4c4835a91a476c1cbb0f4a4426af577f57bc SHA512 a6349295d99180d67eaa467c9ece857697995425975c4a1064eb1176e2aaa1fe2e65d5f7b81136c9ff2c1b663b24d5d1ba3da70a7793ac85ddb84bf82a5a7031 WHIRLPOOL 1125874d0a86ad9c3a13ceae9581b6a2d139fc276944eb68f2b979a5da69cd8c1e20cc81ba6459f2497399ff487943293755645106dcb6c3c8a504191d819a02
+MISC ChangeLog 1785 SHA256 50929e96ac7f58a5f4f69a4d10dac36302526e15adb84bba0e4e96f82667389b SHA512 853b4912905faec801bc88def5833c433db88fdd4bd5b4b53979846dde705134f5692d88cd08fb8c78842d7e8b6db8dc6c418cfe7a428b05c41f0da3eeb1a8a7 WHIRLPOOL a2a6719b867d9ff24e60f552a7d1d5512b9c885229330b45eb58d83f0d3a9504783c4fa7bd5396e4deb7ca70da69bb8a26626d6308dc821253421cc3816c0b63
+MISC metadata.xml 337 SHA256 bbe4d122421fa903c16d329711891c113dad1634fdcb8ed252262380d7f13bfc SHA512 8d1792daf39a5b31aba85c1078347a4abd10537d8fe9b4316e7f71724eca8ce3e99d0d7ab76081eb1c0267aef2482bd014136d16ed3b3a6644157c18513a6190 WHIRLPOOL 2691d1d60cad7a8930ec72d35b12b533cfde52a1af6f5ad91f3e9c57c506377a4a79f57fb3f5cd6b530f3b9c96364adabe600d660c42c3b2d4f89f7b243218c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJRdfRtAAoJEKXdFCfdEflK54QP/RkUVTEHXoqHT32Sl6Cl0LNe
+FooqvzNGMnwpykzSaq1EwXCGJL2P6fJHHb6IowADwWwnmTkQhYbut17/GDOCYxXs
+8f1/5JfvcYxpwbHta6nzfqVC9EGKNyck3xAtVuGk0cplOgkI7mkstM3wLztKwf1L
+yClE5cCsMcsc590zPwkGoFquQ84ak3lJzVpJr184lyW2v4xkb7JLJFbEwmwn4gf0
+tdHNBqKqShAVgul/3ryu4LoR1T8HPS1vaKCi7Db/E6tOKBYD8I2WAII0Nzlw0HsF
+GVYyFokNyFPw2W8VfuHJeQbnK18jJxzW7nyi45/kqU97FHkVsvSODr9TIczXynFP
+bmR1Ir/zmhWASsDX3coBpaOlCpma06gmjMybbjDRFykytBBPAdJUpQhJReUWbfZ4
+64OXYbGHn89QOrTbWKraRIlJh61VV+P1jgFF6CaC6k4TDzIr+dGPLbza1AkKpk9N
+GvkcrMWvfGYH5QiXgbspw1HVUWt9MO9VyXcyzwXOETPSYHfXUNGJiH7SYEnHzOlT
+Otw5iwm7d22Ckf9CnRtReZWmrn89HRkMXrCetuavGqcNan1Hesb2DH5qYn5ob2Pq
+D43UoRmO8UTRnty4WnQfSs0iTr0bzI3uZScFaY8uDdJQYbnzSNxwHywzqLfww6Dm
+/YbWkRn8hjpV46QCd3S/
+=LpTU
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
index 88e9eb110229..8006cb0e3265 100644
--- a/app-crypt/oclhashcat-plus-bin/metadata.xml
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -6,5 +6,6 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
 
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
index 08dcdcf704ed..ea4f76d0c81f 100644
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild,v 1.1 2013/02/03 01:55:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild,v 1.2 2013/04/23 02:36:58 zerochaos Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ QA_PREBUILT="*Hashcat-plus*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -r *.exe docs || die
+	rm -r *.exe *.cmd docs || die
 	use x86 && rm *Hashcat-plus64*
 	use amd64 && rm *Hashcat-plus32*
 
@@ -98,3 +98,22 @@ src_install() {
 	fperms 0660 /opt/${PN}/eula.accepted
 	einfo "oclhashcat-plus can be run as user if you are in the video group"
 }
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild
new file mode 100644
index 000000000000..e5f7deed5844
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild,v 1.1 2013/04/23 02:36:57 zerochaos Exp $
+
+EAPI=5
+
+inherit eutils pax-utils
+
+DESCRIPTION="An opencl multihash cracker"
+HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
+
+MY_P="oclHashcat-plus-${PV}"
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_fglrx
+	video_cards_nvidia"
+
+IUSE="virtualcl ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="sys-libs/zlib
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 )
+	video_cards_fglrx?  ( =x11-drivers/ati-drivers-13.1 )"
+DEPEND="${RDEPEND}
+	app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-plus*.bin"
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
+
+src_install() {
+	dodoc docs/*
+	rm -r "${S}"/*.exe "${S}"/*.cmd "${S}"/docs || die
+	use x86 && rm *Hashcat-plus64*
+	use amd64 && rm *Hashcat-plus32*
+	use virtualcl || { rm vclHashcat-plus* || die; }
+
+	if ! use video_cards_fglrx; then
+		rm -r kernels/4098 || die
+		rm oclHashcat-plus*.bin || die
+	fi
+	if ! use video_cards_nvidia; then
+		rm -r kernels/4318 || die
+		rm cudaHashcat-plus*.bin || die
+	fi
+	pax-mark m *Hashcat-plus*.bin
+
+	insinto /opt/${PN}
+	doins -r "${S}"/* || die "Copy files failed"
+
+	dodir /opt/bin
+
+	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
+		#! /bin/sh
+		echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
+		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
+	EOF
+
+	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin vclHashcat-plus64.bin vclHashcat-plus32.bin
+	do
+		if [ -f "${ED}"/opt/${PN}/${x} ]
+		then
+			case "${x}" in
+				oclHashcat-plus64.bin)
+					echo "echo '64 bit ATI accelerated \"oclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				oclHashcat-plus32.bin)
+					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				cudaHashcat-plus64.bin)
+					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				cudaHashcat-plus32.bin)
+					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				vclHashcat-plus64.bin)
+					echo "echo '64 bit VirtualCL Cluster support \"vclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				vclHashcat-plus32.bin)
+					echo "echo '32 bit VirtualCL Cluster support \"vclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+			esac
+
+			fperms +x /opt/${PN}/${x}
+
+			cat <<-EOF > "${ED}"/opt/bin/${x}
+				#! /bin/sh
+				cd /opt/${PN}
+				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
+				exec ./${x} "\$@"
+			EOF
+
+			fperms +x /opt/bin/${x}
+
+		fi
+	done
+
+	fperms +x /opt/bin/oclhashcat-plus
+	fowners root:video /opt/${PN}
+	einfo "oclhashcat-plus can be run as user if you are in the video group"
+}
+
+pkg_preinst() {
+	#I feel so dirty doing this
+	#first we remove the eula.accepted because it cannot properly handle and empty or old one (crash or doesn't run at all)
+	rm -f "${EROOT}"/opt/${PN}/eula.accepted
+	#next we remove any compiled kernel files as these get built on first run only if they aren't there because there are no timestamp checks
+	rm -f "${EROOT}"/opt/${PN}/kernels/{4318,4098}/"*.kernel"
+	#have mercy on my soul
+}