Update to 4.12.1

2 files changed, 26 insertions, 42 deletions

diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index ce9fba2bcca4..d291da9e8d03 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	metasploit
-PORTVERSION=	4.11.2
-PORTREVISION=	2
+PORTVERSION=	4.12.1
 CATEGORIES=	security
 
 MAINTAINER=	tanawts@gmail.com
@@ -14,63 +13,50 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nasm:devel/nasm \
 		nmap:security/nmap \
-		rubygem-activesupport>=3.0.0:devel/rubygem-activesupport \
-		rubygem-actionpack>=0:www/rubygem-actionpack \
+		rubygem-activerecord4>=4.2.6:databases/rubygem-activerecord4 \
+		rubygem-activesupport4>=4.2.6:devel/rubygem-activesupport4 \
+		rubygem-actionpack4>=4.2.6:www/rubygem-actionpack4 \
 		rubygem-bcrypt>=0:security/rubygem-bcrypt \
 		rubygem-bundler>=0:sysutils/rubygem-bundler \
 		rubygem-jsobfu>=0.2.0:www/rubygem-jsobfu \
 		rubygem-json>=0:devel/rubygem-json \
-		rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-concern \
+		rubygem-metasm>=0:devel/rubygem-metasm \
+		rubygem-metasploit-concern>=2.0.1:security/rubygem-metasploit-concern \
+		rubygem-metasploit-credential>=0.14.5:security/rubygem-metasploit-credential \
+		rubygem-metasploit_data_models>=0.24.0,2:security/rubygem-metasploit_data_models \
 		rubygem-metasploit-model>=0.29.0:security/rubygem-metasploit-model \
 		rubygem-metasploit-payloads>=0.0.3:security/rubygem-metasploit-payloads \
 		rubygem-msgpack>=0:devel/rubygem-msgpack \
-		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
 		rubygem-network_interface>=0.0.1:net/rubygem-network_interface \
+		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
 		rubygem-packetfu>=1.1.9:net/rubygem-packetfu \
 		rubygem-pcaprub>=0:net/rubygem-pcaprub \
-		rubygem-railties>=3.0.0:www/rubygem-railties \
+		rubygem-pg>=0.11:databases/rubygem-pg \
+		rubygem-railties4>=4.2.6:www/rubygem-railties4 \
 		rubygem-recog>=1.0:security/rubygem-recog \
+		rubygem-openssl-ccm>=0:security/rubygem-openssl-ccm \
+		rubygem-octokit>=0:net/rubygem-octokit \
+		rubygem-redcarpet>=0:textproc/rubygem-redcarpet \
+		rubygem-patch_finder>=0:devel/rubygem-patch_finder \
 		rubygem-robots>=0:www/rubygem-robots \
 		rubygem-rubyzip>=1.1:archivers/rubygem-rubyzip \
 		rubygem-sqlite3>=0:databases/rubygem-sqlite3 \
-		rubygem-tzinfo03>=0:devel/rubygem-tzinfo03
+		rubygem-tzinfo>=0:devel/rubygem-tzinfo \
+		rubygem-filesize>=0:devel/rubygem-filesize
 
-SCRIPTS=	msfbinscan msfcli msfconsole msfd msfelfscan msfencode \
-		msfmachscan msfpayload msfpescan msfrop msfrpc msfrpcd msfvenom
+SCRIPTS=	msfbinscan msfconsole msfd msfelfscan \
+		msfmachscan msfpescan msfrop msfrpc msfrpcd msfvenom
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rapid7
 GH_PROJECT=	metasploit-framework
 
-USES=		ncurses:port shebangfix
-SHEBANG_FILES=	data/cpuinfo/build.sh \
-		data/john/run.*/*.rb \
-		data/john/run.*/*.pl \
-		data/templates/src/pe/dll/build.sh \
-		external/ruby-kissfft/tests/test_kissfft.rb \
-		external/source/exploits/*/*.sh \
-		external/source/metsvc/test.rb \
-		external/source/msfJavaToolkit/*.sh \
-		external/source/msfJavaToolkit/*.rb \
-		external/source/pxesploit/regeditor/compile.sh \
-		external/source/shellcode/windows/build.sh \
-		lib/net/ssh/test.rb
+USES=		ncurses:port
 USE_RUBY=	yes
 
-OPTIONS_DEFINE=	DB
-OPTIONS_DEFAULT=DB
-DB_DESC=	Database support
-
-DB_RUN_DEPENDS=	rubygem-activerecord>=3.0.0:databases/rubygem-activerecord \
-		rubygem-metasploit-credential>=0.14.5:security/rubygem-metasploit-credential \
-		rubygem-metasploit_data_models>=0.24.0,2:security/rubygem-metasploit_data_models \
-		rubygem-pg>=0.11:databases/rubygem-pg
-
 post-patch:
 	${REINPLACE_CMD} 's,git ls-files,find . ! -type d | sed "s|^./||", ; \
-		/jsobfu/s/~> 0.2.0/>= 0.2.0/ ; \
-		/packetfu/s/1.1.9/>= 1.1.9/ ; \
-		/rb-readline/d' ${WRKSRC}/metasploit-framework.gemspec
+		/rb-readline-r7/d' ${WRKSRC}/metasploit-framework.gemspec
 
 do-build:
 	${RM} ${WRKSRC}/Gemfile.lock
@@ -80,12 +66,9 @@ do-build:
 	${REINPLACE_CMD} '/^group :coverage/,/^end/d ; /^group :development/,/^end/d ; /^group :test/,/^end/d' \
 		${WRKSRC}/Gemfile
 
-do-build-DB-off:
-	${REINPLACE_CMD} '/^group :db do/,/^end/d' ${WRKSRC}/Gemfile
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${CP} -Rp ${WRKSRC}/ ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${PAX} -rw . ${STAGEDIR}${DATADIR}
 .for f in ${SCRIPTS}
 	${PRINTF} '#!/bin/sh\ncd ${DATADIR} && ./${f} "$$@"\n' > ${STAGEDIR}${PREFIX}/bin/${f}
 	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f}
@@ -93,7 +76,7 @@ do-install:
 
 post-install:
 .for f in ${SCRIPTS}
-	${ECHO} "bin/${f}" >> ${TMPPLIST}
+	@${ECHO} "bin/${f}" >> ${TMPPLIST}
 .endfor
 	@${FIND} ${STAGEDIR}${DATADIR} ! -type d | \
 		${SED} 's,${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
diff --git a/security/metasploit/distinfo b/security/metasploit/distinfo
index 5ae83b471b09..15e63b9ae251 100644
--- a/security/metasploit/distinfo
+++ b/security/metasploit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rapid7-metasploit-framework-4.11.2_GH0.tar.gz) = 1e83deb1c0215278e223b301aa7fe42423e546c9498d149efe29c4b1e89540a8
-SIZE (rapid7-metasploit-framework-4.11.2_GH0.tar.gz) = 34521670
+TIMESTAMP = 1463297270
+SHA256 (rapid7-metasploit-framework-4.12.1_GH0.tar.gz) = 7d05b75b8649001bff07a48c8384f889f94224362051f885912c5533fc11e152
+SIZE (rapid7-metasploit-framework-4.12.1_GH0.tar.gz) = 23281025