- Update to 2.3.0

PR:		ports/77420
Submitted by:	maintainer

9 files changed, 159 insertions, 36 deletions

diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index 92747ed5809..90f1d2b5e0a 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	nessus-libnasl-devel
-PORTVERSION=	2.2.2a
+PORTVERSION=	2.3.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.au.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/
+MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.au.nessus.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.ayamura.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/
 DISTNAME=	libnasl-${PORTVERSION}
 
 MAINTAINER=	udo.schweigert@siemens.com
@@ -21,13 +21,13 @@ COMMENT=	Nessus Attack Scripting Language
 
 CONFLICTS=	nessus-libnasl-[0-9]*
 
-LIB_DEPENDS=	nessus.4:${PORTSDIR}/security/nessus-libraries-devel
+LIB_DEPENDS=	nessus.5:${PORTSDIR}/security/nessus-libraries-devel
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
 USE_BISON=	YES
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	YES
 
 MAN1=		nasl.1 nasl-config.1
diff --git a/security/nessus-libnasl-devel/distinfo b/security/nessus-libnasl-devel/distinfo
index e47095f72d7..94d17a5a6fd 100644
--- a/security/nessus-libnasl-devel/distinfo
+++ b/security/nessus-libnasl-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/libnasl-2.2.2a.tar.gz) = 1ef731dd1470b9c4976071bad2fdfac6
-SIZE (nessus/libnasl-2.2.2a.tar.gz) = 366669
+MD5 (nessus/libnasl-2.3.0.tar.gz) = 515212623424c7c6d4a1d4b23c7ff4ef
+SIZE (nessus/libnasl-2.3.0.tar.gz) = 367487
diff --git a/security/nessus-libnasl-devel/pkg-plist b/security/nessus-libnasl-devel/pkg-plist
index ff8dfaa2c8f..4f5d39321a4 100644
--- a/security/nessus-libnasl-devel/pkg-plist
+++ b/security/nessus-libnasl-devel/pkg-plist
@@ -4,5 +4,5 @@ include/nessus/nasl.h
 lib/libnasl.a
 lib/libnasl.la
 lib/libnasl.so
-lib/libnasl.so.4
+lib/libnasl.so.5
 var/nessus/nessus_org.pem
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 3d046f4f2ac..82ccb53f4dd 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -9,14 +9,14 @@
 # client.
 
 PORTNAME=	nessus-libraries-devel
-PORTVERSION=	2.2.2a
+PORTVERSION=	2.3.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.au.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/
+MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.au.nessus.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.ayamura.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/
 DISTNAME=	nessus-libraries-${PORTVERSION}
 
 MAINTAINER=	udo.schweigert@siemens.com
@@ -28,7 +28,8 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
 USE_BISON=	YES
-USE_LIBTOOL_VER=13
+USE_AUTOCONF_VER=	213
+USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--enable-cipher
 .if defined(WITH_NESSUS_BPF_SHARE)
 CONFIGURE_ARGS+=	--enable-bpf-sharing
diff --git a/security/nessus-libraries-devel/distinfo b/security/nessus-libraries-devel/distinfo
index f0369aa135b..ae1c918a158 100644
--- a/security/nessus-libraries-devel/distinfo
+++ b/security/nessus-libraries-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/nessus-libraries-2.2.2a.tar.gz) = b1f0fb61aa9dfd6f7189a84dc9007d34
-SIZE (nessus/nessus-libraries-2.2.2a.tar.gz) = 423965
+MD5 (nessus/nessus-libraries-2.3.0.tar.gz) = f4e51a31efeaad795d0382de6e8fcff1
+SIZE (nessus/nessus-libraries-2.3.0.tar.gz) = 424340
diff --git a/security/nessus-libraries-devel/pkg-plist b/security/nessus-libraries-devel/pkg-plist
index c3728f83d7f..905c940e6db 100644
--- a/security/nessus-libraries-devel/pkg-plist
+++ b/security/nessus-libraries-devel/pkg-plist
@@ -9,15 +9,15 @@ include/nessus/net/bpf.h
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.la
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.4
+lib/libhosts_gatherer.so.5
 lib/libnessus.a
 lib/libnessus.la
 lib/libnessus.so
-lib/libnessus.so.4
+lib/libnessus.so.5
 lib/libpcap-nessus.a
 lib/libpcap-nessus.la
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.4
+lib/libpcap-nessus.so.5
 sbin/uninstall-nessus
 @dirrm include/nessus/net
 @dirrm include/nessus
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index 7e4fadde0b8..480dd7029ea 100644
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	nessus-plugins-devel
-PORTVERSION=	2.2.2a
+PORTVERSION=	2.3.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.au.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/
+MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.au.nessus.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.ayamura.org/pub/nessus/experimental/nessus-${PORTVERSION}/src/
 DISTNAME=	nessus-plugins-${PORTVERSION}
 
 MAINTAINER=	udo.schweigert@siemens.com
@@ -23,8 +23,7 @@ CONFLICTS=	nessus-plugins-[0-9]*
 
 BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus-devel
 RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus-devel \
-		nmap:${PORTSDIR}/security/nmap \
-		wget:${PORTSDIR}/ftp/wget
+		nmap:${PORTSDIR}/security/nmap
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
diff --git a/security/nessus-plugins-devel/distinfo b/security/nessus-plugins-devel/distinfo
index fd1700ff9fd..3d65583bdff 100644
--- a/security/nessus-plugins-devel/distinfo
+++ b/security/nessus-plugins-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/nessus-plugins-2.2.2a.tar.gz) = 19881413bd26f08f1d960a0076353e6e
-SIZE (nessus/nessus-plugins-2.2.2a.tar.gz) = 2758380
+MD5 (nessus/nessus-plugins-2.3.0.tar.gz) = 0b7f33b394f6c16d281ca7e59c5fec2a
+SIZE (nessus/nessus-plugins-2.3.0.tar.gz) = 2802795
diff --git a/security/nessus-plugins-devel/pkg-plist b/security/nessus-plugins-devel/pkg-plist
index 8e231a4ec35..8a83bfcba28 100644
--- a/security/nessus-plugins-devel/pkg-plist
+++ b/security/nessus-plugins-devel/pkg-plist
@@ -3,6 +3,7 @@ lib/nessus/plugins/04webserver.nasl
 lib/nessus/plugins/12planet_chat_server_path_disclosure.nasl
 lib/nessus/plugins/12planet_chat_server_plaintext_password.nasl
 lib/nessus/plugins/12planet_chat_server_xss.nasl
+lib/nessus/plugins/2bgal_sql_injection.nasl
 lib/nessus/plugins/3com_config_disclosure.nasl
 lib/nessus/plugins/3com_nbx_voip_netset_detection.nasl
 lib/nessus/plugins/3com_ras_crash.nasl
@@ -347,6 +348,7 @@ lib/nessus/plugins/arcserve_hidden_share.nasl
 lib/nessus/plugins/argosoft_dos.nasl
 lib/nessus/plugins/argosoft_ftp_shortcut.nasl
 lib/nessus/plugins/argosoft_multiple_flaws.nasl
+lib/nessus/plugins/argosoft_multiple_flaws2.nasl
 lib/nessus/plugins/argosoft_server_xcmd.nasl
 lib/nessus/plugins/args_bat.nasl
 lib/nessus/plugins/arkeia.nasl
@@ -355,6 +357,7 @@ lib/nessus/plugins/artmedic_kleinanzeigen_file_inclusion.nasl
 lib/nessus/plugins/artmedic_links5_file_inclusion.nasl
 lib/nessus/plugins/ascend_kill.nasl
 lib/nessus/plugins/asip-status.nasl
+lib/nessus/plugins/aspRider_sql.nasl
 lib/nessus/plugins/aspWebAlbum.nasl
 lib/nessus/plugins/aspWebCalendar_sql.nasl
 lib/nessus/plugins/asp_net_css.nasl
@@ -553,6 +556,7 @@ lib/nessus/plugins/cisco_ipv4_dos.nasl
 lib/nessus/plugins/cisco_no_pw.nasl
 lib/nessus/plugins/cisco_ssh_multiple_vulns.nasl
 lib/nessus/plugins/cisco_voip_dos.nasl
+lib/nessus/plugins/citadel_fmt_string.nasl
 lib/nessus/plugins/citadel_overflow.nasl
 lib/nessus/plugins/citrix.nasl
 lib/nessus/plugins/citrix_find.nasl
@@ -634,6 +638,7 @@ 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/cvstrac_unspecified_xss.nasl
 lib/nessus/plugins/cvsweb_shell.nasl
 lib/nessus/plugins/cvsweb_version.nasl
 lib/nessus/plugins/cwmail.nasl
@@ -1260,6 +1265,17 @@ lib/nessus/plugins/debian_DSA-604.nasl
 lib/nessus/plugins/debian_DSA-605.nasl
 lib/nessus/plugins/debian_DSA-606.nasl
 lib/nessus/plugins/debian_DSA-607.nasl
+lib/nessus/plugins/debian_DSA-608.nasl
+lib/nessus/plugins/debian_DSA-609.nasl
+lib/nessus/plugins/debian_DSA-610.nasl
+lib/nessus/plugins/debian_DSA-611.nasl
+lib/nessus/plugins/debian_DSA-612.nasl
+lib/nessus/plugins/debian_DSA-613.nasl
+lib/nessus/plugins/debian_DSA-614.nasl
+lib/nessus/plugins/debian_DSA-615.nasl
+lib/nessus/plugins/debian_DSA-616.nasl
+lib/nessus/plugins/debian_DSA-617.nasl
+lib/nessus/plugins/debian_DSA-618.nasl
 lib/nessus/plugins/debian_package.inc
 lib/nessus/plugins/debian_sasl_default_pwd.nasl
 lib/nessus/plugins/deep_throat.nasl
@@ -1321,6 +1337,7 @@ lib/nessus/plugins/e107_db_dump.nasl
 lib/nessus/plugins/eDonkey_detect.nasl
 lib/nessus/plugins/eMuleWebServer_detect.nasl
 lib/nessus/plugins/eXtremail_format_strings.nasl
+lib/nessus/plugins/e_boards_directory_traversal.nasl
 lib/nessus/plugins/easydynamicpages_code_injection.nasl
 lib/nessus/plugins/easyweb_filemanager.nasl
 lib/nessus/plugins/ebola_overflow.nasl
@@ -1528,6 +1545,23 @@ lib/nessus/plugins/fedora_2004-472.nasl
 lib/nessus/plugins/fedora_2004-487.nasl
 lib/nessus/plugins/fedora_2004-489.nasl
 lib/nessus/plugins/fedora_2004-530.nasl
+lib/nessus/plugins/fedora_2004-546.nasl
+lib/nessus/plugins/fedora_2004-548.nasl
+lib/nessus/plugins/fedora_2004-549.nasl
+lib/nessus/plugins/fedora_2004-550.nasl
+lib/nessus/plugins/fedora_2004-551.nasl
+lib/nessus/plugins/fedora_2004-561.nasl
+lib/nessus/plugins/fedora_2004-562.nasl
+lib/nessus/plugins/fedora_2004-563.nasl
+lib/nessus/plugins/fedora_2004-564.nasl
+lib/nessus/plugins/fedora_2004-567.nasl
+lib/nessus/plugins/fedora_2004-568.nasl
+lib/nessus/plugins/fedora_2004-572.nasl
+lib/nessus/plugins/fedora_2004-573.nasl
+lib/nessus/plugins/fedora_2004-574.nasl
+lib/nessus/plugins/fedora_2004-575.nasl
+lib/nessus/plugins/fedora_2004-576.nasl
+lib/nessus/plugins/fedora_2004-577.nasl
 lib/nessus/plugins/filemakerpro_server.nasl
 lib/nessus/plugins/find_ap.nasl
 lib/nessus/plugins/find_service.nes
@@ -1545,6 +1579,7 @@ lib/nessus/plugins/finger_solaris_disclosure.nasl
 lib/nessus/plugins/finjan_cmd_restart.nasl
 lib/nessus/plugins/firebird_bo.nasl
 lib/nessus/plugins/firewall1_dos.nasl
+lib/nessus/plugins/firstclass_http_dos.nasl
 lib/nessus/plugins/flash_ftp_server_directory_traversal.nasl
 lib/nessus/plugins/flash_player_local_files.nasl
 lib/nessus/plugins/flash_player_overflows.nasl
@@ -2098,6 +2133,23 @@ lib/nessus/plugins/gentoo_GLSA-200412-03.nasl
 lib/nessus/plugins/gentoo_GLSA-200412-04.nasl
 lib/nessus/plugins/gentoo_GLSA-200412-05.nasl
 lib/nessus/plugins/gentoo_GLSA-200412-06.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-07.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-08.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-09.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-10.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-11.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-12.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-13.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-14.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-15.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-16.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-17.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-18.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-19.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-20.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-21.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-22.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-23.nasl
 lib/nessus/plugins/girlfriend.nasl
 lib/nessus/plugins/glimpse.nasl
 lib/nessus/plugins/global_settings.inc
@@ -2105,6 +2157,7 @@ lib/nessus/plugins/global_settings.nasl
 lib/nessus/plugins/gnapster_get_file.nasl
 lib/nessus/plugins/gnocatan_overflow.nasl
 lib/nessus/plugins/gnu_cfserv.nasl
+lib/nessus/plugins/gnuboard_file_include.nasl
 lib/nessus/plugins/gnutella_detect.nasl
 lib/nessus/plugins/gnutella_export.nasl
 lib/nessus/plugins/goodtech_ftpd_dos.nasl
@@ -2280,6 +2333,7 @@ lib/nessus/plugins/iisprotect_sql_injection.nasl
 lib/nessus/plugins/ike_check.nasl
 lib/nessus/plugins/ike_detect.nasl
 lib/nessus/plugins/ikonboard_cmd_exec.nasl
+lib/nessus/plugins/ikonboard_sql_inject.nasl
 lib/nessus/plugins/ilohamail_arbitrary_file_access_via_lang.nasl
 lib/nessus/plugins/ilohamail_arbitrary_file_access_via_session.nasl
 lib/nessus/plugins/ilohamail_attachment_upload.nasl
@@ -2288,6 +2342,7 @@ lib/nessus/plugins/ilohamail_detect.nasl
 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_unspecified_vuln.nasl
 lib/nessus/plugins/ilohamail_user_parameter.nasl
 lib/nessus/plugins/imagefolio_default_password.nasl
 lib/nessus/plugins/imagemap.nasl
@@ -2365,6 +2420,7 @@ 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/iwebnegar_sql.nasl
 lib/nessus/plugins/iws_shtml.nasl
 lib/nessus/plugins/ixmail_arbitrary_file_upload.nasl
 lib/nessus/plugins/ixmail_sql_injection.nasl
@@ -2394,6 +2450,7 @@ lib/nessus/plugins/js.scob.trojan.nasl
 lib/nessus/plugins/jserv_execute.nasl
 lib/nessus/plugins/jshop_xss.nasl
 lib/nessus/plugins/jwalk_traversal.nasl
+lib/nessus/plugins/kayako_sql_injection.nasl
 lib/nessus/plugins/kazaa_installed.nasl
 lib/nessus/plugins/kazaa_morpheus_detect.nasl
 lib/nessus/plugins/kazaa_network.nasl
@@ -2424,6 +2481,7 @@ lib/nessus/plugins/l2tpd_overflow2.nasl
 lib/nessus/plugins/labrea.nasl
 lib/nessus/plugins/labview_www_DoS.nasl
 lib/nessus/plugins/land.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
@@ -2895,6 +2953,16 @@ lib/nessus/plugins/mandrake_MDKSA-2004-144.nasl
 lib/nessus/plugins/mandrake_MDKSA-2004-145.nasl
 lib/nessus/plugins/mandrake_MDKSA-2004-146.nasl
 lib/nessus/plugins/mandrake_MDKSA-2004-147.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-148.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-149.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-150.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-151.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-152.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-153.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-154.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-155.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-156.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-157.nasl
 lib/nessus/plugins/manpage_file_disclosure.nasl
 lib/nessus/plugins/mantis_detect.nasl
 lib/nessus/plugins/mantis_multiple_vulns.nasl
@@ -3046,6 +3114,7 @@ lib/nessus/plugins/mysql_unpassworded.nasl
 lib/nessus/plugins/mysql_version.nasl
 lib/nessus/plugins/nai_webshield_info.nasl
 lib/nessus/plugins/nai_webshield_overflow.nasl
+lib/nessus/plugins/namazu_multiple_vulns.nasl
 lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/nav_installed.nasl
 lib/nessus/plugins/nav_version.nasl
@@ -3112,6 +3181,7 @@ lib/nessus/plugins/nfs_fsirand.nasl
 lib/nessus/plugins/nfs_func.inc
 lib/nessus/plugins/nfs_mount.nasl
 lib/nessus/plugins/nfs_portmap.nasl
+lib/nessus/plugins/nfs_user_mount.nasl
 lib/nessus/plugins/nfs_xlog_overflow.nasl
 lib/nessus/plugins/nikto.nasl
 lib/nessus/plugins/nikto_wrapper.nes
@@ -3168,6 +3238,7 @@ lib/nessus/plugins/oas_overflow.nasl
 lib/nessus/plugins/objectserver.nes
 lib/nessus/plugins/ocean12_db_download.nasl
 lib/nessus/plugins/ocean12_guestbook_xss.nasl
+lib/nessus/plugins/ocean12aspcalendar.nasl
 lib/nessus/plugins/ocp_portal_file_include.nasl
 lib/nessus/plugins/odbc_tools_check.nasl
 lib/nessus/plugins/office_files.nasl
@@ -3315,12 +3386,15 @@ lib/nessus/plugins/phorum_search_xss.nasl
 lib/nessus/plugins/photoaday_xss.nasl
 lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
+lib/nessus/plugins/php45_multiple_flaws.nasl
 lib/nessus/plugins/php4_multiple_flaws.nasl
 lib/nessus/plugins/php4_path_disclosure.nasl
+lib/nessus/plugins/phpDig_unspecifed_vuln.nasl
 lib/nessus/plugins/phpMyAdmin_file_reading.nasl
 lib/nessus/plugins/phpMyAdmin_file_reading2.nasl
 lib/nessus/plugins/phpMyAdmin_multiple_flaws.nasl
 lib/nessus/plugins/phpMyAdmin_remote_cmd.nasl
+lib/nessus/plugins/phpMyAdmin_various_issues.nasl
 lib/nessus/plugins/phpMyAdmin_xss.nasl
 lib/nessus/plugins/phpMyExplorer.nasl
 lib/nessus/plugins/phpPgAdmin_file_reading.nasl
@@ -3369,6 +3443,7 @@ lib/nessus/plugins/phpcsl_xss.nasl
 lib/nessus/plugins/phpdig_code_injection.nasl
 lib/nessus/plugins/phpgedview_directory_traversal.nasl
 lib/nessus/plugins/phpgedview_multiple_flaws.nasl
+lib/nessus/plugins/phpgroupware_detect.nasl
 lib/nessus/plugins/phpgroupware_file_include.nasl
 lib/nessus/plugins/phpgroupware_html_injection.nasl
 lib/nessus/plugins/phpgroupware_plaintext_cookie_auth_vuln.nasl
@@ -3377,12 +3452,14 @@ lib/nessus/plugins/phpgroupware_remote_file_include.nasl
 lib/nessus/plugins/phpgroupware_server_side_exec_vuln.nasl
 lib/nessus/plugins/phpgroupware_sql_injection.nasl
 lib/nessus/plugins/phpgroupware_xss.nasl
+lib/nessus/plugins/phpgroupware_xss_and_sql.nasl
 lib/nessus/plugins/phpinfo.nasl
 lib/nessus/plugins/phpix.nasl
 lib/nessus/plugins/phpix_cmd_exec.nasl
 lib/nessus/plugins/phpkit_multiple_flaws.nasl
 lib/nessus/plugins/phplive_unspecified_vuln.nasl
 lib/nessus/plugins/phpmybackpro_multiple_flaws.nasl
+lib/nessus/plugins/phpmychat_information_disclosure.nasl
 lib/nessus/plugins/phpmyfaq_action_parameter_flaw.nasl
 lib/nessus/plugins/phpmyfaq_admin_bypass.nasl
 lib/nessus/plugins/phpping_code_execution.nasl
@@ -3479,6 +3556,12 @@ lib/nessus/plugins/psybnc_check.nasl
 lib/nessus/plugins/psychoblogger_sql_injection.nasl
 lib/nessus/plugins/psynch_multiple_vulns.nasl
 lib/nessus/plugins/ptnews_admin.nasl
+lib/nessus/plugins/punBB_detect.nasl
+lib/nessus/plugins/punBB_img_xss.nasl
+lib/nessus/plugins/punBB_info_disclosure.nasl
+lib/nessus/plugins/punBB_install_xss.nasl
+lib/nessus/plugins/punBB_profile_xss.nasl
+lib/nessus/plugins/punBB_url_quote_xss.nasl
 lib/nessus/plugins/putty_arbitrary_command_execution.nasl
 lib/nessus/plugins/putty_logon_credential_leak.nasl
 lib/nessus/plugins/putty_version_check.nasl
@@ -3782,22 +3865,44 @@ lib/nessus/plugins/redhat-RHSA-2004-478.nasl
 lib/nessus/plugins/redhat-RHSA-2004-479.nasl
 lib/nessus/plugins/redhat-RHSA-2004-480.nasl
 lib/nessus/plugins/redhat-RHSA-2004-486.nasl
+lib/nessus/plugins/redhat-RHSA-2004-489.nasl
 lib/nessus/plugins/redhat-RHSA-2004-494.nasl
 lib/nessus/plugins/redhat-RHSA-2004-498.nasl
+lib/nessus/plugins/redhat-RHSA-2004-505.nasl
+lib/nessus/plugins/redhat-RHSA-2004-536.nasl
+lib/nessus/plugins/redhat-RHSA-2004-537.nasl
 lib/nessus/plugins/redhat-RHSA-2004-543.nasl
 lib/nessus/plugins/redhat-RHSA-2004-546.nasl
+lib/nessus/plugins/redhat-RHSA-2004-549.nasl
 lib/nessus/plugins/redhat-RHSA-2004-562.nasl
 lib/nessus/plugins/redhat-RHSA-2004-569.nasl
 lib/nessus/plugins/redhat-RHSA-2004-577.nasl
+lib/nessus/plugins/redhat-RHSA-2004-583.nasl
 lib/nessus/plugins/redhat-RHSA-2004-585.nasl
+lib/nessus/plugins/redhat-RHSA-2004-586.nasl
 lib/nessus/plugins/redhat-RHSA-2004-591.nasl
 lib/nessus/plugins/redhat-RHSA-2004-592.nasl
 lib/nessus/plugins/redhat-RHSA-2004-597.nasl
+lib/nessus/plugins/redhat-RHSA-2004-600.nasl
 lib/nessus/plugins/redhat-RHSA-2004-604.nasl
 lib/nessus/plugins/redhat-RHSA-2004-609.nasl
+lib/nessus/plugins/redhat-RHSA-2004-610.nasl
 lib/nessus/plugins/redhat-RHSA-2004-611.nasl
+lib/nessus/plugins/redhat-RHSA-2004-612.nasl
 lib/nessus/plugins/redhat-RHSA-2004-615.nasl
 lib/nessus/plugins/redhat-RHSA-2004-632.nasl
+lib/nessus/plugins/redhat-RHSA-2004-634.nasl
+lib/nessus/plugins/redhat-RHSA-2004-635.nasl
+lib/nessus/plugins/redhat-RHSA-2004-636.nasl
+lib/nessus/plugins/redhat-RHSA-2004-638.nasl
+lib/nessus/plugins/redhat-RHSA-2004-650.nasl
+lib/nessus/plugins/redhat-RHSA-2004-651.nasl
+lib/nessus/plugins/redhat-RHSA-2004-654.nasl
+lib/nessus/plugins/redhat-RHSA-2004-670.nasl
+lib/nessus/plugins/redhat-RHSA-2004-674.nasl
+lib/nessus/plugins/redhat-RHSA-2004-681.nasl
+lib/nessus/plugins/redhat-RHSA-2004-687.nasl
+lib/nessus/plugins/redhat-RHSA-2004-689.nasl
 lib/nessus/plugins/redhat_fixes.nasl
 lib/nessus/plugins/redhat_update_level.nasl
 lib/nessus/plugins/relative_field_vulnerability.nasl
@@ -3889,6 +3994,7 @@ lib/nessus/plugins/sahagent_detection.nasl
 lib/nessus/plugins/samba_arbitrary_file_access.nasl
 lib/nessus/plugins/samba_arbitrary_file_creation.nasl
 lib/nessus/plugins/samba_asn1_dos.nasl
+lib/nessus/plugins/samba_dacl_overflow.nasl
 lib/nessus/plugins/samba_findnextprintchangenotify_dos.nasl
 lib/nessus/plugins/samba_frags_overflow.nasl
 lib/nessus/plugins/samba_mangling_overflow.nasl
@@ -3954,6 +4060,7 @@ lib/nessus/plugins/sendmail_prescan_overflow.nasl
 lib/nessus/plugins/sendmail_queue_destruction.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
 lib/nessus/plugins/sendmail_sun_forward.nasl
+lib/nessus/plugins/sendmail_wiz.nasl
 lib/nessus/plugins/sendtemp.nasl
 lib/nessus/plugins/ser_missing_to_in_ack_dos.nasl
 lib/nessus/plugins/ser_register_overflow.nasl
@@ -3995,6 +4102,7 @@ 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/singapore_flaws.nasl
 lib/nessus/plugins/sip_detection.nasl
 lib/nessus/plugins/sip_status_server.nasl
 lib/nessus/plugins/siteUserMod.nasl
@@ -4055,6 +4163,7 @@ lib/nessus/plugins/smb_netusergetgroups.nasl
 lib/nessus/plugins/smb_netusergetinfo.nasl
 lib/nessus/plugins/smb_netusergetinfo_local.nasl
 lib/nessus/plugins/smb_nt.inc
+lib/nessus/plugins/smb_nt_886185.nasl
 lib/nessus/plugins/smb_nt_kb870669.nasl
 lib/nessus/plugins/smb_nt_ms00-029.nasl
 lib/nessus/plugins/smb_nt_ms00-035.nasl
@@ -4173,6 +4282,11 @@ lib/nessus/plugins/smb_nt_ms04-034.nasl
 lib/nessus/plugins/smb_nt_ms04-037.nasl
 lib/nessus/plugins/smb_nt_ms04-039.nasl
 lib/nessus/plugins/smb_nt_ms04-040.nasl
+lib/nessus/plugins/smb_nt_ms04-041.nasl
+lib/nessus/plugins/smb_nt_ms04-042.nasl
+lib/nessus/plugins/smb_nt_ms04-043.nasl
+lib/nessus/plugins/smb_nt_ms04-044.nasl
+lib/nessus/plugins/smb_nt_ms04-045.nasl
 lib/nessus/plugins/smb_null_params_dos.nasl
 lib/nessus/plugins/smb_reg_MTS_access.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
@@ -5281,6 +5395,7 @@ lib/nessus/plugins/solaris9_x86_116808.nasl
 lib/nessus/plugins/solaris9_x86_117072.nasl
 lib/nessus/plugins/solaris9_x86_117163.nasl
 lib/nessus/plugins/solaris9_x86_117172.nasl
+lib/nessus/plugins/solaris9_x86_117456.nasl
 lib/nessus/plugins/solaris_lpd_env_cmd_exec.nasl
 lib/nessus/plugins/sophos_installed.nasl
 lib/nessus/plugins/source_routed.nasl
@@ -5349,6 +5464,7 @@ 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/subversion_detection.nasl
+lib/nessus/plugins/sugarsales_file_reading.nasl
 lib/nessus/plugins/sun_cobalt_adaptive_firewall_detect.nasl
 lib/nessus/plugins/sun_one_jsp_source.nasl
 lib/nessus/plugins/sunftpd_overflow.nasl
@@ -5561,6 +5677,7 @@ lib/nessus/plugins/typsoftftp_dir_traversal.nasl
 lib/nessus/plugins/typsoftftp_empty_username_dos.nasl
 lib/nessus/plugins/typsoftftp_retr_dos.nasl
 lib/nessus/plugins/ubbthreads_sql_injection.nasl
+lib/nessus/plugins/ubbthreads_xss.nasl
 lib/nessus/plugins/uddi.inc
 lib/nessus/plugins/uddi.nasl
 lib/nessus/plugins/ulog_php_sql_injection.nasl
@@ -5581,6 +5698,7 @@ 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/usemodwiki_xss.nasl
 lib/nessus/plugins/usermin_session_id.nasl
 lib/nessus/plugins/usrobotics_disclosed_password.nasl
 lib/nessus/plugins/ustorekeeper.nasl
@@ -5695,12 +5813,14 @@ lib/nessus/plugins/wildtangent_detection.nasl
 lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/winamp_buffer_overflow.nasl
 lib/nessus/plugins/winamp_in_cdda_buffer_overflow.nasl
+lib/nessus/plugins/winamp_mp4_dos.nasl
 lib/nessus/plugins/windmail.nasl
 lib/nessus/plugins/windows_asn1_vuln_ntlm.nasl
 lib/nessus/plugins/windows_terminal_services.nasl
 lib/nessus/plugins/wingate.nasl
 lib/nessus/plugins/wingate_denial.nasl
 lib/nessus/plugins/wingate_user.nasl
+lib/nessus/plugins/winmail_mail_server_information_disclosure.nasl
 lib/nessus/plugins/winmessenger_installed.nasl
 lib/nessus/plugins/winmx_detect2.nasl
 lib/nessus/plugins/winmx_installed.nasl
@@ -5708,6 +5828,7 @@ lib/nessus/plugins/winnt_dns_flood.nasl
 lib/nessus/plugins/winnt_pptp_dos.nasl
 lib/nessus/plugins/winnuke.nasl
 lib/nessus/plugins/wins_overflow.nasl
+lib/nessus/plugins/wins_replication_overflow.nasl
 lib/nessus/plugins/wins_udp_flood.nasl
 lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/winsyslog_dos.nasl
@@ -5715,8 +5836,10 @@ 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/wordpress_flaws2.nasl
 lib/nessus/plugins/wordpress_http_splitting.nasl
 lib/nessus/plugins/wordpress_xss.nasl
+lib/nessus/plugins/wordpress_xss_sql.nasl
 lib/nessus/plugins/worldclient_server_detection.nasl
 lib/nessus/plugins/worldspan_gw_DoS.nasl
 lib/nessus/plugins/worm_netsky_b.nasl