Update to 1.0.5

PR:		21944
Submitted by:	Anders Nordby <anders@fix.no> MAINTAINER

18 files changed, 172 insertions, 130 deletions

diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 2b223a7811b0..e2c508a174f0 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
-DISTNAME=	nessus-core-1.0.4
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
+DISTNAME=	nessus-core-${PORTVERSION}
 
 MAINTAINER=	anders@fix.no
 
 LIB_DEPENDS=	nasl.1:${PORTSDIR}/security/nessus-libnasl
 
-NESSUS_REV=	${DISTNAME:S/nessus-core-//g}
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 
@@ -36,9 +34,9 @@ MAN1=		nessus.1
 MAN8=		nessusd.8 nessus-adduser.8
 
 post-install:
-	@${ECHO} "=========================================================="
-	@${ECHO} "Be sure to erase your old ${PREFIX}/etc/nessus!"
-	@${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!"
-	@${ECHO} "=========================================================="
+	@${ECHO} "================================================================================"
+	@${ECHO} "Use ${PREFIX}/sbin/update/nessus-update-plugins to update your plugin"
+	@${ECHO} "collection."
+	@${ECHO} "================================================================================"
 
 .include <bsd.port.mk>
diff --git a/security/nessus-devel/distinfo b/security/nessus-devel/distinfo
index 26db817bee21..fa9a5ed129cd 100644
--- a/security/nessus-devel/distinfo
+++ b/security/nessus-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.4.tar.gz) = b6d66f613b3c45526195df9e0087dd63
+MD5 (nessus/nessus-core-1.0.5.tar.gz) = e5636b91642588c4bff8c69b582e3e01
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index b01f369ed831..9d0e2890085d 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
-DISTNAME=	libnasl-1.0.4
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	libnasl-patch-1
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
+DISTNAME=	libnasl-${PORTVERSION}
 
 MAINTAINER=	anders@fix.no
 
 LIB_DEPENDS=	nessus.1:${PORTSDIR}/security/nessus-libraries
 
-NESSUS_REV=	${DISTNAME:S/libnasl-//g}
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
diff --git a/security/nessus-libnasl-devel/distinfo b/security/nessus-libnasl-devel/distinfo
index f380c4501868..d3ccc690944e 100644
--- a/security/nessus-libnasl-devel/distinfo
+++ b/security/nessus-libnasl-devel/distinfo
@@ -1,2 +1 @@
-MD5 (nessus/libnasl-1.0.4.tar.gz) = 3a91b6d6a42b8b73124990a13bbd0da2
-MD5 (nessus/libnasl-patch-1) = a5588935d8d656de4ac3b95e8d3484ea
+MD5 (nessus/libnasl-1.0.5.tar.gz) = cd64d77103817b562e0c4e8a77b8856e
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index b01f369ed831..9d0e2890085d 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
-DISTNAME=	libnasl-1.0.4
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	libnasl-patch-1
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
+DISTNAME=	libnasl-${PORTVERSION}
 
 MAINTAINER=	anders@fix.no
 
 LIB_DEPENDS=	nessus.1:${PORTSDIR}/security/nessus-libraries
 
-NESSUS_REV=	${DISTNAME:S/libnasl-//g}
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index f380c4501868..d3ccc690944e 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1,2 +1 @@
-MD5 (nessus/libnasl-1.0.4.tar.gz) = 3a91b6d6a42b8b73124990a13bbd0da2
-MD5 (nessus/libnasl-patch-1) = a5588935d8d656de4ac3b95e8d3484ea
+MD5 (nessus/libnasl-1.0.5.tar.gz) = cd64d77103817b562e0c4e8a77b8856e
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index e2c415e75d82..369c2e436b5c 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
 
 MAINTAINER=	anders@fix.no
 
-NESSUS_REV=	${DISTNAME:S/nessus-libraries-//g}
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
diff --git a/security/nessus-libraries-devel/distinfo b/security/nessus-libraries-devel/distinfo
index 2a84bd708a43..34a0b154b0f9 100644
--- a/security/nessus-libraries-devel/distinfo
+++ b/security/nessus-libraries-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.0.4.tar.gz) = 1fe60e282532c6018ed402a275903c15
+MD5 (nessus/nessus-libraries-1.0.5.tar.gz) = f34c510ab6e05119b3d6cf66558adb7d
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index e2c415e75d82..369c2e436b5c 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
 
 MAINTAINER=	anders@fix.no
 
-NESSUS_REV=	${DISTNAME:S/nessus-libraries-//g}
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 2a84bd708a43..34a0b154b0f9 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.0.4.tar.gz) = 1fe60e282532c6018ed402a275903c15
+MD5 (nessus/nessus-libraries-1.0.5.tar.gz) = f34c510ab6e05119b3d6cf66558adb7d
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index d0abcd48a739..b18fb1946142 100644
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
 
 MAINTAINER=	anders@fix.no
 
 BUILD_DEPENDS=	${LOCALBASE}/include/nessus/config.h:${PORTSDIR}/security/nessus \
 		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
-NESSUS_REV=	${DISTNAME:S/nessus-plugins-//g}
+RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
+		lynx:${PORTSDIR}/www/lynx
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
diff --git a/security/nessus-plugins-devel/distinfo b/security/nessus-plugins-devel/distinfo
index 4eaee43c2803..b280f081b061 100644
--- a/security/nessus-plugins-devel/distinfo
+++ b/security/nessus-plugins-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-1.0.4.tar.gz) = dc6a2758761428f3bf66d0a06806d66a
+MD5 (nessus/nessus-plugins-1.0.5.tar.gz) = a805e3195d52353beffb74900052ddaa
diff --git a/security/nessus-plugins-devel/pkg-plist b/security/nessus-plugins-devel/pkg-plist
index b78031f67174..71ef421ead08 100644
--- a/security/nessus-plugins-devel/pkg-plist
+++ b/security/nessus-plugins-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/nessus-build
-sbin/nessus-update-plugins
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
 lib/nessus/plugins/ColdFusion.nasl
@@ -27,6 +26,7 @@ lib/nessus/plugins/amanda_detect.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
 lib/nessus/plugins/analogx.nasl
 lib/nessus/plugins/analogx_dos.nasl
+lib/nessus/plugins/analogx_traversal.nasl
 lib/nessus/plugins/annex_dos.nasl
 lib/nessus/plugins/apache_slash.nasl
 lib/nessus/plugins/apache_source_asp.nasl
@@ -38,9 +38,11 @@ lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
 lib/nessus/plugins/axis.nasl
+lib/nessus/plugins/axis_camera.nasl
 lib/nessus/plugins/backorifice1.nasl
 lib/nessus/plugins/bb-hist.nasl
 lib/nessus/plugins/bb-hostsvc.nasl
+lib/nessus/plugins/bboard.nasl
 lib/nessus/plugins/bftelnet.nasl
 lib/nessus/plugins/bigconf.nasl
 lib/nessus/plugins/bind_bof.nes
@@ -53,6 +55,7 @@ lib/nessus/plugins/c32.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/calendar.nasl
 lib/nessus/plugins/campas.nasl
 lib/nessus/plugins/cassandra_nntp_dos.nasl
 lib/nessus/plugins/cdk.nasl
@@ -89,6 +92,7 @@ lib/nessus/plugins/dragon_ftp.nasl
 lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/dumpenv.nasl
 lib/nessus/plugins/echo.nasl
+lib/nessus/plugins/eftp_dos.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
 lib/nessus/plugins/eserv.nasl
 lib/nessus/plugins/eviewer.nasl
@@ -109,6 +113,7 @@ lib/nessus/plugins/formmail_pl.nasl
 lib/nessus/plugins/fp_htimage.nasl
 lib/nessus/plugins/frontpage.nasl
 lib/nessus/plugins/frontpage_authors.nasl
+lib/nessus/plugins/frontpage_dos.nasl
 lib/nessus/plugins/frontpage_dvwssr.nasl
 lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/ftp_anonymous.nasl
@@ -124,6 +129,7 @@ lib/nessus/plugins/ftp_pl.nasl
 lib/nessus/plugins/ftp_realpath.nasl
 lib/nessus/plugins/ftp_root.nasl
 lib/nessus/plugins/ftp_servu_dos.nasl
+lib/nessus/plugins/ftp_servu_dos2.nasl
 lib/nessus/plugins/ftp_site_exec.nasl
 lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftpgate.nasl
@@ -142,9 +148,12 @@ lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_printer_display.nasl
 lib/nessus/plugins/hp_remote_print.nasl
+lib/nessus/plugins/hpux_ftpd.nasl
 lib/nessus/plugins/htdig.nasl
+lib/nessus/plugins/htgrep.nasl
 lib/nessus/plugins/htmlscript.nasl
 lib/nessus/plugins/htsearch_location.nasl
+lib/nessus/plugins/http_methods.nasl
 lib/nessus/plugins/http_version.nasl
 lib/nessus/plugins/httpd_nobody.nasl
 lib/nessus/plugins/hyperbomb.nasl
@@ -157,6 +166,7 @@ lib/nessus/plugins/icmp_mask_req.nasl
 lib/nessus/plugins/icmp_timestamp.nasl
 lib/nessus/plugins/icq_crash.nasl
 lib/nessus/plugins/idq_dll.nasl
+lib/nessus/plugins/iis_anything_idq.nasl
 lib/nessus/plugins/iis_authentification_manager.nasl
 lib/nessus/plugins/iis_buffer_overflow.nasl
 lib/nessus/plugins/iis_crash.nasl
@@ -169,6 +179,7 @@ lib/nessus/plugins/iis_samples.nasl
 lib/nessus/plugins/iis_scripts.nasl
 lib/nessus/plugins/iisadmin.nasl
 lib/nessus/plugins/imagemap.nasl
+lib/nessus/plugins/imail_host_overflow.nasl
 lib/nessus/plugins/imail_imapd_overflow.nasl
 lib/nessus/plugins/imail_imonitor_overflow.nasl
 lib/nessus/plugins/imap_overflow.nasl
@@ -214,6 +225,7 @@ lib/nessus/plugins/mssqlserver_dos.nasl
 lib/nessus/plugins/mstream_agent.nasl
 lib/nessus/plugins/mstream_handler.nasl
 lib/nessus/plugins/multicsp_detect.nasl
+lib/nessus/plugins/multihtml.nasl
 lib/nessus/plugins/mysql_bad_password.nasl
 lib/nessus/plugins/mysql_unpassworded.nasl
 lib/nessus/plugins/nai_webshield_info.nasl
@@ -222,6 +234,7 @@ lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/nessus_detect.nasl
 lib/nessus/plugins/nestea.nasl
+lib/nessus/plugins/netauth.nasl
 lib/nessus/plugins/netbeans.nasl
 lib/nessus/plugins/netbios_name_get.nasl
 lib/nessus/plugins/netbus.nasl
@@ -254,13 +267,17 @@ lib/nessus/plugins/openssh_uselogin.nasl
 lib/nessus/plugins/oshare.nasl
 lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
+lib/nessus/plugins/pam_smb.nasl
 lib/nessus/plugins/passwordless_cayman_router.nasl
 lib/nessus/plugins/passwordless_hp_printer.nasl
+lib/nessus/plugins/perl_browseable.nasl
 lib/nessus/plugins/perl_cgi.nasl
 lib/nessus/plugins/pfdipaly.nasl
+lib/nessus/plugins/pftp.nasl
 lib/nessus/plugins/pgpnet_detect.nasl
 lib/nessus/plugins/phf.nasl
 lib/nessus/plugins/php.nasl
+lib/nessus/plugins/php_file_upload.nasl
 lib/nessus/plugins/php_overflow.nasl
 lib/nessus/plugins/pimp.nasl
 lib/nessus/plugins/ping_host.nasl
@@ -345,6 +362,7 @@ lib/nessus/plugins/rsh.nasl
 lib/nessus/plugins/rsh_users.nasl
 lib/nessus/plugins/sambar_cgi.nasl
 lib/nessus/plugins/sambar_mailit.nasl
+lib/nessus/plugins/sambar_search_cgi.nasl
 lib/nessus/plugins/sambar_sendmail.nasl
 lib/nessus/plugins/sambar_sysadmin.nasl
 lib/nessus/plugins/sawmill.nasl
@@ -355,6 +373,7 @@ lib/nessus/plugins/sendmail_expn.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
 lib/nessus/plugins/shaft.nasl
 lib/nessus/plugins/shells.nasl
+lib/nessus/plugins/shiva_default_pass.nasl
 lib/nessus/plugins/showmount.nasl
 lib/nessus/plugins/siteUserMod.nasl
 lib/nessus/plugins/slmail.nasl
@@ -373,6 +392,11 @@ lib/nessus/plugins/smb_login_as_users.nasl
 lib/nessus/plugins/smb_nt_ms00-029.nasl
 lib/nessus/plugins/smb_nt_ms00-036.nasl
 lib/nessus/plugins/smb_nt_ms00-047.nasl
+lib/nessus/plugins/smb_nt_ms00-052.nasl
+lib/nessus/plugins/smb_nt_ms00-053.nasl
+lib/nessus/plugins/smb_nt_ms00-062.nasl
+lib/nessus/plugins/smb_nt_ms00-065.nasl
+lib/nessus/plugins/smb_nt_ms00-066.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
 lib/nessus/plugins/smb_reg_hklm.nasl
 lib/nessus/plugins/smb_reg_missing_winreg.nasl
@@ -407,7 +431,9 @@ lib/nessus/plugins/stacheldraht.nasl
 lib/nessus/plugins/stream.nasl
 lib/nessus/plugins/subseven.nasl
 lib/nessus/plugins/sunkill.nasl
+lib/nessus/plugins/suse_cgi_bin_sdb.nasl
 lib/nessus/plugins/swat_detect.nasl
+lib/nessus/plugins/swc_overflow.nasl
 lib/nessus/plugins/sygate_remote_control.nasl
 lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/tcp_chorusing.nasl
@@ -425,6 +451,8 @@ lib/nessus/plugins/thttpd_bug.nasl
 lib/nessus/plugins/tomcat_admin.nasl
 lib/nessus/plugins/tomcat_snoop.nasl
 lib/nessus/plugins/traceroute.nasl
+lib/nessus/plugins/translate_f.nasl
+lib/nessus/plugins/trinity.nasl
 lib/nessus/plugins/trinoo.nasl
 lib/nessus/plugins/unicast_dos.nasl
 lib/nessus/plugins/upload_cgi.nasl
@@ -442,6 +470,7 @@ lib/nessus/plugins/w3msql_overflow.nasl
 lib/nessus/plugins/web_traversal.nasl
 lib/nessus/plugins/webactive_log.nasl
 lib/nessus/plugins/webcart.nasl
+lib/nessus/plugins/webdav.nasl
 lib/nessus/plugins/webdist.nasl
 lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webgais.nasl
@@ -453,11 +482,11 @@ lib/nessus/plugins/website_pro.nasl
 lib/nessus/plugins/websitepro_overflow.nasl
 lib/nessus/plugins/webspeed.nasl
 lib/nessus/plugins/wftp.nasl
+lib/nessus/plugins/wftp_241_dos.nasl
 lib/nessus/plugins/wftp_dos.nasl
 lib/nessus/plugins/whois_raw.nasl
 lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/windmail.nasl
-lib/nessus/plugins/windows_detect.nasl
 lib/nessus/plugins/wingate.nasl
 lib/nessus/plugins/wingate_denial.nasl
 lib/nessus/plugins/wingate_user.nasl
@@ -470,18 +499,21 @@ lib/nessus/plugins/wrap.nasl
 lib/nessus/plugins/wu_ftpd_overflow.nasl
 lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
+lib/nessus/plugins/www_too_long_auth.nasl
 lib/nessus/plugins/www_too_long_url.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
 lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl
+lib/nessus/plugins/yabb.nasl
 lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/zeus.nasl
 lib/nessus/plugins/zope.nasl
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
 lib/nessus/plugins_factory/nessus.tmpl
+sbin/nessus-update-plugins
 @dirrm lib/nessus/plugins_factory
 @dirrm lib/nessus/plugins
 @dirrm lib/nessus/reports
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index d0abcd48a739..b18fb1946142 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
 
 MAINTAINER=	anders@fix.no
 
 BUILD_DEPENDS=	${LOCALBASE}/include/nessus/config.h:${PORTSDIR}/security/nessus \
 		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
-NESSUS_REV=	${DISTNAME:S/nessus-plugins-//g}
+RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
+		lynx:${PORTSDIR}/www/lynx
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index 4eaee43c2803..b280f081b061 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-1.0.4.tar.gz) = dc6a2758761428f3bf66d0a06806d66a
+MD5 (nessus/nessus-plugins-1.0.5.tar.gz) = a805e3195d52353beffb74900052ddaa
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index b78031f67174..71ef421ead08 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -1,5 +1,4 @@
 bin/nessus-build
-sbin/nessus-update-plugins
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
 lib/nessus/plugins/ColdFusion.nasl
@@ -27,6 +26,7 @@ lib/nessus/plugins/amanda_detect.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
 lib/nessus/plugins/analogx.nasl
 lib/nessus/plugins/analogx_dos.nasl
+lib/nessus/plugins/analogx_traversal.nasl
 lib/nessus/plugins/annex_dos.nasl
 lib/nessus/plugins/apache_slash.nasl
 lib/nessus/plugins/apache_source_asp.nasl
@@ -38,9 +38,11 @@ lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
 lib/nessus/plugins/axis.nasl
+lib/nessus/plugins/axis_camera.nasl
 lib/nessus/plugins/backorifice1.nasl
 lib/nessus/plugins/bb-hist.nasl
 lib/nessus/plugins/bb-hostsvc.nasl
+lib/nessus/plugins/bboard.nasl
 lib/nessus/plugins/bftelnet.nasl
 lib/nessus/plugins/bigconf.nasl
 lib/nessus/plugins/bind_bof.nes
@@ -53,6 +55,7 @@ lib/nessus/plugins/c32.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/calendar.nasl
 lib/nessus/plugins/campas.nasl
 lib/nessus/plugins/cassandra_nntp_dos.nasl
 lib/nessus/plugins/cdk.nasl
@@ -89,6 +92,7 @@ lib/nessus/plugins/dragon_ftp.nasl
 lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/dumpenv.nasl
 lib/nessus/plugins/echo.nasl
+lib/nessus/plugins/eftp_dos.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
 lib/nessus/plugins/eserv.nasl
 lib/nessus/plugins/eviewer.nasl
@@ -109,6 +113,7 @@ lib/nessus/plugins/formmail_pl.nasl
 lib/nessus/plugins/fp_htimage.nasl
 lib/nessus/plugins/frontpage.nasl
 lib/nessus/plugins/frontpage_authors.nasl
+lib/nessus/plugins/frontpage_dos.nasl
 lib/nessus/plugins/frontpage_dvwssr.nasl
 lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/ftp_anonymous.nasl
@@ -124,6 +129,7 @@ lib/nessus/plugins/ftp_pl.nasl
 lib/nessus/plugins/ftp_realpath.nasl
 lib/nessus/plugins/ftp_root.nasl
 lib/nessus/plugins/ftp_servu_dos.nasl
+lib/nessus/plugins/ftp_servu_dos2.nasl
 lib/nessus/plugins/ftp_site_exec.nasl
 lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftpgate.nasl
@@ -142,9 +148,12 @@ lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_printer_display.nasl
 lib/nessus/plugins/hp_remote_print.nasl
+lib/nessus/plugins/hpux_ftpd.nasl
 lib/nessus/plugins/htdig.nasl
+lib/nessus/plugins/htgrep.nasl
 lib/nessus/plugins/htmlscript.nasl
 lib/nessus/plugins/htsearch_location.nasl
+lib/nessus/plugins/http_methods.nasl
 lib/nessus/plugins/http_version.nasl
 lib/nessus/plugins/httpd_nobody.nasl
 lib/nessus/plugins/hyperbomb.nasl
@@ -157,6 +166,7 @@ lib/nessus/plugins/icmp_mask_req.nasl
 lib/nessus/plugins/icmp_timestamp.nasl
 lib/nessus/plugins/icq_crash.nasl
 lib/nessus/plugins/idq_dll.nasl
+lib/nessus/plugins/iis_anything_idq.nasl
 lib/nessus/plugins/iis_authentification_manager.nasl
 lib/nessus/plugins/iis_buffer_overflow.nasl
 lib/nessus/plugins/iis_crash.nasl
@@ -169,6 +179,7 @@ lib/nessus/plugins/iis_samples.nasl
 lib/nessus/plugins/iis_scripts.nasl
 lib/nessus/plugins/iisadmin.nasl
 lib/nessus/plugins/imagemap.nasl
+lib/nessus/plugins/imail_host_overflow.nasl
 lib/nessus/plugins/imail_imapd_overflow.nasl
 lib/nessus/plugins/imail_imonitor_overflow.nasl
 lib/nessus/plugins/imap_overflow.nasl
@@ -214,6 +225,7 @@ lib/nessus/plugins/mssqlserver_dos.nasl
 lib/nessus/plugins/mstream_agent.nasl
 lib/nessus/plugins/mstream_handler.nasl
 lib/nessus/plugins/multicsp_detect.nasl
+lib/nessus/plugins/multihtml.nasl
 lib/nessus/plugins/mysql_bad_password.nasl
 lib/nessus/plugins/mysql_unpassworded.nasl
 lib/nessus/plugins/nai_webshield_info.nasl
@@ -222,6 +234,7 @@ lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/nessus_detect.nasl
 lib/nessus/plugins/nestea.nasl
+lib/nessus/plugins/netauth.nasl
 lib/nessus/plugins/netbeans.nasl
 lib/nessus/plugins/netbios_name_get.nasl
 lib/nessus/plugins/netbus.nasl
@@ -254,13 +267,17 @@ lib/nessus/plugins/openssh_uselogin.nasl
 lib/nessus/plugins/oshare.nasl
 lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
+lib/nessus/plugins/pam_smb.nasl
 lib/nessus/plugins/passwordless_cayman_router.nasl
 lib/nessus/plugins/passwordless_hp_printer.nasl
+lib/nessus/plugins/perl_browseable.nasl
 lib/nessus/plugins/perl_cgi.nasl
 lib/nessus/plugins/pfdipaly.nasl
+lib/nessus/plugins/pftp.nasl
 lib/nessus/plugins/pgpnet_detect.nasl
 lib/nessus/plugins/phf.nasl
 lib/nessus/plugins/php.nasl
+lib/nessus/plugins/php_file_upload.nasl
 lib/nessus/plugins/php_overflow.nasl
 lib/nessus/plugins/pimp.nasl
 lib/nessus/plugins/ping_host.nasl
@@ -345,6 +362,7 @@ lib/nessus/plugins/rsh.nasl
 lib/nessus/plugins/rsh_users.nasl
 lib/nessus/plugins/sambar_cgi.nasl
 lib/nessus/plugins/sambar_mailit.nasl
+lib/nessus/plugins/sambar_search_cgi.nasl
 lib/nessus/plugins/sambar_sendmail.nasl
 lib/nessus/plugins/sambar_sysadmin.nasl
 lib/nessus/plugins/sawmill.nasl
@@ -355,6 +373,7 @@ lib/nessus/plugins/sendmail_expn.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
 lib/nessus/plugins/shaft.nasl
 lib/nessus/plugins/shells.nasl
+lib/nessus/plugins/shiva_default_pass.nasl
 lib/nessus/plugins/showmount.nasl
 lib/nessus/plugins/siteUserMod.nasl
 lib/nessus/plugins/slmail.nasl
@@ -373,6 +392,11 @@ lib/nessus/plugins/smb_login_as_users.nasl
 lib/nessus/plugins/smb_nt_ms00-029.nasl
 lib/nessus/plugins/smb_nt_ms00-036.nasl
 lib/nessus/plugins/smb_nt_ms00-047.nasl
+lib/nessus/plugins/smb_nt_ms00-052.nasl
+lib/nessus/plugins/smb_nt_ms00-053.nasl
+lib/nessus/plugins/smb_nt_ms00-062.nasl
+lib/nessus/plugins/smb_nt_ms00-065.nasl
+lib/nessus/plugins/smb_nt_ms00-066.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
 lib/nessus/plugins/smb_reg_hklm.nasl
 lib/nessus/plugins/smb_reg_missing_winreg.nasl
@@ -407,7 +431,9 @@ lib/nessus/plugins/stacheldraht.nasl
 lib/nessus/plugins/stream.nasl
 lib/nessus/plugins/subseven.nasl
 lib/nessus/plugins/sunkill.nasl
+lib/nessus/plugins/suse_cgi_bin_sdb.nasl
 lib/nessus/plugins/swat_detect.nasl
+lib/nessus/plugins/swc_overflow.nasl
 lib/nessus/plugins/sygate_remote_control.nasl
 lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/tcp_chorusing.nasl
@@ -425,6 +451,8 @@ lib/nessus/plugins/thttpd_bug.nasl
 lib/nessus/plugins/tomcat_admin.nasl
 lib/nessus/plugins/tomcat_snoop.nasl
 lib/nessus/plugins/traceroute.nasl
+lib/nessus/plugins/translate_f.nasl
+lib/nessus/plugins/trinity.nasl
 lib/nessus/plugins/trinoo.nasl
 lib/nessus/plugins/unicast_dos.nasl
 lib/nessus/plugins/upload_cgi.nasl
@@ -442,6 +470,7 @@ lib/nessus/plugins/w3msql_overflow.nasl
 lib/nessus/plugins/web_traversal.nasl
 lib/nessus/plugins/webactive_log.nasl
 lib/nessus/plugins/webcart.nasl
+lib/nessus/plugins/webdav.nasl
 lib/nessus/plugins/webdist.nasl
 lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webgais.nasl
@@ -453,11 +482,11 @@ lib/nessus/plugins/website_pro.nasl
 lib/nessus/plugins/websitepro_overflow.nasl
 lib/nessus/plugins/webspeed.nasl
 lib/nessus/plugins/wftp.nasl
+lib/nessus/plugins/wftp_241_dos.nasl
 lib/nessus/plugins/wftp_dos.nasl
 lib/nessus/plugins/whois_raw.nasl
 lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/windmail.nasl
-lib/nessus/plugins/windows_detect.nasl
 lib/nessus/plugins/wingate.nasl
 lib/nessus/plugins/wingate_denial.nasl
 lib/nessus/plugins/wingate_user.nasl
@@ -470,18 +499,21 @@ lib/nessus/plugins/wrap.nasl
 lib/nessus/plugins/wu_ftpd_overflow.nasl
 lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
+lib/nessus/plugins/www_too_long_auth.nasl
 lib/nessus/plugins/www_too_long_url.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
 lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl
+lib/nessus/plugins/yabb.nasl
 lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/zeus.nasl
 lib/nessus/plugins/zope.nasl
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
 lib/nessus/plugins_factory/nessus.tmpl
+sbin/nessus-update-plugins
 @dirrm lib/nessus/plugins_factory
 @dirrm lib/nessus/plugins
 @dirrm lib/nessus/reports
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 2b223a7811b0..e2c508a174f0 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
-DISTNAME=	nessus-core-1.0.4
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.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://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
+DISTNAME=	nessus-core-${PORTVERSION}
 
 MAINTAINER=	anders@fix.no
 
 LIB_DEPENDS=	nasl.1:${PORTSDIR}/security/nessus-libnasl
 
-NESSUS_REV=	${DISTNAME:S/nessus-core-//g}
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 
@@ -36,9 +34,9 @@ MAN1=		nessus.1
 MAN8=		nessusd.8 nessus-adduser.8
 
 post-install:
-	@${ECHO} "=========================================================="
-	@${ECHO} "Be sure to erase your old ${PREFIX}/etc/nessus!"
-	@${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!"
-	@${ECHO} "=========================================================="
+	@${ECHO} "================================================================================"
+	@${ECHO} "Use ${PREFIX}/sbin/update/nessus-update-plugins to update your plugin"
+	@${ECHO} "collection."
+	@${ECHO} "================================================================================"
 
 .include <bsd.port.mk>
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index 26db817bee21..fa9a5ed129cd 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.4.tar.gz) = b6d66f613b3c45526195df9e0087dd63
+MD5 (nessus/nessus-core-1.0.5.tar.gz) = e5636b91642588c4bff8c69b582e3e01