gentoo resync : 10.09.2021

5 files changed, 305 insertions, 0 deletions

diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index d89507c4fd90..db8eb5187cf2 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,4 +1,9 @@
+AUX hashcat-6.2.4-brainless.patch 1040 BLAKE2B 0bcdb5fce7b22f95844c5fcef1c92ee0d78a10830a91991033d5476057e883408b595486dcc5d3fb3fad1c4d6b0c05f5e0a5c16f4404aee613a97203f88d8ab6 SHA512 a00d84c8611d43870c4d46be78454350e17471ad4d8d9ac98528b8527cde81bb23deed931c01d042511b98c8962554fbdc965e62555f640cb19f2196418f4f7a
+AUX hashcat-6.2.4-pocl-quoting-include.patch 1480 BLAKE2B 4999e878010c8083e0ba708adafc46ee744ca4127f8f2442ae1c659a1ca59525f0a66ffb55e845ffb0da897259d7206c53534fec4a58c6daa6bdc25e28493fe9 SHA512 ed64891dc00a546b07e32aa65a30ea30bbb0b6aeacf616e43f59b0c28dfafcdc54dce8e194fdf0805187dbf57c6c0a9655153823734d7e9537ab150b798b7205
 DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563
+DIST hashcat-6.2.4.tar.gz 6269444 BLAKE2B 15d774253841350710e89bb6358f5fd615ef6e0645f271507d5bfc3e814be1533f78b83b90c11b24c7088ac60f2bb9098cf3410c4bedb5d53b0ccff4d840664c SHA512 bb18646794e168616e6f018b41c1a17c26bb0d8625aaeec0bd0d734efbc331008f432efde7b3d08e8838c995c771a406670812edaf7d605e7fdff9ef001aa954
 EBUILD hashcat-6.2.1-r1.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
+EBUILD hashcat-6.2.4-r1.ebuild 2888 BLAKE2B dc79427a21aaac44371bd86e9b63761b0acedc6144d588993996728b1d3c9ab9529aed319a4b28a44eaa9b0dc8b397b9bf7808c05300b621b71cbccc40985fd5 SHA512 e6f596682a789b735c80ced40cff61f9c000a6c0b92742db5ad5c450f745304fa3c5f3315c65163b2d2168e0dc3fe6f3afaf8f8efb2088061644bbd707b51192
+EBUILD hashcat-6.2.4.ebuild 2834 BLAKE2B 3655e6a31038a45aa0106b501f902f828f0e7c818d3a53634218f0e1281aa06149c69dcdc49fbd4c96ee122150bb68cc0a5b7767ef9e9a286d9693c45f0c0ca4 SHA512 d453f5c9da614c8bb625d844d628739a78f4074d0283a6347e9f1157130f63c96d02612eb1cf6a092924e77e9939b5ad02a110aeb46ad4a4462043b59cd03050
 EBUILD hashcat-9999.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
 MISC metadata.xml 395 BLAKE2B fc7a2bac75e2c4805d002a30364e4f0e20ef972e1c8c91dc1ef3fb2f55914b8fc717a3a9502f064a19e6b0e590db779c650eab94c7b819a497a1d7ec41a78771 SHA512 6476fd0ec2f099314595408d6a593d74d126be57edc651ae5180dc8f36ae26f9db947b038e7d08f4e3f856ea9750f7bfc814f8e31d8ba829258a4dcdef5af75d
diff --git a/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch b/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch
new file mode 100644
index 000000000000..66d85d45c0b2
--- /dev/null
+++ b/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch
@@ -0,0 +1,41 @@
+https://github.com/hashcat/hashcat/pull/2961#event-5251978340
+From 0d5aed883b45cf3c218cb71916b08d56ae3d25a3 Mon Sep 17 00:00:00 2001
+From: Miezhiko <Miezhiko@gmail.com>
+Date: Thu, 2 Sep 2021 17:52:27 +0400
+Subject: [PATCH] Fix compilation without brain
+
+Signed-off-by: Miezhiko <Miezhiko@gmail.com>
+---
+ src/hashcat.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/hashcat.c b/src/hashcat.c
+index 163d7408d..bf936ccc0 100644
+--- a/src/hashcat.c
++++ b/src/hashcat.c
+@@ -922,7 +922,10 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
+ 
+   // clean up
+ 
++  #ifdef WITH_BRAIN
+   brain_ctx_destroy       (hashcat_ctx);
++  #endif
++
+   bitmap_ctx_destroy      (hashcat_ctx);
+   combinator_ctx_destroy  (hashcat_ctx);
+   cpt_ctx_destroy         (hashcat_ctx);
+@@ -1090,13 +1093,13 @@ int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, const char *install_folder
+     }
+   }
+   #endif
+-  #endif
+ 
+   /**
+    * brain
+    */
+ 
+   if (brain_ctx_init (hashcat_ctx) == -1) return -1;
++  #endif
+ 
+   /**
+    * logfile
diff --git a/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch b/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch
new file mode 100644
index 000000000000..c2c834f712e6
--- /dev/null
+++ b/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch
@@ -0,0 +1,34 @@
+Fixes POCL include error.
+
+https://github.com/hashcat/hashcat/commit/8c14fd85eaf98f4cda3acf8f917edae696a3bb71
+https://github.com/hashcat/hashcat/issues/2950
+
+From: Jens Steube <jens.steube@gmail.com>
+Date: Sun, 5 Sep 2021 10:55:59 +0200
+Subject: [PATCH] POCL: Added a workaround for an issue in POCL that uses a
+ quote character as part of the path itself given to a path for the -I option
+
+--- a/src/backend.c
++++ b/src/backend.c
+@@ -11365,7 +11365,19 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
+     }
+     else
+     {
+-      build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I \"%s\" ", folder_config->cpath_real);
++      if (device_param->opencl_platform_vendor_id == VENDOR_ID_POCL)
++      {
++        // POCL doesn't like quotes in the include path, see:
++        //   https://github.com/hashcat/hashcat/issues/2950
++        // Maybe related:
++        //   https://github.com/pocl/pocl/issues/962
++
++        build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I %s ", folder_config->cpath_real);
++      }
++      else
++      {
++        build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I \"%s\" ", folder_config->cpath_real);
++      }
+     }
+
+     /* currently disabled, hangs NEO drivers since 20.09.
+
diff --git a/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild b/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild
new file mode 100644
index 000000000000..8d00e75fa192
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils toolchain-funcs
+
+DESCRIPTION="World's fastest and most advanced password recovery utility"
+HOMEPAGE="https://github.com/hashcat/hashcat"
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="brain video_cards_nvidia"
+DEPEND="
+	app-arch/lzma
+	app-arch/unrar
+	sys-libs/zlib[minizip]
+	brain? ( dev-libs/xxhash )
+	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
+						|| ( dev-util/nvidia-cuda-toolkit
+							virtual/opencl )
+						)
+	!video_cards_nvidia? ( virtual/opencl )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.4-brainless.patch
+	"${FILESDIR}"/${PN}-6.2.4-pocl-quoting-include.patch
+)
+
+src_prepare() {
+	# remove bundled stuff
+	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
+	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
+	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
+	#rm -r deps || die "Failed to remove bundled deps"
+
+	# do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile
+	# do not add random CFLAGS
+	sed -i "s/-O2//" src/Makefile || die
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	# respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
+	export LIBRARY_FOLDER="/usr/$(get_libdir)"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX AR
+
+	# Use bundled unrar for now, bug #792720
+	emake \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=0 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
+	pax-mark -mr hashcat
+}
+
+src_test() {
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia-uvm
+		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
+	#elif use vidia_cards_fglrx; then
+	#	addwrite /dev/ati
+	fi
+	#this always exits with 255 despite success
+	#./hashcat -b -m 2500 || die "Test failed"
+	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}" \
+		install
+}
diff --git a/app-crypt/hashcat/hashcat-6.2.4.ebuild b/app-crypt/hashcat/hashcat-6.2.4.ebuild
new file mode 100644
index 000000000000..4a204caae634
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-6.2.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils toolchain-funcs
+
+DESCRIPTION="World's fastest and most advanced password recovery utility"
+HOMEPAGE="https://github.com/hashcat/hashcat"
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="brain video_cards_nvidia"
+DEPEND="
+	app-arch/lzma
+	app-arch/unrar
+	sys-libs/zlib[minizip]
+	brain? ( dev-libs/xxhash )
+	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
+						|| ( dev-util/nvidia-cuda-toolkit
+							virtual/opencl )
+						)
+	!video_cards_nvidia? ( virtual/opencl )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.4-brainless.patch
+)
+
+src_prepare() {
+	# remove bundled stuff
+	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
+	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
+	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
+	#rm -r deps || die "Failed to remove bundled deps"
+
+	# do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile
+	# do not add random CFLAGS
+	sed -i "s/-O2//" src/Makefile || die
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	# respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
+	export LIBRARY_FOLDER="/usr/$(get_libdir)"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX AR
+
+	# Use bundled unrar for now, bug #792720
+	emake \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=0 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
+	pax-mark -mr hashcat
+}
+
+src_test() {
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia-uvm
+		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
+	#elif use vidia_cards_fglrx; then
+	#	addwrite /dev/ati
+	fi
+	#this always exits with 255 despite success
+	#./hashcat -b -m 2500 || die "Test failed"
+	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}" \
+		install
+}