infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rapid7/metasploit-framework

bug/bundler_fix
jvazquez-r7 2013-03-27 00:47:24 +01:00
parent 18559e35fc 7c9a65ffcb
commit a82b7b1ee4
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
msfconsole
View File

@ -36,13 +36,14 @@ end
def print_deprecation_warning def print_deprecation_warning
$stdout.puts "" $stdout.puts ""
$stdout.puts "[*] Deprecation Note: After 2013-03-15 (March 15, 2013), Metasploit" $stdout.puts "[-] Deprecation Note: Metasploit source checkouts NO LONGER update"
$stdout.puts "[*] source checkouts will NO LONGER update over SVN, but will be using" $stdout.puts "[-] over SVN. You will need to reinstall Metasploit using"
$stdout.puts "[*] GitHub exclusively. You should either download a new Metasploit" $stdout.puts "[-] binary installers (from http://www.metasploit.com/download ),"
$stdout.puts "[*] installer, or use a git clone of Metasploit Framework before" $stdout.puts "[-] Debian packages (currently only supported on Kali Linux), or"
$stdout.puts "[*] then. You will also need outbound access to github.com on" $stdout.puts "[-] a development source checkout from GitHub (see http://r-7.co/ZLhA8P )"
$stdout.puts "[*] TCP port 9418 (git), 22 (ssh) or 443 (https), depending on the" $stdout.puts "[-] "
$stdout.puts "[*] protocol used to clone Metasploit Framework (usually, git protocol)." $stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP"
$stdout.puts ""
end end
if is_svn if is_svn

20
msfupdate
View File

@ -58,14 +58,18 @@ end
def print_deprecation_warning def print_deprecation_warning
$stdout.puts "" $stdout.puts ""
$stdout.puts "[*] Deprecation Note: After 2013-02-28 (February 28, 2013), Metasploit" $stdout.puts "[-] Deprecation Note: Metasploit source checkouts NO LONGER update"
$stdout.puts "[*] source checkouts will NO LONGER update over SVN, but will be using" $stdout.puts "[-] over SVN. You will need to reinstall Metasploit using"
$stdout.puts "[*] GitHub exclusively. You should either download a new Metasploit" $stdout.puts "[-] binary installers (from http://www.metasploit.com/download ),"
$stdout.puts "[*] installer, or use a git clone of Metasploit Framework before" $stdout.puts "[-] Debian packages (currently only supported on Kali Linux), or"
$stdout.puts "[*] then. You will also need outbound access to github.com:9418/TCP." $stdout.puts "[-] a development source checkout from GitHub (see http://r-7.co/ZLhA8P )"
$stdout.puts "[-] "
$stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP"
$stdout.puts "" $stdout.puts ""
end end
# This only exits if you actually pass a wait option, otherwise
# just returns nil. This is likely unexpected, revisit this.
def maybe_wait_and_exit(exit_code=0) def maybe_wait_and_exit(exit_code=0)
if @actually_wait if @actually_wait
$stdout.puts "" $stdout.puts ""
@ -129,7 +133,13 @@ end
####### Since we're SVN, do it all this way ####### ####### Since we're SVN, do it all this way #######
if is_svn if is_svn
# We're fully deprecated now, so just exit.
# Leaving in the commented code in case someone wants to
# get a last-chance at msfupdate before the SVN server goes
# off line, which will be ANY DAY NOW. Seriously.
print_deprecation_warning print_deprecation_warning
$stdin.readline if @actually_wait
exit(0x11) # Comment this to get old functionality back.
@args.push("--config-dir=#{@configdir}") @args.push("--config-dir=#{@configdir}")
@args.push("--non-interactive") @args.push("--non-interactive")