- Update to 2.5

PR:		87863
Submitted by:	Jonatan B <onatan@gmail.com> (maintainer)

3 files changed, 53 insertions, 9 deletions

diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index 9347f3a7ace7..36b44e78918a 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	metasploit
-PORTVERSION=	2.4
-PORTREVISION=	1
+PORTVERSION=	2.5
 CATEGORIES=	security
 MASTER_SITES=	http://www.metasploit.org/tools/
 DISTNAME=	framework-${PORTVERSION}
@@ -21,6 +20,11 @@ RUN_DEPENDS=	${SITE_PERL}/mach/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLin
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ''
+
+SCRIPTS=	msfcli msfconsole msfelfscan msfencode msflogdump msfpayload msfpescan \
+		msfupdate msfweb
 
 .include <bsd.port.pre.mk>
 
@@ -28,11 +32,16 @@ USE_PERL5_RUN=	yes
 IGNORE=		This port requires perl version 5.6.0 or higher.
 .endif
 
+post-patch:
+.for f in ${SCRIPTS}
+	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${f}
+.endfor
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${CP} -Rp ${WRKSRC}/ ${DATADIR}
-.	for i in msfcli msfconsole msfelfscan msfencode msflogdump msfpayload msfpescan msfupdate msfweb
-		${LN} -s ${DATADIR}/$i ${PREFIX}/bin
-.	endfor
+.for f in ${SCRIPTS}
+	${LN} -s ${DATADIR}/${f} ${PREFIX}/bin
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/security/metasploit/distinfo b/security/metasploit/distinfo
index 453e7f29cd6f..b0d4a4f108c2 100644
--- a/security/metasploit/distinfo
+++ b/security/metasploit/distinfo
@@ -1,2 +1,2 @@
-MD5 (framework-2.4.tar.gz) = cb3319b92399c7fab68c742dc750589e
-SIZE (framework-2.4.tar.gz) = 2607730
+MD5 (framework-2.5.tar.gz) = af317c1c673a1ce4523c6fa7b651e1c5
+SIZE (framework-2.5.tar.gz) = 2625719
diff --git a/security/metasploit/pkg-plist b/security/metasploit/pkg-plist
index 96a115c469fe..aa36bd7d45a5 100644
--- a/security/metasploit/pkg-plist
+++ b/security/metasploit/pkg-plist
@@ -58,7 +58,7 @@ bin/msfweb
 %%DATADIR%%/docs/QUICKSTART.msfcli
 %%DATADIR%%/docs/QUICKSTART.msfconsole
 %%DATADIR%%/docs/QUICKSTART.msfweb
-%%DATADIR%%/docs/RELEASE_2.4.txt
+%%DATADIR%%/docs/RELEASE_2.5.txt
 %%DATADIR%%/docs/SECURITY
 %%DATADIR%%/docs/VERSION
 %%DATADIR%%/docs/cacert.pem
@@ -80,25 +80,42 @@ bin/msfweb
 %%DATADIR%%/encoders/Sparc.pm
 %%DATADIR%%/exploits/3com_3cdaemon_ftp_overflow.pm
 %%DATADIR%%/exploits/Credits.pm
+%%DATADIR%%/exploits/Tester.pm
 %%DATADIR%%/exploits/afp_loginext.pm
 %%DATADIR%%/exploits/aim_goaway.pm
+%%DATADIR%%/exploits/altn_webadmin.pm
 %%DATADIR%%/exploits/apache_chunked_win32.pm
 %%DATADIR%%/exploits/arkeia_agent_access.pm
 %%DATADIR%%/exploits/arkeia_type77_macos.pm
 %%DATADIR%%/exploits/arkeia_type77_win32.pm
+%%DATADIR%%/exploits/awstats_configdir_exec.pm
+%%DATADIR%%/exploits/backupexec_agent.pm
+%%DATADIR%%/exploits/backupexec_dump.pm
 %%DATADIR%%/exploits/backupexec_ns.pm
+%%DATADIR%%/exploits/backupexec_registry.pm
+%%DATADIR%%/exploits/badblue_ext_overflow.pm
 %%DATADIR%%/exploits/bakbone_netvault_heap.pm
+%%DATADIR%%/exploits/barracuda_img_exec.pm
 %%DATADIR%%/exploits/blackice_pam_icq.pm
 %%DATADIR%%/exploits/cabrightstor_disco.pm
 %%DATADIR%%/exploits/cabrightstor_disco_servicepc.pm
+%%DATADIR%%/exploits/cabrightstor_sqlagent.pm
 %%DATADIR%%/exploits/cabrightstor_uniagent.pm
+%%DATADIR%%/exploits/cacam_logsecurity_win32.pm
+%%DATADIR%%/exploits/cacti_graphimage_exec.pm
 %%DATADIR%%/exploits/calicclnt_getconfig.pm
 %%DATADIR%%/exploits/calicserv_getconfig.pm
 %%DATADIR%%/exploits/distcc_exec.pm
+%%DATADIR%%/exploits/edirectory_imonitor.pm
 %%DATADIR%%/exploits/exchange2000_xexch50.pm
+%%DATADIR%%/exploits/futuresoft_tftpd.pm
 %%DATADIR%%/exploits/globalscapeftp_user_input.pm
+%%DATADIR%%/exploits/gnu_mailutils_imap4d.pm
+%%DATADIR%%/exploits/hpux_ftpd_preauth_list.pm
+%%DATADIR%%/exploits/hpux_lpd_exec.pm
 %%DATADIR%%/exploits/ia_webmail.pm
 %%DATADIR%%/exploits/icecast_header.pm
+%%DATADIR%%/exploits/ie_objecttype.pm
 %%DATADIR%%/exploits/iis40_htr.pm
 %%DATADIR%%/exploits/iis50_printer_overflow.pm
 %%DATADIR%%/exploits/iis50_webdav_ntdll.pm
@@ -110,9 +127,14 @@ bin/msfweb
 %%DATADIR%%/exploits/imail_ldap.pm
 %%DATADIR%%/exploits/irix_lpsched_exec.pm
 %%DATADIR%%/exploits/lsass_ms04_011.pm
+%%DATADIR%%/exploits/mailenable_auth_header.pm
+%%DATADIR%%/exploits/mailenable_imap.pm
 %%DATADIR%%/exploits/maxdb_webdbm_get_overflow.pm
+%%DATADIR%%/exploits/mdaemon_imap_cram_md5.pm
 %%DATADIR%%/exploits/mercantec_softcart.pm
+%%DATADIR%%/exploits/mercury_imap.pm
 %%DATADIR%%/exploits/minishare_get_overflow.pm
+%%DATADIR%%/exploits/ms05_039_pnp.pm
 %%DATADIR%%/exploits/msasn1_ms04_007_killbill.pm
 %%DATADIR%%/exploits/msmq_deleteobject_ms05_017.pm
 %%DATADIR%%/exploits/msrpc_dcom_ms03_026.pm
@@ -123,8 +145,13 @@ bin/msfweb
 %%DATADIR%%/exploits/oracle9i_xdb_ftp.pm
 %%DATADIR%%/exploits/oracle9i_xdb_ftp_pass.pm
 %%DATADIR%%/exploits/payload_handler.pm
+%%DATADIR%%/exploits/php_vbulletin_template.pm
+%%DATADIR%%/exploits/php_wordpress_lastpost.pm
+%%DATADIR%%/exploits/php_xmlrpc_eval.pm
+%%DATADIR%%/exploits/phpbb_highlight.pm
 %%DATADIR%%/exploits/poptop_negative_read.pm
 %%DATADIR%%/exploits/realserver_describe_linux.pm
+%%DATADIR%%/exploits/rsa_iiswebagent_redirect.pm
 %%DATADIR%%/exploits/samba_nttrans.pm
 %%DATADIR%%/exploits/samba_trans2open.pm
 %%DATADIR%%/exploits/samba_trans2open_osx.pm
@@ -133,10 +160,13 @@ bin/msfweb
 %%DATADIR%%/exploits/seattlelab_mail_55.pm
 %%DATADIR%%/exploits/sentinel_lm7_overflow.pm
 %%DATADIR%%/exploits/servu_mdtm_overflow.pm
+%%DATADIR%%/exploits/shoutcast_format_win32.pm
+%%DATADIR%%/exploits/slimftpd_list_concat.pm
 %%DATADIR%%/exploits/smb_sniffer.pm
 %%DATADIR%%/exploits/solaris_dtspcd_noir.pm
 %%DATADIR%%/exploits/solaris_kcms_readfile.pm
 %%DATADIR%%/exploits/solaris_lpd_exec.pm
+%%DATADIR%%/exploits/solaris_lpd_unlink.pm
 %%DATADIR%%/exploits/solaris_sadmind_exec.pm
 %%DATADIR%%/exploits/solaris_snmpxdmid.pm
 %%DATADIR%%/exploits/solaris_ttyprompt.pm
@@ -153,8 +183,12 @@ bin/msfweb
 %%DATADIR%%/exploits/windows_ssl_pct.pm
 %%DATADIR%%/exploits/wins_ms04_045.pm
 %%DATADIR%%/exploits/wsftp_server_503_mkd.pm
+%%DATADIR%%/exploits/zenworks_desktop_agent.pm
 %%DATADIR%%/extras/Net_SSLeay.pm-1.23.tar.gz
 %%DATADIR%%/extras/Term-ReadLine-Gnu-1.14.tar.gz
+%%DATADIR%%/lib/Digest/HMAC.pm
+%%DATADIR%%/lib/Digest/HMAC_MD5.pm
+%%DATADIR%%/lib/Digest/HMAC_SHA1.pm
 %%DATADIR%%/lib/Digest/Perl/MD5.pm
 %%DATADIR%%/lib/Msf/Base.pm
 %%DATADIR%%/lib/Msf/ColPrint.pm
@@ -274,6 +308,7 @@ bin/msfweb
 %%DATADIR%%/lib/NetPacket.pm
 %%DATADIR%%/lib/Pex/Alpha.pm
 %%DATADIR%%/lib/Pex/Arkeia.pm
+%%DATADIR%%/lib/Pex/BEServerRPC.pm
 %%DATADIR%%/lib/Pex/DCERPC.pm
 %%DATADIR%%/lib/Pex/ELFInfo.pm
 %%DATADIR%%/lib/Pex/Encoder.pm
@@ -321,6 +356,7 @@ bin/msfweb
 %%DATADIR%%/lib/Pex/Text.pm
 %%DATADIR%%/lib/Pex/Utils.pm
 %%DATADIR%%/lib/Pex/XDR.pm
+%%DATADIR%%/lib/Pex/jBASE.pm
 %%DATADIR%%/lib/Pex/x86.pm
 %%DATADIR%%/lib/Pex.pm
 %%DATADIR%%/msfcli
@@ -378,7 +414,6 @@ bin/msfweb
 %%DATADIR%%/payloads/linux_ia32_bind.pm
 %%DATADIR%%/payloads/linux_ia32_bind_ie.pm
 %%DATADIR%%/payloads/linux_ia32_bind_stg.pm
-%%DATADIR%%/payloads/linux_ia32_dN_reverse.pm
 %%DATADIR%%/payloads/linux_ia32_exec.pm
 %%DATADIR%%/payloads/linux_ia32_findrecv.pm
 %%DATADIR%%/payloads/linux_ia32_findrecv_stg.pm