From 62cd67d4468afcb6632f45ee28ea2e49c72c1f5d Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Fri, 11 Sep 2020 23:38:28 -0400
Subject: [PATCH] eselect-metasploit: minor ebuild cleanup, minor speed
 improvement, stub out bundle-audit use in msfloader

---
 ....ebuild => eselect-metasploit-0.19.ebuild} |  3 +--
 .../files/{msfloader-0.18 => msfloader-0.19}  | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)
 rename app-eselect/eselect-metasploit/{eselect-metasploit-0.18.ebuild => eselect-metasploit-0.19.ebuild} (91%)
 rename app-eselect/eselect-metasploit/files/{msfloader-0.18 => msfloader-0.19} (56%)

diff --git a/app-eselect/eselect-metasploit/eselect-metasploit-0.18.ebuild b/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild
similarity index 91%
rename from app-eselect/eselect-metasploit/eselect-metasploit-0.18.ebuild
rename to app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild
index 12ff043a2..326be039d 100644
--- a/app-eselect/eselect-metasploit/eselect-metasploit-0.18.ebuild
+++ b/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild
@@ -4,8 +4,6 @@
 
 EAPI=7
 
-inherit multilib
-
 DESCRIPTION="eselect module for metasploit"
 HOMEPAGE="http://www.pentoo.ch/"
 SRC_URI=""
@@ -16,6 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="!<net-analyzer/metasploit-4.6"
+		#dev-ruby/bundler-audit needed if we uncomment the code in msfloader which uses it
 RDEPEND="${DEPEND}
 		app-admin/eselect"
 
diff --git a/app-eselect/eselect-metasploit/files/msfloader-0.18 b/app-eselect/eselect-metasploit/files/msfloader-0.19
similarity index 56%
rename from app-eselect/eselect-metasploit/files/msfloader-0.18
rename to app-eselect/eselect-metasploit/files/msfloader-0.19
index b5c296309..1c3968155 100644
--- a/app-eselect/eselect-metasploit/files/msfloader-0.18
+++ b/app-eselect/eselect-metasploit/files/msfloader-0.19
@@ -9,6 +9,13 @@ ruby="${header:2}"
 
 if [ -f "/usr/lib/metasploit/Gemfile.lock" ]; then
   GEMFILE=/usr/lib/metasploit/Gemfile
+  #printf "Checking for known vulnerabilities...\n"
+  #pushd /usr/lib/metasploit/ > /dev/zero
+	#if ! ${ruby} -S bundle-audit check -u; then
+  #  printf "Known vulnerabilites have been found, please update metasploit.\n"
+  #  printf "If you are up to date, please report an issue https://github.com/rapid7/metasploit-framework/issues\n"
+  #fi
+  #popd > /dev/zero
 else
   GEMFILE="~/.msf4/Gemfile"
 
@@ -30,17 +37,19 @@ else
   if ls -A /usr/lib/metasploit/*.gemspec > /dev/zero 2>&1; then
     cp /usr/lib/metasploit/*.gemspec ~/.msf4/
   fi
+  #ensure Gemfile.lock is up to date
+  if ! BUNDLE_GEMFILE="${GEMFILE}" ${ruby} -S bundle check > /dev/null 2>&1; then
+    if [ -f "~/.msf4/Gemfile.lock" ]; then
+      rm "~/.msf4/Gemfile.lock"
+    else
+      echo "Something went wrong, please open a bug for metasploit on https://github.com/pentoo/pentoo-overlay/issues"
+      exit 1
+    fi
+  fi
+  #printf "Checking for known vulnerabilities...\n"
+	#${ruby} -S bundle-audit check -u
 fi
 
-#ensure Gemfile.lock is up to date
-if ! BUNDLE_GEMFILE="${GEMFILE}" ${ruby} -S bundle check > /dev/null 2>&1; then
-	if [ -f "~/.msf4/Gemfile.lock" ]; then
-		rm "~/.msf4/Gemfile.lock"
-	else
-    echo "Something went wrong, please open a bug for metasploit on https://github.com/pentoo/pentoo-overlay/issues"
-    exit 1
-	fi
-fi
 
 #ready to go
 BUNDLE_GEMFILE="${GEMFILE}" ${ruby} -S bundle exec /usr/lib/metasploit/$(basename $0) "$@"