Update to 2.6

The changes since the 2.5 release include:

msfconsole:
* Tab completion improvements
* Remember last used exploit after save
* Improved reload/rexploit/rcheck commands
* Security fixes for handling terminal escapes

msfcli:
* Security fixes for handling terminal escapes

msfweb:
* Security fixes when using defanged mode

meterpreter:
* Addition of the SAM password dump extension
* Improvements to the VNC injection

msfpescan:
* PE fingerprinting via the -S option
* Additional information via the -D option
* Major bug fixes to PE format parser

exploits:
* Major rewrites of many exploit modules
* Reliability improvements across the entire set
* 42 new exploits added since 2.5 was released
* Improved IPS evasion for SMB/DCERPC/HTTP modules

libraries:
* Human-friendly SMB and DCERPC error codes
* Reworking of the entire DCERPC API
* Incremental improvements to the SMB stack
* Integration of commonly-duplicated routines
* Major improvements to PEInfo module

3 files changed, 59 insertions, 12 deletions

diff --git a/security/msf/Makefile b/security/msf/Makefile
index 02fd6745289..61747291c99 100644
--- a/security/msf/Makefile
+++ b/security/msf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/04/12 21:31:51 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/05 12:33:52 adrianp Exp $
 #
 
-DISTNAME=	framework-2.5
-PKGNAME=	msf-2.5
-PKGREVISION=	1
+DISTNAME=	framework-2.6
+PKGNAME=	msf-2.6
 CATEGORIES=	security
 MASTER_SITES=	http://www.metasploit.com/tools/
 
diff --git a/security/msf/PLIST b/security/msf/PLIST
index b4f6650e99b..c17ec644a82 100644
--- a/security/msf/PLIST
+++ b/security/msf/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/12 21:31:51 rillig Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/06/05 12:33:52 adrianp Exp $
 share/doc/msf
+share/msf/data/dce_errors.txt
 share/msf/data/meterpreter/ext_server_fs.dll
 share/msf/data/meterpreter/ext_server_net.dll
 share/msf/data/meterpreter/ext_server_process.dll
+share/msf/data/meterpreter/ext_server_sam.dll
 share/msf/data/meterpreter/ext_server_sys.dll
 share/msf/data/meterpreter/metsrv.dll
 share/msf/data/msfpayload/template.exe
+share/msf/data/msfpescan/identify.txt
 share/msf/data/msfweb/icons/aix.gif
 share/msf/data/msfweb/icons/amiga.gif
 share/msf/data/msfweb/icons/any.gif
@@ -34,6 +37,7 @@ share/msf/data/msfweb/themes/gwhite/style.css
 share/msf/data/passivex/passivex.dll
 share/msf/data/rpc_names
 share/msf/data/shelldemo
+share/msf/data/smb_errors.txt
 share/msf/data/vncdll.dll
 share/msf/docs/7f8d5320.0
 share/msf/docs/BUGS
@@ -47,17 +51,19 @@ share/msf/docs/CrashCourse_FR.pdf
 share/msf/docs/CrashCourse_IT.pdf
 share/msf/docs/CrashCourse_IT.sxw
 share/msf/docs/Environment.txt
+share/msf/docs/Environment_FR.txt
 share/msf/docs/QUICKSTART.impurity
 share/msf/docs/QUICKSTART.msfcli
 share/msf/docs/QUICKSTART.msfconsole
 share/msf/docs/QUICKSTART.msfweb
-share/msf/docs/RELEASE_2.5.txt
+share/msf/docs/RELEASE_2.6.txt
 share/msf/docs/SECURITY
 share/msf/docs/VERSION
 share/msf/docs/cacert.pem
 share/msf/docs/meterpreter.pdf
 share/msf/docs/userguide.pdf
 share/msf/docs/userguide.tex
+share/msf/docs/userguide_ES.tex
 share/msf/encoders/Alpha2.pm
 share/msf/encoders/Countdown.pm
 share/msf/encoders/JmpCallAdditive.pm
@@ -90,6 +96,8 @@ share/msf/exploits/badblue_ext_overflow.pm
 share/msf/exploits/bakbone_netvault_heap.pm
 share/msf/exploits/barracuda_img_exec.pm
 share/msf/exploits/blackice_pam_icq.pm
+share/msf/exploits/bluecoat_winproxy.pm
+share/msf/exploits/bomberclone_overflow_win32.pm
 share/msf/exploits/cabrightstor_disco.pm
 share/msf/exploits/cabrightstor_disco_servicepc.pm
 share/msf/exploits/cabrightstor_sqlagent.pm
@@ -100,15 +108,26 @@ share/msf/exploits/calicclnt_getconfig.pm
 share/msf/exploits/calicserv_getconfig.pm
 share/msf/exploits/distcc_exec.pm
 share/msf/exploits/edirectory_imonitor.pm
+share/msf/exploits/edirectory_imonitor2.pm
+share/msf/exploits/eudora_imap.pm
 share/msf/exploits/exchange2000_xexch50.pm
+share/msf/exploits/firefox_queryinterface_linux.pm
+share/msf/exploits/firefox_queryinterface_osx.pm
+share/msf/exploits/freeftpd_key_exchange.pm
+share/msf/exploits/freeftpd_user.pm
+share/msf/exploits/freesshd_key_exchange.pm
 share/msf/exploits/futuresoft_tftpd.pm
 share/msf/exploits/globalscapeftp_user_input.pm
 share/msf/exploits/gnu_mailutils_imap4d.pm
+share/msf/exploits/google_proxystylesheet_exec.pm
 share/msf/exploits/hpux_ftpd_preauth_list.pm
 share/msf/exploits/hpux_lpd_exec.pm
 share/msf/exploits/ia_webmail.pm
 share/msf/exploits/icecast_header.pm
+share/msf/exploits/ie_createtextrange.pm
+share/msf/exploits/ie_iscomponentinstalled.pm
 share/msf/exploits/ie_objecttype.pm
+share/msf/exploits/ie_xp_pfv_metafile.pm
 share/msf/exploits/iis40_htr.pm
 share/msf/exploits/iis50_printer_overflow.pm
 share/msf/exploits/iis50_webdav_ntdll.pm
@@ -119,14 +138,19 @@ share/msf/exploits/iis_w3who_overflow.pm
 share/msf/exploits/imail_imap_delete.pm
 share/msf/exploits/imail_ldap.pm
 share/msf/exploits/irix_lpsched_exec.pm
+share/msf/exploits/kerio_auth.pm
 share/msf/exploits/lsass_ms04_011.pm
+share/msf/exploits/lyris_attachment_mssql.pm
 share/msf/exploits/mailenable_auth_header.pm
 share/msf/exploits/mailenable_imap.pm
+share/msf/exploits/mailenable_imap_w3c.pm
 share/msf/exploits/maxdb_webdbm_get_overflow.pm
 share/msf/exploits/mdaemon_imap_cram_md5.pm
 share/msf/exploits/mercantec_softcart.pm
+share/msf/exploits/mercur_imap_select_overflow.pm
 share/msf/exploits/mercury_imap.pm
 share/msf/exploits/minishare_get_overflow.pm
+share/msf/exploits/mozilla_compareto.pm
 share/msf/exploits/ms05_039_pnp.pm
 share/msf/exploits/msasn1_ms04_007_killbill.pm
 share/msf/exploits/msmq_deleteobject_ms05_017.pm
@@ -134,17 +158,27 @@ share/msf/exploits/msrpc_dcom_ms03_026.pm
 share/msf/exploits/mssql2000_preauthentication.pm
 share/msf/exploits/mssql2000_resolution.pm
 share/msf/exploits/netterm_netftpd_user_overflow.pm
+share/msf/exploits/novell_messenger_acceptlang.pm
+share/msf/exploits/openview_connectednodes_exec.pm
 share/msf/exploits/openview_omniback.pm
 share/msf/exploits/oracle9i_xdb_ftp.pm
 share/msf/exploits/oracle9i_xdb_ftp_pass.pm
+share/msf/exploits/oracle9i_xdb_http.pm
+share/msf/exploits/pajax_remote_exec.pm
 share/msf/exploits/payload_handler.pm
+share/msf/exploits/peercast_url_linux.pm
+share/msf/exploits/peercast_url_win32.pm
 share/msf/exploits/php_vbulletin_template.pm
 share/msf/exploits/php_wordpress_lastpost.pm
 share/msf/exploits/php_xmlrpc_eval.pm
 share/msf/exploits/phpbb_highlight.pm
+share/msf/exploits/phpnuke_search_module.pm
 share/msf/exploits/poptop_negative_read.pm
+share/msf/exploits/putty_ssh.pm
 share/msf/exploits/realserver_describe_linux.pm
+share/msf/exploits/realvnc_41_bypass.pm
 share/msf/exploits/rsa_iiswebagent_redirect.pm
+share/msf/exploits/safari_safefiles_exec.pm
 share/msf/exploits/samba_nttrans.pm
 share/msf/exploits/samba_trans2open.pm
 share/msf/exploits/samba_trans2open_osx.pm
@@ -153,6 +187,7 @@ share/msf/exploits/sambar6_search_results.pm
 share/msf/exploits/seattlelab_mail_55.pm
 share/msf/exploits/sentinel_lm7_overflow.pm
 share/msf/exploits/servu_mdtm_overflow.pm
+share/msf/exploits/shixxnote_font.pm
 share/msf/exploits/shoutcast_format_win32.pm
 share/msf/exploits/slimftpd_list_concat.pm
 share/msf/exploits/smb_sniffer.pm
@@ -163,9 +198,14 @@ share/msf/exploits/solaris_lpd_unlink.pm
 share/msf/exploits/solaris_sadmind_exec.pm
 share/msf/exploits/solaris_snmpxdmid.pm
 share/msf/exploits/solaris_ttyprompt.pm
+share/msf/exploits/sphpblog_file_upload.pm
 share/msf/exploits/squid_ntlm_authenticate.pm
 share/msf/exploits/svnserve_date.pm
+share/msf/exploits/sybase_easerver.pm
+share/msf/exploits/sygate_policy_manager.pm
+share/msf/exploits/tftpd32_long_filename.pm
 share/msf/exploits/trackercam_phparg_overflow.pm
+share/msf/exploits/ultravnc_client.pm
 share/msf/exploits/uow_imap4_copy.pm
 share/msf/exploits/uow_imap4_lsub.pm
 share/msf/exploits/ut2004_secure_linux.pm
@@ -173,12 +213,16 @@ share/msf/exploits/ut2004_secure_win32.pm
 share/msf/exploits/warftpd_165_pass.pm
 share/msf/exploits/warftpd_165_user.pm
 share/msf/exploits/webstar_ftp_user.pm
+share/msf/exploits/winamp_playlist_unc.pm
 share/msf/exploits/windows_ssl_pct.pm
 share/msf/exploits/wins_ms04_045.pm
+share/msf/exploits/wmailserver_smtp.pm
 share/msf/exploits/wsftp_server_503_mkd.pm
+share/msf/exploits/wzdftpd_site.pm
+share/msf/exploits/ypops_smtp.pm
 share/msf/exploits/zenworks_desktop_agent.pm
-share/msf/extras/Net_SSLeay.pm-1.23.tar.gz
-share/msf/extras/Term-ReadLine-Gnu-1.14.tar.gz
+share/msf/extras/Net_SSLeay.pm-1.30.tar.gz
+share/msf/extras/Term-ReadLine-Gnu-1.15.tar.gz
 share/msf/lib/Digest/HMAC.pm
 share/msf/lib/Digest/HMAC_MD5.pm
 share/msf/lib/Digest/HMAC_SHA1.pm
@@ -321,10 +365,12 @@ share/msf/lib/Pex/Meterpreter/Extension/Client/Boiler.pm
 share/msf/lib/Pex/Meterpreter/Extension/Client/Fs.pm
 share/msf/lib/Pex/Meterpreter/Extension/Client/Net.pm
 share/msf/lib/Pex/Meterpreter/Extension/Client/Process.pm
+share/msf/lib/Pex/Meterpreter/Extension/Client/Sam.pm
 share/msf/lib/Pex/Meterpreter/Extension/Client/Sys.pm
 share/msf/lib/Pex/Meterpreter/LocalDispatch.pm
 share/msf/lib/Pex/Meterpreter/Packet.pm
 share/msf/lib/Pex/Meterpreter/RemoteDispatch.pm
+share/msf/lib/Pex/NDR.pm
 share/msf/lib/Pex/Nasm/Instruction.pm
 share/msf/lib/Pex/Nasm/Nasm.pm
 share/msf/lib/Pex/Nasm/Ndisasm.pm
@@ -440,6 +486,7 @@ share/msf/payloads/win32_bind_meterpreter.pm
 share/msf/payloads/win32_bind_stg.pm
 share/msf/payloads/win32_bind_stg_upexec.pm
 share/msf/payloads/win32_bind_vncinject.pm
+share/msf/payloads/win32_downloadexec.pm
 share/msf/payloads/win32_exec.pm
 share/msf/payloads/win32_findrecv_ord_meterpreter.pm
 share/msf/payloads/win32_findrecv_ord_stg.pm
@@ -1031,6 +1078,7 @@ share/msf/tools/socketNinja.pl
 @dirrm share/msf/data/msfweb/cache
 @dirrm share/msf/data/msfweb
 @dirrm share/msf/data/msfpayload
+@dirrm share/msf/data/msfpescan
 @dirrm share/msf/data/meterpreter
 @dirrm share/msf/data
 @dirrm share/msf
diff --git a/security/msf/distinfo b/security/msf/distinfo
index 5952885816e..9c42d7eebb1 100644
--- a/security/msf/distinfo
+++ b/security/msf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/10/19 10:34:33 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2006/06/05 12:33:52 adrianp Exp $
 
-SHA1 (framework-2.5.tar.gz) = 16d2d3efb2c3930b95913693f01ebf35653fe737
-RMD160 (framework-2.5.tar.gz) = 5470e2a975530f540d35182e8e63af9525bf0483
-Size (framework-2.5.tar.gz) = 2625719 bytes
+SHA1 (framework-2.6.tar.gz) = f7dd2dc9384d5e681d837f85bf86f0c02a78c82b
+RMD160 (framework-2.6.tar.gz) = 4f66bbe759d5ffa2c193a69c2bc0f27291b84b68
+Size (framework-2.6.tar.gz) = 2782676 bytes