crackmapexec: v3.1 bump with its deps

dev-python/impacket/impacket-0.9.15_pre20160604.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python classes focused on providing access to network packets"
+HOMEPAGE="https://github.com/CoreSecurity/impacket"
+SRC_URI=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	KEYWORDS=""
+elif [[ ${PVR} == "0.9.15_pre20160604" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	EGIT_COMMIT="04c66e588083dbcff855c1b476f0cdad98141435"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="https://github.com/CoreSecurity/impacket/archive/impacket_${PV//./_}.tar.gz -> ${P}.tar.gz"
+	inherit versionator
+	S="${WORKDIR}"/${PN}-${PN}_$(replace_all_version_separators _)
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	pushd impacket/testcases/dot11
+	for test in $(ls *.py); do
+		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
+	done
+	popd
+	pushd impacket/testcases/ImpactPacket
+	for test in $(ls *.py); do
+		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
+	done
+	popd
+}

net-analyzer/crackmapexec/Manifest

@@ -1,2 +1,2 @@
 DIST crackmapexec-2.3.tar.gz 846765 SHA256 8958c73a1ad753f0519b3117e441662e57a6c4f5ee1827ef78f18c376c010240 SHA512 865ab679b0e35d08d848882e270054e509b2e7ce3818eb3fc5ad8c781473e12119dcac70d8861fc607f38ef82d6391ae13251bbf3a6226599a2d7fb4cc51500b WHIRLPOOL 6c1d62c7e8f6d4bbeb6c0cf5d4bf277fe4800ad7198424e05950165a0b79f9e2ea565b907e50289a856ee5135ade962f59106b220449e4eaaa43ed99a614a653
-DIST crackmapexec-3.0.tar.gz 52272 SHA256 8db3a5054fa8713181ab78e400b24838ba57ca6a925873b5bc6f51da46876cbd SHA512 36187c339b78a8515d9f267f657e0db97f50c80751135b20738839c2924567764e6f712a2e0baa155e02d058f7fb2bead050dbe01dc51a63477bbc8d90ddd106 WHIRLPOOL db42d99b7c65fcb3d9d5c478b7d3003ce57338148db54d06b69c41de05eb2fc0a0a9a8b04da4030a93baccd05c50cefef71e551e9bede4f7e31b8ff177fede8e
+DIST crackmapexec-3.1.tar.gz 59669 SHA256 794a64edf482bb5118f2c59c9410024dee3ca442fa173bd59847a01714024620 SHA512 e1c56eb8bcef7da1ebfae5277eb86069229d5b7595a660a36efa7e83bf79121dd2b2f2762ed3aa4d03d17ab7c2485f0636362d32db6898dace1e628780788fff WHIRLPOOL 9d5b9aae1269324bd7fe003d5e705cdd234989129c6b11563706aa8edd71247bc2fa97ce6e270a4acd44cf4f4f06b6b1bcd8b55225e8580efa9f32403ca6589c

net-analyzer/crackmapexec/crackmapexec-3.1.ebuild

@@ -5,7 +5,8 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multilib
+#inherit python-single-r1 multilib
+inherit distutils-r1 eutils
 
 DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
 HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
@@ -16,27 +17,27 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 SLOT="0"
 
-RDEPEND=">=dev-python/impacket-0.9.14
+RDEPEND=">dev-python/impacket-0.9.14
 	dev-python/gevent
 	dev-python/netaddr
 	dev-python/pycrypto
 	dev-python/pyasn1
 	dev-python/termcolor
-	dev-python/colorama
+	dev-python/requests
 	dev-python/pyopenssl"
 
 S="${WORKDIR}/CrackMapExec-${PV}"
 
 src_prepare() {
-	cd setup
-	python2 ./setup_database.py
-	cd ..
+	epatch "${FILESDIR}/${P}-leftovers.patch"
+#	cd setup
+#	python2 ./setup_database.py
+#	cd ..
 }
 
-src_install() {
-	fperms +x crackmapexec.py
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR "${S}"/* "${ED}"/usr/$(get_libdir)/"${PN}" || die
-#	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}
-	dosym /usr/$(get_libdir)/${PN}/${PN}.py /usr/sbin/${PN}
-}
+#src_install() {
+#	fperms +x crackmapexec.py
+#	dodir /usr/$(get_libdir)/${PN}
+#	cp -pPR "${S}"/* "${ED}"/usr/$(get_libdir)/"${PN}" || die
+#	dosym /usr/$(get_libdir)/${PN}/${PN}.py /usr/sbin/${PN}
+#}

net-analyzer/crackmapexec/files/crackmapexec-3.1-leftovers.patch

@@ -0,0 +1,31 @@
+From 1e281bd638a27e9da024a31a3cabb87ef9f7202b Mon Sep 17 00:00:00 2001
+From: byt3bl33d3r <byt3bl33d3r@gmail.com>
+Date: Sat, 4 Jun 2016 02:18:17 -0600
+Subject: [PATCH] Got rid of some left over merger cruft
+
+---
+ cme/cmeserver.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/cme/cmeserver.py b/cme/cmeserver.py
+index 4549095..5bc336b 100644
+--- a/cme/cmeserver.py
++++ b/cme/cmeserver.py
+@@ -1,17 +1,9 @@
+ import BaseHTTPServer
+ import threading
+ import ssl
+-<<<<<<< HEAD:cme/cmeserver.py
+-<<<<<<< 23d8a6517fb1a36bac9b09e3923201ee291d00ac:cme/cmeserver.py
+ import os
+ import sys
+ from getpass import getuser
+-=======
+-import sys
+->>>>>>> Added error handling for CME server in case the port is already in use.:core/cmeserver.py
+-=======
+-import sys
+->>>>>>> da4e55380a1d1ad46d3176c513b829bd4a7099f4:core/cmeserver.py
+ from BaseHTTPServer import BaseHTTPRequestHandler
+ from logging import getLogger
+ from gevent import sleep

profiles/pentoo/base/package.accept_keywords/dev-python

@@ -9,6 +9,7 @@
 
 #required by net-analyzer/crackmapexec-2.2
 ~dev-python/impacket-0.9.14
+=dev-python/impacket-0.9.15*
 
 ~dev-python/nltk-2.0.1_rc1
 =dev-python/pyqwt-5.2.0

profiles/pentoo/base/package.accept_keywords/net-analyzer

@@ -30,7 +30,7 @@ net-analyzer/multimon-ng
 =net-analyzer/bettercap-1.5*
 ~net-analyzer/chaosreader-0.94
 net-analyzer/cloudshark
-~net-analyzer/crackmapexec-2.3
+~net-analyzer/crackmapexec-3.1
 ~net-analyzer/davtest-1.0
 ~net-analyzer/dnsa-0.5
 ~net-analyzer/dnsrecon-0.8.9