From 159dce00a299df6d3ec15d207ba0c5e18896aeba Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 14 Sep 2018 19:43:57 +0800
Subject: [PATCH] armitage: bump

---
 net-analyzer/armitage/Manifest                |  1 +
 .../armitage/armitage-20160709.ebuild         | 59 +++++++++++++++++++
 net-analyzer/armitage/files/meterpreter.patch | 22 +++++++
 3 files changed, 82 insertions(+)
 create mode 100644 net-analyzer/armitage/armitage-20160709.ebuild
 create mode 100644 net-analyzer/armitage/files/meterpreter.patch

diff --git a/net-analyzer/armitage/Manifest b/net-analyzer/armitage/Manifest
index 9bdea1e65..a92d29f67 100644
--- a/net-analyzer/armitage/Manifest
+++ b/net-analyzer/armitage/Manifest
@@ -1 +1,2 @@
 DIST armitage-20150813.zip 16746184 BLAKE2B 4f30f0b0e3548797046b66d9143db71f6f687fb9aa30114711e014151e468da6b1ba82d481a8d287346a91d5d185ffcecbcd778308b8390d6076b01a78d39849 SHA512 42d92e2505ac56758d3ecc565c2d8571fecb6c920b48617c3d67470d03b7c93d6948d9b1e0f74edc250d9a8f94bedb0c5dd95707a1c796da4d81c2777a26be3e
+DIST armitage-20160709.zip 16746190 BLAKE2B 39ccd3631005decc94c0874b59020e0ff1c67ab03e4c6eef45231b4de2064e610bf15cf1e8295eb7beddd518026d4ff63918b78b6972d214c6018b33840e967a SHA512 d61d30a763f27532e704e7e838cac6c1da32e9e86459ea1338e89c4d78484c0df8f6a09194856ef5b7453127c28495846e135abd356d78007fff7cda2fa3b8b4
diff --git a/net-analyzer/armitage/armitage-20160709.ebuild b/net-analyzer/armitage/armitage-20160709.ebuild
new file mode 100644
index 000000000..0e0ca2dfc
--- /dev/null
+++ b/net-analyzer/armitage/armitage-20160709.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Cyber Attack Management for Metasploit"
+HOMEPAGE="http://www.fastandeasyhacking.com/"
+MY_COMMIT="c8ca6c00b5584444ef3c3a8e32341f43974567bd"
+SRC_URI="https://github.com/rsmudge/${PN}/archive/${MY_COMMIT}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="net-analyzer/metasploit:*
+	net-analyzer/nmap"
+
+JGRAPHX_SLOT="1.4"
+MSGPACK_SLOT="6.12"
+
+DEPEND="${CDEPEND}
+	!net-analyzer/armitage-bin
+	dev-java/jgraphx:${JGRAPHX_SLOT}
+	dev-java/sleep:0
+	dev-java/msgpack:${MSGPACK_SLOT}
+	dev-java/javassist:3
+	dev-java/jdbc-postgresql:0
+		>=virtual/jdk-1.6"
+RDEPEND="${CDEPEND}
+		>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+JAVA_GENTOO_CLASSPATH="sleep,jgraphx-${JGRAPHX_SLOT},msgpack-${MSGPACK_SLOT},jdbc-postgresql,javassist-3"
+
+#copied from kali, but not tested
+#PATCHES=( "${FILESDIR}/meterpreter.patch" )
+
+#src_prepare() {
+#	find . -name '*.jar' -delete
+#	cd "${S}"/lib
+#	java-pkg_jar-from sleep
+#	java-pkg_jar-from jgraphx-${JGRAPHX_SLOT}
+#	java-pkg_jar-from msgpack-${MSGPACK_SLOT} msgpack.jar msgpack-0.6.12-devel.jar
+#	java-pkg_jar-from jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.jdbc4.jar
+#	java-pkg_jar-from javassist-3 javassist.jar javassist-3.15.0-GA.jar
+#	eapply_user
+#}
+
+src_install() {
+	java-pkg_newjar ${PN}.jar
+	java-pkg_dolauncher ${PN}
+	dosbin release/armitage-unix/teamserver
+	doicon release/armitage-unix/${PN}-logo.png
+	dodoc release/armitage-unix/readme.txt
+}
diff --git a/net-analyzer/armitage/files/meterpreter.patch b/net-analyzer/armitage/files/meterpreter.patch
new file mode 100644
index 000000000..c1013960b
--- /dev/null
+++ b/net-analyzer/armitage/files/meterpreter.patch
@@ -0,0 +1,22 @@
+From 4900a3a6982985d3a583dc8510b7f9a0d1fe4549 Mon Sep 17 00:00:00 2001
+From: netniV <netniV@users.noreply.github.com>
+Date: Tue, 14 Nov 2017 13:06:32 +0000
+Bug-Kali: https://bugs.kali.org/view.php?id=4968
+Subject: [PATCH] Update meterpreter.sl
+
+Fix issue with Auxiliary scanner output
+---
+ scripts/meterpreter.sl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/scripts/meterpreter.sl
++++ b/scripts/meterpreter.sl
+@@ -378,7 +378,7 @@ sub launch_msf_scans {
+ 			local('$text $host $port $hosts $modules $module $options');
+ 
+ 			foreach $text (split("\n", $3)) {
+-				if ($text ismatch '... (.*?): +- \1:(\d+) - TCP OPEN') {
++				if ($text ismatch '... (.*?):\s+-\s+\1:(\d+)\s+-\s+TCP OPEN') {
+ 					($host, $port) = matched();
+ 					push(%discover[$port], $host);
+ 				}