Update to 2.2.6

Make portlint happyer
Add SHA256

PR:		88679
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

9 files changed, 96 insertions, 244 deletions

diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index b62e98e9ec04..ea4e6640cff8 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.6
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -18,10 +18,10 @@ DISTNAME=	libnasl-${PORTVERSION}
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	Nessus Attack Scripting Language
 
-CONFLICTS=	nessus-libnasl-devel-[0-9]*
-
 LIB_DEPENDS=	nessus.4:${PORTSDIR}/security/nessus-libraries
 
+CONFLICTS=	nessus-libnasl-devel-[0-9]*
+
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index 74538c22d4b7..60c0bb310c7d 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1,2 +1,3 @@
-MD5 (nessus/libnasl-2.2.5.tar.gz) = da1d96493714c34ae7ffbc1907b5bbcd
-SIZE (nessus/libnasl-2.2.5.tar.gz) = 364395
+MD5 (nessus/libnasl-2.2.6.tar.gz) = 06f90680d20953fb9806b8c54e021683
+SHA256 (nessus/libnasl-2.2.6.tar.gz) = f3c95f9fd72c914ad35ed0411060d41f2228d19ecddac972a6afe12a75e181ea
+SIZE (nessus/libnasl-2.2.6.tar.gz) = 364643
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 9d614cce8a29..ea96d582b360 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -9,7 +9,7 @@
 # client.
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.6
 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 e6b7ef003a2e..43957205077f 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,2 +1,3 @@
-MD5 (nessus/nessus-libraries-2.2.5.tar.gz) = a26a31ee7d8e82511e4ba3954ab1db24
-SIZE (nessus/nessus-libraries-2.2.5.tar.gz) = 426788
+MD5 (nessus/nessus-libraries-2.2.6.tar.gz) = ac027cd2dfa149a44a6dbb748eb93ce9
+SHA256 (nessus/nessus-libraries-2.2.6.tar.gz) = 3389d0579aa28e6c2da86682cad994976e15938fd47bcf31ef6decc2841cbc67
+SIZE (nessus/nessus-libraries-2.2.6.tar.gz) = 426911
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index e4dde09d8959..d4fc5ac59491 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -19,12 +18,12 @@ DISTNAME=	nessus-plugins-GPL-${PORTVERSION}
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	Plugins for Nessus, the security scanner
 
-CONFLICTS=	nessus-plugins-devel-[0-9]*
-
 BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus
 RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \
 		nmap:${PORTSDIR}/security/nmap
 
+CONFLICTS=	nessus-plugins-devel-[0-9]*
+
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
 
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index 9715b5a4b1f2..9b8c93b05f82 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1,2 +1,3 @@
-MD5 (nessus/nessus-plugins-GPL-2.2.5.tar.gz) = 4b2710dfb7d7957145b6f101edfba7a7
-SIZE (nessus/nessus-plugins-GPL-2.2.5.tar.gz) = 1115570
+MD5 (nessus/nessus-plugins-GPL-2.2.6.tar.gz) = 7d4f1fed76105a1e4e0522573e36cba5
+SHA256 (nessus/nessus-plugins-GPL-2.2.6.tar.gz) = 383bb5f530009ffde7238c9cb819c0dd7e040125eed3ca0aa39bca554258658f
+SIZE (nessus/nessus-plugins-GPL-2.2.6.tar.gz) = 1018246
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 70e3c43f0c9c..2d3ef24470b3 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -1,6 +1,4 @@
 bin/nessus-build
-lib/nessus/plugins/12planet_chat_server_xss.nasl
-lib/nessus/plugins/3com_nbx_voip_netset_detection.nasl
 lib/nessus/plugins/3com_switches.nasl
 lib/nessus/plugins/404_path_disclosure.nasl
 lib/nessus/plugins/4553.nasl
@@ -13,6 +11,7 @@ lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code.nasl
 lib/nessus/plugins/Black_JumboDog_FTP_overflow.nasl
 lib/nessus/plugins/CA_License_Service_Stack_Overflow.nasl
 lib/nessus/plugins/CSCdu35577_web.nasl
+lib/nessus/plugins/CiscoVG248.nasl
 lib/nessus/plugins/DDI_AirConnect_Default_Password.nasl
 lib/nessus/plugins/DDI_Cabletron_Web_View.nasl
 lib/nessus/plugins/DDI_Compaq_Mgmt_Proxy.nasl
@@ -44,7 +43,6 @@ lib/nessus/plugins/DDI_warftpd_dir_traversal.nasl
 lib/nessus/plugins/DDI_warftpd_user_overflow.nasl
 lib/nessus/plugins/DDI_ws_ftp-server-cpwd-bo.nasl
 lib/nessus/plugins/EZsiteForum.nasl
-lib/nessus/plugins/GuildFTPD097.nasl
 lib/nessus/plugins/IIS_frontpage_DOS_2.nasl
 lib/nessus/plugins/JM_Fluxay.nasl
 lib/nessus/plugins/JM_FsSniffer.nasl
@@ -64,7 +62,6 @@ lib/nessus/plugins/PGPCert_DoS.nasl
 lib/nessus/plugins/PWS_DoS.nasl
 lib/nessus/plugins/PagesPro_dir_trav.nasl
 lib/nessus/plugins/RA_ssh_detect.nasl
-lib/nessus/plugins/RA_www_css.nasl
 lib/nessus/plugins/RA_www_detect.nasl
 lib/nessus/plugins/RM_safetynet_xss.nasl
 lib/nessus/plugins/SHN_MySQL_Privilege_Escalation.nasl
@@ -75,10 +72,8 @@ lib/nessus/plugins/ShowCode.nasl
 lib/nessus/plugins/TLD_wildcard.nasl
 lib/nessus/plugins/TelSrv_DoS.nasl
 lib/nessus/plugins/W32.Sasser.Worm.nasl
-lib/nessus/plugins/X.nasl
 lib/nessus/plugins/Xeneo_Web_Server_2.2.9.0_DoS.nasl
 lib/nessus/plugins/Xerver_DoS.nasl
-lib/nessus/plugins/aardvark_topsites_multiple.nasl
 lib/nessus/plugins/abyss_msdos_dos.nasl
 lib/nessus/plugins/acc.nasl
 lib/nessus/plugins/account_bash.nasl
@@ -96,9 +91,7 @@ lib/nessus/plugins/account_super_forgot.nasl
 lib/nessus/plugins/account_swift_swift.nasl
 lib/nessus/plugins/account_user_debug.nasl
 lib/nessus/plugins/account_user_forgot.nasl
-lib/nessus/plugins/admentor_login_flaw.nasl
 lib/nessus/plugins/advanced_guestbook.nasl
-lib/nessus/plugins/aenovo_db_disclosure.nasl
 lib/nessus/plugins/afs_version.nasl
 lib/nessus/plugins/agora.nasl
 lib/nessus/plugins/aix.inc
@@ -107,14 +100,12 @@ lib/nessus/plugins/alcatel_adsl_firewalling.nasl
 lib/nessus/plugins/alcatel_backdoor_switch.nasl
 lib/nessus/plugins/alchemy_eye_http.nasl
 lib/nessus/plugins/alienform.nasl
+lib/nessus/plugins/allegro_dos.nasl
 lib/nessus/plugins/alya.nasl
 lib/nessus/plugins/amanda_detect.nasl
-lib/nessus/plugins/amanda_version.nasl
 lib/nessus/plugins/amap.nasl
-lib/nessus/plugins/anaconda_doublenull.nasl
 lib/nessus/plugins/anti_nessus.nasl
 lib/nessus/plugins/aol_installed.nasl
-lib/nessus/plugins/aolserver_default_password.nasl
 lib/nessus/plugins/apache_SSL_complain.nasl
 lib/nessus/plugins/apache_Tomcat_DOS_Device_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_Servlet_XSS.nasl
@@ -139,17 +130,14 @@ lib/nessus/plugins/appsocket_DoS.nasl
 lib/nessus/plugins/argosoft_multiple_flaws2.nasl
 lib/nessus/plugins/argosoft_server_xcmd.nasl
 lib/nessus/plugins/arkoon.nasl
-lib/nessus/plugins/articlelive_xss.nasl
-lib/nessus/plugins/artmedic_kleinanzeigen_file_inclusion.nasl
-lib/nessus/plugins/artmedic_links5_file_inclusion.nasl
 lib/nessus/plugins/asip-status.nasl
-lib/nessus/plugins/asp_inline_sql_injection.nasl
 lib/nessus/plugins/asp_source_space.nasl
 lib/nessus/plugins/aspdev_imgtag.nasl
-lib/nessus/plugins/aspjar_sql_injection.nasl
 lib/nessus/plugins/athena_web_remote_cmd_exec.nasl
+lib/nessus/plugins/atutor_multiple_flaws.nasl
+lib/nessus/plugins/atutor_password_reminder_sql.nasl
+lib/nessus/plugins/atutor_xss.nasl
 lib/nessus/plugins/avaya_switches.nasl
-lib/nessus/plugins/avengers_news_system_command_execution.nasl
 lib/nessus/plugins/aventail_asap.nasl
 lib/nessus/plugins/avirt_gateway_telnet.nasl
 lib/nessus/plugins/avirt_proxy_overflow.nasl
@@ -157,8 +145,6 @@ lib/nessus/plugins/avotus_mm.nasl
 lib/nessus/plugins/awstats_configdir.nasl
 lib/nessus/plugins/awstats_input_vuln.nasl
 lib/nessus/plugins/aztek_xss.nasl
-lib/nessus/plugins/b2evolution_net_sql_injection.nasl
-lib/nessus/plugins/backoffice_lite_bypass.nasl
 lib/nessus/plugins/backport.inc
 lib/nessus/plugins/badblue_directory_traversal.nasl
 lib/nessus/plugins/badblue_get_DoS.nasl
@@ -175,12 +161,13 @@ lib/nessus/plugins/basit_xss.nasl
 lib/nessus/plugins/bblog_sql_inject.nasl
 lib/nessus/plugins/bea_password.nasl
 lib/nessus/plugins/bgp_detect.nasl
+lib/nessus/plugins/bigip_cookie.nasl
 lib/nessus/plugins/bind_stub_res.nasl
-lib/nessus/plugins/bind_version.nasl
 lib/nessus/plugins/bizdb1_search.nasl
 lib/nessus/plugins/blackboard_remote_file_include.nasl
 lib/nessus/plugins/blackice_dos.nasl
 lib/nessus/plugins/bluecoat_mgnt_console.nasl
+lib/nessus/plugins/bmforum_xss.nasl
 lib/nessus/plugins/bofra_detect.nasl
 lib/nessus/plugins/bookreview_xss.nasl
 lib/nessus/plugins/boozt_admin_overflow.nasl
@@ -192,14 +179,11 @@ lib/nessus/plugins/bugbear_b.nasl
 lib/nessus/plugins/bugbear_b_1080.nasl
 lib/nessus/plugins/bugport_attachment_handling_flaw.nasl
 lib/nessus/plugins/bugzilla_remote_exec.nasl
-lib/nessus/plugins/ca_unicenter_file_transfer_service.nasl
-lib/nessus/plugins/ca_unicenter_transport_service.nasl
 lib/nessus/plugins/cachemgr_cgi.nasl
 lib/nessus/plugins/cactuShop_multiple_flaws.nasl
-lib/nessus/plugins/calendar_scheduler_xss.nasl
+lib/nessus/plugins/calendar_express_flaws.nasl
 lib/nessus/plugins/calendarix_sql.nasl
 lib/nessus/plugins/carello.nasl
-lib/nessus/plugins/cart32_xss.nasl
 lib/nessus/plugins/cern_httpd_access_ctrl.nasl
 lib/nessus/plugins/cern_httpd_cginame_overflow.nasl
 lib/nessus/plugins/cf_debug.nasl
@@ -209,8 +193,6 @@ lib/nessus/plugins/cfengine_format_string_vuln.nasl
 lib/nessus/plugins/cfengine_trans_packet_buff_overrun.nasl
 lib/nessus/plugins/cgi_rb.nasl
 lib/nessus/plugins/cgibin_browsable.nasl
-lib/nessus/plugins/cgicso_command_execution.nasl
-lib/nessus/plugins/cgicso_cross_site_scripting.nasl
 lib/nessus/plugins/cgimail.nasl
 lib/nessus/plugins/cgiwebupdate.nasl
 lib/nessus/plugins/cgiwrap.nasl
@@ -221,6 +203,8 @@ lib/nessus/plugins/check_ports.nasl
 lib/nessus/plugins/check_smtp_helo.nasl
 lib/nessus/plugins/checkpoint_open_web_admin.nasl
 lib/nessus/plugins/checkpoint_secureplatform.nasl
+lib/nessus/plugins/cheopsNG_clear_text_password.nasl
+lib/nessus/plugins/cheopsNG_detect.nasl
 lib/nessus/plugins/cherokee_0_4_6.nasl
 lib/nessus/plugins/cherokee_0_4_7.nasl
 lib/nessus/plugins/cherokee_dir_traversal.nasl
@@ -228,37 +212,34 @@ lib/nessus/plugins/cherokee_remote_cmd.nasl
 lib/nessus/plugins/chora_detect.nasl
 lib/nessus/plugins/chora_remote_code_execution.nasl
 lib/nessus/plugins/cisco_acs_web_overflow.nasl
+lib/nessus/plugins/ciscoworks_detect.nasl
 lib/nessus/plugins/citrix.nasl
 lib/nessus/plugins/citrix_find.nasl
 lib/nessus/plugins/citrix_web_xss.nasl
 lib/nessus/plugins/citrix_xss.nasl
-lib/nessus/plugins/citrusdb_cc_disclosure.nasl
 lib/nessus/plugins/cjoverkill_xss.nasl
 lib/nessus/plugins/clearswift_mimesweeper_smtp_detect.nasl
+lib/nessus/plugins/clevercopy_path_disclosure_xss.nasl
+lib/nessus/plugins/cmsimple_guestbook_xss.nasl
+lib/nessus/plugins/cmsimple_search_xss.nasl
 lib/nessus/plugins/cobalt_cube_webmail_dir_trav.nasl
-lib/nessus/plugins/cobalt_web_admin_server.nasl
-lib/nessus/plugins/codered_x.nasl
 lib/nessus/plugins/codethatshoppingcart_sql.nasl
 lib/nessus/plugins/cold_fusion_admin_dos.nasl
-lib/nessus/plugins/comersus_xss.nasl
+lib/nessus/plugins/community_link_pro_login_remote_cmd_exec.nasl
 lib/nessus/plugins/compaq_wbem_SSI_DoS.nasl
-lib/nessus/plugins/compaq_wbem_detect.nasl
 lib/nessus/plugins/compaq_web_mgmt_password.nasl
 lib/nessus/plugins/consolehelp.nasl
 lib/nessus/plugins/count_cgi.nasl
 lib/nessus/plugins/counter.nasl
-lib/nessus/plugins/cp-firewall-auth.nasl
-lib/nessus/plugins/cp-firewall-webauth.nasl
-lib/nessus/plugins/cross_site_scripting.nasl
 lib/nessus/plugins/crypto_func.inc
 lib/nessus/plugins/csnews.nasl
 lib/nessus/plugins/cubecart_lang_xss.nasl
+lib/nessus/plugins/cubecart_xss.nasl
 lib/nessus/plugins/cups_empty_udp_dos.nasl
 lib/nessus/plugins/cups_multiple_vulnerabilities.nasl
+lib/nessus/plugins/cutenews_dir_traversal.nasl
 lib/nessus/plugins/cutenews_indexphp_xss.nasl
-lib/nessus/plugins/cutenews_show_news_xss.nasl
 lib/nessus/plugins/cutenews_xss.nasl
-lib/nessus/plugins/cvs_detect.nasl
 lib/nessus/plugins/cvs_file_existence_info_weak.nasl
 lib/nessus/plugins/cvs_in_www.nasl
 lib/nessus/plugins/cvs_malformed_entry_lines_flaw.nasl
@@ -272,21 +253,19 @@ lib/nessus/plugins/cvstrac_jail_escape.nasl
 lib/nessus/plugins/cvstrac_malformed_uri_dos.nasl
 lib/nessus/plugins/cvstrac_ticket_title.nasl
 lib/nessus/plugins/cvstrac_timeline_overflow.nasl
-lib/nessus/plugins/cvsweb_version.nasl
 lib/nessus/plugins/cwmail.nasl
+lib/nessus/plugins/cyberstrong_eshop_sql.nasl
 lib/nessus/plugins/cyrus_imap_prelogin_overflow.nasl
-lib/nessus/plugins/cyrus_imsp_overflow.nasl
 lib/nessus/plugins/dabber_worm.nasl
+lib/nessus/plugins/dada_mail_xss.nasl
+lib/nessus/plugins/dame.nasl
 lib/nessus/plugins/dameware_mini_remote_control_disclosure.nasl
 lib/nessus/plugins/dangerous_cgis.nasl
 lib/nessus/plugins/db2_discovery_DoS.nasl
 lib/nessus/plugins/db2_dos.nasl
 lib/nessus/plugins/db4web_dir_trav.nasl
 lib/nessus/plugins/db4web_tcp_relay.nasl
-lib/nessus/plugins/dbman_cgi.nasl
-lib/nessus/plugins/dcetest.nasl
 lib/nessus/plugins/dcp_portal_xss.nasl
-lib/nessus/plugins/dcshop_information_disclosure.nasl
 lib/nessus/plugins/ddicgi.nasl
 lib/nessus/plugins/debian_DSA-177.nasl
 lib/nessus/plugins/debian_package.inc
@@ -294,12 +273,12 @@ lib/nessus/plugins/default_account.inc
 lib/nessus/plugins/defaultnavcheck.nasl
 lib/nessus/plugins/delegate_overflow2.nasl
 lib/nessus/plugins/dell_openmanage.nasl
-lib/nessus/plugins/deltaups_detect.nasl
-lib/nessus/plugins/desknow_multiple_vuln.nasl
+lib/nessus/plugins/deluxeBB_sql_injection.nasl
 lib/nessus/plugins/devoyBB_flaws.nasl
+lib/nessus/plugins/digital_scribe_login_sql_inject.nasl
 lib/nessus/plugins/directconnect_hub.nasl
 lib/nessus/plugins/directoryphp.nasl
-lib/nessus/plugins/distcc_detection.nasl
+lib/nessus/plugins/discuz_arbitrary_file_upload_flaw.nasl
 lib/nessus/plugins/dns_response_flood.nasl
 lib/nessus/plugins/dns_xfer.nasl
 lib/nessus/plugins/doc_browsable.nasl
@@ -312,25 +291,22 @@ lib/nessus/plugins/doublecheck_std_services.nasl
 lib/nessus/plugins/dream4_koobi_cms_sql.nasl
 lib/nessus/plugins/dump.inc
 lib/nessus/plugins/dwhttp_format_string.nasl
+lib/nessus/plugins/e107_sql_injection.nasl
 lib/nessus/plugins/eDonkey_detect.nasl
 lib/nessus/plugins/eMuleWebServer_detect.nasl
-lib/nessus/plugins/easy_message_board_cmd_exec.nasl
 lib/nessus/plugins/ece_flag.nasl
 lib/nessus/plugins/eftp_bufferoverflow.nasl
 lib/nessus/plugins/eftp_directory_traversal.nasl
 lib/nessus/plugins/eftp_root_disclosure.nasl
 lib/nessus/plugins/egd_detect.nasl
 lib/nessus/plugins/egp_detect.nasl
+lib/nessus/plugins/embedded_web_server_detect.nasl
 lib/nessus/plugins/enterasys_dragon_reporting_detect.nasl
 lib/nessus/plugins/episodex_guestbook.nasl
-lib/nessus/plugins/esesix_backdoor.nasl
-lib/nessus/plugins/eshop_information_disclosure.nasl
 lib/nessus/plugins/ewave_servlet_upload.nasl
-lib/nessus/plugins/exchange_public_folders_information_leak.nasl
 lib/nessus/plugins/exchange_xexch50_overflow.nasl
 lib/nessus/plugins/external_svc_ident.nasl
 lib/nessus/plugins/ez_dos.nasl
-lib/nessus/plugins/ezcontents_code_execution.nasl
 lib/nessus/plugins/ezpublish_xss.nasl
 lib/nessus/plugins/famd_detect.nasl
 lib/nessus/plugins/faq_o_matic_xss.nasl
@@ -342,16 +318,10 @@ lib/nessus/plugins/find_service2.nasl
 lib/nessus/plugins/find_service_3digits.nasl
 lib/nessus/plugins/finger_akfingerd.nasl
 lib/nessus/plugins/finger_overflow.nasl
-lib/nessus/plugins/fishcart_sql_injection.nasl
-lib/nessus/plugins/flash_ftp_server_directory_traversal.nasl
-lib/nessus/plugins/flexwatch_auth_bypass.nasl
 lib/nessus/plugins/formmail_pl.nasl
-lib/nessus/plugins/formmail_version_disclosure.nasl
 lib/nessus/plugins/fortigate_detect.nasl
 lib/nessus/plugins/foxweb_dll.nasl
 lib/nessus/plugins/frontpage_overflow.nasl
-lib/nessus/plugins/fsp_detection.nasl
-lib/nessus/plugins/fspd_directory_traversal.nasl
 lib/nessus/plugins/ftp_administrator.nasl
 lib/nessus/plugins/ftp_func.inc
 lib/nessus/plugins/ftp_kibuv_worm.nasl
@@ -359,14 +329,11 @@ lib/nessus/plugins/ftp_servu_dos3.nasl
 lib/nessus/plugins/ftp_servu_overflow.nasl
 lib/nessus/plugins/ftp_w98_devname_dos.nasl
 lib/nessus/plugins/ftp_write_dirs.nes
-lib/nessus/plugins/ftpd_1byte_overflow.nasl
+lib/nessus/plugins/ftp_writeable_directories.nasl
 lib/nessus/plugins/ftpglob.nasl
-lib/nessus/plugins/ftpserver_detect_type_nd_version.nasl
 lib/nessus/plugins/fusetalk_forum_xss.nasl
-lib/nessus/plugins/fusion_sbx_bypass.nasl
 lib/nessus/plugins/fw1_udp_DoS.nasl
 lib/nessus/plugins/gator.nasl
-lib/nessus/plugins/gemitel_file_inclusion.nasl
 lib/nessus/plugins/generic_WEB-INF.nasl
 lib/nessus/plugins/gentoo_GLSA-200409-14.nasl
 lib/nessus/plugins/gentoo_GLSA-200411-01.nasl
@@ -378,13 +345,13 @@ lib/nessus/plugins/gnutella_export.nasl
 lib/nessus/plugins/goollery_xss.nasl
 lib/nessus/plugins/gosmart_message_board.nasl
 lib/nessus/plugins/gpl_feed.nasl
-lib/nessus/plugins/groupwise_web_interface_help_hole.nasl
-lib/nessus/plugins/groupwise_web_interface_htmlver_hole.nasl
+lib/nessus/plugins/greymatter_html_inject.nasl
 lib/nessus/plugins/guestbook.nasl
 lib/nessus/plugins/guestbook_pl.nasl
 lib/nessus/plugins/guildftpd_site_cmd_overflow.nasl
+lib/nessus/plugins/guppy_directory_traversal.nasl
+lib/nessus/plugins/guppy_request_header_flaws.nasl
 lib/nessus/plugins/hacker_defender.nasl
-lib/nessus/plugins/healthd_detect.nasl
 lib/nessus/plugins/helix_overflow.nasl
 lib/nessus/plugins/hello_detect.nasl
 lib/nessus/plugins/horde_3_0_xss.nasl
@@ -392,11 +359,9 @@ lib/nessus/plugins/horde_detect.nasl
 lib/nessus/plugins/horde_help_xss.nasl
 lib/nessus/plugins/horde_test_disclosure.nasl
 lib/nessus/plugins/hosting_controller.nasl
-lib/nessus/plugins/hotsync.nasl
+lib/nessus/plugins/hp_data_protector_installed.nasl
 lib/nessus/plugins/hp_jadm_vuln.nasl
-lib/nessus/plugins/hpftp_glob_stat.nasl
 lib/nessus/plugins/htdig_xss.nasl
-lib/nessus/plugins/htsearch_location.nasl
 lib/nessus/plugins/http-rpc-epmap.nasl
 lib/nessus/plugins/http_func.inc
 lib/nessus/plugins/http_header_name_format_string.nasl
@@ -484,7 +449,6 @@ lib/nessus/plugins/ilohamail_email_header_html_injection.nasl
 lib/nessus/plugins/ilohamail_external_progs.nasl
 lib/nessus/plugins/ilohamail_password_disclosure.nasl
 lib/nessus/plugins/ilohamail_user_parameter.nasl
-lib/nessus/plugins/imap4_banner.nasl
 lib/nessus/plugins/imap_arbitrary_file_retrieval.nasl
 lib/nessus/plugins/imap_func.inc
 lib/nessus/plugins/imap_unencrypted_cleartext_logins.nasl
@@ -499,17 +463,13 @@ lib/nessus/plugins/imss_detect.nasl
 lib/nessus/plugins/incomplete_http_requests_DoS.nasl
 lib/nessus/plugins/inktomi_path_disclosure.nasl
 lib/nessus/plugins/inn_buff_overflow.nasl
-lib/nessus/plugins/inserter_file_inclusion.nasl
 lib/nessus/plugins/interchange_detect.nasl
 lib/nessus/plugins/interscan_vw_cgi.nasl
 lib/nessus/plugins/interspect_detect.nasl
 lib/nessus/plugins/intrushield_console_detect.nasl
-lib/nessus/plugins/invision_power_board_calendar_sql_injection.nasl
-lib/nessus/plugins/invision_power_top_site_sql_injection.nasl
 lib/nessus/plugins/invision_pwb.nasl
 lib/nessus/plugins/ion_p.nasl
 lib/nessus/plugins/ip_protocol_scan.nasl
-lib/nessus/plugins/ipb_sql_disclosure.nasl
 lib/nessus/plugins/iplanet_data_snag.nasl
 lib/nessus/plugins/iplanet_perf.nasl
 lib/nessus/plugins/ipswitch_IMail_bo.nasl
@@ -519,6 +479,8 @@ lib/nessus/plugins/ircd_ignition_ircop_vuln.nasl
 lib/nessus/plugins/iss_deploymanager.nasl
 lib/nessus/plugins/iwss_detect.nasl
 lib/nessus/plugins/java_jre_jdk_dos.nasl
+lib/nessus/plugins/jaws_file_inclusion.nasl
+lib/nessus/plugins/jaws_xss.nasl
 lib/nessus/plugins/jetroot.nasl
 lib/nessus/plugins/jetty_4_1_9_dos.nasl
 lib/nessus/plugins/jgsportal_sql.nasl
@@ -528,39 +490,35 @@ lib/nessus/plugins/jolt2.nasl
 lib/nessus/plugins/jrun_getdir.nasl
 lib/nessus/plugins/js.scob.trojan.nasl
 lib/nessus/plugins/jserv_execute.nasl
-lib/nessus/plugins/jshop_xss.nasl
-lib/nessus/plugins/kayako_sql_injection.nasl
-lib/nessus/plugins/kazaa_morpheus_detect.nasl
 lib/nessus/plugins/kazaa_network.nasl
 lib/nessus/plugins/keene_xss.nasl
 lib/nessus/plugins/kerio_PF_buffer_overflow.nasl
 lib/nessus/plugins/kerio_firewall_admin_port.nasl
 lib/nessus/plugins/kerio_mailserver_admin_port.nasl
 lib/nessus/plugins/kerio_winroute_admin_port.nasl
-lib/nessus/plugins/knowledge_builder_code_execution.nasl
 lib/nessus/plugins/korgo.nasl
 lib/nessus/plugins/kuang2_the_virus.nasl
 lib/nessus/plugins/labrea.nasl
 lib/nessus/plugins/labview_www_DoS.nasl
-lib/nessus/plugins/last10_sql_injection.nasl
-lib/nessus/plugins/lcdproc_buffer_overflow.nasl
-lib/nessus/plugins/lcdproc_detect.nasl
 lib/nessus/plugins/ldap_null_base.nasl
 lib/nessus/plugins/ldap_null_bind.nasl
+lib/nessus/plugins/ldu_801.nasl
+lib/nessus/plugins/ldu_detection.nasl
+lib/nessus/plugins/ldu_sql_injection.nasl
 lib/nessus/plugins/leafnode_version.nasl
 lib/nessus/plugins/limewire_remote_unauth_access.nasl
 lib/nessus/plugins/line_overflow.nasl
 lib/nessus/plugins/linksys_dos.nasl
 lib/nessus/plugins/linksys_empty_GET_DoS.nasl
 lib/nessus/plugins/linksys_gozila_cgi_DoS.nasl
-lib/nessus/plugins/linksys_next_file_file_disclosure.nasl
+lib/nessus/plugins/linksys_multiple_vulns.nasl
+lib/nessus/plugins/linux_icmp_sctp_DoS.nasl
 lib/nessus/plugins/linux_tftp.nes
-lib/nessus/plugins/linuxconf_detect.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_notes_openserver_disclosure.nasl
+lib/nessus/plugins/lotus_domino_xss.nasl
 lib/nessus/plugins/lotus_slashdot_DoS.nasl
 lib/nessus/plugins/lotus_smency.nasl
 lib/nessus/plugins/mailcarrier_smtp_overflow.nasl
@@ -570,6 +528,7 @@ lib/nessus/plugins/mailenable_httpmail_get_overflow.nasl
 lib/nessus/plugins/mailenable_imap_overflows.nasl
 lib/nessus/plugins/mailenable_imap_search_dos.nasl
 lib/nessus/plugins/mailenable_smtp_dos.nasl
+lib/nessus/plugins/mailgust_sql_injection.nasl
 lib/nessus/plugins/mailman_detect.nasl
 lib/nessus/plugins/mailman_password_retrieval.nasl
 lib/nessus/plugins/mailman_privatepy_directory_traversal.nasl
@@ -578,16 +537,15 @@ lib/nessus/plugins/maincfgret.nasl
 lib/nessus/plugins/mambo_flaws.nasl
 lib/nessus/plugins/mambo_xss.nasl
 lib/nessus/plugins/mambo_xss3.nasl
-lib/nessus/plugins/manpage_file_disclosure.nasl
+lib/nessus/plugins/mantis_file_incl_sql_inject.nasl
+lib/nessus/plugins/mantis_multiple_vulns4.nasl
 lib/nessus/plugins/mantis_xss.nasl
 lib/nessus/plugins/mdaemon_imap_server_dos.nasl
 lib/nessus/plugins/mdaemon_imap_server_dos2.nasl
 lib/nessus/plugins/mdaemon_mail_server_dos.nasl
-lib/nessus/plugins/mediahouse_statistics_web_server.nasl
 lib/nessus/plugins/merak_multiple_vulns.nasl
-lib/nessus/plugins/mercuryboard_multiple_vuln.nasl
+lib/nessus/plugins/mercora_imradio_installed.nasl
 lib/nessus/plugins/metacart_sql.nasl
-lib/nessus/plugins/metadot_sql_injection.nasl
 lib/nessus/plugins/minishare_overflow.nasl
 lib/nessus/plugins/misc_format_string.nasl
 lib/nessus/plugins/misc_func.inc
@@ -595,7 +553,6 @@ lib/nessus/plugins/mldonkey_telnet.nasl
 lib/nessus/plugins/mldonkey_www.nasl
 lib/nessus/plugins/mod_access_referer.nasl
 lib/nessus/plugins/mod_python_handle.nasl
-lib/nessus/plugins/mod_rootme_backdoor.nasl
 lib/nessus/plugins/mod_ssl_hook_functions_format_string_vuln.nasl
 lib/nessus/plugins/mod_ssl_offby1.nasl
 lib/nessus/plugins/moniwiki_xss.nasl
@@ -603,7 +560,6 @@ lib/nessus/plugins/monkeyweb_post_DoS.nasl
 lib/nessus/plugins/monkeyweb_too_big_post.nasl
 lib/nessus/plugins/moodle_php_reply_variable_xss.nasl
 lib/nessus/plugins/moodle_sql_inject.nasl
-lib/nessus/plugins/moodle_xss.nasl
 lib/nessus/plugins/moonlit_virus.nasl
 lib/nessus/plugins/movabletype_cfg.nasl
 lib/nessus/plugins/mozilla_certif_handle_dos.nasl
@@ -613,8 +569,6 @@ lib/nessus/plugins/msadcs_dll.nasl
 lib/nessus/plugins/msdtc_dos.nasl
 lib/nessus/plugins/msmmask.nasl
 lib/nessus/plugins/msrpc-spike27.nasl
-lib/nessus/plugins/msrpc_dcom.nasl
-lib/nessus/plugins/mssms_dos.nasl
 lib/nessus/plugins/mssql_blank_password.nasl
 lib/nessus/plugins/mssql_brute_force.nasl
 lib/nessus/plugins/mssql_hello_overflow.nasl
@@ -622,13 +576,7 @@ lib/nessus/plugins/mssql_ping.nasl
 lib/nessus/plugins/mssqlserver_detect.nasl
 lib/nessus/plugins/mt-load_cgi.nasl
 lib/nessus/plugins/multiple_ftpd_dos.nasl
-lib/nessus/plugins/musicd_dos.nasl
-lib/nessus/plugins/musicd_file_disclosure.nasl
 lib/nessus/plugins/mvnforum_search_xss.nasl
-lib/nessus/plugins/my_little_forum_xss.nasl
-lib/nessus/plugins/mybloggie_sql_injection.nasl
-lib/nessus/plugins/mycio_detect.nasl
-lib/nessus/plugins/mycio_directory_traversal.nasl
 lib/nessus/plugins/myserver_dir_list_and_xss.nasl
 lib/nessus/plugins/myserver_post_dos.nasl
 lib/nessus/plugins/myserver_traversal.nasl
@@ -637,17 +585,11 @@ lib/nessus/plugins/mysql_buff_overflow.nasl
 lib/nessus/plugins/mysql_eventum_flaws.nasl
 lib/nessus/plugins/mysql_hotcopy_tempfile.nasl
 lib/nessus/plugins/mysql_multiple_flaws2.nasl
-lib/nessus/plugins/mysql_version.nasl
-lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/nbmember_info_disclosure.nasl
 lib/nessus/plugins/ncacn_http.nasl
 lib/nessus/plugins/ndcgi.nasl
-lib/nessus/plugins/nds_web_based_browsing.nasl
-lib/nessus/plugins/nessus_detect.nasl
 lib/nessus/plugins/nessus_tcp_scanner.nes
 lib/nessus/plugins/netasq.nasl
-lib/nessus/plugins/netbios_name_get.nasl
-lib/nessus/plugins/netobserve_command_execution.nasl
 lib/nessus/plugins/netop.inc
 lib/nessus/plugins/netop_detect_tcp.nasl
 lib/nessus/plugins/netop_detect_udp.nasl
@@ -673,23 +615,18 @@ lib/nessus/plugins/nntp_func.inc
 lib/nessus/plugins/nntp_info.nasl
 lib/nessus/plugins/nntp_too_long_headers.nasl
 lib/nessus/plugins/nntp_too_long_password.nasl
-lib/nessus/plugins/nntpserver_detect.nasl
+lib/nessus/plugins/no404.nasl
 lib/nessus/plugins/nortel_annex_default_pass.nasl
 lib/nessus/plugins/nortel_baystack_default_pass.nasl
-lib/nessus/plugins/nortel_default_username_password.nasl
 lib/nessus/plugins/nortel_passport_default_pass.nasl
 lib/nessus/plugins/nortel_pwdless1.nasl
 lib/nessus/plugins/nortel_pwdless2.nasl
-lib/nessus/plugins/nortel_webadmin.nasl
 lib/nessus/plugins/notesinicheck.nasl
 lib/nessus/plugins/novell_groupwise_servletmanager_default_password.nasl
-lib/nessus/plugins/novell_groupwise_webacc_information_disclosure.nasl
 lib/nessus/plugins/novell_netbasic_directory_traversal.nasl
 lib/nessus/plugins/novell_novonyx_default_files.nasl
 lib/nessus/plugins/novell_viewcode.nasl
 lib/nessus/plugins/nph-publish.nasl
-lib/nessus/plugins/nqt_xss.nasl
-lib/nessus/plugins/ntalk_detect.nasl
 lib/nessus/plugins/ntds_get_info.nasl
 lib/nessus/plugins/ntp_open.nasl
 lib/nessus/plugins/nuked_klan_xss.nasl
@@ -740,21 +677,15 @@ lib/nessus/plugins/oracle9i_soapconfig.nasl
 lib/nessus/plugins/oracle9i_soapdocs.nasl
 lib/nessus/plugins/oracle9i_soaprouter.nasl
 lib/nessus/plugins/oracle_enterprise_manager.nasl
-lib/nessus/plugins/oracle_one_hour_install.nasl
 lib/nessus/plugins/oracle_tnslsnr_security.nasl
 lib/nessus/plugins/oracle_tnslsnr_version.nasl
-lib/nessus/plugins/oracle_web_admin_server.nasl
 lib/nessus/plugins/oracle_xsql.nasl
 lib/nessus/plugins/oracle_xsql_query.nasl
 lib/nessus/plugins/osCommerce_dirtraversal.nasl
 lib/nessus/plugins/osCommerce_xss.nasl
 lib/nessus/plugins/osX_apache_finder.nasl
-lib/nessus/plugins/osX_apache_finder_content.nasl
-lib/nessus/plugins/oscommerce_file_manager_disclosure.nasl
-lib/nessus/plugins/oscommerce_session_id_xss.nasl
 lib/nessus/plugins/ospf_detect.nasl
 lib/nessus/plugins/osticket_attachment_code_execution.nasl
-lib/nessus/plugins/osticket_backdoored.nasl
 lib/nessus/plugins/osticket_detect.nasl
 lib/nessus/plugins/osticket_large_attachment_upload.nasl
 lib/nessus/plugins/osticket_setup_php_accessible.nasl
@@ -763,39 +694,34 @@ lib/nessus/plugins/osticket_view_attachments.nasl
 lib/nessus/plugins/overnet.nasl
 lib/nessus/plugins/owa-anonymous.nasl
 lib/nessus/plugins/owa_sqlinject.nasl
-lib/nessus/plugins/owls_file_disclosure.nasl
-lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/p-smash.nasl
-lib/nessus/plugins/passwordprotect_sql_inject.nasl
 lib/nessus/plugins/pccsmysqladm.nasl
 lib/nessus/plugins/perlIS_dll_bufferoverflow.nasl
 lib/nessus/plugins/pgpmail.nasl
-lib/nessus/plugins/pgpnet_detect.nasl
-lib/nessus/plugins/photopost_sql_injection.nasl
+lib/nessus/plugins/phorum_register_xss.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
 lib/nessus/plugins/phpMyAdmin_remote_cmd.nasl
 lib/nessus/plugins/phpMyAdmin_xss.nasl
 lib/nessus/plugins/php_apache_win32_default.nasl
 lib/nessus/plugins/php_arbitrary_file_access.nasl
+lib/nessus/plugins/php_fusion_6_00_110.nasl
 lib/nessus/plugins/php_fusion_sql_inject.nasl
 lib/nessus/plugins/php_fusion_xss.nasl
 lib/nessus/plugins/php_mail_func_header_spoof.nasl
-lib/nessus/plugins/php_nuke_admin_cp.nasl
-lib/nessus/plugins/php_nuke_bb_smilies_passwd.nasl
 lib/nessus/plugins/php_nuke_sql_debug.nasl
-lib/nessus/plugins/php_ping_code_execution.nasl
 lib/nessus/plugins/php_split_mime.nasl
 lib/nessus/plugins/php_strip_tags_memory_limit_vuln.nasl
-lib/nessus/plugins/phpadsnew_xss.nasl
+lib/nessus/plugins/php_surveyor_xss_sql.nasl
+lib/nessus/plugins/php_topsites_authentication_bypass.nasl
 lib/nessus/plugins/phpauction_admin.nasl
 lib/nessus/plugins/phpbb_fetch_all_sql_injection.nasl
 lib/nessus/plugins/phpbb_search_author_xss.nasl
 lib/nessus/plugins/phpbb_sql_injection3.nasl
-lib/nessus/plugins/phpbugtracker_bug_sql.nasl
 lib/nessus/plugins/phpcms_xss.nasl
-lib/nessus/plugins/phpgedview_multiple_flaws.nasl
+lib/nessus/plugins/phpgroupware_addressbook_flaw.nasl
 lib/nessus/plugins/phpgroupware_html_injection.nasl
 lib/nessus/plugins/phpgroupware_html_injection2.nasl
+lib/nessus/plugins/phpgroupware_message_script_inject.nasl
 lib/nessus/plugins/phpgroupware_plaintext_cookie_auth_vuln.nasl
 lib/nessus/plugins/phpgroupware_remote_cmd.nasl
 lib/nessus/plugins/phpgroupware_remote_file_include.nasl
@@ -804,43 +730,31 @@ lib/nessus/plugins/phpgroupware_sql_injection.nasl
 lib/nessus/plugins/phpgroupware_xss.nasl
 lib/nessus/plugins/phpinfo.nasl
 lib/nessus/plugins/phpix.nasl
-lib/nessus/plugins/phpmychat_information_disclosure.nasl
 lib/nessus/plugins/phpmyfaq_action_parameter_flaw.nasl
 lib/nessus/plugins/phprocketaddin_traversal.nasl
-lib/nessus/plugins/phproxy_xss.nasl
-lib/nessus/plugins/phpshop_sql_injection.nasl
 lib/nessus/plugins/phptonuke_dir_trav.nasl
-lib/nessus/plugins/phpweblog_xss.nasl
 lib/nessus/plugins/ping_asp.nasl
 lib/nessus/plugins/pingpong.inc
 lib/nessus/plugins/pinnacle_sc_skin_dos.nasl
 lib/nessus/plugins/pinnacle_xss.nasl
 lib/nessus/plugins/pirelli_router_default_password.nasl
-lib/nessus/plugins/pivot_file_inclusion.nasl
 lib/nessus/plugins/platinum_ftp.nasl
 lib/nessus/plugins/plaxo_installed.nasl
-lib/nessus/plugins/playsms_sql_inject.nasl
+lib/nessus/plugins/plugin_feed_info.inc
 lib/nessus/plugins/pollit.nasl
 lib/nessus/plugins/pop2_unencrypted_cleartext_logins.nasl
 lib/nessus/plugins/pop3_func.inc
 lib/nessus/plugins/pop3_unencrypted_cleartext_logins.nasl
 lib/nessus/plugins/poppassd_too_long_user.nasl
 lib/nessus/plugins/poprelayd_auth.nasl
-lib/nessus/plugins/popserver_detect.nasl
 lib/nessus/plugins/poptop_negative_read.nasl
-lib/nessus/plugins/port_shell_execution.nasl
 lib/nessus/plugins/postgresql_tempfile.nasl
 lib/nessus/plugins/postnuke_news_xss.nasl
-lib/nessus/plugins/powerportal_path_disclosure.nasl
-lib/nessus/plugins/powerup_information_disclosure.nasl
-lib/nessus/plugins/pptp_detect.nasl
 lib/nessus/plugins/printenv.nasl
 lib/nessus/plugins/proftpd_user_enum.nasl
 lib/nessus/plugins/propfind_internal_ip.nasl
 lib/nessus/plugins/psnews_xss.nasl
 lib/nessus/plugins/psybnc_check.nasl
-lib/nessus/plugins/psychoblogger_sql_injection.nasl
-lib/nessus/plugins/psychostats_xss.nasl
 lib/nessus/plugins/punBB_detect.nasl
 lib/nessus/plugins/punBB_img_xss.nasl
 lib/nessus/plugins/punBB_info_disclosure.nasl
@@ -855,11 +769,8 @@ lib/nessus/plugins/qpkg.inc
 lib/nessus/plugins/qpopper2.nasl
 lib/nessus/plugins/qpopper_user_disclosure.nasl
 lib/nessus/plugins/quake3_dos.nasl
-lib/nessus/plugins/quicktime_admin.nasl
 lib/nessus/plugins/quicktime_heap_overflow.nasl
-lib/nessus/plugins/quixplorer_file_disclosure.nasl
 lib/nessus/plugins/quote.nasl
-lib/nessus/plugins/qwikiwiki_file_inclusion.nasl
 lib/nessus/plugins/radmin_detect.nasl
 lib/nessus/plugins/raidenHTTPD_dir_traversal.nasl
 lib/nessus/plugins/raidenftpd_dir_traversal.nasl
@@ -871,11 +782,9 @@ lib/nessus/plugins/readdesigncheck.nasl
 lib/nessus/plugins/realserver_malformed_request_dos.nasl
 lib/nessus/plugins/record_route.nasl
 lib/nessus/plugins/redhat_update_level.nasl
-lib/nessus/plugins/relative_field_vulnerability.nasl
 lib/nessus/plugins/resin_path_disclosure.nasl
 lib/nessus/plugins/resin_server_status.nasl
 lib/nessus/plugins/reviewpost_sql.nasl
-lib/nessus/plugins/rich_media_ecommerce_stores_sensitive_information_insecurely.nasl
 lib/nessus/plugins/rip_detect.nasl
 lib/nessus/plugins/rip_poison.nasl
 lib/nessus/plugins/ris_detect.nasl
@@ -888,7 +797,6 @@ lib/nessus/plugins/rpcinfo.nasl
 lib/nessus/plugins/rpm.inc
 lib/nessus/plugins/rsa_authentication_agent_xss.nasl
 lib/nessus/plugins/rsync_path_sanitation_vuln.nasl
-lib/nessus/plugins/rtsp_detect.nasl
 lib/nessus/plugins/samba_arbitrary_file_access.nasl
 lib/nessus/plugins/sambar_DoS.nasl
 lib/nessus/plugins/sambar_admin_xss.nasl
@@ -901,14 +809,13 @@ lib/nessus/plugins/sambar_sysadmin.nasl
 lib/nessus/plugins/samihttp_1_0_4.nasl
 lib/nessus/plugins/sapdb_detect.nasl
 lib/nessus/plugins/sasser_virus.nasl
-lib/nessus/plugins/savant_cgi_download.nasl
 lib/nessus/plugins/savant_cgitest.nasl
 lib/nessus/plugins/savant_content_length_DoS.nasl
+lib/nessus/plugins/scan_info.nasl
 lib/nessus/plugins/securecrt_remote_overflow.nasl
-lib/nessus/plugins/securemote.nasl
-lib/nessus/plugins/securemote_info_leak.nasl
 lib/nessus/plugins/securenet_provider_detect.nasl
 lib/nessus/plugins/securenet_sensor_detect.nasl
+lib/nessus/plugins/sendcard_sql.nasl
 lib/nessus/plugins/sendmail_875_bo.nasl
 lib/nessus/plugins/sendmail_custom_config.nasl
 lib/nessus/plugins/sendmail_daemon_mode.nasl
@@ -921,22 +828,15 @@ lib/nessus/plugins/sendmail_maillocal_dos.nasl
 lib/nessus/plugins/sendmail_parsing_redirection.nasl
 lib/nessus/plugins/sendmail_queue_destruction.nasl
 lib/nessus/plugins/sendmail_wiz.nasl
-lib/nessus/plugins/ser_missing_to_in_ack_dos.nasl
-lib/nessus/plugins/ser_register_overflow.nasl
 lib/nessus/plugins/serendipity_xss.nasl
 lib/nessus/plugins/servletExec_DoS.nasl
 lib/nessus/plugins/servletExec_File_Reading.nasl
 lib/nessus/plugins/servletExec_Path_Disclosure.nasl
-lib/nessus/plugins/sgallery_sql_injection.nasl
 lib/nessus/plugins/sgdynamo_path.nasl
 lib/nessus/plugins/sgdynamo_xss.nasl
-lib/nessus/plugins/sglmerchant_information_disclosure.nasl
 lib/nessus/plugins/shambala_www_dos.nasl
 lib/nessus/plugins/shiva_default_pass.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_version.nasl
 lib/nessus/plugins/shttp_detect.nasl
 lib/nessus/plugins/silverstream_database.nasl
 lib/nessus/plugins/silverstream_dirlisting.nasl
@@ -944,55 +844,16 @@ lib/nessus/plugins/simple_form_mail_relaying.nasl
 lib/nessus/plugins/simple_form_mail_relaying_via_subject_tags.nasl
 lib/nessus/plugins/simpleserverwww_dos.nasl
 lib/nessus/plugins/simplewww.nasl
-lib/nessus/plugins/singapore_file_disclosure.nasl
-lib/nessus/plugins/sip_detection.nasl
-lib/nessus/plugins/sip_status_server.nasl
 lib/nessus/plugins/siteframe_xss.nasl
-lib/nessus/plugins/sitescope_management_server.nasl
-lib/nessus/plugins/sitescope_web_admin_server.nasl
 lib/nessus/plugins/skullsplitter_html_injection.nasl
 lib/nessus/plugins/slackware.inc
 lib/nessus/plugins/slident.nasl
 lib/nessus/plugins/smad.nes
 lib/nessus/plugins/smallftpd_1_0_3.nasl
 lib/nessus/plugins/smb_file_funcs.inc
-lib/nessus/plugins/smb_hotfixes.inc
 lib/nessus/plugins/smb_mssql7.nasl
 lib/nessus/plugins/smb_nt.inc
-lib/nessus/plugins/smb_nt_kb870669.nasl
-lib/nessus/plugins/smb_nt_ms02-005.nasl
 lib/nessus/plugins/smb_nt_ms02-006.nasl
-lib/nessus/plugins/smb_nt_ms02-008.nasl
-lib/nessus/plugins/smb_nt_ms02-009.nasl
-lib/nessus/plugins/smb_nt_ms02-016.nasl
-lib/nessus/plugins/smb_nt_ms02-017.nasl
-lib/nessus/plugins/smb_nt_ms02-018.nasl
-lib/nessus/plugins/smb_nt_ms02-024.nasl
-lib/nessus/plugins/smb_nt_ms02-025.nasl
-lib/nessus/plugins/smb_nt_ms02-042.nasl
-lib/nessus/plugins/smb_nt_ms02-048.nasl
-lib/nessus/plugins/smb_nt_ms02-050.nasl
-lib/nessus/plugins/smb_nt_ms02-051.nasl
-lib/nessus/plugins/smb_nt_ms02-052.nasl
-lib/nessus/plugins/smb_nt_ms02-054.nasl
-lib/nessus/plugins/smb_nt_ms02-055.nasl
-lib/nessus/plugins/smb_nt_ms02-063.nasl
-lib/nessus/plugins/smb_nt_ms02-070.nasl
-lib/nessus/plugins/smb_nt_ms02-071.nasl
-lib/nessus/plugins/smb_nt_ms02-072.nasl
-lib/nessus/plugins/smb_nt_ms03-005.nasl
-lib/nessus/plugins/smb_nt_ms03-007.nasl
-lib/nessus/plugins/smb_nt_ms03-009.nasl
-lib/nessus/plugins/smb_nt_ms03-023.nasl
-lib/nessus/plugins/smb_nt_ms03-041.nasl
-lib/nessus/plugins/smb_nt_ms03-042.nasl
-lib/nessus/plugins/smb_nt_ms03-043.nasl
-lib/nessus/plugins/smb_nt_ms03-045.nasl
-lib/nessus/plugins/smb_nt_ms04-001.nasl
-lib/nessus/plugins/smb_nt_ms04-016.nasl
-lib/nessus/plugins/smb_nt_ms04-026.nasl
-lib/nessus/plugins/smb_nt_ms04-029.nasl
-lib/nessus/plugins/smb_nt_ms04-039.nasl
 lib/nessus/plugins/smb_reg_service_pack_XP.nasl
 lib/nessus/plugins/smb_xp_ms01-059.nasl
 lib/nessus/plugins/smc2804wbr_default_password.nasl
@@ -1005,18 +866,11 @@ lib/nessus/plugins/smtp_overflows.nasl
 lib/nessus/plugins/smtp_relay2.nasl
 lib/nessus/plugins/smtp_too_long_line.nasl
 lib/nessus/plugins/smtpscan.nasl
-lib/nessus/plugins/smtpserver_detect.nasl
 lib/nessus/plugins/snapstream_dir_trav.nasl
-lib/nessus/plugins/sniff_css.nasl
-lib/nessus/plugins/sniff_file_disclosure.nasl
-lib/nessus/plugins/snitz_down_http_xss.nasl
 lib/nessus/plugins/snitz_forums_2000_sql_injection.nasl
 lib/nessus/plugins/snmpXdmid.nasl
-lib/nessus/plugins/snmp_default_communities.nasl
 lib/nessus/plugins/snmp_detect.nasl
-lib/nessus/plugins/snmp_hpJetDirectEWS.nasl
 lib/nessus/plugins/snmp_portscan.nes
-lib/nessus/plugins/snmpwalk_portscan.nasl
 lib/nessus/plugins/socks.nasl
 lib/nessus/plugins/socks4_loop_connect.nasl
 lib/nessus/plugins/socks4_username_overflow.nasl
@@ -1027,14 +881,13 @@ lib/nessus/plugins/sonicwall_soho_10_xss.nasl
 lib/nessus/plugins/sophos_installed.nasl
 lib/nessus/plugins/source_routed.nasl
 lib/nessus/plugins/spank.nasl
-lib/nessus/plugins/sparkleblog_sql_injection.nasl
 lib/nessus/plugins/sphpblog_dir_traversal.nasl
 lib/nessus/plugins/sql_injection.nasl
-lib/nessus/plugins/sqlqhit_information_disclosure.nasl
 lib/nessus/plugins/squid_dos.nasl
 lib/nessus/plugins/squid_rdos.nasl
 lib/nessus/plugins/squirrelmail_144.nasl
 lib/nessus/plugins/squirrelmail_detect.nasl
+lib/nessus/plugins/squirrelmail_from_header_html_injection.nasl
 lib/nessus/plugins/squirrelmail_html_injection_vuln.nasl
 lib/nessus/plugins/squirremail_cross_site_scripting.nasl
 lib/nessus/plugins/sscd_input.nasl
@@ -1054,15 +907,11 @@ lib/nessus/plugins/stonegate_detect.nasl
 lib/nessus/plugins/story.nasl
 lib/nessus/plugins/stronghold.nasl
 lib/nessus/plugins/stronghold_swish.nasl
-lib/nessus/plugins/stun_detection.nasl
 lib/nessus/plugins/subversion_1_0_5.nasl
 lib/nessus/plugins/subversion_1_0_6.nasl
 lib/nessus/plugins/subversion_1_0_8.nasl
-lib/nessus/plugins/sun_cobalt_adaptive_firewall_detect.nasl
 lib/nessus/plugins/sunftpd_overflow.nasl
 lib/nessus/plugins/sunftpd_traversal.nasl
-lib/nessus/plugins/surgeldap_file_disclosure.nasl
-lib/nessus/plugins/swat_detect.nasl
 lib/nessus/plugins/sympa_do_search_list_overflow.nasl
 lib/nessus/plugins/sympa_invalid_ldap_pass.nasl
 lib/nessus/plugins/sympa_queue_utility_priv_escalation.nasl
@@ -1073,12 +922,16 @@ lib/nessus/plugins/tcp_port_zero.nasl
 lib/nessus/plugins/teekai_track_online_xss.nasl
 lib/nessus/plugins/telcondex.nasl
 lib/nessus/plugins/telnet_func.inc
-lib/nessus/plugins/telnetserver_detect_type_nd_version.nasl
 lib/nessus/plugins/teso_telnet.nasl
+lib/nessus/plugins/tetrinet_detect.nasl
 lib/nessus/plugins/tftp.inc
+lib/nessus/plugins/tftp_files_cisco_callmanager.nasl
 lib/nessus/plugins/tftp_files_cisco_ios.nasl
 lib/nessus/plugins/tftp_files_cisco_ios_ca.nasl
+lib/nessus/plugins/tftp_files_hp_ignite_ux.nasl
+lib/nessus/plugins/tftp_files_hp_ignite_ux_passwd.nasl
 lib/nessus/plugins/tftp_grab_file.nes
+lib/nessus/plugins/tftp_permissions_hp_ignite_ux.nasl
 lib/nessus/plugins/tftpd_backdoor.nasl
 lib/nessus/plugins/tftpd_dir_trav.nasl
 lib/nessus/plugins/tftpd_overflow.nasl
@@ -1099,11 +952,9 @@ lib/nessus/plugins/tomcat_server_default_files.nasl
 lib/nessus/plugins/tomcat_source_exposure.nasl
 lib/nessus/plugins/tomcat_srcjsp_malformed_request.nasl
 lib/nessus/plugins/tomcat_status.nasl
-lib/nessus/plugins/towerblog_admin_bypass.nasl
 lib/nessus/plugins/translate_f.nasl
 lib/nessus/plugins/trendmicro_emanager.nasl
 lib/nessus/plugins/trillian_installed.nasl
-lib/nessus/plugins/tripwire_webpage.nasl
 lib/nessus/plugins/trojan_horses.nasl
 lib/nessus/plugins/turboseek_read_file.nasl
 lib/nessus/plugins/tutos_input_vuln.nasl
@@ -1113,63 +964,63 @@ lib/nessus/plugins/typsoftftp_dir_traversal.nasl
 lib/nessus/plugins/typsoftftp_empty_username_dos.nasl
 lib/nessus/plugins/uddi.inc
 lib/nessus/plugins/uddi.nasl
-lib/nessus/plugins/uebimiau_session_disclosure.nasl
-lib/nessus/plugins/ultraseek_detect.nasl
+lib/nessus/plugins/ultravnc_dsm_detect.nasl
 lib/nessus/plugins/unknown_services.nasl
+lib/nessus/plugins/unprotected_cheopsNG.nasl
 lib/nessus/plugins/unprotected_webadmin_php.nasl
 lib/nessus/plugins/upb_info_leak.nasl
+lib/nessus/plugins/upb_weak_pass.nasl
+lib/nessus/plugins/upb_xss.nasl
+lib/nessus/plugins/upb_xss2.nasl
 lib/nessus/plugins/upd_xss_sql_injection.nasl
 lib/nessus/plugins/uploadskrip.nasl
 lib/nessus/plugins/upnp_xp.nasl
-lib/nessus/plugins/vbulletin_calender_command_execution.nasl
+lib/nessus/plugins/url_func.inc
 lib/nessus/plugins/vbulletin_detect.nasl
 lib/nessus/plugins/vbulletin_forumdisplay_remote_cmd_exec.nasl
 lib/nessus/plugins/vbulletin_init_php_flaw.nasl
 lib/nessus/plugins/vbulletin_xss.nasl
 lib/nessus/plugins/vbulletin_xss2.nasl
 lib/nessus/plugins/vbulletin_xss3.nasl
+lib/nessus/plugins/ventrilo_dos.nasl
 lib/nessus/plugins/verity_ultraseek_xss.nasl
 lib/nessus/plugins/viewcvs_xss.nasl
-lib/nessus/plugins/visualroute_server_detect.nasl
 lib/nessus/plugins/vnc.nasl
 lib/nessus/plugins/vnc_http.nasl
+lib/nessus/plugins/vnc_security_types.nasl
 lib/nessus/plugins/vpasswd_cgi.nasl
-lib/nessus/plugins/vqServer_admin_detect.nasl
-lib/nessus/plugins/vqServer_web_traversal.nasl
 lib/nessus/plugins/vssetcookie.nasl
 lib/nessus/plugins/vxworks_ftpd.nasl
 lib/nessus/plugins/vxworks_ftpdDOS.nasl
 lib/nessus/plugins/w32_spybot_worm_variant.nasl
 lib/nessus/plugins/w3who_dll.nasl
 lib/nessus/plugins/w_agora_dir_traversal.nasl
+lib/nessus/plugins/w_agora_dir_traversal2.nasl
 lib/nessus/plugins/wackowiki_xss.nasl
 lib/nessus/plugins/webadmin.nasl
 lib/nessus/plugins/webalizer.nasl
 lib/nessus/plugins/webapp_apage_cmd_exe.nasl
-lib/nessus/plugins/webcalendar_sql_injection.nasl
 lib/nessus/plugins/webcart_cmd_exec.nasl
+lib/nessus/plugins/webgui_remote_cmd_exec.nasl
 lib/nessus/plugins/webhints_remote_cmd_exec.nasl
-lib/nessus/plugins/weblibs_file_inclusion.nasl
 lib/nessus/plugins/weblogic_adm_servlet.nasl
 lib/nessus/plugins/weblogic_dotdotdos.nasl
 lib/nessus/plugins/weblogic_percent.nasl
 lib/nessus/plugins/webmin.nasl
 lib/nessus/plugins/webnews.nasl
 lib/nessus/plugins/webplus_install_path.nasl
-lib/nessus/plugins/webplus_version.nasl
 lib/nessus/plugins/webseal_DoS.nasl
 lib/nessus/plugins/websense_detect.nasl
 lib/nessus/plugins/webserver4d.nasl
-lib/nessus/plugins/webserver_robot.nasl
+lib/nessus/plugins/webserver_favicon.nasl
 lib/nessus/plugins/webshield_detect.nasl
 lib/nessus/plugins/websphere_cache_DoS.nasl
 lib/nessus/plugins/websphere_too_long_header.nasl
 lib/nessus/plugins/webspirs_cgi.nasl
-lib/nessus/plugins/winmail_mail_server_information_disclosure.nasl
+lib/nessus/plugins/webwasher_conf_xss.nasl
 lib/nessus/plugins/winmx_detect2.nasl
 lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/winsyslog_dos.nasl
-lib/nessus/plugins/worldclient_server_detection.nasl
 lib/nessus/plugins/worldspan_gw_DoS.nasl
 lib/nessus/plugins/wowBB_flaws.nasl
 lib/nessus/plugins/wowBB_sql_injection.nasl
@@ -1204,6 +1055,7 @@ lib/nessus/plugins/www_too_long_options.nasl
 lib/nessus/plugins/www_too_long_useragent.nasl
 lib/nessus/plugins/www_too_long_version.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
+lib/nessus/plugins/xaraya_detection.nasl
 lib/nessus/plugins/xdmcp.nasl
 lib/nessus/plugins/xedus_detect.nasl
 lib/nessus/plugins/xedus_dir_traversal.nasl
@@ -1212,7 +1064,6 @@ lib/nessus/plugins/xedus_xss.nasl
 lib/nessus/plugins/xeneo_percent_DoS.nasl
 lib/nessus/plugins/xitami_POST_DoS.nasl
 lib/nessus/plugins/xnews.nasl
-lib/nessus/plugins/xoops_myheader_url_xss.nasl
 lib/nessus/plugins/xoops_viewtopic_xss.nasl
 lib/nessus/plugins/xst_http_trace.nasl
 lib/nessus/plugins/xtel_detect.nasl
@@ -1220,12 +1071,10 @@ lib/nessus/plugins/xtelw_detect.nasl
 lib/nessus/plugins/xtux_server.nasl
 lib/nessus/plugins/yabb_xss.nasl
 lib/nessus/plugins/yacy_xss.nasl
-lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/yapig_multiple_flaws.nasl
 lib/nessus/plugins/yapig_pass_dir_access.nasl
 lib/nessus/plugins/yapig_remote_vuln.nasl
 lib/nessus/plugins/yawcam_dir_traversal.nasl
-lib/nessus/plugins/yusasp_asset_manager_detection.nasl
 lib/nessus/plugins/zebra_dos.nasl
 lib/nessus/plugins/zeroboard_flaws.nasl
 lib/nessus/plugins/zeroboard_flaws2.nasl
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 2e62c8034927..6b1533bd4b12 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -11,8 +11,7 @@
 #  WITHOUT_NESSUS_GTK
 
 PORTNAME=	nessus
-PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -24,9 +23,10 @@ DISTNAME=	nessus-core-${PORTVERSION}
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	A security scanner: looks for vulnerabilities in a given network
 
+LIB_DEPENDS=	nasl.4:${PORTSDIR}/security/nessus-libnasl
+
 CONFLICTS=	nessus-devel-[0-9]* nessus-devel-gtk-[0-9]* \
 		nessus-devel-gtk2-[0-9]*
-LIB_DEPENDS=	nasl.4:${PORTSDIR}/security/nessus-libnasl
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
@@ -44,10 +44,10 @@ WITHOUT_GNOME=	yes
 
 .if ${HAVE_GNOME:Mgtk20}!=""
 USE_GNOME+=	gtk20
-PKGNAMESUFFIX=	-gtk2
+PKGNAMESUFFIX+=	-gtk2
 .elif ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME+=	gtk12
-PKGNAMESUFFIX=	-gtk
+PKGNAMESUFFIX+=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
@@ -87,7 +87,7 @@ post-install:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/move_nessus
 .if ! exists(${PREFIX}/var/CA/serverkey.pem)
 	@${ECHO} ""
-	@${ECHO} "**************************************************************************"   
+	@${ECHO} "**************************************************************************"
 	@${ECHO} "To create and install a new certificate, type \"make cert\""
 	@${ECHO} "**************************************************************************"
 	@${ECHO} ""
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index 170b740ab9fa..6ab0b64f9bf1 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1,2 +1,3 @@
-MD5 (nessus/nessus-core-2.2.5.tar.gz) = 282de0aa80a5c85aeab12bf556933694
-SIZE (nessus/nessus-core-2.2.5.tar.gz) = 683117
+MD5 (nessus/nessus-core-2.2.6.tar.gz) = 616dd7727b90df1ac978b5e736c0a960
+SHA256 (nessus/nessus-core-2.2.6.tar.gz) = cfac284e4158bf302d15a06c1636c64c974c9360ebb48c6b7b971fda27c93e15
+SIZE (nessus/nessus-core-2.2.6.tar.gz) = 683530