From 0b0e85f6efcc807f380e9bc4ca411ae47b5efaba Mon Sep 17 00:00:00 2001 From: adrianp Date: Wed, 19 Oct 2005 10:34:33 +0000 Subject: Update to metasploit 2.5 This is a maintenance release - all updates to 2.4 have been rolled into 2.5, along with some new exploits and minor features. --- security/msf/Makefile | 20 ++++++------------- security/msf/PLIST | 46 ++++++++++++++++++++++++++++++++++++++++--- security/msf/distinfo | 9 ++++----- security/msf/patches/patch-aa | 24 ---------------------- 4 files changed, 53 insertions(+), 46 deletions(-) delete mode 100644 security/msf/patches/patch-aa (limited to 'security') diff --git a/security/msf/Makefile b/security/msf/Makefile index 7a92d3ab003..710b5cc53b7 100644 --- a/security/msf/Makefile +++ b/security/msf/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:29 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/10/19 10:34:33 adrianp Exp $ # -DISTNAME= framework-2.4 -PKGNAME= msf-2.4 -PKGREVISION= 2 +DISTNAME= framework-2.5 +PKGNAME= msf-2.5 CATEGORIES= security MASTER_SITES= http://www.metasploit.com/tools/ @@ -14,7 +13,6 @@ COMMENT= Platform for developing, testing, and using exploit code DEPENDS+= p5-Net-SSLeay>=1.23:../../security/p5-Net-SSLeay DEPENDS+= p5-Term-ReadLine>=1.14:../../devel/p5-Term-ReadLine -DIST_SUBDIR= ${PKGNAME} LICENSE= inlineegg-license MSFDIR?= ${PREFIX}/share/msf @@ -22,8 +20,8 @@ MSFDOC?= ${PREFIX}/share/doc/msf MESSAGE_SUBST+= MSFDIR=${MSFDIR} USE_TOOLS+= perl:run -PERL_FILES= msfcli msfconsole msfencode msflogdump msfpayload \ - msfpescan msfweb msfupdate msfelfscan +PERL_FILES= msfcli msfconsole msfelfscan msfencode msflogdump msfpayload \ + msfpescan msfupdate msfweb REPLACE_PERL+= ${PERL_FILES} tools/socketNinja.pl sdk/formatGen.pl \ sdk/patternOffset.pl sdk/spitCode.pl src/shellcode/import.pl @@ -52,8 +50,6 @@ do-install: ${INSTALL_DATA_DIR} ${MSFDIR} ${INSTALL_DATA_DIR} ${MSFDIR}/docs ${INSTALL_DATA_DIR} ${MSFDIR}/data - ${INSTALL_DATA_DIR} ${MSFDIR}/data/meterpreter - ${INSTALL_DATA_DIR} ${MSFDIR}/data/msfweb ${INSTALL_DATA_DIR} ${MSFDIR}/encoders ${INSTALL_DATA_DIR} ${MSFDIR}/exploits ${INSTALL_DATA_DIR} ${MSFDIR}/extras @@ -66,10 +62,6 @@ do-install: ${INSTALL_DATA_DIR} ${MSFDIR}/tools ${INSTALL_DATA} ${WRKSRC}/docs/* ${MSFDIR}/docs - ${INSTALL_PROGRAM} ${WRKSRC}/data/shelldemo ${MSFDIR}/data - ${INSTALL_DATA} ${WRKSRC}/data/vncdll.dll ${MSFDIR}/data - ${INSTALL_DATA} ${WRKSRC}/data/meterpreter/*.dll \ - ${MSFDIR}/data/meterpreter ${INSTALL_DATA} ${WRKSRC}/encoders/*.pm ${MSFDIR}/encoders ${INSTALL_DATA} ${WRKSRC}/exploits/*.pm ${MSFDIR}/exploits ${INSTALL_DATA} ${WRKSRC}/extras/*.tar.gz ${MSFDIR}/extras @@ -79,7 +71,7 @@ do-install: cd ${WRKSRC}/sdk && ${PAX} -rw . ${MSFDIR}/sdk cd ${WRKSRC}/tools && ${PAX} -rw . ${MSFDIR}/tools cd ${WRKSRC}/src && ${PAX} -rw . ${MSFDIR}/src - cd ${WRKSRC}/data/msfweb && ${PAX} -rw . ${MSFDIR}/data/msfweb + cd ${WRKSRC}/data && ${PAX} -rw . ${MSFDIR}/data ${INSTALL_DATA} ${WRKSRC}/nops/*.pm ${MSFDIR}/nops ${INSTALL_DATA} ${WRKSRC}/payloads/*.pm ${MSFDIR}/payloads diff --git a/security/msf/PLIST b/security/msf/PLIST index 3886b9746d9..7ad15a85036 100644 --- a/security/msf/PLIST +++ b/security/msf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/08/08 10:33:25 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.6 2005/10/19 10:34:33 adrianp Exp $ share/doc/msf share/msf/docs/7f8d5320.0 share/msf/docs/BUGS @@ -18,13 +18,16 @@ share/msf/docs/QUICKSTART.msfconsole share/msf/docs/QUICKSTART.msfweb share/msf/docs/SECURITY share/msf/docs/VERSION -share/msf/docs/RELEASE_2.4.txt +share/msf/docs/RELEASE_2.5.txt share/msf/docs/meterpreter.pdf share/msf/docs/userguide.pdf share/msf/docs/userguide.tex share/msf/docs/cacert.pem share/msf/data/shelldemo share/msf/data/vncdll.dll +share/msf/data/passivex/passivex.dll +share/msf/data/msfpayload/template.exe +share/msf/data/rpc_names share/msf/data/meterpreter/ext_server_fs.dll share/msf/data/meterpreter/ext_server_net.dll share/msf/data/meterpreter/ext_server_process.dll @@ -143,6 +146,37 @@ share/msf/exploits/solaris_snmpxdmid.pm share/msf/exploits/solaris_ttyprompt.pm share/msf/exploits/trackercam_phparg_overflow.pm share/msf/exploits/wsftp_server_503_mkd.pm +share/msf/exploits/Tester.pm +share/msf/exploits/altn_webadmin.pm +share/msf/exploits/awstats_configdir_exec.pm +share/msf/exploits/backupexec_agent.pm +share/msf/exploits/backupexec_dump.pm +share/msf/exploits/backupexec_registry.pm +share/msf/exploits/badblue_ext_overflow.pm +share/msf/exploits/barracuda_img_exec.pm +share/msf/exploits/cabrightstor_sqlagent.pm +share/msf/exploits/cacam_logsecurity_win32.pm +share/msf/exploits/cacti_graphimage_exec.pm +share/msf/exploits/edirectory_imonitor.pm +share/msf/exploits/futuresoft_tftpd.pm +share/msf/exploits/gnu_mailutils_imap4d.pm +share/msf/exploits/hpux_ftpd_preauth_list.pm +share/msf/exploits/hpux_lpd_exec.pm +share/msf/exploits/ie_objecttype.pm +share/msf/exploits/mailenable_auth_header.pm +share/msf/exploits/mailenable_imap.pm +share/msf/exploits/mdaemon_imap_cram_md5.pm +share/msf/exploits/mercury_imap.pm +share/msf/exploits/ms05_039_pnp.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/rsa_iiswebagent_redirect.pm +share/msf/exploits/shoutcast_format_win32.pm +share/msf/exploits/slimftpd_list_concat.pm +share/msf/exploits/solaris_lpd_unlink.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/lib/Msf/Nop/OptyNop2.pm @@ -211,6 +245,11 @@ share/msf/lib/Pex/Encoding/XorDwordFeedbackN.pm share/msf/lib/Pex/Encoding/XorDwordFeedback.pm share/msf/lib/Pex/Encoding/XorDword.pm share/msf/lib/Pex/ELFInfo.pm +share/msf/lib/Pex/jBASE.pm +share/msf/lib/Pex/BEServerRPC.pm +share/msf/lib/Digest/HMAC_MD5.pm +share/msf/lib/Digest/HMAC.pm +share/msf/lib/Digest/HMAC_SHA1.pm share/msf/lib/Pex/Alpha.pm share/msf/lib/Msf/PayloadComponent/Windows/ia32/UploadExecStage.pm share/msf/lib/Msf/PayloadComponent/Windows/ia32/ShellStage.pm @@ -334,7 +373,6 @@ share/msf/payloads/cmd_unix_reverse.pm share/msf/payloads/cmd_unix_reverse_nss.pm share/msf/payloads/cmd_interact.pm share/msf/payloads/cmd_localshell.pm -share/msf/payloads/linux_ia32_dN_reverse.pm share/msf/payloads/linux_sparc_findsock.pm share/msf/payloads/solaris_sparc_findsock.pm share/msf/payloads/win32_passivex.pm @@ -991,6 +1029,8 @@ share/msf/src/shellcode/win32/dllinject/vncinject/vncdll.txt @dirrm share/msf/data/msfweb/themes @dirrm share/msf/data/msfweb @dirrm share/msf/data/meterpreter +@dirrm share/msf/data/msfpayload +@dirrm share/msf/data/passivex @dirrm share/msf/data @dirrm share/msf/docs @dirrm share/msf diff --git a/security/msf/distinfo b/security/msf/distinfo index 8f2044ed682..5952885816e 100644 --- a/security/msf/distinfo +++ b/security/msf/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2005/08/03 20:37:44 adrianp Exp $ +$NetBSD: distinfo,v 1.7 2005/10/19 10:34:33 adrianp Exp $ -SHA1 (msf-2.4nb2/framework-2.4.tar.gz) = b09ec49e259d812805301dc9152175903e46beb3 -RMD160 (msf-2.4nb2/framework-2.4.tar.gz) = c2791c46d6c7b8ac9490acfb81f88f5be7105855 -Size (msf-2.4nb2/framework-2.4.tar.gz) = 2607730 bytes -SHA1 (patch-aa) = 318c8136c22d95195ecd40071d36ae22af0807bb +SHA1 (framework-2.5.tar.gz) = 16d2d3efb2c3930b95913693f01ebf35653fe737 +RMD160 (framework-2.5.tar.gz) = 5470e2a975530f540d35182e8e63af9525bf0483 +Size (framework-2.5.tar.gz) = 2625719 bytes diff --git a/security/msf/patches/patch-aa b/security/msf/patches/patch-aa deleted file mode 100644 index 6cbb6ee7cd7..00000000000 --- a/security/msf/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2005/08/03 20:37:44 adrianp Exp $ - ---- msfweb.orig 2005-08-03 21:12:33.000000000 +0100 -+++ msfweb 2005-08-03 21:04:52.000000000 +0100 -@@ -616,7 +616,18 @@ - my $res = {}; - - foreach (keys(%{$state})) { -- if (m/^OPT\_(.*)/ && defined($state->{$_})) { $res->{$1} = $state->{$_} } -+ if (m/^OPT\_(.*)/ && defined($state->{$_})) { -+ my $name = $1; -+ -+ # Block all options starting with underscore (thanks Dino!) -+ if ($name !~ /^_/) { -+ $res->{$name} = $state->{$_}; -+ } -+ else { -+ # XXX - report a possible "refang" attack? -+ next; -+ } -+ } - } - return $res; - } -- cgit v1.2.3