3 files changed, 56 insertions, 8 deletions

diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index 3ca55073126a..1b47621602f9 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	metasploit
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	security
 MASTER_SITES=	http://www.metasploit.org/tools/
 DISTNAME=	framework-${PORTVERSION}
@@ -28,7 +28,7 @@ SCRIPTS=	msfcli msfconsole msfelfscan msfencode msflogdump msfpayload msfpescan
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=		This port requires perl version 5.6.0 or higher.
+IGNORE=		requires perl version 5.6.0 or higher
 .endif
 
 post-patch:
diff --git a/security/metasploit/distinfo b/security/metasploit/distinfo
index a96673d818eb..299a76ecbe6a 100644
--- a/security/metasploit/distinfo
+++ b/security/metasploit/distinfo
@@ -1,3 +1,3 @@
-MD5 (framework-2.5.tar.gz) = af317c1c673a1ce4523c6fa7b651e1c5
-SHA256 (framework-2.5.tar.gz) = 29c0064ac82224f26556e037593356cd0d1e641d2a47a874d081ada732bbccca
-SIZE (framework-2.5.tar.gz) = 2625719
+MD5 (framework-2.6.tar.gz) = fea4047b477c1a9c9fb1ad4acda65610
+SHA256 (framework-2.6.tar.gz) = 4096fcc8828e35b33d3bbf5ee48213a79dae9cc7c96745443229d41940649449
+SIZE (framework-2.6.tar.gz) = 2782676
diff --git a/security/metasploit/pkg-plist b/security/metasploit/pkg-plist
index aa36bd7d45a5..1ec98448c92d 100644
--- a/security/metasploit/pkg-plist
+++ b/security/metasploit/pkg-plist
@@ -7,12 +7,15 @@ bin/msfpayload
 bin/msfpescan
 bin/msfupdate
 bin/msfweb
+%%DATADIR%%/data/dce_errors.txt
 %%DATADIR%%/data/meterpreter/ext_server_fs.dll
 %%DATADIR%%/data/meterpreter/ext_server_net.dll
 %%DATADIR%%/data/meterpreter/ext_server_process.dll
+%%DATADIR%%/data/meterpreter/ext_server_sam.dll
 %%DATADIR%%/data/meterpreter/ext_server_sys.dll
 %%DATADIR%%/data/meterpreter/metsrv.dll
 %%DATADIR%%/data/msfpayload/template.exe
+%%DATADIR%%/data/msfpescan/identify.txt
 %%DATADIR%%/data/msfweb/icons/aix.gif
 %%DATADIR%%/data/msfweb/icons/amiga.gif
 %%DATADIR%%/data/msfweb/icons/any.gif
@@ -41,6 +44,7 @@ bin/msfweb
 %%DATADIR%%/data/passivex/passivex.dll
 %%DATADIR%%/data/rpc_names
 %%DATADIR%%/data/shelldemo
+%%DATADIR%%/data/smb_errors.txt
 %%DATADIR%%/data/vncdll.dll
 %%DATADIR%%/docs/7f8d5320.0
 %%DATADIR%%/docs/BUGS
@@ -54,17 +58,19 @@ bin/msfweb
 %%DATADIR%%/docs/CrashCourse_IT.pdf
 %%DATADIR%%/docs/CrashCourse_IT.sxw
 %%DATADIR%%/docs/Environment.txt
+%%DATADIR%%/docs/Environment_FR.txt
 %%DATADIR%%/docs/QUICKSTART.impurity
 %%DATADIR%%/docs/QUICKSTART.msfcli
 %%DATADIR%%/docs/QUICKSTART.msfconsole
 %%DATADIR%%/docs/QUICKSTART.msfweb
-%%DATADIR%%/docs/RELEASE_2.5.txt
+%%DATADIR%%/docs/RELEASE_2.6.txt
 %%DATADIR%%/docs/SECURITY
 %%DATADIR%%/docs/VERSION
 %%DATADIR%%/docs/cacert.pem
 %%DATADIR%%/docs/meterpreter.pdf
 %%DATADIR%%/docs/userguide.pdf
 %%DATADIR%%/docs/userguide.tex
+%%DATADIR%%/docs/userguide_ES.tex
 %%DATADIR%%/encoders/Alpha2.pm
 %%DATADIR%%/encoders/Countdown.pm
 %%DATADIR%%/encoders/JmpCallAdditive.pm
@@ -97,6 +103,8 @@ bin/msfweb
 %%DATADIR%%/exploits/bakbone_netvault_heap.pm
 %%DATADIR%%/exploits/barracuda_img_exec.pm
 %%DATADIR%%/exploits/blackice_pam_icq.pm
+%%DATADIR%%/exploits/bluecoat_winproxy.pm
+%%DATADIR%%/exploits/bomberclone_overflow_win32.pm
 %%DATADIR%%/exploits/cabrightstor_disco.pm
 %%DATADIR%%/exploits/cabrightstor_disco_servicepc.pm
 %%DATADIR%%/exploits/cabrightstor_sqlagent.pm
@@ -107,15 +115,26 @@ bin/msfweb
 %%DATADIR%%/exploits/calicserv_getconfig.pm
 %%DATADIR%%/exploits/distcc_exec.pm
 %%DATADIR%%/exploits/edirectory_imonitor.pm
+%%DATADIR%%/exploits/edirectory_imonitor2.pm
+%%DATADIR%%/exploits/eudora_imap.pm
 %%DATADIR%%/exploits/exchange2000_xexch50.pm
+%%DATADIR%%/exploits/firefox_queryinterface_linux.pm
+%%DATADIR%%/exploits/firefox_queryinterface_osx.pm
+%%DATADIR%%/exploits/freeftpd_key_exchange.pm
+%%DATADIR%%/exploits/freeftpd_user.pm
+%%DATADIR%%/exploits/freesshd_key_exchange.pm
 %%DATADIR%%/exploits/futuresoft_tftpd.pm
 %%DATADIR%%/exploits/globalscapeftp_user_input.pm
 %%DATADIR%%/exploits/gnu_mailutils_imap4d.pm
+%%DATADIR%%/exploits/google_proxystylesheet_exec.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_createtextrange.pm
+%%DATADIR%%/exploits/ie_iscomponentinstalled.pm
 %%DATADIR%%/exploits/ie_objecttype.pm
+%%DATADIR%%/exploits/ie_xp_pfv_metafile.pm
 %%DATADIR%%/exploits/iis40_htr.pm
 %%DATADIR%%/exploits/iis50_printer_overflow.pm
 %%DATADIR%%/exploits/iis50_webdav_ntdll.pm
@@ -126,14 +145,19 @@ bin/msfweb
 %%DATADIR%%/exploits/imail_imap_delete.pm
 %%DATADIR%%/exploits/imail_ldap.pm
 %%DATADIR%%/exploits/irix_lpsched_exec.pm
+%%DATADIR%%/exploits/kerio_auth.pm
 %%DATADIR%%/exploits/lsass_ms04_011.pm
+%%DATADIR%%/exploits/lyris_attachment_mssql.pm
 %%DATADIR%%/exploits/mailenable_auth_header.pm
 %%DATADIR%%/exploits/mailenable_imap.pm
+%%DATADIR%%/exploits/mailenable_imap_w3c.pm
 %%DATADIR%%/exploits/maxdb_webdbm_get_overflow.pm
 %%DATADIR%%/exploits/mdaemon_imap_cram_md5.pm
 %%DATADIR%%/exploits/mercantec_softcart.pm
+%%DATADIR%%/exploits/mercur_imap_select_overflow.pm
 %%DATADIR%%/exploits/mercury_imap.pm
 %%DATADIR%%/exploits/minishare_get_overflow.pm
+%%DATADIR%%/exploits/mozilla_compareto.pm
 %%DATADIR%%/exploits/ms05_039_pnp.pm
 %%DATADIR%%/exploits/msasn1_ms04_007_killbill.pm
 %%DATADIR%%/exploits/msmq_deleteobject_ms05_017.pm
@@ -141,17 +165,27 @@ bin/msfweb
 %%DATADIR%%/exploits/mssql2000_preauthentication.pm
 %%DATADIR%%/exploits/mssql2000_resolution.pm
 %%DATADIR%%/exploits/netterm_netftpd_user_overflow.pm
+%%DATADIR%%/exploits/novell_messenger_acceptlang.pm
+%%DATADIR%%/exploits/openview_connectednodes_exec.pm
 %%DATADIR%%/exploits/openview_omniback.pm
 %%DATADIR%%/exploits/oracle9i_xdb_ftp.pm
 %%DATADIR%%/exploits/oracle9i_xdb_ftp_pass.pm
+%%DATADIR%%/exploits/oracle9i_xdb_http.pm
+%%DATADIR%%/exploits/pajax_remote_exec.pm
 %%DATADIR%%/exploits/payload_handler.pm
+%%DATADIR%%/exploits/peercast_url_linux.pm
+%%DATADIR%%/exploits/peercast_url_win32.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/phpnuke_search_module.pm
 %%DATADIR%%/exploits/poptop_negative_read.pm
+%%DATADIR%%/exploits/putty_ssh.pm
 %%DATADIR%%/exploits/realserver_describe_linux.pm
+%%DATADIR%%/exploits/realvnc_41_bypass.pm
 %%DATADIR%%/exploits/rsa_iiswebagent_redirect.pm
+%%DATADIR%%/exploits/safari_safefiles_exec.pm
 %%DATADIR%%/exploits/samba_nttrans.pm
 %%DATADIR%%/exploits/samba_trans2open.pm
 %%DATADIR%%/exploits/samba_trans2open_osx.pm
@@ -160,6 +194,7 @@ bin/msfweb
 %%DATADIR%%/exploits/seattlelab_mail_55.pm
 %%DATADIR%%/exploits/sentinel_lm7_overflow.pm
 %%DATADIR%%/exploits/servu_mdtm_overflow.pm
+%%DATADIR%%/exploits/shixxnote_font.pm
 %%DATADIR%%/exploits/shoutcast_format_win32.pm
 %%DATADIR%%/exploits/slimftpd_list_concat.pm
 %%DATADIR%%/exploits/smb_sniffer.pm
@@ -170,9 +205,14 @@ bin/msfweb
 %%DATADIR%%/exploits/solaris_sadmind_exec.pm
 %%DATADIR%%/exploits/solaris_snmpxdmid.pm
 %%DATADIR%%/exploits/solaris_ttyprompt.pm
+%%DATADIR%%/exploits/sphpblog_file_upload.pm
 %%DATADIR%%/exploits/squid_ntlm_authenticate.pm
 %%DATADIR%%/exploits/svnserve_date.pm
+%%DATADIR%%/exploits/sybase_easerver.pm
+%%DATADIR%%/exploits/sygate_policy_manager.pm
+%%DATADIR%%/exploits/tftpd32_long_filename.pm
 %%DATADIR%%/exploits/trackercam_phparg_overflow.pm
+%%DATADIR%%/exploits/ultravnc_client.pm
 %%DATADIR%%/exploits/uow_imap4_copy.pm
 %%DATADIR%%/exploits/uow_imap4_lsub.pm
 %%DATADIR%%/exploits/ut2004_secure_linux.pm
@@ -180,12 +220,16 @@ bin/msfweb
 %%DATADIR%%/exploits/warftpd_165_pass.pm
 %%DATADIR%%/exploits/warftpd_165_user.pm
 %%DATADIR%%/exploits/webstar_ftp_user.pm
+%%DATADIR%%/exploits/winamp_playlist_unc.pm
 %%DATADIR%%/exploits/windows_ssl_pct.pm
 %%DATADIR%%/exploits/wins_ms04_045.pm
+%%DATADIR%%/exploits/wmailserver_smtp.pm
 %%DATADIR%%/exploits/wsftp_server_503_mkd.pm
+%%DATADIR%%/exploits/wzdftpd_site.pm
+%%DATADIR%%/exploits/ypops_smtp.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%%/extras/Net_SSLeay.pm-1.30.tar.gz
+%%DATADIR%%/extras/Term-ReadLine-Gnu-1.15.tar.gz
 %%DATADIR%%/lib/Digest/HMAC.pm
 %%DATADIR%%/lib/Digest/HMAC_MD5.pm
 %%DATADIR%%/lib/Digest/HMAC_SHA1.pm
@@ -327,10 +371,12 @@ bin/msfweb
 %%DATADIR%%/lib/Pex/Meterpreter/Extension/Client/Fs.pm
 %%DATADIR%%/lib/Pex/Meterpreter/Extension/Client/Net.pm
 %%DATADIR%%/lib/Pex/Meterpreter/Extension/Client/Process.pm
+%%DATADIR%%/lib/Pex/Meterpreter/Extension/Client/Sam.pm
 %%DATADIR%%/lib/Pex/Meterpreter/Extension/Client/Sys.pm
 %%DATADIR%%/lib/Pex/Meterpreter/LocalDispatch.pm
 %%DATADIR%%/lib/Pex/Meterpreter/Packet.pm
 %%DATADIR%%/lib/Pex/Meterpreter/RemoteDispatch.pm
+%%DATADIR%%/lib/Pex/NDR.pm
 %%DATADIR%%/lib/Pex/Nasm/Instruction.pm
 %%DATADIR%%/lib/Pex/Nasm/Nasm.pm
 %%DATADIR%%/lib/Pex/Nasm/Ndisasm.pm
@@ -447,6 +493,7 @@ bin/msfweb
 %%DATADIR%%/payloads/win32_bind_stg.pm
 %%DATADIR%%/payloads/win32_bind_stg_upexec.pm
 %%DATADIR%%/payloads/win32_bind_vncinject.pm
+%%DATADIR%%/payloads/win32_downloadexec.pm
 %%DATADIR%%/payloads/win32_exec.pm
 %%DATADIR%%/payloads/win32_findrecv_ord_meterpreter.pm
 %%DATADIR%%/payloads/win32_findrecv_ord_stg.pm
@@ -911,6 +958,7 @@ bin/msfweb
 %%DATADIR%%/tools/socketNinja.pl
 @dirrm %%DATADIR%%/data/meterpreter
 @dirrm %%DATADIR%%/data/msfpayload
+@dirrm %%DATADIR%%/data/msfpescan
 @dirrm %%DATADIR%%/data/msfweb/cache
 @dirrm %%DATADIR%%/data/msfweb/default
 @dirrm %%DATADIR%%/data/msfweb/gblack