Upgrade to 2.0.7.

PR:		ports/54050
Submitted by:	maintainer

12 files changed, 197 insertions, 10 deletions

diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index aa012f2..5367d96 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	2.0.6a
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index eca1cca..9067de5 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1 +1 @@
-MD5 (nessus/libnasl-2.0.6a.tar.gz) = 879551f7e1943eba7133f64b576c1f67
+MD5 (nessus/libnasl-2.0.7.tar.gz) = c724ad451f79df3a76a3823401c8f7a3
diff --git a/security/nessus-libnasl/files/patch-Makefile b/security/nessus-libnasl/files/patch-Makefile
new file mode 100644
index 0000000..5755e05
--- /dev/null
+++ b/security/nessus-libnasl/files/patch-Makefile
@@ -0,0 +1,16 @@
+--- Makefile.orig	Tue Jan 21 15:27:53 2003
++++ Makefile	Thu Jul  3 08:27:43 2003
+@@ -18,13 +18,6 @@
+ 	$(INSTALL) -c -m 0644 doc/nasl.1 $(DESTDIR)${mandir}/man1
+ 
+ 
+-	@echo
+-	@echo ' --------------------------------------------------------------'
+-	@echo ' libnasl has been sucessfully installed. '
+-	@echo " Make sure that $(bindir) is in your PATH before you"
+-	@echo " continue "
+-	@echo ' --------------------------------------------------------------'
+-	@echo
+ clean :
+ 	cd nasl && ${MAKE} clean
+ 
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 080e5f2..04aa9df 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -9,7 +9,7 @@
 # client.
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	2.0.6a
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 59056a8..47e65ec 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-2.0.6a.tar.gz) = 8d2ad10fe0dd55fc21a4f42350ab0599
+MD5 (nessus/nessus-libraries-2.0.7.tar.gz) = dfb40d73c664937ab0405f29a2e3a603
diff --git a/security/nessus-libraries/files/patch-aa b/security/nessus-libraries/files/patch-aa
index 2eca56c..c4d0297 100644
--- a/security/nessus-libraries/files/patch-aa
+++ b/security/nessus-libraries/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Jan 21 15:25:01 2003
-+++ Makefile	Wed Jan 22 08:40:19 2003
+--- Makefile.orig	Fri Apr  4 10:40:37 2003
++++ Makefile	Thu Jul  3 08:17:18 2003
 @@ -51,7 +51,6 @@
  	cd libhosts_gatherer && ${MAKE} install
  
@@ -8,3 +8,19 @@
  	$(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus
  	$(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus
  	$(INSTALL) -m 0444 include/libvers.h   $(DESTDIR)${includedir}/nessus
+@@ -63,15 +62,6 @@
+ 	test -d $(DESTDIR)${mandir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}
+ 	test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
+ 	$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1
+-
+-	@echo
+-	@echo ' --------------------------------------------------------------'
+-	@echo ' nessus-libraries has been sucessfully installed. '
+-	@echo " Make sure that $(bindir) is in your PATH before you"
+-	@echo " continue "
+-	@if [ -f /etc/ld.so.conf ]; then echo " Be sure to add $(libdir) in /etc/ld.so.conf and type 'ldconfig'"; else echo ""; fi
+-	@echo ' --------------------------------------------------------------'
+-	@echo
+ 
+ clean : $(PCAP_CLEAN)
+ 	-cd libnessus && ${MAKE} clean
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 9c1889f..52edc0f 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	2.0.6a
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index da6bd19..46ac8f2 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-2.0.6a.tar.gz) = 4f03c34f37c3505ea3a834f15a27afb6
+MD5 (nessus/nessus-plugins-2.0.7.tar.gz) = 95db9d20e4c3ddcc47b5d1abdb7d5d62
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 84876ec..bc5ea0a 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -6,6 +6,7 @@ lib/nessus/plugins/3com_config_disclosure.nasl
 lib/nessus/plugins/3com_hub.nes
 lib/nessus/plugins/3com_ras_crash.nasl
 lib/nessus/plugins/3com_switches.nasl
+lib/nessus/plugins/404_path_disclosure.nasl
 lib/nessus/plugins/4553.nasl
 lib/nessus/plugins/AnyForm.nasl
 lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code.nasl
@@ -119,6 +120,7 @@ lib/nessus/plugins/Xeneo_Web_Server_2.2.9.0_DoS.nasl
 lib/nessus/plugins/Xerver_DoS.nasl
 lib/nessus/plugins/a1stats.nasl
 lib/nessus/plugins/abyss_dos.nasl
+lib/nessus/plugins/abyss_overflow.nasl
 lib/nessus/plugins/acc.nasl
 lib/nessus/plugins/account_4Dgifts.nasl
 lib/nessus/plugins/account_EZsetup.nasl
@@ -149,6 +151,7 @@ lib/nessus/plugins/account_tutor.nasl
 lib/nessus/plugins/account_wank_wank.nasl
 lib/nessus/plugins/achievo_code_injection.nasl
 lib/nessus/plugins/active_sync_overflow.nasl
+lib/nessus/plugins/activeftp_overflows.nasl
 lib/nessus/plugins/activestate_perl.nasl
 lib/nessus/plugins/ad_cgi.nasl
 lib/nessus/plugins/adcycle_pass_disclosure.nasl
@@ -189,6 +192,7 @@ lib/nessus/plugins/apache_1_3_27.nasl
 lib/nessus/plugins/apache_2_0_42.nasl
 lib/nessus/plugins/apache_2_0_45.nasl
 lib/nessus/plugins/apache_2_0_45_OS2.nasl
+lib/nessus/plugins/apache_2_0_46.nasl
 lib/nessus/plugins/apache_Tomcat_DOS_Device_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_Servlet_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_TroubleShooter.nasl
@@ -209,6 +213,8 @@ lib/nessus/plugins/apcnisd_detect.nasl
 lib/nessus/plugins/apcupsd_overflows.nasl
 lib/nessus/plugins/appsocket_DoS.nasl
 lib/nessus/plugins/arcserve_hidden_share.nasl
+lib/nessus/plugins/argosoft_dos.nasl
+lib/nessus/plugins/argosoft_multiple_flaws.nasl
 lib/nessus/plugins/args_bat.nasl
 lib/nessus/plugins/arkeia.nasl
 lib/nessus/plugins/ascend_kill.nasl
@@ -224,11 +230,13 @@ lib/nessus/plugins/auktion_cgi.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/avengers_news_system_command_execution.nasl
 lib/nessus/plugins/avirt_gateway_telnet.nasl
+lib/nessus/plugins/avirt_proxy_overflow.nasl
 lib/nessus/plugins/awol_injection.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
 lib/nessus/plugins/axis.nasl
 lib/nessus/plugins/axis2400_webcams.nasl
 lib/nessus/plugins/axis_camera.nasl
+lib/nessus/plugins/b2cafelog_command_injection.nasl
 lib/nessus/plugins/backorifice1.nasl
 lib/nessus/plugins/badblue_directory_traversal.nasl
 lib/nessus/plugins/badblue_get_DoS.nasl
@@ -236,9 +244,12 @@ lib/nessus/plugins/badblue_null_byte.nasl
 lib/nessus/plugins/badblue_remote_administrative_access.nasl
 lib/nessus/plugins/badblue_remote_administrative_access2.nasl
 lib/nessus/plugins/bakfiles.nasl
+lib/nessus/plugins/bandmin_xss.nasl
 lib/nessus/plugins/basilix_inc_files.nasl
 lib/nessus/plugins/basilix_webmail.nasl
 lib/nessus/plugins/basit_xss.nasl
+lib/nessus/plugins/basomail_overflow.nasl
+lib/nessus/plugins/batalla_server_overflow.nasl
 lib/nessus/plugins/bb-hist.nasl
 lib/nessus/plugins/bb-hostsvc.nasl
 lib/nessus/plugins/bboard.nasl
@@ -266,6 +277,9 @@ lib/nessus/plugins/bitkeeper_remote_shell.nasl
 lib/nessus/plugins/bizdb1_search.nasl
 lib/nessus/plugins/biztalk_flaws.nasl
 lib/nessus/plugins/blackice_dos.nasl
+lib/nessus/plugins/blackmoon_ftp_users_database.nasl
+lib/nessus/plugins/blackmoon_ftp_users_enum.nasl
+lib/nessus/plugins/blnews_code_injection.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bonsai_flaws.nasl
 lib/nessus/plugins/bootparamd.nasl
@@ -275,6 +289,8 @@ lib/nessus/plugins/broker_ftp.nasl
 lib/nessus/plugins/browsegate_http_overflows.nasl
 lib/nessus/plugins/bttlxe_sql_injection.nasl
 lib/nessus/plugins/bugbear.nasl
+lib/nessus/plugins/bugbear_b.nasl
+lib/nessus/plugins/bugbear_b_1080.nasl
 lib/nessus/plugins/bugzilla_detect.nasl
 lib/nessus/plugins/bugzilla_vulns.nasl
 lib/nessus/plugins/bugzilla_xss_and_tmp_files.nasl
@@ -283,14 +299,17 @@ lib/nessus/plugins/ca_unicenter_file_transfer_service.nasl
 lib/nessus/plugins/ca_unicenter_transport_service.nasl
 lib/nessus/plugins/cachefsd_overflow.nasl
 lib/nessus/plugins/cachemgr_cgi.nasl
+lib/nessus/plugins/cajun_switch_dos.nasl
 lib/nessus/plugins/calendar.nasl
 lib/nessus/plugins/campas.nasl
 lib/nessus/plugins/canna_overflow.nasl
+lib/nessus/plugins/carello.nasl
 lib/nessus/plugins/cassandra_nntp_dos.nasl
 lib/nessus/plugins/cayman_any_username.nasl
 lib/nessus/plugins/cc_guestbook.nasl
 lib/nessus/plugins/cdk.nasl
 lib/nessus/plugins/cern_httpd_path.nasl
+lib/nessus/plugins/cesarftp_overflows.nasl
 lib/nessus/plugins/cesarftp_passwd.nasl
 lib/nessus/plugins/cf_debug.nasl
 lib/nessus/plugins/cfinger_format_bug.nasl
@@ -301,9 +320,12 @@ lib/nessus/plugins/cgibin_in_kb.nasl
 lib/nessus/plugins/cgicso_command_execution.nasl
 lib/nessus/plugins/cgicso_cross_site_scripting.nasl
 lib/nessus/plugins/cgiforum.nasl
+lib/nessus/plugins/cgimail.nasl
 lib/nessus/plugins/cgitest.nasl
+lib/nessus/plugins/cgiwebupdate.nasl
 lib/nessus/plugins/cgiwrap.nasl
 lib/nessus/plugins/chameleon_smtpd_overflow.nasl
+lib/nessus/plugins/changepw.nasl
 lib/nessus/plugins/chargen.nasl
 lib/nessus/plugins/check_ports.nasl
 lib/nessus/plugins/checkpoint.nasl
@@ -321,6 +343,7 @@ lib/nessus/plugins/cisco_gsr_acl.nasl
 lib/nessus/plugins/cisco_gsr_unreachable.nasl
 lib/nessus/plugins/cisco_http_admin_access.nasl
 lib/nessus/plugins/cisco_http_dos.nasl
+lib/nessus/plugins/cisco_ids_manager_detect.nasl
 lib/nessus/plugins/cisco_no_pw.nasl
 lib/nessus/plugins/cisco_ssh_multiple_vulns.nasl
 lib/nessus/plugins/cisco_voip_dos.nasl
@@ -338,26 +361,34 @@ lib/nessus/plugins/commerce_cgi.nasl
 lib/nessus/plugins/communigatepro_overflow.nasl
 lib/nessus/plugins/communigatepro_referer_field.nasl
 lib/nessus/plugins/compaq_wbem_detect.nasl
+lib/nessus/plugins/consolehelp.nasl
 lib/nessus/plugins/coppermine_gallery_cmd_exec.nasl
 lib/nessus/plugins/coppermine_gallery_sql_injection.nasl
 lib/nessus/plugins/count_cgi.nasl
+lib/nessus/plugins/counter.nasl
 lib/nessus/plugins/counter_php_file_overwrite.nasl
 lib/nessus/plugins/cp-firewall-auth.nasl
 lib/nessus/plugins/cp-firewall-webauth.nasl
 lib/nessus/plugins/cp_syslog_overflow.nasl
 lib/nessus/plugins/cpanel_cmd_exec.nasl
 lib/nessus/plugins/crlinux_file_reading.nasl
+lib/nessus/plugins/crobftp_format_string.nasl
 lib/nessus/plugins/cross_site_scripting.nasl
 lib/nessus/plugins/csSearch_cgi.nasl
 lib/nessus/plugins/csm_helo.nasl
+lib/nessus/plugins/csnews.nasl
+lib/nessus/plugins/cups_browseable_printers_list.nasl
 lib/nessus/plugins/cups_vulns.nasl
+lib/nessus/plugins/cuteftp_flaws.nasl
 lib/nessus/plugins/cvs_detect.nasl
 lib/nessus/plugins/cvs_double_free.nasl
 lib/nessus/plugins/cvs_in_www.nasl
 lib/nessus/plugins/cvs_public_pserver.nasl
 lib/nessus/plugins/cvsweb_shell.nasl
 lib/nessus/plugins/cvsweb_version.nasl
+lib/nessus/plugins/cwmail.nasl
 lib/nessus/plugins/cyrus_imap_prelogin_overflow.nasl
+lib/nessus/plugins/dangerous_cgis.nasl
 lib/nessus/plugins/dansie_cart.nasl
 lib/nessus/plugins/daytime.nasl
 lib/nessus/plugins/db2_dos.nasl
@@ -371,15 +402,19 @@ lib/nessus/plugins/dcp_portal_injection.nasl
 lib/nessus/plugins/dcp_portal_path_disclosure.nasl
 lib/nessus/plugins/dcp_portal_xss.nasl
 lib/nessus/plugins/dcshop_information_disclosure.nasl
+lib/nessus/plugins/ddicgi.nasl
 lib/nessus/plugins/deep_throat.nasl
 lib/nessus/plugins/default_account.inc
 lib/nessus/plugins/delegate_overflow.nasl
 lib/nessus/plugins/deltaups_detect.nasl
+lib/nessus/plugins/desktop_orbiter_detect.nasl
+lib/nessus/plugins/desktop_orbiter_reboot.nasl
 lib/nessus/plugins/dhcp.nasl
 lib/nessus/plugins/dhcp_minires_and_fmt_string.nasl
 lib/nessus/plugins/directory_manager.nasl
 lib/nessus/plugins/directoryphp.nasl
 lib/nessus/plugins/directorypro.nasl
+lib/nessus/plugins/dlink_router_overflow.nasl
 lib/nessus/plugins/dmail_overflow.nasl
 lib/nessus/plugins/dns_server.nasl
 lib/nessus/plugins/dns_xfer.nasl
@@ -401,6 +436,7 @@ lib/nessus/plugins/drweb_overflow.nasl
 lib/nessus/plugins/dtspcd.nasl
 lib/nessus/plugins/dump.inc
 lib/nessus/plugins/dumpenv.nasl
+lib/nessus/plugins/dune_overflow.nasl
 lib/nessus/plugins/dwhttp_format_string.nasl
 lib/nessus/plugins/eDonkey_detect.nasl
 lib/nessus/plugins/eXtremail_format_strings.nasl
@@ -411,10 +447,12 @@ lib/nessus/plugins/eftp_directory_traversal.nasl
 lib/nessus/plugins/eftp_dos.nasl
 lib/nessus/plugins/eftp_root_disclosure.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
+lib/nessus/plugins/eldapo_plaintext_passwords.nasl
 lib/nessus/plugins/empower_path.nasl
 lib/nessus/plugins/emule_dos.nasl
 lib/nessus/plugins/epolicy_orchestrator_format_string.nasl
 lib/nessus/plugins/eserv.nasl
+lib/nessus/plugins/eserv_dir_traversal.nasl
 lib/nessus/plugins/eserv_mem_leak.nasl
 lib/nessus/plugins/eshop_information_disclosure.nasl
 lib/nessus/plugins/etheni_code_injection.nasl
@@ -448,6 +486,7 @@ lib/nessus/plugins/finger_redirection.nasl
 lib/nessus/plugins/finger_solaris_disclosure.nasl
 lib/nessus/plugins/firewall1_dos.nasl
 lib/nessus/plugins/flash_player_overflows.nasl
+lib/nessus/plugins/flashfxp_overflow.nasl
 lib/nessus/plugins/formhandler.nasl
 lib/nessus/plugins/formmail_pl.nasl
 lib/nessus/plugins/formmail_version_disclosure.nasl
@@ -472,6 +511,7 @@ lib/nessus/plugins/ftp_cwd_root.nasl
 lib/nessus/plugins/ftp_forward.nasl
 lib/nessus/plugins/ftp_func.inc
 lib/nessus/plugins/ftp_glob_overflow.nasl
+lib/nessus/plugins/ftp_hosting_copyrighted_material.nasl
 lib/nessus/plugins/ftp_nb1300_router.nasl
 lib/nessus/plugins/ftp_novell_dos.nasl
 lib/nessus/plugins/ftp_overflow.nasl
@@ -497,15 +537,19 @@ lib/nessus/plugins/ftpd_1byte_overflow.nasl
 lib/nessus/plugins/ftpgate.nasl
 lib/nessus/plugins/ftpglob.nasl
 lib/nessus/plugins/ftpserver_detect_type_nd_version.nasl
+lib/nessus/plugins/ftpvoyager_overflow.nasl
 lib/nessus/plugins/gallery_injection.nasl
 lib/nessus/plugins/gamespy_detect.nasl
 lib/nessus/plugins/gatecrasher.nasl
 lib/nessus/plugins/gauntlet_overflow.nasl
+lib/nessus/plugins/geeklog_admin_access.nasl
 lib/nessus/plugins/generic_WEB-INF.nasl
 lib/nessus/plugins/girlfriend.nasl
 lib/nessus/plugins/glimpse.nasl
 lib/nessus/plugins/gnapster_get_file.nasl
+lib/nessus/plugins/gnocatan_overflow.nasl
 lib/nessus/plugins/gnutella_detect.nasl
+lib/nessus/plugins/gnutella_export.nasl
 lib/nessus/plugins/goodtech_ftpd_dos.nasl
 lib/nessus/plugins/groupwise_overflow.nasl
 lib/nessus/plugins/groupwise_web_interface_help_hole.nasl
@@ -524,6 +568,7 @@ lib/nessus/plugins/helix_overflow.nasl
 lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/horde_test_disclosure.nasl
 lib/nessus/plugins/horde_turba_path_disclosure.nasl
+lib/nessus/plugins/hosting_controller.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_instant_toptools_dos.nasl
 lib/nessus/plugins/hp_jetdirect_vulns.nasl
@@ -531,6 +576,7 @@ lib/nessus/plugins/hp_printer_display.nasl
 lib/nessus/plugins/hp_remote_print.nasl
 lib/nessus/plugins/hpftp_glob_stat.nasl
 lib/nessus/plugins/hpux_ftpd.nasl
+lib/nessus/plugins/hpux_ftpd_rest_conversion.nasl
 lib/nessus/plugins/hsweb_location.nasl
 lib/nessus/plugins/hsx.nasl
 lib/nessus/plugins/htdig.nasl
@@ -563,6 +609,7 @@ lib/nessus/plugins/icat.nasl
 lib/nessus/plugins/icecap_default_pw.nasl
 lib/nessus/plugins/icecast_disclosure.nasl
 lib/nessus/plugins/icecast_overflow.nasl
+lib/nessus/plugins/icmp_leak.nasl
 lib/nessus/plugins/icmp_mask_req.nasl
 lib/nessus/plugins/icmp_timestamp.nasl
 lib/nessus/plugins/icq_crash.nasl
@@ -608,8 +655,12 @@ lib/nessus/plugins/iis_webdav_overflow.nasl
 lib/nessus/plugins/iis_xss_404.nasl
 lib/nessus/plugins/iis_xss_idc.nasl
 lib/nessus/plugins/iisadmin.nasl
+lib/nessus/plugins/iisprotect_bypass.nasl
+lib/nessus/plugins/iisprotect_passwordless.nasl
+lib/nessus/plugins/iisprotect_sql_injection.nasl
 lib/nessus/plugins/ike_check.nasl
 lib/nessus/plugins/ikonboard_cmd_exec.nasl
+lib/nessus/plugins/imagefolio_default_password.nasl
 lib/nessus/plugins/imagemap.nasl
 lib/nessus/plugins/imail_host_overflow.nasl
 lib/nessus/plugins/imail_imapd_overflow.nasl
@@ -632,6 +683,7 @@ lib/nessus/plugins/interchange_detect.nasl
 lib/nessus/plugins/interscan_dos.nasl
 lib/nessus/plugins/interscan_vw_cgi.nasl
 lib/nessus/plugins/invision_power_board.nasl
+lib/nessus/plugins/ion_p.nasl
 lib/nessus/plugins/iplanet_app_server_detection.nasl
 lib/nessus/plugins/iplanet_app_server_overflow.nasl
 lib/nessus/plugins/iplanet_chunked_encoding.nasl
@@ -643,10 +695,17 @@ lib/nessus/plugins/ipop2d.nasl
 lib/nessus/plugins/ipop2d_readfiles.nasl
 lib/nessus/plugins/ipswitch_IMail_version.nasl
 lib/nessus/plugins/ircd.nasl
+lib/nessus/plugins/ircd_format_string.nasl
+lib/nessus/plugins/ircxpro_cleartext_passwords.nasl
+lib/nessus/plugins/ircxpro_default_admin_password.nasl
 lib/nessus/plugins/irix_copilot.nasl
 lib/nessus/plugins/ismail_overflow.nasl
 lib/nessus/plugins/ithousemail_bof.nasl
 lib/nessus/plugins/iws_shtml.nasl
+lib/nessus/plugins/ixmail_arbitrary_file_upload.nasl
+lib/nessus/plugins/ixmail_sql_injection.nasl
+lib/nessus/plugins/jboss_source.nasl
+lib/nessus/plugins/jeus_url_xss.nasl
 lib/nessus/plugins/jigsaw_msdos_dev_DoS.nasl
 lib/nessus/plugins/jj.nasl
 lib/nessus/plugins/jmf_privs_escalation.nasl
@@ -664,6 +723,7 @@ lib/nessus/plugins/kerberos5_issues.nasl
 lib/nessus/plugins/kerberos_overflow.nasl
 lib/nessus/plugins/kerio_PF_buffer_overflow.nasl
 lib/nessus/plugins/kerio_PF_udpbypass.nasl
+lib/nessus/plugins/kerio_webmail_multiple_flaws.nasl
 lib/nessus/plugins/kietu_code_injection.nasl
 lib/nessus/plugins/krb_pingpong.nasl
 lib/nessus/plugins/kuang2_the_virus.nasl
@@ -679,11 +739,14 @@ lib/nessus/plugins/lcdproc_detect.nasl
 lib/nessus/plugins/ldap_null_base.nasl
 lib/nessus/plugins/ldap_null_bind.nasl
 lib/nessus/plugins/leafnode_version.nasl
+lib/nessus/plugins/leapftp_overflow.nasl
+lib/nessus/plugins/lednews_xss.nasl
 lib/nessus/plugins/libgtop_daemon.nasl
 lib/nessus/plugins/libwhisker_settings.nasl
 lib/nessus/plugins/limewire_installed.nasl
 lib/nessus/plugins/line_overflow.nasl
 lib/nessus/plugins/linksys_ap_default_password.nasl
+lib/nessus/plugins/linksys_gozila_cgi_DoS.nasl
 lib/nessus/plugins/linux_tftp.nes
 lib/nessus/plugins/linux_zero_len_fragment.nasl
 lib/nessus/plugins/linuxconf_detect.nasl
@@ -691,10 +754,12 @@ lib/nessus/plugins/lion.nasl
 lib/nessus/plugins/listrec.nasl
 lib/nessus/plugins/localweb2k.nasl
 lib/nessus/plugins/logins.nasl
+lib/nessus/plugins/lotus_bounce_DoS.nasl
 lib/nessus/plugins/lotus_envid.nasl
 lib/nessus/plugins/lotus_esmtp_overflow.nasl
 lib/nessus/plugins/lotus_notes_openserver_disclosure.nasl
 lib/nessus/plugins/lotus_path_disclosure.nasl
+lib/nessus/plugins/lotus_slashdot_DoS.nasl
 lib/nessus/plugins/lovgate_virus_installed.nasl
 lib/nessus/plugins/lpd_aix_overflow.nasl
 lib/nessus/plugins/lpd_bsd_overflow.nasl
@@ -702,13 +767,18 @@ lib/nessus/plugins/lpd_dvips.nasl
 lib/nessus/plugins/lpd_freebsd_overflow.nasl
 lib/nessus/plugins/lpd_overflow.nasl
 lib/nessus/plugins/macos_x_directory_svc_dos.nasl
+lib/nessus/plugins/magic_winmail_pop_format_string.nasl
 lib/nessus/plugins/mailman_webmail.nasl
 lib/nessus/plugins/mailmax_imap_overflows.nasl
 lib/nessus/plugins/mailmax_imap_overflows2.nasl
 lib/nessus/plugins/mailmaxweb_path_disclosure.nasl
 lib/nessus/plugins/mailnews.nasl
+lib/nessus/plugins/mailreader.nasl
+lib/nessus/plugins/mailsweeper_ppt_dos.nasl
 lib/nessus/plugins/mambo.nasl
 lib/nessus/plugins/mambo_xss.nasl
+lib/nessus/plugins/mantis_detect.nasl
+lib/nessus/plugins/mantis_multiple_vulns.nasl
 lib/nessus/plugins/marconi_dos.nasl
 lib/nessus/plugins/master_index_search.nasl
 lib/nessus/plugins/mcms_overflow.nasl
@@ -734,9 +804,12 @@ lib/nessus/plugins/miscflood.nasl
 lib/nessus/plugins/mkilog.nasl
 lib/nessus/plugins/mldonkey_telnet.nasl
 lib/nessus/plugins/mldonkey_www.nasl
+lib/nessus/plugins/mnogosearch_overflows.nasl
 lib/nessus/plugins/mod_access_referer.nasl
 lib/nessus/plugins/mod_auth_any.nasl
 lib/nessus/plugins/mod_frontpage.nasl
+lib/nessus/plugins/mod_gzip_format_string.nasl
+lib/nessus/plugins/mod_gzip_running.nasl
 lib/nessus/plugins/mod_jk_chunked_encoding_dos.nasl
 lib/nessus/plugins/mod_ntlm.nasl
 lib/nessus/plugins/mod_python_handle.nasl
@@ -778,6 +851,7 @@ lib/nessus/plugins/mycio_detect.nasl
 lib/nessus/plugins/mycio_directory_traversal.nasl
 lib/nessus/plugins/myguestbk_admin_access.nasl
 lib/nessus/plugins/myphpPageTool_code_injection.nasl
+lib/nessus/plugins/myserver_dos.nasl
 lib/nessus/plugins/mysql_bad_password.nasl
 lib/nessus/plugins/mysql_double_free.nasl
 lib/nessus/plugins/mysql_flaws.nasl
@@ -791,6 +865,7 @@ lib/nessus/plugins/ncacn_http.nasl
 lib/nessus/plugins/ncbook_cgi.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/ncl_items_2.nasl
+lib/nessus/plugins/ndcgi.nasl
 lib/nessus/plugins/nds_web_based_browsing.nasl
 lib/nessus/plugins/neoteris_ive_xss.nasl
 lib/nessus/plugins/nessus_detect.nasl
@@ -802,6 +877,7 @@ lib/nessus/plugins/netbus.nasl
 lib/nessus/plugins/netbus2.nasl
 lib/nessus/plugins/netcharts_default_password.nasl
 lib/nessus/plugins/netcommerce_sql.nasl
+lib/nessus/plugins/netgear_default_password.nasl
 lib/nessus/plugins/netgear_password_disclosure.nasl
 lib/nessus/plugins/netgear_prosafe_dos.nasl
 lib/nessus/plugins/netscape_PageServices.nasl
@@ -847,8 +923,10 @@ lib/nessus/plugins/notes_detection.nasl
 lib/nessus/plugins/notes_mta_dos.nasl
 lib/nessus/plugins/novell_border_manager.nasl
 lib/nessus/plugins/novell_groupwise_webacc_information_disclosure.nasl
+lib/nessus/plugins/nph-exploitscanget.nasl
 lib/nessus/plugins/nph-publish.nasl
 lib/nessus/plugins/nph-test-cgi.nasl
+lib/nessus/plugins/nsiislog_dll.nasl
 lib/nessus/plugins/nsm_format_strings.nasl
 lib/nessus/plugins/nt_ftp_guest.nasl
 lib/nessus/plugins/nt_spam.nasl
@@ -876,6 +954,7 @@ lib/nessus/plugins/openssh_adv_option.nasl
 lib/nessus/plugins/openssh_afs.nasl
 lib/nessus/plugins/openssh_channel.nasl
 lib/nessus/plugins/openssh_pam_timing.nasl
+lib/nessus/plugins/openssh_rev_dns_lookup_bypass.nasl
 lib/nessus/plugins/openssh_uselogin.nasl
 lib/nessus/plugins/openssh_uselogin_environment.nasl
 lib/nessus/plugins/openssl_overflow_generic_test.nasl
@@ -917,6 +996,7 @@ lib/nessus/plugins/owa-anonymous.nasl
 lib/nessus/plugins/owl_browse.nasl
 lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
+lib/nessus/plugins/p-news_priv_escalation.nasl
 lib/nessus/plugins/p-smash.nasl
 lib/nessus/plugins/pafiledb_sql_injection.nasl
 lib/nessus/plugins/pafiledb_xss.nasl
@@ -932,15 +1012,19 @@ lib/nessus/plugins/perl_cal.nasl
 lib/nessus/plugins/perl_cgi.nasl
 lib/nessus/plugins/pfdipaly.nasl
 lib/nessus/plugins/pftp.nasl
+lib/nessus/plugins/pftp_cleartext_passwords.nasl
 lib/nessus/plugins/pgpmail.nasl
 lib/nessus/plugins/pgpnet_detect.nasl
 lib/nessus/plugins/phf.nasl
+lib/nessus/plugins/philboard_auth_bypass.nasl
+lib/nessus/plugins/philboard_db_access.nasl
 lib/nessus/plugins/phonebook.nasl
 lib/nessus/plugins/phorum.nasl
 lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
 lib/nessus/plugins/php4_path_disclosure.nasl
 lib/nessus/plugins/phpMyAdmin_file_reading.nasl
+lib/nessus/plugins/phpMyAdmin_multiple_flaws.nasl
 lib/nessus/plugins/phpMyExplorer.nasl
 lib/nessus/plugins/phpPgAdmin_file_reading.nasl
 lib/nessus/plugins/php_4_2_x_malformed_POST.nasl
@@ -962,11 +1046,13 @@ lib/nessus/plugins/php_safe_mode.nasl
 lib/nessus/plugins/php_socket_iovec_alloc_overflow.nasl
 lib/nessus/plugins/php_split_mime.nasl
 lib/nessus/plugins/phpay_info_disclosure.nasl
+lib/nessus/plugins/phpbb_sql_injection.nasl
 lib/nessus/plugins/phpinfo.nasl
 lib/nessus/plugins/phpix.nasl
 lib/nessus/plugins/phpping_code_execution.nasl
 lib/nessus/plugins/phprocketaddin_traversal.nasl
 lib/nessus/plugins/pi3web_dos.nasl
+lib/nessus/plugins/pi3web_dos2.nasl
 lib/nessus/plugins/pi3web_isapi.nasl
 lib/nessus/plugins/pimp.nasl
 lib/nessus/plugins/ping_asp.nasl
@@ -975,9 +1061,12 @@ lib/nessus/plugins/pingpong.inc
 lib/nessus/plugins/piranha.nasl
 lib/nessus/plugins/platinum_ftp.nasl
 lib/nessus/plugins/plusmail.nasl
+lib/nessus/plugins/pmachine_code_injection.nasl
+lib/nessus/plugins/pmachine_xss_and_path_disclosure.nasl
 lib/nessus/plugins/pmcrash.nasl
 lib/nessus/plugins/pnserver.nasl
 lib/nessus/plugins/poc32.nasl
+lib/nessus/plugins/podboard_forum_details_xss.nasl
 lib/nessus/plugins/pollit.nasl
 lib/nessus/plugins/pop3_overflow.nasl
 lib/nessus/plugins/popper_mod.nasl
@@ -990,6 +1079,10 @@ lib/nessus/plugins/poster_version_two.nasl
 lib/nessus/plugins/postgresql_multiple_flaws.nasl
 lib/nessus/plugins/postgresql_unpassworded.nasl
 lib/nessus/plugins/postnuke_info_disclosure.nasl
+lib/nessus/plugins/postnuke_info_disclosure2.nasl
+lib/nessus/plugins/postnuke_multiple_xss.nasl
+lib/nessus/plugins/postnuke_rating_dos.nasl
+lib/nessus/plugins/postnuke_sql_injection.nasl
 lib/nessus/plugins/powerplay.nasl
 lib/nessus/plugins/powerup_information_disclosure.nasl
 lib/nessus/plugins/pptp_detect.nasl
@@ -1000,14 +1093,18 @@ lib/nessus/plugins/proftpd_debian.nasl
 lib/nessus/plugins/proftpd_exhaust.nasl
 lib/nessus/plugins/proftpd_mkdir_overflow.nasl
 lib/nessus/plugins/proftpd_overflow.nasl
+lib/nessus/plugins/proftpd_pgsql_insertion.nasl
 lib/nessus/plugins/proftpd_pre10.nasl
 lib/nessus/plugins/proftpd_pre6_exploit.nasl
+lib/nessus/plugins/proxomitron_dos.nasl
 lib/nessus/plugins/proxy_connect.nasl
 lib/nessus/plugins/proxy_cross_site_scripting.nasl
 lib/nessus/plugins/proxy_gopher.nasl
 lib/nessus/plugins/proxy_port.nasl
 lib/nessus/plugins/proxy_post.nasl
 lib/nessus/plugins/proxy_use.nasl
+lib/nessus/plugins/psunami_cmd_exec.nasl
+lib/nessus/plugins/psynch_multiple_vulns.nasl
 lib/nessus/plugins/ptnews_admin.nasl
 lib/nessus/plugins/pxe_overflow.nasl
 lib/nessus/plugins/qmtp_detect.nasl
@@ -1021,6 +1118,7 @@ lib/nessus/plugins/quickstore.nasl
 lib/nessus/plugins/quicktime_admin.nasl
 lib/nessus/plugins/quicktime_player_overflow.nasl
 lib/nessus/plugins/quote.nasl
+lib/nessus/plugins/radius_detect.nasl
 lib/nessus/plugins/radmin_detect.nasl
 lib/nessus/plugins/ramcrash.nasl
 lib/nessus/plugins/raptor_detect.nasl
@@ -1032,6 +1130,7 @@ lib/nessus/plugins/realserver_malformed_request_dos.nasl
 lib/nessus/plugins/realserver_ussr_dos.nasl
 lib/nessus/plugins/realserverg2.nasl
 lib/nessus/plugins/relative_field_vulnerability.nasl
+lib/nessus/plugins/remote_pc_detect.nasl
 lib/nessus/plugins/remwatch.nasl
 lib/nessus/plugins/resin_path_disclosure.nasl
 lib/nessus/plugins/resin_traversal.nasl
@@ -1044,6 +1143,7 @@ lib/nessus/plugins/rlogin.nasl
 lib/nessus/plugins/rlogin_froot.nasl
 lib/nessus/plugins/roads_cgi.nasl
 lib/nessus/plugins/rockliffe_mailsite_overflow.nasl
+lib/nessus/plugins/rot13sj.nasl
 lib/nessus/plugins/rover_pop3_overflow.nasl
 lib/nessus/plugins/roxen_counter.nasl
 lib/nessus/plugins/roxen_percent.nasl
@@ -1109,6 +1209,7 @@ lib/nessus/plugins/samba_trans2open_overflow.nasl
 lib/nessus/plugins/samba_unicode_overflow.nasl
 lib/nessus/plugins/sambar_DoS.nasl
 lib/nessus/plugins/sambar_cgi.nasl
+lib/nessus/plugins/sambar_cgi_path_disclosure.nasl
 lib/nessus/plugins/sambar_default_accounts.nasl
 lib/nessus/plugins/sambar_info_disclosure.nasl
 lib/nessus/plugins/sambar_mailit.nasl
@@ -1162,15 +1263,18 @@ lib/nessus/plugins/sgi_rpc_passwd.nasl
 lib/nessus/plugins/sglmerchant_information_disclosure.nasl
 lib/nessus/plugins/shaft.nasl
 lib/nessus/plugins/shambala_www_dos.nasl
+lib/nessus/plugins/sharemailpro_username_identification.nasl
 lib/nessus/plugins/sheerdns_traversal.nasl
 lib/nessus/plugins/shells.nasl
 lib/nessus/plugins/shiva_default_pass.nasl
 lib/nessus/plugins/shlwapi_dll_dos.nasl
 lib/nessus/plugins/shopping_cart_information_disclosure.nasl
 lib/nessus/plugins/shopplus_information_disclosure.nasl
+lib/nessus/plugins/shoutcast_admin_cgi_overflow.nasl
 lib/nessus/plugins/shoutcast_log_xss.nasl
 lib/nessus/plugins/shoutcast_version.nasl
 lib/nessus/plugins/showmount.nasl
+lib/nessus/plugins/shttp_detect.nasl
 lib/nessus/plugins/silverstream_database.nasl
 lib/nessus/plugins/silverstream_dirlisting.nasl
 lib/nessus/plugins/simple_chat_user_disclosure.nasl
@@ -1188,10 +1292,12 @@ lib/nessus/plugins/slmail_smtp_overflows.nasl
 lib/nessus/plugins/slmail_webmail_flaws.nasl
 lib/nessus/plugins/smad.nes
 lib/nessus/plugins/small_ftp_traversal.nasl
+lib/nessus/plugins/smartftp_overflow.nasl
 lib/nessus/plugins/smartserver_pop_overflow.nasl
 lib/nessus/plugins/smb2www_cmd_exec.nasl
 lib/nessus/plugins/smb2www_installed.nasl
 lib/nessus/plugins/smb_accessible_shares.nasl
+lib/nessus/plugins/smb_accessible_shares_copyrighted_content.nasl
 lib/nessus/plugins/smb_bruteforce_pass.nasl
 lib/nessus/plugins/smb_crash_winlogon.nasl
 lib/nessus/plugins/smb_dom2sid.nasl
@@ -1288,6 +1394,8 @@ lib/nessus/plugins/smb_nt_ms03-011.nasl
 lib/nessus/plugins/smb_nt_ms03-012.nasl
 lib/nessus/plugins/smb_nt_ms03-013.nasl
 lib/nessus/plugins/smb_nt_ms03-017.nasl
+lib/nessus/plugins/smb_nt_ms03-018.nasl
+lib/nessus/plugins/smb_nt_ms03-021.nasl
 lib/nessus/plugins/smb_null_params_dos.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
 lib/nessus/plugins/smb_reg_cachedlogons.nasl
@@ -1333,6 +1441,7 @@ lib/nessus/plugins/smtp_func.inc
 lib/nessus/plugins/smtp_helo.nasl
 lib/nessus/plugins/smtp_ms01-037.nasl
 lib/nessus/plugins/smtp_ms02-037.nasl
+lib/nessus/plugins/smtp_overflows.nasl
 lib/nessus/plugins/smtp_program.nasl
 lib/nessus/plugins/smtp_relay.nasl
 lib/nessus/plugins/smtp_settings.nasl
@@ -1364,11 +1473,13 @@ lib/nessus/plugins/socks4a_hostname_overflow.nasl
 lib/nessus/plugins/sojourn.nasl
 lib/nessus/plugins/solaris_lpd_env_cmd_exec.nasl
 lib/nessus/plugins/spinclient.nasl
+lib/nessus/plugins/spyke_flaws.nasl
 lib/nessus/plugins/sql_injection.nasl
 lib/nessus/plugins/sqlqhit_information_disclosure.nasl
 lib/nessus/plugins/squid_dos.nasl
 lib/nessus/plugins/squid_overflows.nasl
 lib/nessus/plugins/squirremail_cross_site_scripting.nasl
+lib/nessus/plugins/squirremail_multiple_flaws.nasl
 lib/nessus/plugins/sscd_input.nasl
 lib/nessus/plugins/ssh1_proto_enabled.nasl
 lib/nessus/plugins/ssh3_passwd.nasl
@@ -1387,10 +1498,12 @@ lib/nessus/plugins/ssh_proto_version.nasl
 lib/nessus/plugins/ssh_scp.nasl
 lib/nessus/plugins/ssh_setsid.nasl
 lib/nessus/plugins/ssl_ciphers.nes
+lib/nessus/plugins/st_ftp_traversal.nasl
 lib/nessus/plugins/stacheldraht.nasl
 lib/nessus/plugins/statd_format_string.nasl
 lib/nessus/plugins/stockman_shopping_cart_cmd_exec.nasl
 lib/nessus/plugins/stockman_shopping_cart_path_disclosure.nasl
+lib/nessus/plugins/stonegate_detect.nasl
 lib/nessus/plugins/store_cgi.nasl
 lib/nessus/plugins/story.nasl
 lib/nessus/plugins/stream.nasl
@@ -1398,16 +1511,19 @@ lib/nessus/plugins/stronghold.nasl
 lib/nessus/plugins/stronghold_swish.nasl
 lib/nessus/plugins/subseven.nasl
 lib/nessus/plugins/sun_cobalt_adaptive_firewall_detect.nasl
+lib/nessus/plugins/sun_one_jsp_source.nasl
 lib/nessus/plugins/sunftpd_overflow.nasl
 lib/nessus/plugins/sunftpd_traversal.nasl
 lib/nessus/plugins/sunkill.nasl
 lib/nessus/plugins/superguestbook_config_disclosure.nasl
+lib/nessus/plugins/superm_son_hserver_traversal.nasl
 lib/nessus/plugins/suse_cgi_bin_sdb.nasl
 lib/nessus/plugins/suse_identd.nasl
 lib/nessus/plugins/swat_detect.nasl
 lib/nessus/plugins/swat_guessable_usernames.nasl
 lib/nessus/plugins/swc_overflow.nasl
 lib/nessus/plugins/sygate_remote_control.nasl
+lib/nessus/plugins/synchrologic_detect.nasl
 lib/nessus/plugins/synscan.nes
 lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/tanned_format_string.nasl
@@ -1425,6 +1541,7 @@ lib/nessus/plugins/testcgi_xss.nasl
 lib/nessus/plugins/texis_info_disclosure.nasl
 lib/nessus/plugins/texis_path_disclosure.nasl
 lib/nessus/plugins/textcounter_pl.nasl
+lib/nessus/plugins/textportal_default_password.nasl
 lib/nessus/plugins/tfn.nasl
 lib/nessus/plugins/tfs_smtp_overflow.nasl
 lib/nessus/plugins/tftp_grab_file.nes
@@ -1445,6 +1562,7 @@ lib/nessus/plugins/tomcat_status.nasl
 lib/nessus/plugins/torturecgis.nasl
 lib/nessus/plugins/traceroute.nasl
 lib/nessus/plugins/translate_f.nasl
+lib/nessus/plugins/trendmicro_emanager.nasl
 lib/nessus/plugins/trillian_installed.nasl
 lib/nessus/plugins/trinity.nasl
 lib/nessus/plugins/trinoo.nasl
@@ -1464,10 +1582,14 @@ lib/nessus/plugins/ultraseek_dos.nasl
 lib/nessus/plugins/unicast_dos.nasl
 lib/nessus/plugins/unknown_services.nasl
 lib/nessus/plugins/unreal_game_engine.nasl
+lib/nessus/plugins/upb_code_injection.nasl
 lib/nessus/plugins/upload_cgi.nasl
 lib/nessus/plugins/upload_lite_cgi.nasl
 lib/nessus/plugins/uploader_exe.nasl
+lib/nessus/plugins/uploadskrip.nasl
 lib/nessus/plugins/upnp_xp.nasl
+lib/nessus/plugins/upnp_xp_tcp.nasl
+lib/nessus/plugins/urlscan_detect.nasl
 lib/nessus/plugins/usermin_session_id.nasl
 lib/nessus/plugins/ustorekeeper.nasl
 lib/nessus/plugins/uw_imap_overflow.nasl
@@ -1478,8 +1600,10 @@ lib/nessus/plugins/vftpd_overflow.nasl
 lib/nessus/plugins/view_source_cgi.nasl
 lib/nessus/plugins/viewpage_file_reading.nasl
 lib/nessus/plugins/vignette_info_leak.nasl
+lib/nessus/plugins/vignette_tcl_code_injection.nasl
 lib/nessus/plugins/viralator.nasl
 lib/nessus/plugins/visadmin.nasl
+lib/nessus/plugins/visnetic_and_titan_ftp_traversal.nasl
 lib/nessus/plugins/visualroute_server_detect.nasl
 lib/nessus/plugins/vnc.nasl
 lib/nessus/plugins/vnc_http.nasl
@@ -1488,6 +1612,7 @@ lib/nessus/plugins/vpop_input_validation.nasl
 lib/nessus/plugins/vpopmail_cmd_exec.nasl
 lib/nessus/plugins/vqServer_admin_detect.nasl
 lib/nessus/plugins/vqServer_web_traversal.nasl
+lib/nessus/plugins/vssetcookie.nasl
 lib/nessus/plugins/vw_bof.nasl
 lib/nessus/plugins/vxworks_ftpd.nasl
 lib/nessus/plugins/vxworks_ftpdDOS.nasl
@@ -1496,6 +1621,7 @@ lib/nessus/plugins/wayboard.nasl
 lib/nessus/plugins/web_chat_xss.nasl
 lib/nessus/plugins/web_traversal.nasl
 lib/nessus/plugins/webactive_log.nasl
+lib/nessus/plugins/webadmin.nasl
 lib/nessus/plugins/webalizer.nasl
 lib/nessus/plugins/webc_cgi_installed.nasl
 lib/nessus/plugins/webc_cgi_overflows.nasl
@@ -1509,6 +1635,8 @@ lib/nessus/plugins/webdist.nasl
 lib/nessus/plugins/webdriver.nasl
 lib/nessus/plugins/weberp_config_file_disclosure.nasl
 lib/nessus/plugins/webfind.nasl
+lib/nessus/plugins/webfroot_shoutbox_file_injection.nasl
+lib/nessus/plugins/webfroot_shoutbox_traversal.nasl
 lib/nessus/plugins/webgais.nasl
 lib/nessus/plugins/weblogic_adm_servlet.nasl
 lib/nessus/plugins/weblogic_casigned_cert_spoofing.nasl
@@ -1519,6 +1647,7 @@ lib/nessus/plugins/weblogic_percent.nasl
 lib/nessus/plugins/webmin.nasl
 lib/nessus/plugins/webmin_session_id.nasl
 lib/nessus/plugins/webmirror.nasl
+lib/nessus/plugins/webnews.nasl
 lib/nessus/plugins/webplus.nasl
 lib/nessus/plugins/webplus_version.nasl
 lib/nessus/plugins/webseal_DoS.nasl
@@ -1533,10 +1662,12 @@ lib/nessus/plugins/websphere_cache_DoS.nasl
 lib/nessus/plugins/websphere_too_long_header.nasl
 lib/nessus/plugins/websphere_xss.nasl
 lib/nessus/plugins/webspirs_cgi.nasl
+lib/nessus/plugins/webstores_browseitemdetails_sql_injection.nasl
 lib/nessus/plugins/webweaver_retr_dos.nasl
 lib/nessus/plugins/webwho_pl.nasl
 lib/nessus/plugins/webwiz_forum_password_disclosure.nasl
 lib/nessus/plugins/webwiznews_password_disclosure.nasl
+lib/nessus/plugins/wfchat_user_disclosure.nasl
 lib/nessus/plugins/wftp.nasl
 lib/nessus/plugins/wftp_241_dos.nasl
 lib/nessus/plugins/wftp_dos.nasl
@@ -1560,6 +1691,7 @@ lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/wireless_sensor_detection.nasl
 lib/nessus/plugins/wnn_overflow.nasl
 lib/nessus/plugins/wordit_logbook.nasl
+lib/nessus/plugins/wordpress_flaws.nasl
 lib/nessus/plugins/worldclient_server_detection.nasl
 lib/nessus/plugins/worldspan_gw_DoS.nasl
 lib/nessus/plugins/wrap.nasl
@@ -1575,6 +1707,7 @@ lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
 lib/nessus/plugins/www_default_page.nasl
 lib/nessus/plugins/www_fingerprinting.nasl
+lib/nessus/plugins/www_hosting_copyrighted_material.nasl
 lib/nessus/plugins/www_infinite_request_DoS.nasl
 lib/nessus/plugins/www_server_name.nasl
 lib/nessus/plugins/www_too_long_auth.nasl
@@ -1600,6 +1733,7 @@ lib/nessus/plugins/xmb_xss.nasl
 lib/nessus/plugins/xolox_installed.nasl
 lib/nessus/plugins/xoops_path_disclosure.nasl
 lib/nessus/plugins/xoops_xss.nasl
+lib/nessus/plugins/xpressions_sql_injection.nasl
 lib/nessus/plugins/xst_http_trace.nasl
 lib/nessus/plugins/xtel_detect.nasl
 lib/nessus/plugins/xtelw_detect.nasl
@@ -1612,11 +1746,15 @@ lib/nessus/plugins/yabbse_cmd_exec.nasl
 lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/yahoo_installed.nasl
 lib/nessus/plugins/yppasswdd.nasl
+lib/nessus/plugins/zentrack_code_injection.nasl
+lib/nessus/plugins/zentrack_read_files.nasl
 lib/nessus/plugins/zeus.nasl
+lib/nessus/plugins/zeus_web_admin_xss.nasl
 lib/nessus/plugins/zml_cgi_traversal.nasl
 lib/nessus/plugins/zope.nasl
 lib/nessus/plugins/zope_dos.nasl
 lib/nessus/plugins/zope_img_updating.nasl
+lib/nessus/plugins/zope_invalid_query_path_disclosure.nasl
 lib/nessus/plugins/zope_path_disclosure.nasl
 lib/nessus/plugins/zope_zclass.nasl
 lib/nessus/plugins/zyxel_pwd.nasl
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 3f4f2ea..c1cbaad 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	2.0.6a
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index 4ee342b..c1f9c06 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-2.0.6a.tar.gz) = 2dd997d65d1785526fe9d87393ce0417
+MD5 (nessus/nessus-core-2.0.7.tar.gz) = d9e214bbdd93f5ce1376897d96e7b859
diff --git a/security/nessus/files/patch-Makefile b/security/nessus/files/patch-Makefile
new file mode 100644
index 0000000..e5cba48
--- /dev/null
+++ b/security/nessus/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	Tue Jan 21 11:45:03 2003
++++ Makefile	Thu Jul  3 08:41:17 2003
+@@ -10,14 +10,6 @@
+ 	touch $@
+ 
+ install: all $(CLIENT_INSTALL) install-bin install-man
+-	@echo
+-	@echo ' --------------------------------------------------------------'
+-	@echo ' nessus-core has been sucessfully installed. '
+-	@echo " Make sure that $(bindir) and $(sbindir) are in your PATH before"
+-	@echo " you continue."
+-	@echo " nessusd has been installed into $(sbindir)"
+-	@echo ' --------------------------------------------------------------'
+-	@echo
+ 
+ install-bin:
+ 	test -d $(DESTDIR)${sbindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${sbindir}