From 2b281dce5c8e192f1bed3a33df2c6c86d78a9242 Mon Sep 17 00:00:00 2001
From: sjanusz <simon_janusz@rapid7.com>
Date: Fri, 11 Feb 2022 11:43:35 +0000
Subject: [PATCH 1/2] Add support for Java Meterpreter's native_arch

---
 lib/msf/base/sessions/meterpreter_java.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/msf/base/sessions/meterpreter_java.rb b/lib/msf/base/sessions/meterpreter_java.rb
index 4cb58ed640..4bc6dc5947 100644
--- a/lib/msf/base/sessions/meterpreter_java.rb
+++ b/lib/msf/base/sessions/meterpreter_java.rb
@@ -21,8 +21,11 @@ class Meterpreter_Java_Java < Msf::Sessions::Meterpreter
     self.base_platform = 'java'
     self.base_arch = ARCH_JAVA
   end
+
+  def native_arch
+    @native_arch ||= self.core.native_arch
+  end
 end
 
 end
 end
-

From 6b2c7aadfa665facd8bae818784554dbf8b8c06e Mon Sep 17 00:00:00 2001
From: Tim W <timrlw@gmail.com>
Date: Sat, 12 Feb 2022 06:02:46 +0000
Subject: [PATCH 2/2] bump metasploit-payloads to 2.0.73

---
 Gemfile.lock                 | 4 ++--
 LICENSE_GEMS                 | 4 ++--
 metasploit-framework.gemspec | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7a8564dc30..a57a7fd9cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,7 +29,7 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.71)
+      metasploit-payloads (= 2.0.73)
       metasploit_data_models
       metasploit_payloads-mettle (= 1.0.18)
       mqtt
@@ -261,7 +261,7 @@ GEM
       activemodel (~> 6.0)
       activesupport (~> 6.0)
       railties (~> 6.0)
-    metasploit-payloads (2.0.71)
+    metasploit-payloads (2.0.73)
     metasploit_data_models (5.0.4)
       activerecord (~> 6.0)
       activesupport (~> 6.0)
diff --git a/LICENSE_GEMS b/LICENSE_GEMS
index 2c49ea8ba0..4a426f1fa4 100644
--- a/LICENSE_GEMS
+++ b/LICENSE_GEMS
@@ -77,9 +77,9 @@ memory_profiler, 1.0.0, MIT
 metasm, 1.0.5, LGPL-2.1
 metasploit-concern, 4.0.3, "New BSD"
 metasploit-credential, 5.0.5, "New BSD"
-metasploit-framework, 6.1.28, "New BSD"
+metasploit-framework, 6.1.30, "New BSD"
 metasploit-model, 4.0.3, "New BSD"
-metasploit-payloads, 2.0.71, "3-clause (or ""modified"") BSD"
+metasploit-payloads, 2.0.73, "3-clause (or ""modified"") BSD"
 metasploit_data_models, 5.0.4, "New BSD"
 metasploit_payloads-mettle, 1.0.18, "3-clause (or ""modified"") BSD"
 method_source, 1.0.0, MIT
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 2f25088e8c..6233772b54 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -70,7 +70,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter
-  spec.add_runtime_dependency 'metasploit-payloads', '2.0.71'
+  spec.add_runtime_dependency 'metasploit-payloads', '2.0.73'
   # Needed for the next-generation POSIX Meterpreter
   spec.add_runtime_dependency 'metasploit_payloads-mettle', '1.0.18'
   # Needed by msfgui and other rpc components