From f22bfe03fcf159d1538a68b6980ec84684ead935 Mon Sep 17 00:00:00 2001 From: blshkv Date: Tue, 30 Jun 2020 07:51:15 +0800 Subject: [PATCH] crackmapexec: add x86 keyword, cleaanup --- .../crackmapexec/crackmapexec-5.0.1.ebuild | 90 ------------------- .../crackmapexec/crackmapexec-5.1.0.ebuild | 2 +- net-analyzer/crackmapexec/files/setup.patch | 10 --- .../base/package.accept_keywords/net-analyzer | 2 +- 4 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 net-analyzer/crackmapexec/crackmapexec-5.0.1.ebuild delete mode 100644 net-analyzer/crackmapexec/files/setup.patch diff --git a/net-analyzer/crackmapexec/crackmapexec-5.0.1.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.0.1.ebuild deleted file mode 100644 index 4403bfd18..000000000 --- a/net-analyzer/crackmapexec/crackmapexec-5.0.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 git-r3 - -DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments" -HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases" - -#EGIT_REPO_URI="https://github.com/byt3bl33d3r/CrackMapExec.git" - -#python3 support: https://github.com/byt3bl33d3r/CrackMapExec/issues/317 -#EGIT_REPO_URI="https://github.com/mpgn/CrackMapExec" -#EGIT_COMMIT="2aca373e33c175d956033bd2b5683fc39ebe44fc" -#EGIT_BRANCH="python3" -EGIT_REPO_URI="https://github.com/byt3bl33d3r/CrackMapExec.git" -EGIT_COMMIT="ec1b6c69cf32c4e754c53611b9dd5faf34303845" - -#use system impacket -EGIT_SUBMODULES=('*' '-*impacket*' '-*pywerview' '-*pywinrm') -#EGIT_SUBMODULES=('*' '-*impacket*' '-*pywinrm') - -LICENSE="BSD-2" -KEYWORDS="~amd64" -IUSE="" -SLOT="0" - -RDEPEND=" - dev-python/asn1crypto[${PYTHON_USEDEP}] - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/gevent[${PYTHON_USEDEP}] - - dev-python/idna[${PYTHON_USEDEP}] - - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/ntlm-auth[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pycparser[${PYTHON_USEDEP}] - dev-python/pycryptodomex[${PYTHON_USEDEP}] - dev-python/pylnk3[${PYTHON_USEDEP}] - dev-python/pynacl[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/requests-ntlm[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/selenium[${PYTHON_USEDEP}] - - dev-python/six[${PYTHON_USEDEP}] - - dev-python/splinter[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/terminaltables[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - dev-python/xmltodict[${PYTHON_USEDEP}] - - dev-python/impacket[${PYTHON_USEDEP}] - dev-python/pywinrm[${PYTHON_USEDEP}] - dev-python/pywerview[${PYTHON_USEDEP}] -" -#soupsieve==1.8 not in use? - -QA_FLAGS_IGNORED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*" - -#https://github.com/byt3bl33d3r/CrackMapExec/issues/282 -#https://github.com/byt3bl33d3r/CrackMapExec/issues/317 -PATCHES=( "${FILESDIR}/setup.patch" - "${FILESDIR}/invoke-vnc_python3.patch" ) - -python_prepare_all() { -# sed -i -e "/pycrypto/d" setup.py || die - sed -i -e '/bs4/d' setup.py || die - sed -i -e 's#msgpack-python#msgpack#' setup.py || die - distutils-r1_python_prepare_all -} - -python_install() { - #install data files disabled in setup.patch - rm -r cme/thirdparty/{impacket,pywinrm} - cp -r cme/{data,thirdparty} "${BUILD_DIR}"/lib/cme - distutils-r1_python_install -} diff --git a/net-analyzer/crackmapexec/crackmapexec-5.1.0.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.1.0.ebuild index 3385757bd..e68c71d08 100644 --- a/net-analyzer/crackmapexec/crackmapexec-5.1.0.ebuild +++ b/net-analyzer/crackmapexec/crackmapexec-5.1.0.ebuild @@ -20,7 +20,7 @@ EGIT_OVERRIDE_COMMIT_ARTKOND_INVOKE_VNC="906c7476b9490817a6defa63e86a5b8c5269018 EGIT_SUBMODULES=('*' '-*pywerview' ) LICENSE="BSD-2" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" SLOT="0" diff --git a/net-analyzer/crackmapexec/files/setup.patch b/net-analyzer/crackmapexec/files/setup.patch deleted file mode 100644 index ce7b6203c..000000000 --- a/net-analyzer/crackmapexec/files/setup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.py.orig 2018-12-10 21:11:31.753951980 +0800 -+++ b/setup.py 2018-12-12 09:57:24.528955420 +0800 -@@ -17,6 +17,7 @@ - packages=find_packages(include=[ - "cme", "cme.*" - ]), -+ exclude_package_data={'': ['data/*','thirdparty/*']}, - install_requires=[ - 'pycrypto>=2.6', - 'pyasn1>=0.1.8', diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer index 4b638a7b3..c1575429d 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer @@ -7,7 +7,7 @@ net-analyzer/amass net-analyzer/cameradar net-analyzer/cipherscan net-analyzer/commix -net-analyzer/crackmapexec ~amd64 +net-analyzer/crackmapexec net-analyzer/dirb net-analyzer/dirble-bin net-analyzer/dirhunt