security/metasploit: update to 6.3.50

2 files changed, 20 insertions, 16 deletions

diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index 14043aabaf9c..abcf770108b5 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	metasploit
-DISTVERSION=	6.2.23
-PORTREVISION=	11
+DISTVERSION=	6.3.50
 CATEGORIES=	security
 
 MAINTAINER=	tanawts@gmail.com
@@ -12,17 +11,20 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		nmap:security/nmap \
-		rubygem-actionpack60>=6.0:www/rubygem-actionpack60 \
-		rubygem-activerecord60>=6.0:databases/rubygem-activerecord60 \
-		rubygem-activesupport60>=6.0:devel/rubygem-activesupport60 \
+		rubygem-actionpack70>=7.0:www/rubygem-actionpack70 \
+		rubygem-activerecord70>=7.0:databases/rubygem-activerecord70 \
+		rubygem-activesupport70>=7.0:devel/rubygem-activesupport70 \
 		rubygem-aws-sdk-ec2>=0:devel/rubygem-aws-sdk-ec2 \
+		rubygem-aws-sdk-ec2instanceconnect>=0:devel/rubygem-aws-sdk-ec2instanceconnect \
 		rubygem-aws-sdk-iam>=0:devel/rubygem-aws-sdk-iam \
 		rubygem-aws-sdk-s3>=0:devel/rubygem-aws-sdk-s3 \
+		rubygem-aws-sdk-ssm>=0:devel/rubygem-aws-sdk-ssm \
 		rubygem-bcrypt>=0:security/rubygem-bcrypt \
 		rubygem-bcrypt_pbkdf>=0:security/rubygem-bcrypt_pbkdf \
+		rubygem-bootsnap>=0:devel/rubygem-bootsnap \
 		rubygem-bson>=0:devel/rubygem-bson \
 		rubygem-bundler>=0:sysutils/rubygem-bundler \
-		rubygem-concurrent-ruby>=0:devel/rubygem-concurrent-ruby \
+		rubygem-chunky_png>=0:graphics/rubygem-chunky_png \
 		rubygem-dnsruby>=0:dns/rubygem-dnsruby \
 		rubygem-ed25519>=0:security/rubygem-ed25519 \
 		rubygem-em-http-request>=0:www/rubygem-em-http-request \
@@ -41,12 +43,13 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		rubygem-metasploit-concern>=0:security/rubygem-metasploit-concern \
 		rubygem-metasploit-credential>=0:security/rubygem-metasploit-credential \
 		rubygem-metasploit-model>=0:security/rubygem-metasploit-model \
-		rubygem-metasploit-payloads>=2.0.97:security/rubygem-metasploit-payloads \
+		rubygem-metasploit-payloads>=2.0.161:security/rubygem-metasploit-payloads \
 		rubygem-metasploit_data_models>=0:security/rubygem-metasploit_data_models \
-		rubygem-metasploit_payloads-mettle>=1.0.20:security/rubygem-metasploit_payloads-mettle \
+		rubygem-metasploit_payloads-mettle>=1.0.26:security/rubygem-metasploit_payloads-mettle \
 		rubygem-mqtt>=0:net/rubygem-mqtt \
 		rubygem-msgpack>=0:devel/rubygem-msgpack \
 		rubygem-nessus_rest>=0:security/rubygem-nessus_rest \
+		rubygem-net-imap>=0:mail/rubygem-net-imap \
 		rubygem-net-ldap>=0:net/rubygem-net-ldap \
 		rubygem-net-smtp>=0:mail/rubygem-net-smtp \
 		rubygem-net-ssh>=0:security/rubygem-net-ssh \
@@ -62,7 +65,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		rubygem-pdf-reader>=0:print/rubygem-pdf-reader \
 		rubygem-pg>=0:databases/rubygem-pg \
 		rubygem-puma>=0:www/rubygem-puma \
-		rubygem-railties60>=6.0:www/rubygem-railties60 \
+		rubygem-railties70>=7.0:www/rubygem-railties70 \
+		rubygem-rasn1>=0:security/rubygem-rasn1 \
 		rubygem-recog>=0:security/rubygem-recog \
 		rubygem-redcarpet>=0:textproc/rubygem-redcarpet \
 		rubygem-rex-arch>=0:security/rubygem-rex-arch \
@@ -84,6 +88,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		rubygem-rex-text>=0:security/rubygem-rex-text \
 		rubygem-rex-zip>=0:security/rubygem-rex-zip \
 		rubygem-ruby-macho>=0:devel/rubygem-ruby-macho \
+		rubygem-ruby-mysql>=0:databases/rubygem-ruby-mysql \
 		rubygem-ruby_smb>=0:net/rubygem-ruby_smb \
 		rubygem-rubyntlm>=0:net/rubygem-rubyntlm \
 		rubygem-rubyzip>=0:archivers/rubygem-rubyzip \
@@ -143,6 +148,7 @@ SHEBANG_FILES=	data/exploits/CVE-2017-17562/build.sh \
 		modules/auxiliary/gather/office365userenum.py \
 		modules/auxiliary/scanner/http/onion_omega2_login.py \
 		modules/auxiliary/scanner/http/rdp_web_login.py \
+		modules/auxiliary/scanner/http/rpyc_rce.py \
 		modules/auxiliary/scanner/msmail/exchange_enum.go \
 		modules/auxiliary/scanner/msmail/host_id.go \
 		modules/auxiliary/scanner/msmail/onprem_enum.go \
@@ -165,10 +171,8 @@ NO_ARCH=	yes
 NO_ARCH_IGNORE=	template_x64_bsd.bin template_x86_bsd.bin CVE-2013-2171.bin
 
 post-patch:
-	${REINPLACE_CMD} 's,git ls-files,find . ! -type d | sed "s|^./||", ; \
-		/rb-readline/d ; /win32api/d' \
-		${WRKSRC}/metasploit-framework.gemspec
-	${REINPLACE_CMD} "/concurrent-ruby/s|,'1.0.5'|| ; /octokit/s|, '~> 4.0'||" \
+	${REINPLACE_CMD} "/rb-readline/d ; /win32api/d ; \
+		/irb/s|, '~> 1.7.4'|| ; /msgpack/s|, '~> 1.6.0'|| ; /nokogiri/s|, '~> 1.14.0'|| ; /octokit/s|, '~> 4.0'||" \
 		${WRKSRC}/metasploit-framework.gemspec
 
 do-build:
diff --git a/security/metasploit/distinfo b/security/metasploit/distinfo
index ece21d5f9d9c..4b283beac967 100644
--- a/security/metasploit/distinfo
+++ b/security/metasploit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666784433
-SHA256 (rapid7-metasploit-framework-6.2.23_GH0.tar.gz) = b6e6ab7c98f678d94f668d2f414e49c893b2ce0cbfcb0982b2f60f133bfd6fba
-SIZE (rapid7-metasploit-framework-6.2.23_GH0.tar.gz) = 70153792
+TIMESTAMP = 1704462370
+SHA256 (rapid7-metasploit-framework-6.3.50_GH0.tar.gz) = 3d17375164e737aad727fdcc8d43f9fce967d464540f432c0555c5b2f7def6c8
+SIZE (rapid7-metasploit-framework-6.3.50_GH0.tar.gz) = 73968223