summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2014-10-03 04:02:56 +0000
committerRick Farina <zerochaos@gentoo.org>2014-10-03 04:02:56 +0000
commitba84ac5aa833ce983f3ae02392eb655e542e6ca4 (patch)
tree6c8ceb0d4d43f04c3083f6edacfbabad91e3f948 /app-admin
parentupdate loader based on upstream metasploit changes (diff)
downloadgentoo-2-ba84ac5aa833ce983f3ae02392eb655e542e6ca4.tar.gz
gentoo-2-ba84ac5aa833ce983f3ae02392eb655e542e6ca4.tar.bz2
gentoo-2-ba84ac5aa833ce983f3ae02392eb655e542e6ca4.zip
move env to proper place
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect-metasploit/ChangeLog6
-rw-r--r--app-admin/eselect-metasploit/files/91metasploit3
-rw-r--r--app-admin/eselect-metasploit/files/msfloader-0.144
3 files changed, 10 insertions, 3 deletions
diff --git a/app-admin/eselect-metasploit/ChangeLog b/app-admin/eselect-metasploit/ChangeLog
index b6aeb3c1cc21..c1312edce9e2 100644
--- a/app-admin/eselect-metasploit/ChangeLog
+++ b/app-admin/eselect-metasploit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/eselect-metasploit
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/ChangeLog,v 1.6 2014/10/03 03:39:09 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/ChangeLog,v 1.7 2014/10/03 04:02:56 zerochaos Exp $
+
+ 03 Oct 2014; Rick Farina <zerochaos@gentoo.org> files/91metasploit,
+ files/msfloader-0.14:
+ move env to proper place
*eselect-metasploit-0.14 (03 Oct 2014)
diff --git a/app-admin/eselect-metasploit/files/91metasploit b/app-admin/eselect-metasploit/files/91metasploit
index 01934bc5ea5b..ce58b5043ddd 100644
--- a/app-admin/eselect-metasploit/files/91metasploit
+++ b/app-admin/eselect-metasploit/files/91metasploit
@@ -3,3 +3,6 @@ MSF_DATABASE_CONFIG=/usr/lib/metasploit/config/database.yml
# needed because MSF ships an old version of metasm
# which isn't compatible with the new one
MSF_LOCAL_LIB="/usr/lib/metasploit/lib/metasm"
+
+# needed because MSF doesn't know where it is since the alzheimer's
+MSF_ROOT=/usr/lib/metasploit
diff --git a/app-admin/eselect-metasploit/files/msfloader-0.14 b/app-admin/eselect-metasploit/files/msfloader-0.14
index ab5f5d302294..b1c40c72c85d 100644
--- a/app-admin/eselect-metasploit/files/msfloader-0.14
+++ b/app-admin/eselect-metasploit/files/msfloader-0.14
@@ -21,7 +21,7 @@ cp /usr/lib/metasploit/Gemfile ~/.msf4/
cp /usr/lib/metasploit/*.gemspec ~/.msf4/
#ensure Gemfile.lock is up to date
-BUNDLE_GEMFILE=~/.msf4/Gemfile MSF_ROOT=/usr/lib/metasploit bundle check > /dev/null 2>&1
+BUNDLE_GEMFILE=~/.msf4/Gemfile bundle check > /dev/null 2>&1
if [ "$?" != "0" ]; then
if [ -f ~/.msf4/Gemfile.lock ]; then
rm ~/.msf4/Gemfile.lock
@@ -31,5 +31,5 @@ if [ "$?" != "0" ]; then
fi
#ready to go
-BUNDLE_GEMFILE=~/.msf4/Gemfile MSF_ROOT=/usr/lib/metasploit bundle exec /usr/lib/metasploit/$(basename $0) "$@"
+BUNDLE_GEMFILE=~/.msf4/Gemfile bundle exec /usr/lib/metasploit/$(basename $0) "$@"
#profit