Skip to content
This repository
Browse code

Merge PR #1593 - remove msfupdate svn support

  • Loading branch information...
commit 7c9a65ffcb153420f9042a6a0c1c16444776908b 2 parents 6e1182b + debae8a
Brandon Turner authored March 26, 2013

Showing 2 changed files with 23 additions and 12 deletions. Show diff stats Hide diff stats

  1. 15  msfconsole
  2. 20  msfupdate
15  msfconsole
@@ -36,13 +36,14 @@ end
36 36
 
37 37
 def print_deprecation_warning
38 38
 	$stdout.puts ""
39  
-	$stdout.puts "[*] Deprecation Note: After 2013-03-15 (March 15, 2013), Metasploit"
40  
-	$stdout.puts "[*] source checkouts will NO LONGER update over SVN, but will be using"
41  
-	$stdout.puts "[*] GitHub exclusively. You should either download a new Metasploit"
42  
-	$stdout.puts "[*] installer, or use a git clone of Metasploit Framework before"
43  
-	$stdout.puts "[*] then. You will also need outbound access to github.com on"
44  
-	$stdout.puts "[*] TCP port 9418 (git), 22 (ssh) or 443 (https), depending on the"
45  
-	$stdout.puts "[*] protocol used to clone Metasploit Framework (usually, git protocol)."
  39
+	$stdout.puts "[-] Deprecation Note: Metasploit source checkouts NO LONGER update"
  40
+	$stdout.puts "[-] over SVN. You will need to reinstall Metasploit using"
  41
+	$stdout.puts "[-] binary installers (from http://www.metasploit.com/download ),"
  42
+	$stdout.puts "[-] Debian packages (currently only supported on Kali Linux), or"
  43
+	$stdout.puts "[-] a development source checkout from GitHub (see http://r-7.co/ZLhA8P )"
  44
+	$stdout.puts "[-] "
  45
+	$stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP"
  46
+	$stdout.puts ""
46 47
 end
47 48
 
48 49
 if is_svn
20  msfupdate
@@ -58,14 +58,18 @@ end
58 58
 
59 59
 def print_deprecation_warning
60 60
 	$stdout.puts ""
61  
-	$stdout.puts "[*] Deprecation Note: After 2013-02-28 (February 28, 2013), Metasploit"
62  
-	$stdout.puts "[*] source checkouts will NO LONGER update over SVN, but will be using"
63  
-	$stdout.puts "[*] GitHub exclusively. You should either download a new Metasploit"
64  
-	$stdout.puts "[*] installer, or use a git clone of Metasploit Framework before"
65  
-	$stdout.puts "[*] then. You will also need outbound access to github.com:9418/TCP."
  61
+	$stdout.puts "[-] Deprecation Note: Metasploit source checkouts NO LONGER update"
  62
+	$stdout.puts "[-] over SVN. You will need to reinstall Metasploit using"
  63
+	$stdout.puts "[-] binary installers (from http://www.metasploit.com/download ),"
  64
+	$stdout.puts "[-] Debian packages (currently only supported on Kali Linux), or"
  65
+	$stdout.puts "[-] a development source checkout from GitHub (see http://r-7.co/ZLhA8P )"
  66
+	$stdout.puts "[-] "
  67
+	$stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP"
66 68
 	$stdout.puts ""
67 69
 end
68 70
 
  71
+# This only exits if you actually pass a wait option, otherwise
  72
+# just returns nil. This is likely unexpected, revisit this.
69 73
 def maybe_wait_and_exit(exit_code=0)
70 74
 	if @actually_wait
71 75
 		$stdout.puts ""
@@ -129,7 +133,13 @@ end
129 133
 
130 134
 ####### Since we're SVN, do it all this way #######
131 135
 if is_svn
  136
+	# We're fully deprecated now, so just exit.
  137
+	# Leaving in the commented code in case someone wants to
  138
+	# get a last-chance at msfupdate before the SVN server goes
  139
+	# off line, which will be ANY DAY NOW. Seriously.
132 140
 	print_deprecation_warning
  141
+	$stdin.readline if @actually_wait
  142
+	exit(0x11) # Comment this to get old functionality back.
133 143
 	@args.push("--config-dir=#{@configdir}")
134 144
 	@args.push("--non-interactive")
135 145
 

0 notes on commit 7c9a65f

Please sign in to comment.
Something went wrong with that request. Please try again.