version bump

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

3 files changed, 171 insertions, 16 deletions

diff --git a/app-crypt/oclhashcat-plus-bin/ChangeLog b/app-crypt/oclhashcat-plus-bin/ChangeLog
index f24683d88146..662966442781 100644
--- a/app-crypt/oclhashcat-plus-bin/ChangeLog
+++ b/app-crypt/oclhashcat-plus-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2013/04/29 16:06:38 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.12 2013/08/25 05:08:17 zerochaos Exp $
+
+*oclhashcat-plus-bin-0.15 (25 Aug 2013)
+
+  25 Aug 2013; Rick Farina <zerochaos@gentoo.org>
+  +oclhashcat-plus-bin-0.15.ebuild:
+  version bump
 
   29 Apr 2013; Rick Farina <zerochaos@gentoo.org>
   oclhashcat-plus-bin-0.14.ebuild:
diff --git a/app-crypt/oclhashcat-plus-bin/Manifest b/app-crypt/oclhashcat-plus-bin/Manifest
index 4ae2d98ef401..d785e1958b01 100644
--- a/app-crypt/oclhashcat-plus-bin/Manifest
+++ b/app-crypt/oclhashcat-plus-bin/Manifest
@@ -3,24 +3,26 @@ Hash: SHA512
 
 DIST oclHashcat-plus-0.13.7z 22397251 SHA256 374e612979a9e10ecf01d2f2a892f8f0af00ca8cfcfbcba5e6e36eb2aae27228 SHA512 3e259ad7abb1a42b1bed30de2ccc1d3f81d0ce420b27e4969332abbbe460287e3b3420c253cc7a82e060daa7411464927edb4f084e8e671ae60553c234f097de WHIRLPOOL 075f6eab5b03e24964ce4793435189bd950678f12276cd45f49e12f57b6d638c1d6acdb91d2d8397963de5a83b44383103c41438ac21a67d6e51d4c68149d399
 DIST oclHashcat-plus-0.14.7z 43411331 SHA256 4e5ee82bdb72ecd0ebc7795414a89d2755ed35dfc26fcbf92648e46dd223056e SHA512 8f6f548eb7de0dc9285f214757a9400976a696085a5ae61c583c0a3d73fcdb8326345054dda132414c2d44cdaa3207abebb47968defbb290e77fd496fd62861d WHIRLPOOL 9cf03c51a5b65326f08acf78987397035641cd6c38b86bb00620d3880958ccfc48fde24eff8f41b40a2c022ef3478e22c203d8eb8037c545b797956473c80a94
+DIST oclHashcat-plus-0.15.7z 71543716 SHA256 545bbaa4ea4fb45a4c4af365e880c56dce8d8bd9c8d73ad2f9cdc16b5df47f14 SHA512 0b11aa805b186a432ee8a9f6ff5823235986d2552fc99b5365150c165bd10232a76408b375887483375cf1e29d8e78de2dadf2e046863061c7ce8722c7591da4 WHIRLPOOL 1a8e52990831ed113c06d702f0de4e5a82f0d3250c630fde8b3b11e5c4d48a0361a1fd8513ce0f183513c3329aa4aa7dd276789f2b04bde44226a16d7e86829a
 EBUILD oclhashcat-plus-bin-0.13.ebuild 3234 SHA256 63e654d0301ada5cf4f75d3f44c5574469c59eeeb6e04d1b579c72e861a3ac66 SHA512 63a985f843a9ad81024271a159d0f96fc19d5782d71642e3b9b23ee11a4e2adcddc4e511edf99c8c126e09c7d087d1af393b77fec07dbd483e5f37306f99020f WHIRLPOOL c03ea9766a5e562def520ed86d5c5e3fa58346b88502c6c6ea90e62f5d25c4e788c301246e4d5f918d8a0fd6bc7818966d0d02b71d679c95b6c4861c2e4e382c
 EBUILD oclhashcat-plus-bin-0.14.ebuild 4357 SHA256 71b7ae619ab7f6becb82d9eefdc4ab7c2f4d8ddce300dccc2b6eadaf5a3a1287 SHA512 679560ac3e989f4827ed35393d6a24836bb44b80d41538041387b6597c8df3d94988045059f16cdddbff84b5ada37ea522fb86383aa3e7bf81b1b7929bc04b37 WHIRLPOOL 30793ff71cae688608e44fe729327fa3e7378ed3657765f78f2ec976d962b910786962e2eb5977bc9178be8ff61bba274bb3007d05d918d47df4eb65850cb490
-MISC ChangeLog 2018 SHA256 76b14b801d74394cfa1cbafdf750a2c6cf4a85b5fd7f6bfc85f5d3f56d416e14 SHA512 f2e8f36c211ddd0c3f50d3fe507719d5337f99bc3d3ad7d645a85ccb6ebce486cad0dc78680c4379d8c70f15c7b1cd60dd3ffdaff9c761afa5fb49d21ea400d0 WHIRLPOOL 5682a3affa10f386c316d735072aea007b8b1cf77e20b8cff1f1231f0af778bb08033758b70152979a851fc5de3054b77b0f5e0f73e65fdb0408e92b74fb5504
+EBUILD oclhashcat-plus-bin-0.15.ebuild 4395 SHA256 f482d9e9a9afc1218d3ae8ccbbfc52b565f0378d9866c94d99d32f0dcbec689c SHA512 89d0d4e3b9b83d317a42ec8904227b96e4cd26206955aa9a5c126dbaef14d60c93d26ca7a3d15dd9b54919f8fd24207bf8d384a053e61a44f7732f60aa47a7c8 WHIRLPOOL f82da699c8856f192bac03c11a10c1f08ad2f77228303c7925d9c4f7678db397f99074bb3762fb4bccf747af6ba6dc6566a2a7c6c0e566cad9de3c766bc2888e
+MISC ChangeLog 2161 SHA256 a88d3df460ed2c0c386b4dc7fce7a5e938e78a00765ecac3de83a083a1c7e3d7 SHA512 2b621b9bf982c7d3e71132ee6745347d35e0892c2dd6d90f55a1140117d24a8fdde02bbaf6777bb7d24a49e0409fcd7dfb6de66fd25a460611733547dabf850e WHIRLPOOL 341fea21ba52f455065c0d4c963b5a0621775ea875b2054f996d0c6ce04af6dd80b54661fea561e0262f2fd851228566726b6180309d2766a44e5dd6003f8202
 MISC metadata.xml 337 SHA256 bbe4d122421fa903c16d329711891c113dad1634fdcb8ed252262380d7f13bfc SHA512 8d1792daf39a5b31aba85c1078347a4abd10537d8fe9b4316e7f71724eca8ce3e99d0d7ab76081eb1c0267aef2482bd014136d16ed3b3a6644157c18513a6190 WHIRLPOOL 2691d1d60cad7a8930ec72d35b12b533cfde52a1af6f5ad91f3e9c57c506377a4a79f57fb3f5cd6b530f3b9c96364adabe600d660c42c3b2d4f89f7b243218c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRfptEAAoJEKXdFCfdEflKN9EQALPqXYkafdQi7xS4q+/Dmjqq
-N3oLJJcgtPbH3DM7q59ELfWPiwLHKXdPwqzWGDu8x5iUhFuEoesPT6T3Ytd/Z7Yp
-v/zV7t4zdavVb4vBMnd58qXS3fr7Rn/w5phA/rVPtfyoNRCT7JtySfPEwh3dU7JE
-MPT+wwzEhtpOlfNw81kzgQfgGwrqgZHdFymTTtrWNtQ1WiNT5WNzyit05mo1Ax7U
-qNMWoCDIx5kkFAluQL0SbgsDIxwplpVHjx7ldlr4shuk4G9c+feIFcKuapj8sA2i
-PGv4K0dN66BRQZjGA08K22j/2/nf5MhEl73KCQavUwnRURaGBCJwMS330GEuuWrX
-5/3At+N1PAton2EZ4iGmt2NSqcw3Z0xDScj40qkW2Znh971wmnrtyC2wetMoHUmP
-4nT1glgDPCXbR1DghvY3WPGmBnzF8zTMa/iAf17cf01SOSHSXMRqjvx0+fQGjJpp
-hZnRYsFUK+rN00evY6OVDAfHyOytUwDF50Ki1JdoAPqbN56345Xkhign4RVGiTUq
-ibFhu9c48I3O7rvr+hZlFEnRRwP64H/luslBlUEJrq8U65QHtlq6AxvE2i9mo6y5
-Kn1VtIkAjvMQ/a9x4e3KVECb032w2Yx4oJ//13gEMbH5u2rI2XfGb3A8ihii44dO
-a3E+1cb4bsG1MJysB8+f
-=FDh3
+iQIcBAEBCgAGBQJSGZF3AAoJEKXdFCfdEflK8Z8P/3CdEePeuUXE+0U7JlPFeghb
+o5EDnPwnwkaBh/rMZ+AzB1q3iJZF5V+Q6z8NiFCQyG8NMR83CqL/xIQLEO1txDeJ
+QyNj8LFutVVSKZMbwIgK0aZkg8mr3ASENu1DgjW87cMa/+yzO6DxQXeWL/sa4wsF
+1a1u7U9AdLlcu5l9plrElgCkR8xjNgcZULbmfyPYNHTfplb79JM3mMdyZN+dyTXp
+NoFoRKtnBIXZ6cIaE29S16gZD5QqU9g6tEvEG13XXR6smk3wQBD3kWqYxG9Wph1F
+OUdOCDrhuc6YLxMJ2Na91KHAbBQAs6MNLrO8Vt4gnJ3YJ8wfuYe2Q6BEu6B8Lema
+Lflnlzu1tX31CK5jYpRXOFeRPMei4K4iciZ381p4Pe9iHAZlp7iMKh/SDWp2j+rJ
+raDIzGcFfSS5su3NhmEx9COZ89jEN/AiwWxzRZ/GrXGfjJBGOp1VPqvauf8xaNCC
+NyoMS8VSJWkDURqBXlk0CF5OQwfoBaLf+3O1SwP0UenUNfJa8GMFTCInqdMQJHth
+eZajCWnLwIyjDpLmMsd9OZ+uM8+8H3WMymTtNVNOt7i3VpVQytsS53WG5gfHPFiF
+jwM6fkGWkvxSZMDOYCNqXdMOABzl9+4onR4yCLywTD4BFy2S9lNL4n1dgY8+YlRo
+on2FA1hW4R1GV+lQdwbm
+=g36f
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.15.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.15.ebuild
new file mode 100644
index 000000000000..45ceb0dc1924
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.15.ebuild
@@ -0,0 +1,147 @@
+# 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.15.ebuild,v 1.1 2013/08/25 05:08:17 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-319.37 )
+	video_cards_fglrx?  ( >=x11-drivers/ati-drivers-13.4 )"
+DEPEND="${RDEPEND}
+	app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-plus*.bin
+	    opt/${PN}/kernels/4098/*.llvmir"
+
+src_prepare() {
+	use x86 && rm *Hashcat-plus64*
+	use amd64 && rm *Hashcat-plus32*
+	use virtualcl || rm vclHashcat-plus*
+
+	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
+
+	#paxmark goes here so test and install works
+	pax-mark r *Hashcat-plus*.bin
+}
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
+		fi
+		if use amd64; then
+			./cudaHashcat-plus64.bin -a 3 -m 1500 nQCk49SiErOgk || die
+		elif use x86; then
+			./cudaHashcat-plus32.bin -a 3 -m 1500 nQCk49SiErOgk || die
+		fi
+	fi
+	if use video_cards_fglrx; then
+		addwrite /dev/ati
+		if use amd64; then
+			./oclHashcat-plus64.bin -a 3 -m 1500 nQCk49SiErOgk || die
+		elif use x86; then
+			./oclHashcat-plus32.bin -a 3 -m 1500 nQCk49SiErOgk || die
+		fi
+	fi
+	rm eula.accepted hashcat.pot hashcat.dictstat
+}
+
+src_install() {
+	dodoc docs/*
+	rm -r "${S}"/*.exe "${S}"/*.cmd "${S}"/docs || die
+
+	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 -R root:video /opt/${PN}
+	fperms g+w /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
+}