Unbreak OptInt hex syntax

* Fix spec for no-longer-pending tests
* Fix regex in OptInt#valid? to allow hex syntax again

[See rapid7#1293][See rapid7#1296]

Author: egypt

lib/msf/core/option_container.rb

@@ -445,7 +445,7 @@ def normalize(value)
 	def valid?(value)
 		return false if empty_required_value?(value)
 
-		if value and not value.to_s.match(/^\d+$/)
+		if value and not value.to_s.match(/^(?:0x)?\d+$/)
 			return false
 		end
 

spec/lib/msf/core/options/opt_int_spec.rb

@@ -11,8 +11,8 @@
     { :pending => "Redmine #7540", :value => "-1", :normalized => -1 }
   ]
   invalid_values = [
-    { :pending => "Redmine #7539", :value => "yer mom", },
-    { :pending => "Redmine #7539", :value => "0.1",     },
+    { :value => "yer mom", },
+    { :value => "0.1",     },
   ]
 
   it_behaves_like "an option", valid_values, invalid_values

spec/lib/msf/core/options/opt_port_spec.rb

@@ -4,9 +4,9 @@
 
 describe Msf::OptPort do
   valid_values = [
-    { :pending => "Redmine #7535", :value => "0",    :normalized => 0     },
-    { :pending => "Redmine #7535", :value => "65536",:normalized => 65536 },
-    { :pending => "Redmine #7535", :value => "80",   :normalized => 80    },
+    { :value => "0",    :normalized => 0     },
+    { :value => "65535",:normalized => 65535 },
+    { :value => "80",   :normalized => 80    },
   ]
   invalid_values = [
     { :value => "yer mom", },