From c7dc457ac75df74f403cebb30a2a231a50d92b58 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 22 Apr 2020 21:50:14 -0400 Subject: [PATCH] BloodHound: fix the complete failure, leave the rest of the failures --- ...build => pentoo-cracking-2020.1-r1.ebuild} | 11 ++- .../base/package.accept_keywords/dev-libs | 8 ++- .../base/package.accept_keywords/sys-devel | 2 + www-apps/BloodHound/BloodHound-3.0.3.ebuild | 69 ------------------- www-apps/BloodHound/BloodHound-3.0.4.ebuild | 1 + 5 files changed, 18 insertions(+), 73 deletions(-) rename pentoo/pentoo-cracking/{pentoo-cracking-2020.1.ebuild => pentoo-cracking-2020.1-r1.ebuild} (73%) delete mode 100644 www-apps/BloodHound/BloodHound-3.0.3.ebuild diff --git a/pentoo/pentoo-cracking/pentoo-cracking-2020.1.ebuild b/pentoo/pentoo-cracking/pentoo-cracking-2020.1-r1.ebuild similarity index 73% rename from pentoo/pentoo-cracking/pentoo-cracking-2020.1.ebuild rename to pentoo/pentoo-cracking/pentoo-cracking-2020.1-r1.ebuild index 2d7425ad8..c90fb26e1 100644 --- a/pentoo/pentoo-cracking/pentoo-cracking-2020.1.ebuild +++ b/pentoo/pentoo-cracking/pentoo-cracking-2020.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,16 +8,21 @@ HOMEPAGE="http://www.pentoo.ch" LICENSE="GPL-3" SLOT="0" -IUSE_VIDEO_CARDS="video_cards_fglrx video_cards_nvidia" -IUSE="cuda opencl +dict ${IUSE_VIDEO_CARDS} livecd-stage1 pentoo-extra pentoo-full" +IUSE_VIDEO_CARDS="video_cards_nvidia" +IUSE="amd-opencl intel-opencl opencl +dict ${IUSE_VIDEO_CARDS} livecd-stage1 pentoo-extra pentoo-full" KEYWORDS="~amd64 ~arm ~x86" +#rocm is opencl for amd +#intel-neo is opencl for newer intel + PDEPEND=" app-crypt/johntheripper-jumbo net-analyzer/hydra net-analyzer/medusa !arm? ( app-crypt/chntpw ) !arm? ( !livecd-stage1? ( opencl? ( app-crypt/hashcat + amd-opencl? ( dev-libs/rocm-opencl-runtime ) + intel-opencl? ( dev-libs/intel-neo ) dev-libs/opencl-icd-loader net-wireless/hcxkeys ) ) ) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-libs b/profiles/pentoo/base/package.accept_keywords/dev-libs index ceef93565..3efe9c24b 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-libs +++ b/profiles/pentoo/base/package.accept_keywords/dev-libs @@ -2,9 +2,15 @@ ~dev-libs/libxmlb-0.1.13 #opencl stuff unversioned and not by accident -dev-libs/opencl-icd-loader dev-libs/intel-neo +dev-libs/opencl-icd-loader dev-libs/opencl-clang +dev-libs/rocm-opencl-runtime +dev-libs/rocr-runtime +dev-libs/rocm-comgr +dev-libs/rocm-device-libs +dev-util/rocm-cmake +dev-libs/roct-thunk-interface #ugh https://bugs.gentoo.org/627576 ~dev-libs/elfutils-0.170 diff --git a/profiles/pentoo/base/package.accept_keywords/sys-devel b/profiles/pentoo/base/package.accept_keywords/sys-devel index 14bd528d8..ca3ac7cc8 100644 --- a/profiles/pentoo/base/package.accept_keywords/sys-devel +++ b/profiles/pentoo/base/package.accept_keywords/sys-devel @@ -3,6 +3,8 @@ sys-devel/pwndbg ### Gentoo ### sys-devel/gcc-arm-none-eabi +#opencl stuff unversioned on purpose +sys-devel/llvm-roc #required by net-misc/seafile-7.0.4 ~sys-devel/automake-1.16.1 diff --git a/www-apps/BloodHound/BloodHound-3.0.3.ebuild b/www-apps/BloodHound/BloodHound-3.0.3.ebuild deleted file mode 100644 index 7ee4dd311..000000000 --- a/www-apps/BloodHound/BloodHound-3.0.3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -ELECTRON_PV="6.0.11" - -DESCRIPTION="Six Degrees of Domain Admin" -HOMEPAGE="https://github.com/BloodHoundAD/BloodHound" -SRC_URI="https://github.com/BloodHoundAD/BloodHound/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/electron/electron/releases/download/v${ELECTRON_PV}/electron-v${ELECTRON_PV}-linux-x64.zip - https://dev.pentoo.ch/~blshkv/distfiles/${P}-node_modules.tar.gz" -#create modules using "npm install" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="" - -DEPEND=">=net-libs/nodejs-12.10.0[npm]" -# dev-util/electron-packager" -RDEPEND="${DEPEND} - gnome-base/gconf" - -BLOODHOUND_BINDIR="FAIL_TO_DETECT_ARCH" -QA_FLAGS_IGNORED="usr/lib.*/BloodHound/.*\.so" - -src_prepare() { - epatch "${FILESDIR}/3.0.3-singlearch.patch" - #https://github.com/electron/electron-packager/issues/187 - epatch "${FILESDIR}/3.0.3-packager_14_2_1.patch" - mv "${WORKDIR}/node_modules" "${S}" - eapply_user -} - -src_compile() { - #npm shrinkwrap - #we provide node_modules, there is no need to install - #npm install \ - - npm run-script webbuild || die "Webbuild failed to compile" - - if use amd64; then - npm run-script linuxbuild_64 || die "Failed to compile" - BLOODHOUND_BINDIR="BloodHound-linux-x64" - elif use x86; then - npm run-script linuxbuild_32 || die "Failed to compile" - BLOODHOUND_BINDIR="BloodHound-linux-ia32" - elif use arm; then - npm run-script linuxbuild_arm || die "Failed to compile" - BLOODHOUND_BINDIR="BloodHound-linux-armv7l" - elif use arm64; then - npm run-script linuxbuild_arm64 || die "Failed to compile" - BLOODHOUND_BINDIR="BloodHound-linux-arm64" - fi -} - -src_install() { - dodir /usr/$(get_libdir)/${PN} - cp -R ${BLOODHOUND_BINDIR}/* "${ED}"/usr/$(get_libdir)/${PN} || die "Copy files failed" - - newbin - ${PN} <<-EOF - #!/bin/sh - cd /usr/$(get_libdir)/${PN} - LD_LIBRARY_PATH=. exec ./${PN} "\${@}" - EOF -} diff --git a/www-apps/BloodHound/BloodHound-3.0.4.ebuild b/www-apps/BloodHound/BloodHound-3.0.4.ebuild index ce2b46d42..88e29aecf 100644 --- a/www-apps/BloodHound/BloodHound-3.0.4.ebuild +++ b/www-apps/BloodHound/BloodHound-3.0.4.ebuild @@ -40,6 +40,7 @@ src_compile() { #we provide node_modules, there is no need to install #npm install \ + addpredict /etc/npm npm run-script webbuild || die "Webbuild failed to compile" if use amd64; then