18 files changed, 262 insertions, 158 deletions

diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 0626110e3960..9961c7592fa5 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -1,27 +1,25 @@
-# New ports collection makefile for: 	nessus
-# Date created:		1 May 1999
-# Whom:			Anders Nordby <anders@fix.no>
+# New ports collection makefile for: 	nessus-devel
 #
 # $FreeBSD$
 #
 
-PORTNAME=	nessus
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-devel
+PORTVERSION=	1.1.7
 CATEGORIES=	security
-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/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/unstable/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/unstable/nessus-${PORTVERSION}/src/
 DISTNAME=	nessus-core-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
-LIB_DEPENDS=	nasl.1:${PORTSDIR}/security/nessus-libnasl
+LIB_DEPENDS=	nasl.2:${PORTSDIR}/security/nessus-libnasl-devel
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
@@ -37,13 +35,17 @@ USE_GTK=	yes
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 
+CONFIGURE_ARGS+=	--sharedstatedir=${PREFIX}/etc/nessus/com \
+			--localstatedir=${PREFIX}/etc/nessus/var 
+
 MAN1=		nessus.1
-MAN8=		nessusd.8 nessus-adduser.8
+MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 
 post-install:
-	@${ECHO} "================================================================================"
-	@${ECHO} "Use ${PREFIX}/sbin/update/nessus-update-plugins to update your plugin"
-	@${ECHO} "collection."
-	@${ECHO} "================================================================================"
+.if ! defined(BATCH)
+.if ! exists(${PREFIX}/etc/nessus/var/CA/serverkey.pem)
+	${PREFIX}/sbin/nessus-mkcert
+.endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/nessus-devel/distinfo b/security/nessus-devel/distinfo
index 46df0a10cd0a..758ef9dd4e40 100644
--- a/security/nessus-devel/distinfo
+++ b/security/nessus-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.9.tar.gz) = 83af77f6879383a58009fa4cdebc7e74
+MD5 (nessus/nessus-core-1.1.7.tar.gz) = 6c29c9b7168b014305458e00809e6e1a
diff --git a/security/nessus-devel/files/patch-aa b/security/nessus-devel/files/patch-aa
new file mode 100644
index 000000000000..ff03c508c112
--- /dev/null
+++ b/security/nessus-devel/files/patch-aa
@@ -0,0 +1,13 @@
+--- nessus-install-cert.in.orig	Fri Sep 14 13:09:12 2001
++++ nessus-install-cert.in	Mon Oct  8 13:25:25 2001
+@@ -18,8 +18,8 @@
+ localstatedir=@localstatedir@
+ sharedstatedir=@sharedstatedir@
+ 
+-NESSUSPRIV="$localstatedir/nessus/CA"
+-NESSUSPUB="$sharedstatedir/nessus/CA"
++NESSUSPRIV="$localstatedir/CA"
++NESSUSPUB="$sharedstatedir/CA"
+ if [ ! -d "$NESSUSPRIV" ]; then
+     mkdir -p "$NESSUSPRIV"
+     chmod 700 "$NESSUSPRIV"
diff --git a/security/nessus-devel/files/patch-ab b/security/nessus-devel/files/patch-ab
new file mode 100644
index 000000000000..97c1601ff14d
--- /dev/null
+++ b/security/nessus-devel/files/patch-ab
@@ -0,0 +1,13 @@
+--- nessus-mkcert.in.orig	Fri Sep 14 13:09:12 2001
++++ nessus-mkcert.in	Mon Oct  8 13:25:14 2001
+@@ -64,8 +64,8 @@
+    exit 1
+ esac
+      
+-NESSUSPRIV="$localstatedir/nessus/CA"
+-NESSUSPUB="$sharedstatedir/nessus/CA"
++NESSUSPRIV="$localstatedir/CA"
++NESSUSPUB="$sharedstatedir/CA"
+ if [ ! -d "$NESSUSPRIV" ]; then
+     mkdir -p "$NESSUSPRIV"
+     chmod 700 "$NESSUSPRIV"
diff --git a/security/nessus-devel/files/patch-ag b/security/nessus-devel/files/patch-ag
deleted file mode 100644
index d30f542889c4..000000000000
--- a/security/nessus-devel/files/patch-ag
+++ /dev/null
@@ -1,37 +0,0 @@
---- nessus/preferences.c.orig	Sun Jan 30 12:22:46 2000
-+++ nessus/preferences.c	Sun Jan 30 12:23:27 2000
-@@ -60,27 +60,6 @@
-  if(Alt_rcfile)return Alt_rcfile;
-  else
-   {
--#ifdef ENABLE_CRYPTO_LAYER
--  char *t, *s = peks_get_dirfile (NESSUS_RCFILE);
--  if (s == 0) 
--    return 0 ;
--  /* peks uses another memory management */
--  t = estrdup (s);
--  xfree (s);
--#ifdef _WIN32
--  /* on Windows we have no HOME varable set, by default */
--  if (getenv("HOME") == 0 && (s = peks_get_homedir (0)) != 0) {
--    char *e = strcat (strcpy (pmalloc (strlen (s) + 10), "HOME="), s);
--#   ifdef HAVE__PUTENV
--    _putenv (e);
--#   else
--    putenv (e);
--#   endif
--    xfree (e);
--  }
--#endif /* _WIN32 */
--  return t;
--#else
-   char* home;
-   char * ret;
-   struct passwd * pwd;
-@@ -100,7 +79,6 @@
-    return(ret);
-   } 
-   return(NULL);
--#endif
-  }
- }
diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist
index 4dc6b50f5f6e..ed86cf12f97f 100644
--- a/security/nessus-devel/pkg-plist
+++ b/security/nessus-devel/pkg-plist
@@ -1,5 +1,6 @@
 bin/nessus
 include/nessus/config.h
+include/nessus/includes.h
 include/nessus/nessus-devel.h
 include/nessus/nessusicmp.h
 include/nessus/nessusip.h
@@ -8,7 +9,12 @@ include/nessus/nessustcp.h
 include/nessus/nessusudp.h
 include/nessus/ntcompat.h
 sbin/nessus-adduser
+sbin/nessus-mkcert
+sbin/nessus-rmuser
 sbin/nessusd
+@unexec rmdir %D/var/nessus/jobs 2>/dev/null || true
+@unexec rmdir %D/var/nessus/logs 2>/dev/null || true
+@unexec rmdir %D/var/nessus/users 2>/dev/null || true
 @unexec rmdir %D/var/nessus 2>/dev/null || true
 @unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true
 @unexec rmdir %D/lib/nessus 2>/dev/null || true
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index 54bf1919e7d4..dcfe0b9e504f 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -1,30 +1,28 @@
-# Ports collection makefile for:	nessus-libnasl
-# Date created:				07 November 1999
-# Whom:					Anders Nordby <anders@fix.no>
+# Ports collection makefile for:	nessus-libnasl-devel
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libnasl
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-libnasl-devel
+PORTVERSION=	1.1.7
 CATEGORIES=	security
-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/
-PKGNAMEPREFIX=	nessus-
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/unstable/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/unstable/nessus-${PORTVERSION}/src/
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com	
 
-LIB_DEPENDS=	nessus.1:${PORTSDIR}/security/nessus-libraries
+LIB_DEPENDS=	nessus.2:${PORTSDIR}/security/nessus-libraries-devel
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
+DISTNAME=	libnasl-${PORTVERSION}
 
 USE_LIBTOOL=	YES
 INSTALLS_SHLIB=	YES
diff --git a/security/nessus-libnasl-devel/distinfo b/security/nessus-libnasl-devel/distinfo
index 13f93d5c106d..3d567e245f8e 100644
--- a/security/nessus-libnasl-devel/distinfo
+++ b/security/nessus-libnasl-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/libnasl-1.0.9.tar.gz) = eb4d216e43ec5d30ea0062315db47284
+MD5 (nessus/libnasl-1.1.7.tar.gz) = 1950b58b8b76ee66e5f8a6dddd19180a
diff --git a/security/nessus-libnasl-devel/files/patch-aa b/security/nessus-libnasl-devel/files/patch-aa
new file mode 100644
index 000000000000..03f5d8af5f66
--- /dev/null
+++ b/security/nessus-libnasl-devel/files/patch-aa
@@ -0,0 +1,12 @@
+--- configure.orig	Thu Oct 18 06:16:47 2001
++++ configure	Thu Oct 18 06:18:59 2001
+@@ -5065,7 +5065,8 @@
+ LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(PREFIX)/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
diff --git a/security/nessus-libnasl-devel/pkg-plist b/security/nessus-libnasl-devel/pkg-plist
index 72c2f2cbbace..a5c8374e3ffd 100644
--- a/security/nessus-libnasl-devel/pkg-plist
+++ b/security/nessus-libnasl-devel/pkg-plist
@@ -3,4 +3,4 @@ bin/nasl-config
 include/nessus/nasl.h
 lib/libnasl.a
 lib/libnasl.so
-lib/libnasl.so.1
+lib/libnasl.so.2
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 6cb7752ee494..85ea6762c022 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -1,27 +1,26 @@
-# Ports collection makefile for:	nessus-libraries
-# Date created:				07 November 1999
-# Whom:					Anders Nordby <anders@fix.no>
+# Ports collection makefile for:	nessus-libraries-devel
 #
 # $FreeBSD$
 #
 
-PORTNAME=	nessus-libraries
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-libraries-devel
+PORTVERSION=	1.1.7
 CATEGORIES=	security
-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/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/unstable/nessus-${PORTVERSION}/src/
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
+DISTNAME=	nessus-libraries-${PORTVERSION}
 
 USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--enable-cipher
diff --git a/security/nessus-libraries-devel/distinfo b/security/nessus-libraries-devel/distinfo
index 66155b7c26f3..ea8d67c068ec 100644
--- a/security/nessus-libraries-devel/distinfo
+++ b/security/nessus-libraries-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.0.9.tar.gz) = 9de5bad530f193afd75ff843578dfefc
+MD5 (nessus/nessus-libraries-1.1.7.tar.gz) = df0713d3268fd635ca93e83251d2f27c
diff --git a/security/nessus-libraries-devel/files/patch-aa b/security/nessus-libraries-devel/files/patch-aa
new file mode 100644
index 000000000000..9d914ce75c0c
--- /dev/null
+++ b/security/nessus-libraries-devel/files/patch-aa
@@ -0,0 +1,10 @@
+--- Makefile.orig	Thu May 31 15:51:08 2001
++++ Makefile	Wed Oct 10 20:16:14 2001
+@@ -46,7 +46,6 @@
+ 	cd libhosts_gatherer && ${MAKE} install
+ 	cd libpcap-nessus && ${MAKE} install 
+ 
+-	$(INSTALL) -m 0444 include/includes.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/libnessus.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/harglists.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/libvers.h   ${includedir}/nessus
diff --git a/security/nessus-libraries-devel/files/patch-ab b/security/nessus-libraries-devel/files/patch-ab
new file mode 100644
index 000000000000..472a39e0f390
--- /dev/null
+++ b/security/nessus-libraries-devel/files/patch-ab
@@ -0,0 +1,12 @@
+--- configure.orig	Tue Oct 16 19:56:40 2001
++++ configure	Thu Oct 18 06:13:41 2001
+@@ -5074,7 +5074,8 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(PREFIX)/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
diff --git a/security/nessus-libraries-devel/pkg-plist b/security/nessus-libraries-devel/pkg-plist
index dc3368d53470..bdadbb007825 100644
--- a/security/nessus-libraries-devel/pkg-plist
+++ b/security/nessus-libraries-devel/pkg-plist
@@ -1,27 +1,20 @@
 bin/nessus-config
 include/nessus/getopt.h
 include/nessus/harglists.h
-include/nessus/includes.h
 include/nessus/libnessus.h
 include/nessus/libvers.h
 include/nessus/net/bpf.h
 include/nessus/pcap-namedb.h
 include/nessus/pcap.h
-include/peks/messages.h
-include/peks/peks.h
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.1
+lib/libhosts_gatherer.so.2
 lib/libnessus.a
 lib/libnessus.so
-lib/libnessus.so.1
+lib/libnessus.so.2
 lib/libpcap-nessus.a
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.1
-lib/libpeks.a
-lib/libpeks.la
-lib/libpeks.so
-lib/libpeks.so.8
+lib/libpcap-nessus.so.2
+sbin/uninstall-nessus
 @dirrm include/nessus/net
 @dirrm include/nessus
-@dirrm include/peks
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index 9780d2deb072..9afd1fbf56b2 100644
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -1,36 +1,44 @@
-# Ports collection makefile for:	nessus-plugins
-# Date created:				16 October 1999
-# Whom:					Anders Nordby <anders@fix.no>
+# Ports collection makefile for:	nessus-plugins-devel
 #
 # $FreeBSD$
 #
 
-PORTNAME=	nessus-plugins
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-plugins-devel
+PORTVERSION=	1.1.7
 CATEGORIES=	security
-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=	olgeni@FreeBSD.org
-
-BUILD_DEPENDS=	${LOCALBASE}/include/nessus/config.h:${PORTSDIR}/security/nessus \
-		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-		lynx:${PORTSDIR}/www/lynx
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/unstable/nessus/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/unstable/nessus-${PORTVERSION}/src/
+
+MAINTAINER=	udo.schweigert@siemens.com
+
+BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus-devel \
+		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \
+		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
+DISTNAME=	nessus-plugins-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-fetchcmd=wget
 
 MAN1=		nessus-build.1
 MAN8=		nessus-update-plugins.8
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-install:
+	@${ECHO} "================================================================================"
+	@${ECHO} "Use ${PREFIX}/sbin/nessus-update-plugins to update your plugin"
+	@${ECHO} "collection."
+	@${ECHO} "================================================================================"
+
+.include <bsd.port.post.mk>
diff --git a/security/nessus-plugins-devel/distinfo b/security/nessus-plugins-devel/distinfo
index cf9beb0b1757..4683e4c0f13a 100644
--- a/security/nessus-plugins-devel/distinfo
+++ b/security/nessus-plugins-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-1.0.9.tar.gz) = 86dc25b2ff26f1f1fe90a3577c09be37
+MD5 (nessus/nessus-plugins-1.1.7.tar.gz) = 23c645587ab4b64b4d04474e03fb91c3
diff --git a/security/nessus-plugins-devel/pkg-plist b/security/nessus-plugins-devel/pkg-plist
index 42479cd802eb..1344018d8af8 100644
--- a/security/nessus-plugins-devel/pkg-plist
+++ b/security/nessus-plugins-devel/pkg-plist
@@ -1,8 +1,11 @@
 bin/nessus-build
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
+lib/nessus/plugins/3com_switches.nasl
 lib/nessus/plugins/40x_cross_site.nasl
+lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code.nasl
 lib/nessus/plugins/ColdFusion.nasl
+lib/nessus/plugins/DDI_Unprotected_SiteScope.nasl
 lib/nessus/plugins/ExAir_dos_advsearch.nasl
 lib/nessus/plugins/ExAir_dos_query.nasl
 lib/nessus/plugins/ExAir_dos_search.nasl
@@ -10,6 +13,7 @@ lib/nessus/plugins/GuildFTPD097.nasl
 lib/nessus/plugins/IIS_frontpage_DOS.nasl
 lib/nessus/plugins/LPRng.nasl
 lib/nessus/plugins/NetSphere.nasl
+lib/nessus/plugins/Omnihttpd_pro_source_disclosure.nasl
 lib/nessus/plugins/PC_anywhere.nasl
 lib/nessus/plugins/PGPCert_DoS.nasl
 lib/nessus/plugins/ShowCode.nasl
@@ -18,10 +22,11 @@ lib/nessus/plugins/WebSite.nasl
 lib/nessus/plugins/X.nasl
 lib/nessus/plugins/a1stats.nasl
 lib/nessus/plugins/acc.nasl
+lib/nessus/plugins/accounts.nes
 lib/nessus/plugins/afs_version.nasl
-lib/nessus/plugins/jj.nasl
 lib/nessus/plugins/aix_ftpd.nasl
 lib/nessus/plugins/alcatel_adsl.nasl
+lib/nessus/plugins/alcatel_adsl_firewalling.nasl
 lib/nessus/plugins/alibaba.nasl
 lib/nessus/plugins/alibaba_get32.nasl
 lib/nessus/plugins/alibaba_overflow.nasl
@@ -29,6 +34,7 @@ lib/nessus/plugins/alibaba_pl.nasl
 lib/nessus/plugins/alibaba_tst.nasl
 lib/nessus/plugins/altavista_search.nasl
 lib/nessus/plugins/amanda_detect.nasl
+lib/nessus/plugins/amanda_version.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
 lib/nessus/plugins/anaconda.nasl
 lib/nessus/plugins/anacondaclip.nasl
@@ -36,11 +42,14 @@ 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/aolserver_default_password.nasl
+lib/nessus/plugins/apache_auth_sql_insertion.nasl
 lib/nessus/plugins/apache_dir_listing.nasl
 lib/nessus/plugins/apache_server_info.nasl
 lib/nessus/plugins/apache_server_status.nasl
 lib/nessus/plugins/apache_slash.nasl
 lib/nessus/plugins/apache_source_asp.nasl
+lib/nessus/plugins/apache_username.nasl
 lib/nessus/plugins/arkeia.nasl
 lib/nessus/plugins/ascend_kill.nasl
 lib/nessus/plugins/asip-status.nasl
@@ -61,6 +70,8 @@ lib/nessus/plugins/bftelnet.nasl
 lib/nessus/plugins/bftpd_chown.nasl
 lib/nessus/plugins/bftpd_format_string.nasl
 lib/nessus/plugins/bigconf.nasl
+lib/nessus/plugins/bind_authors.nasl
+lib/nessus/plugins/bind_bof.nes
 lib/nessus/plugins/bind_covert_overflows.nasl
 lib/nessus/plugins/bind_query.nasl
 lib/nessus/plugins/bind_version.nasl
@@ -73,11 +84,12 @@ lib/nessus/plugins/broadvision_path_disclosure.nasl
 lib/nessus/plugins/broker_ftp.nasl
 lib/nessus/plugins/c32.nasl
 lib/nessus/plugins/ca_unicenter_file_transfer_service.nasl
-lib/nessus/plugins/calendar.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/cayman_any_username.nasl
 lib/nessus/plugins/cdk.nasl
 lib/nessus/plugins/cern_httpd_path.nasl
 lib/nessus/plugins/cfinger_format_bug.nasl
@@ -97,11 +109,13 @@ lib/nessus/plugins/cisco_catalyst.nasl
 lib/nessus/plugins/cisco_dos.nasl
 lib/nessus/plugins/cisco_http_admin_access.nasl
 lib/nessus/plugins/cisco_http_dos.nasl
+lib/nessus/plugins/cisco_no_pw.nasl
 lib/nessus/plugins/cmail_overflow.nasl
 lib/nessus/plugins/codered_x.nasl
 lib/nessus/plugins/cold_fusion_admin_dos.nasl
 lib/nessus/plugins/commerce_cgi.nasl
 lib/nessus/plugins/communigatepro_overflow.nasl
+lib/nessus/plugins/compaq_wbem_detect.nasl
 lib/nessus/plugins/count_cgi.nasl
 lib/nessus/plugins/cp-firewall-auth.nasl
 lib/nessus/plugins/cp-firewall-webauth.nasl
@@ -112,7 +126,9 @@ lib/nessus/plugins/cvsweb_version.nasl
 lib/nessus/plugins/dansie_cart.nasl
 lib/nessus/plugins/daytime.nasl
 lib/nessus/plugins/dbman_cgi.nasl
+lib/nessus/plugins/dcetest.nasl
 lib/nessus/plugins/dcforum.nasl
+lib/nessus/plugins/dcshop_information_disclosure.nasl
 lib/nessus/plugins/deep_throat.nasl
 lib/nessus/plugins/delegate_overflow.nasl
 lib/nessus/plugins/dhcp.nasl
@@ -126,28 +142,31 @@ lib/nessus/plugins/domino_default_db.nasl
 lib/nessus/plugins/domino_fs_config.nasl
 lib/nessus/plugins/domino_http_dos.nasl
 lib/nessus/plugins/dragon_ftp.nasl
-lib/nessus/plugins/echo.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/empower_path.nasl
 lib/nessus/plugins/eserv.nasl
+lib/nessus/plugins/eshop_information_disclosure.nasl
 lib/nessus/plugins/eviewer.nasl
 lib/nessus/plugins/ewave_servlet_upload.nasl
 lib/nessus/plugins/ews.nasl
 lib/nessus/plugins/exchange_dos.nasl
+lib/nessus/plugins/exchange_public_folders_information_leak.nasl
 lib/nessus/plugins/ezshopper.nasl
 lib/nessus/plugins/fakebo.nasl
 lib/nessus/plugins/faxsurvey.nasl
+lib/nessus/plugins/find_service.nes
 lib/nessus/plugins/finger.nasl
 lib/nessus/plugins/finger_0.nasl
 lib/nessus/plugins/finger_backdoor.nasl
 lib/nessus/plugins/finger_cgi.nasl
 lib/nessus/plugins/finger_dot.nasl
 lib/nessus/plugins/finger_freebsd.nasl
-lib/nessus/plugins/firewall1_dos.nasl
 lib/nessus/plugins/finger_redirection.nasl
+lib/nessus/plugins/firewall1_dos.nasl
 lib/nessus/plugins/formhandler.nasl
 lib/nessus/plugins/formmail_pl.nasl
 lib/nessus/plugins/fp_htimage.nasl
@@ -160,13 +179,14 @@ lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/ftp_anonymous.nasl
 lib/nessus/plugins/ftp_backdoor.nasl
 lib/nessus/plugins/ftp_bounce.nasl
+lib/nessus/plugins/ftp_bounce_scan.nes
 lib/nessus/plugins/ftp_check_user.nasl
 lib/nessus/plugins/ftp_cwd_root.nasl
 lib/nessus/plugins/ftp_glob_overflow.nasl
 lib/nessus/plugins/ftp_overflow.nasl
-lib/nessus/plugins/ftp_pl.nasl
 lib/nessus/plugins/ftp_pasv_dos.nasl
 lib/nessus/plugins/ftp_pasv_on_connect.nasl
+lib/nessus/plugins/ftp_pl.nasl
 lib/nessus/plugins/ftp_qnx_stack_overflow.nasl
 lib/nessus/plugins/ftp_realpath.nasl
 lib/nessus/plugins/ftp_root.nasl
@@ -175,19 +195,21 @@ lib/nessus/plugins/ftp_servu_dos2.nasl
 lib/nessus/plugins/ftp_servu_traversal.nasl
 lib/nessus/plugins/ftp_site_exec.nasl
 lib/nessus/plugins/ftp_sol_check_user.nasl
+lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftpgate.nasl
 lib/nessus/plugins/ftpserver_detect_type_nd_version.nasl
 lib/nessus/plugins/gatecrasher.nasl
 lib/nessus/plugins/gauntlet_overflow.nasl
 lib/nessus/plugins/girlfriend.nasl
 lib/nessus/plugins/glimpse.nasl
-lib/nessus/plugins/guestbook.nasl
 lib/nessus/plugins/gnapster_get_file.nasl
 lib/nessus/plugins/goodtech_ftpd_dos.nasl
 lib/nessus/plugins/groupwise_overflow.nasl
+lib/nessus/plugins/guestbook.nasl
 lib/nessus/plugins/guestbook_pl.nasl
 lib/nessus/plugins/guild_ftp.nasl
 lib/nessus/plugins/handler.nasl
+lib/nessus/plugins/healthd_detect.nasl
 lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_printer_display.nasl
@@ -199,6 +221,8 @@ 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-rpc-epmap.nasl
+lib/nessus/plugins/http_auth.nasl
 lib/nessus/plugins/http_methods.nasl
 lib/nessus/plugins/http_version.nasl
 lib/nessus/plugins/http_webshopper.nasl
@@ -233,6 +257,7 @@ lib/nessus/plugins/iis_ftp_crash.nasl
 lib/nessus/plugins/iis_ida_isapi.nasl
 lib/nessus/plugins/iis_isapi_overflow.nasl
 lib/nessus/plugins/iis_malformed_request.nasl
+lib/nessus/plugins/iis_nat.nasl
 lib/nessus/plugins/iis_perl_problem.nasl
 lib/nessus/plugins/iis_propfind2.nasl
 lib/nessus/plugins/iis_propfind_dos.nasl
@@ -241,6 +266,7 @@ lib/nessus/plugins/iis_samples.nasl
 lib/nessus/plugins/iis_scripts.nasl
 lib/nessus/plugins/iis_shtml_cross_site.nasl
 lib/nessus/plugins/iis_viewcode.nasl
+lib/nessus/plugins/iis_webdav_lock_memory_leak.nasl
 lib/nessus/plugins/iisadmin.nasl
 lib/nessus/plugins/imagemap.nasl
 lib/nessus/plugins/imail_host_overflow.nasl
@@ -253,15 +279,19 @@ lib/nessus/plugins/in_fingerd.nasl
 lib/nessus/plugins/info2www.nasl
 lib/nessus/plugins/infosrch.nasl
 lib/nessus/plugins/inn.nasl
-lib/nessus/plugins/ipop2d.nasl
 lib/nessus/plugins/innd_overflow.nasl
 lib/nessus/plugins/interscan_dos.nasl
+lib/nessus/plugins/interscan_vw_cgi.nasl
 lib/nessus/plugins/iplanet_dir_serv.nasl
+lib/nessus/plugins/iplanet_traversal.nasl
+lib/nessus/plugins/ipop2d.nasl
 lib/nessus/plugins/ipop2d_readfiles.nasl
 lib/nessus/plugins/ithousemail_bof.nasl
 lib/nessus/plugins/iws_shtml.nasl
+lib/nessus/plugins/jj.nasl
 lib/nessus/plugins/jrun.nasl
 lib/nessus/plugins/jrun_dir_listing.nasl
+lib/nessus/plugins/kazaa_morpheus_detect.nasl
 lib/nessus/plugins/ken_segfault.nasl
 lib/nessus/plugins/kerberos_overflow.nasl
 lib/nessus/plugins/krb_pingpong.nasl
@@ -270,11 +300,16 @@ lib/nessus/plugins/kw_whois.nasl
 lib/nessus/plugins/land.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/linux_tftp.nes
 lib/nessus/plugins/linux_zero_len_fragment.nasl
 lib/nessus/plugins/linuxconf_detect.nasl
 lib/nessus/plugins/lion.nasl
+lib/nessus/plugins/listrec.nasl
 lib/nessus/plugins/lotus_envid.nasl
 lib/nessus/plugins/lotus_esmtp_overflow.nasl
+lib/nessus/plugins/lpd_overflow.nasl
 lib/nessus/plugins/mailman_webmail.nasl
 lib/nessus/plugins/mailnews.nasl
 lib/nessus/plugins/marconi_dos.nasl
@@ -285,11 +320,13 @@ lib/nessus/plugins/mdaemon_dos.nasl
 lib/nessus/plugins/mdaemon_webconfig.nasl
 lib/nessus/plugins/mdaemon_worldclient.nasl
 lib/nessus/plugins/mediahouse_statistics_server.nasl
+lib/nessus/plugins/mediahouse_statistics_web_server.nasl
 lib/nessus/plugins/mercure_expn_overflow.nasl
 lib/nessus/plugins/mercure_imap_read_any_file.nasl
 lib/nessus/plugins/mercure_webview.nasl
 lib/nessus/plugins/metainfo_mail.nasl
 lib/nessus/plugins/minivend_view_page.nasl
+lib/nessus/plugins/miscflood.nasl
 lib/nessus/plugins/mkilog.nasl
 lib/nessus/plugins/ms_index_server.nasl
 lib/nessus/plugins/msadcs_dll.nasl
@@ -307,13 +344,16 @@ lib/nessus/plugins/mycio_detect.nasl
 lib/nessus/plugins/mycio_directory_traversal.nasl
 lib/nessus/plugins/mysql_bad_password.nasl
 lib/nessus/plugins/mysql_flaws.nasl
-lib/nessus/plugins/mysql_overflow.nasl
 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/napster_detect.nasl
+lib/nessus/plugins/ncacn_http.nasl
+lib/nessus/plugins/ncbook_cgi.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/ncl_items_2.nasl
+lib/nessus/plugins/nds_web_based_browsing.nasl
 lib/nessus/plugins/nessus_detect.nasl
 lib/nessus/plugins/nestea.nasl
 lib/nessus/plugins/netauth.nasl
@@ -321,9 +361,9 @@ lib/nessus/plugins/netbeans.nasl
 lib/nessus/plugins/netbios_name_get.nasl
 lib/nessus/plugins/netbus.nasl
 lib/nessus/plugins/netbus2.nasl
-lib/nessus/plugins/netscape_adminpw.nasl
 lib/nessus/plugins/netscape_PageServices.nasl
 lib/nessus/plugins/netscape_accept_overflow.nasl
+lib/nessus/plugins/netscape_adminpw.nasl
 lib/nessus/plugins/netscape_crash.nasl
 lib/nessus/plugins/netscape_entreprise_dot_overflow.nasl
 lib/nessus/plugins/netscape_entreprise_index.nasl
@@ -335,7 +375,10 @@ lib/nessus/plugins/netscape_wp_tag.nasl
 lib/nessus/plugins/netstat.nasl
 lib/nessus/plugins/newdsn.nasl
 lib/nessus/plugins/newsdesk.nasl
+lib/nessus/plugins/nimda.nasl
 lib/nessus/plugins/nis_server.nasl
+lib/nessus/plugins/nmap_tcp_connect.nes
+lib/nessus/plugins/nmap_wrapper.nes
 lib/nessus/plugins/nntpserver_detect.nasl
 lib/nessus/plugins/no404.nasl
 lib/nessus/plugins/nortel_cgiproc_dos.nasl
@@ -352,16 +395,22 @@ lib/nessus/plugins/nt_spam.nasl
 lib/nessus/plugins/ntalk_detect.nasl
 lib/nessus/plugins/ntp_overflow.nasl
 lib/nessus/plugins/oas_overflow.nasl
+lib/nessus/plugins/objectserver.nes
 lib/nessus/plugins/oops_overflow.nasl
 lib/nessus/plugins/openlink_overflow.nasl
-lib/nessus/plugins/oshare.nasl
 lib/nessus/plugins/openssh_231.nasl
+lib/nessus/plugins/openssh_adv_option.nasl
 lib/nessus/plugins/openssh_uselogin.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/orange_dos.nasl
+lib/nessus/plugins/osX_apache_finder.nasl
+lib/nessus/plugins/osX_apache_finder_content.nasl
+lib/nessus/plugins/oshare.nasl
 lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
 lib/nessus/plugins/pagelog_cgi.nasl
@@ -380,9 +429,11 @@ lib/nessus/plugins/phonebook.nasl
 lib/nessus/plugins/phorum.nasl
 lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
+lib/nessus/plugins/phpMyExplorer.nasl
 lib/nessus/plugins/php_file_upload.nasl
 lib/nessus/plugins/php_imap_overflow.nasl
 lib/nessus/plugins/php_log.nasl
+lib/nessus/plugins/php_nuke_admin_cp.nasl
 lib/nessus/plugins/php_nuke_bb_smilies_passwd.nasl
 lib/nessus/plugins/php_nuke_opendir.nasl
 lib/nessus/plugins/php_overflow.nasl
@@ -402,6 +453,7 @@ lib/nessus/plugins/popserver_detect.nasl
 lib/nessus/plugins/portal_of_doom.nasl
 lib/nessus/plugins/postgresql_unpassworded.nasl
 lib/nessus/plugins/powerplay.nasl
+lib/nessus/plugins/powerup_information_disclosure.nasl
 lib/nessus/plugins/pptp_detect.nasl
 lib/nessus/plugins/printenv.nasl
 lib/nessus/plugins/processit.nasl
@@ -409,7 +461,6 @@ lib/nessus/plugins/proftpd_exhaust.nasl
 lib/nessus/plugins/proftpd_mkdir_overflow.nasl
 lib/nessus/plugins/proftpd_overflow.nasl
 lib/nessus/plugins/proftpd_pre10.nasl
-lib/nessus/plugins/quote.nasl
 lib/nessus/plugins/proftpd_pre6_exploit.nasl
 lib/nessus/plugins/proxy_connect.nasl
 lib/nessus/plugins/proxy_port.nasl
@@ -418,7 +469,11 @@ lib/nessus/plugins/proxy_use.nasl
 lib/nessus/plugins/qpopper.nasl
 lib/nessus/plugins/qpopper_euidl.nasl
 lib/nessus/plugins/qpopper_list.nasl
+lib/nessus/plugins/queso.nes
+lib/nessus/plugins/quickstore.nasl
+lib/nessus/plugins/quote.nasl
 lib/nessus/plugins/ramcrash.nasl
+lib/nessus/plugins/raptor_detect.nasl
 lib/nessus/plugins/rbs.nasl
 lib/nessus/plugins/realserver_disclosure.nasl
 lib/nessus/plugins/realserver_malformed_request_dos.nasl
@@ -465,7 +520,6 @@ lib/nessus/plugins/rpc_snmp.nasl
 lib/nessus/plugins/rpc_sprayd.nasl
 lib/nessus/plugins/rpc_statd.nasl
 lib/nessus/plugins/rpc_statmon.nasl
-lib/nessus/plugins/rsh.nasl
 lib/nessus/plugins/rpc_sunlink_mapper.nasl
 lib/nessus/plugins/rpc_tfsd.nasl
 lib/nessus/plugins/rpc_tooltalk.nasl
@@ -475,7 +529,9 @@ lib/nessus/plugins/rpc_yppasswd.nasl
 lib/nessus/plugins/rpc_ypupated.nasl
 lib/nessus/plugins/rpc_ypxfrd.nasl
 lib/nessus/plugins/rpm_query.nasl
+lib/nessus/plugins/rsh.nasl
 lib/nessus/plugins/rsh_users.nasl
+lib/nessus/plugins/rtsp_detect.nasl
 lib/nessus/plugins/sambar_cgi.nasl
 lib/nessus/plugins/sambar_mailit.nasl
 lib/nessus/plugins/sambar_pagecount.nasl
@@ -486,25 +542,34 @@ lib/nessus/plugins/savant_cgi_download.nasl
 lib/nessus/plugins/savant_percent_dos.nasl
 lib/nessus/plugins/sawmill.nasl
 lib/nessus/plugins/sawmill_password.nasl
+lib/nessus/plugins/sdbsearch.nasl
 lib/nessus/plugins/securemote.nasl
 lib/nessus/plugins/securemote_info_leak.nasl
 lib/nessus/plugins/sedum_dos.nasl
 lib/nessus/plugins/sendmail_debug.nasl
 lib/nessus/plugins/sendmail_decode.nasl
 lib/nessus/plugins/sendmail_expn.nasl
+lib/nessus/plugins/sendmail_local_overflow.nasl
 lib/nessus/plugins/sendmail_mime_overflow.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
 lib/nessus/plugins/sendtemp.nasl
+lib/nessus/plugins/sglmerchant_information_disclosure.nasl
 lib/nessus/plugins/shaft.nasl
 lib/nessus/plugins/shells.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_version.nasl
 lib/nessus/plugins/showmount.nasl
 lib/nessus/plugins/simplewww.nasl
 lib/nessus/plugins/siteUserMod.nasl
+lib/nessus/plugins/sitescope_management_server.nasl
+lib/nessus/plugins/sitescope_web_admin_server.nasl
+lib/nessus/plugins/six_webboard.nasl
 lib/nessus/plugins/slmail.nasl
-lib/nessus/plugins/stream.nasl
 lib/nessus/plugins/slmail27.nasl
 lib/nessus/plugins/slmail_helo.nasl
+lib/nessus/plugins/smad.nes
 lib/nessus/plugins/smartserver_pop_overflow.nasl
 lib/nessus/plugins/smb_accessible_shares.nasl
 lib/nessus/plugins/smb_bruteforce_pass.nasl
@@ -534,6 +599,7 @@ lib/nessus/plugins/smb_nt_ms01-008.nasl
 lib/nessus/plugins/smb_nt_ms01-009.nasl
 lib/nessus/plugins/smb_nt_ms01-011.nasl
 lib/nessus/plugins/smb_nt_ms01-025.nasl
+lib/nessus/plugins/smb_nt_ms01-046.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
 lib/nessus/plugins/smb_reg_hklm.nasl
 lib/nessus/plugins/smb_reg_missing_winreg.nasl
@@ -566,13 +632,14 @@ lib/nessus/plugins/snmp_detect.nasl
 lib/nessus/plugins/snmp_dos.nasl
 lib/nessus/plugins/snmp_ifaces.nasl
 lib/nessus/plugins/snmp_lanman_services.nasl
-lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/snmp_lanman_shares.nasl
 lib/nessus/plugins/snmp_lanman_users.nasl
 lib/nessus/plugins/snmp_processes.nasl
 lib/nessus/plugins/snmp_vacm.nasl
 lib/nessus/plugins/sojourn.nasl
 lib/nessus/plugins/spinclient.nasl
+lib/nessus/plugins/sqlqhit_information_disclosure.nasl
+lib/nessus/plugins/squid_dos.nasl
 lib/nessus/plugins/ssh3_passwd.nasl
 lib/nessus/plugins/ssh_crc32.nasl
 lib/nessus/plugins/ssh_detect.nasl
@@ -582,35 +649,39 @@ lib/nessus/plugins/ssh_overflow.nasl
 lib/nessus/plugins/stacheldraht.nasl
 lib/nessus/plugins/statd_format_string.nasl
 lib/nessus/plugins/store_cgi.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/telnet.nasl
 lib/nessus/plugins/suse_identd.nasl
 lib/nessus/plugins/swat_detect.nasl
 lib/nessus/plugins/swat_guessable_usernames.nasl
 lib/nessus/plugins/swc_overflow.nasl
 lib/nessus/plugins/sygate_remote_control.nasl
+lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/tcp_chorusing.nasl
-lib/nessus/plugins/tcp_ping.nasl
 lib/nessus/plugins/tcp_syn_scan.nasl
 lib/nessus/plugins/teardrop.nasl
 lib/nessus/plugins/technote.nasl
+lib/nessus/plugins/telnet.nasl
 lib/nessus/plugins/telnetserver_detect_type_nd_version.nasl
 lib/nessus/plugins/teso_telnet.nasl
 lib/nessus/plugins/test-cgi.nasl
 lib/nessus/plugins/tfn.nasl
 lib/nessus/plugins/tfs_smtp_overflow.nasl
+lib/nessus/plugins/tftp_grab_file.nes
 lib/nessus/plugins/thttpd_buffer_overflow.nasl
 lib/nessus/plugins/thttpd_bug.nasl
 lib/nessus/plugins/thttpd_ssi.nasl
 lib/nessus/plugins/tiny_proxy_heap_overflow.nasl
 lib/nessus/plugins/tomcat_admin.nasl
 lib/nessus/plugins/tomcat_snoop.nasl
+lib/nessus/plugins/torturecgis.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/tripwire_webpage.nasl
 lib/nessus/plugins/ttawebtop.nasl
 lib/nessus/plugins/ultraseek_dos.nasl
 lib/nessus/plugins/unicast_dos.nasl
@@ -622,7 +693,8 @@ lib/nessus/plugins/uw_imap_overflow_two.nasl
 lib/nessus/plugins/vftpd_overflow.nasl
 lib/nessus/plugins/view_source_cgi.nasl
 lib/nessus/plugins/visadmin.nasl
-lib/nessus/plugins/vnc.nasl
+lib/nessus/plugins/visualroute_server_detect.nasl
+lib/nessus/plugins/vnc_http.nasl
 lib/nessus/plugins/vpop_input_validation.nasl
 lib/nessus/plugins/vqServer_admin_detect.nasl
 lib/nessus/plugins/vqServer_web_traversal.nasl
@@ -640,6 +712,8 @@ lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webgais.nasl
 lib/nessus/plugins/weblogic_dotdotdos.nasl
 lib/nessus/plugins/weblogic_percent.nasl
+lib/nessus/plugins/webmin.nasl
+lib/nessus/plugins/webmirror.nasl
 lib/nessus/plugins/webplus.nasl
 lib/nessus/plugins/webplus_version.nasl
 lib/nessus/plugins/websendmail.nasl
@@ -663,6 +737,7 @@ lib/nessus/plugins/winnt_pptp_dos.nasl
 lib/nessus/plugins/winnuke.nasl
 lib/nessus/plugins/wins_udp_flood.nasl
 lib/nessus/plugins/winsatan.nasl
+lib/nessus/plugins/worldclient_server_detection.nasl
 lib/nessus/plugins/wrap.nasl
 lib/nessus/plugins/wu_ftpd_overflow.nasl
 lib/nessus/plugins/wu_ftpd_site_exec.nasl
@@ -676,25 +751,25 @@ lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xmail_overflow.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
-lib/nessus/plugins/yabb.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl
+lib/nessus/plugins/yabb.nasl
 lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/yppasswdd.nasl
 lib/nessus/plugins/zeus.nasl
 lib/nessus/plugins/zope.nasl
+lib/nessus/plugins/zope_dos.nasl
 lib/nessus/plugins/zope_img_updating.nasl
-lib/nessus/plugins/accounts.nes
-lib/nessus/plugins/bind_bof.nes
-lib/nessus/plugins/find_service.nes
-lib/nessus/plugins/ftp_bounce_scan.nes
-lib/nessus/plugins/ftp_write_dirs.nes
-lib/nessus/plugins/linux_tftp.nes
-lib/nessus/plugins/nmap_tcp_connect.nes
-lib/nessus/plugins/nmap_wrapper.nes
-lib/nessus/plugins/objectserver.nes
-lib/nessus/plugins/queso.nes
-lib/nessus/plugins/smad.nes
-lib/nessus/plugins/tftp_grab_file.nes
+lib/nessus/plugins/zope_zclass.nasl
+lib/nessus/plugins/zyxel_pwd.nasl
+lib/nessus/plugins/cgicso_command_execution.nasl
+lib/nessus/plugins/cgicso_cross_site_scripting.nasl
+lib/nessus/plugins/formmail_version_disclosure.nasl
+lib/nessus/plugins/owa-anonymous.nasl
+lib/nessus/plugins/htsearch_config_switch.nasl
+lib/nessus/plugins/pccsmysqladm.nasl
+lib/nessus/plugins/samba_arbitrary_file_creation.nasl
+lib/nessus/plugins/smb_nativelanman.nasl
+lib/nessus/plugins/vnc.nasl
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
 lib/nessus/plugins_factory/nessus.tmpl