Update nessus suite to version 1.2.2, from security/nessus-*-devel ports.

Give maintainership to udo.schweigert@siemens.com, who already maintains
the -devel ports.

20 files changed, 479 insertions, 162 deletions

diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 54bf1919e7d4..06f817feb1a2 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libnasl
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-libnasl
+PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
@@ -17,11 +17,11 @@ MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/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-
+DISTNAME=	libnasl-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
-LIB_DEPENDS=	nessus.1:${PORTSDIR}/security/nessus-libraries
+LIB_DEPENDS=	nessus.3:${PORTSDIR}/security/nessus-libraries
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index 13f93d5c106d..7ffdea0a8d8c 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1 +1 @@
-MD5 (nessus/libnasl-1.0.9.tar.gz) = eb4d216e43ec5d30ea0062315db47284
+MD5 (nessus/libnasl-1.2.2.tar.gz) = c03d21d0609cd559aa71ff186c47ff09
diff --git a/security/nessus-libnasl/files/patch-aa b/security/nessus-libnasl/files/patch-aa
new file mode 100644
index 000000000000..03f5d8af5f66
--- /dev/null
+++ b/security/nessus-libnasl/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/pkg-plist b/security/nessus-libnasl/pkg-plist
index 72c2f2cbbace..735c883c6883 100644
--- a/security/nessus-libnasl/pkg-plist
+++ b/security/nessus-libnasl/pkg-plist
@@ -2,5 +2,6 @@ bin/nasl
 bin/nasl-config
 include/nessus/nasl.h
 lib/libnasl.a
+lib/libnasl.la
 lib/libnasl.so
-lib/libnasl.so.1
+lib/libnasl.so.3
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 56314a29592e..576e081bd046 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
@@ -18,8 +17,9 @@ MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/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-libraries-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 66155b7c26f3..af3085623ec2 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.0.9.tar.gz) = 9de5bad530f193afd75ff843578dfefc
+MD5 (nessus/nessus-libraries-1.2.2.tar.gz) = d0899306ba952a10ed7c719de7183b6f
diff --git a/security/nessus-libraries/files/patch-aa b/security/nessus-libraries/files/patch-aa
index 91463f7c5ade..9d914ce75c0c 100644
--- a/security/nessus-libraries/files/patch-aa
+++ b/security/nessus-libraries/files/patch-aa
@@ -1,11 +1,10 @@
---- nessus-config.pre.in.orig	Fri Nov 17 20:46:14 2000
-+++ nessus-config.pre.in	Wed Nov 14 12:01:46 2001
-@@ -45,7 +45,7 @@
- 		;;
- 	--libs)
- 	
--		echo $Xn "-L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
-+		echo $Xn "-lc -L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
- 		;;
- 	--cflags)
- 		echo $Xn "-I$INCLUDEDIR $DEFS -I$INCLUDEDIR/nessus $CIPHER_CFLAGS $Xc"
+--- 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/files/patch-ab b/security/nessus-libraries/files/patch-ab
new file mode 100644
index 000000000000..472a39e0f390
--- /dev/null
+++ b/security/nessus-libraries/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/files/patch-ac b/security/nessus-libraries/files/patch-ac
new file mode 100644
index 000000000000..d99314b84a2a
--- /dev/null
+++ b/security/nessus-libraries/files/patch-ac
@@ -0,0 +1,15 @@
+--- libpcap-nessus/configure.orig	Mon Jul 31 11:09:51 2000
++++ libpcap-nessus/configure	Wed May 29 12:07:45 2002
+@@ -391,9 +391,9 @@
+     if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+       echo "configure: warning: $ac_option: invalid host type" 1>&2
+     fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
++#    if test "x$nonopt" != xNONE; then
++#      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++#    fi
+     nonopt="$ac_option"
+     ;;
+ 
diff --git a/security/nessus-libraries/pkg-plist b/security/nessus-libraries/pkg-plist
index dc3368d53470..61a338bc13bd 100644
--- a/security/nessus-libraries/pkg-plist
+++ b/security/nessus-libraries/pkg-plist
@@ -1,27 +1,23 @@
 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
+include/nessus/net/bpf.h
 lib/libhosts_gatherer.a
+lib/libhosts_gatherer.la
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.1
+lib/libhosts_gatherer.so.3
 lib/libnessus.a
+lib/libnessus.la
 lib/libnessus.so
-lib/libnessus.so.1
+lib/libnessus.so.3
 lib/libpcap-nessus.a
+lib/libpcap-nessus.la
 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.3
+sbin/uninstall-nessus
 @dirrm include/nessus/net
 @dirrm include/nessus
-@dirrm include/peks
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 9780d2deb072..d214ec4d74a0 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	1.0.9
+PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
@@ -17,20 +17,31 @@ MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/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-plugins-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
-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
+BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus
+RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \
+		nmap:${PORTSDIR}/security/nmap \
+		wget:${PORTSDIR}/ftp/wget
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-fetchcmd=wget --sharedstatedir=${PREFIX}/etc/nessus/com \
+		--localstatedir=${PREFIX}/etc/nessus/var
 
 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/distinfo b/security/nessus-plugins/distinfo
index cf9beb0b1757..997dc0595515 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-1.0.9.tar.gz) = 86dc25b2ff26f1f1fe90a3577c09be37
+MD5 (nessus/nessus-plugins-1.2.2.tar.gz) = 2099c854c8c922f8c45a2afdf2c1e9a9
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 42479cd802eb..e588e76b5a43 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -1,34 +1,87 @@
 bin/nessus-build
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
-lib/nessus/plugins/40x_cross_site.nasl
+lib/nessus/plugins/3com_switches.nasl
+lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code.nasl
+lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code_2.nasl
+lib/nessus/plugins/CSCdi34061.nasl
+lib/nessus/plugins/CSCdi36962.nasl
+lib/nessus/plugins/CSCdp35794.nasl
+lib/nessus/plugins/CSCds04747.nasl
+lib/nessus/plugins/CSCds07326.nasl
+lib/nessus/plugins/CSCds66191.nasl
+lib/nessus/plugins/CSCdt46181.nasl
+lib/nessus/plugins/CSCdt62732.nasl
+lib/nessus/plugins/CSCdt65960.nasl
+lib/nessus/plugins/CSCdt93866.nasl
+lib/nessus/plugins/CSCdu20643.nasl
+lib/nessus/plugins/CSCdu81936.nasl
+lib/nessus/plugins/CSCdv48261.nasl
+lib/nessus/plugins/CSCdw19195.nasl
+lib/nessus/plugins/CSCdw67458.nasl
 lib/nessus/plugins/ColdFusion.nasl
+lib/nessus/plugins/DDI_AirConnect_Default_Password.nasl
+lib/nessus/plugins/DDI_Cabletron_Web_View.nasl
+lib/nessus/plugins/DDI_Compaq_Mgmt_Proxy.nasl
+lib/nessus/plugins/DDI_F5_Default_Support.nasl
+lib/nessus/plugins/DDI_FTP_Any_User_Login.nasl
+lib/nessus/plugins/DDI_GlobalASA_Retrieval.nasl
+lib/nessus/plugins/DDI_IIS_Compromised.nasl
+lib/nessus/plugins/DDI_IIS_dotNet_Trace.nasl
+lib/nessus/plugins/DDI_IPSwitch-IMail-SMTP-Buffer-Overflow.nasl
+lib/nessus/plugins/DDI_JRun_Sample_Files.nasl
+lib/nessus/plugins/DDI_JRun_Traversal.nasl
+lib/nessus/plugins/DDI_JavaServer_Default.nasl
+lib/nessus/plugins/DDI_LanRover_Blank_Password.nasl
+lib/nessus/plugins/DDI_Linksys_Router_Default_Password.nasl
+lib/nessus/plugins/DDI_MPEiX_FTP_Accounts.nasl
+lib/nessus/plugins/DDI_MRTG_File_Read.nasl
+lib/nessus/plugins/DDI_Netware_Management_Portal.nasl
+lib/nessus/plugins/DDI_PIX_Firewall_Manager.nasl
+lib/nessus/plugins/DDI_Unprotected_PCanywhere.nasl
+lib/nessus/plugins/DDI_Unprotected_SiteScope.nasl
+lib/nessus/plugins/DDI_WhatsUp_Default.nasl
 lib/nessus/plugins/ExAir_dos_advsearch.nasl
 lib/nessus/plugins/ExAir_dos_query.nasl
 lib/nessus/plugins/ExAir_dos_search.nasl
 lib/nessus/plugins/GuildFTPD097.nasl
 lib/nessus/plugins/IIS_frontpage_DOS.nasl
+lib/nessus/plugins/Jserv_css.nasl
 lib/nessus/plugins/LPRng.nasl
+lib/nessus/plugins/NDS_Object_Enum.nasl
 lib/nessus/plugins/NetSphere.nasl
+lib/nessus/plugins/Omnihttpd_pro_source_disclosure.nasl
 lib/nessus/plugins/PC_anywhere.nasl
+lib/nessus/plugins/PC_anywhere_tcp.nasl
 lib/nessus/plugins/PGPCert_DoS.nasl
+lib/nessus/plugins/RA_ssh_detect.nasl
+lib/nessus/plugins/RA_www_detect.nasl
 lib/nessus/plugins/ShowCode.nasl
 lib/nessus/plugins/TelSrv_DoS.nasl
 lib/nessus/plugins/WebSite.nasl
 lib/nessus/plugins/X.nasl
+lib/nessus/plugins/Xerver_DoS.nasl
 lib/nessus/plugins/a1stats.nasl
 lib/nessus/plugins/acc.nasl
+lib/nessus/plugins/accounts.nes
+lib/nessus/plugins/activestate_perl.nasl
+lib/nessus/plugins/admentor_login_flaw.nasl
 lib/nessus/plugins/afs_version.nasl
-lib/nessus/plugins/jj.nasl
+lib/nessus/plugins/agora.nasl
 lib/nessus/plugins/aix_ftpd.nasl
 lib/nessus/plugins/alcatel_adsl.nasl
+lib/nessus/plugins/alcatel_adsl_firewalling.nasl
+lib/nessus/plugins/alcatel_pabx4400_detect.nasl
+lib/nessus/plugins/alchemy_eye_http.nasl
 lib/nessus/plugins/alibaba.nasl
 lib/nessus/plugins/alibaba_get32.nasl
 lib/nessus/plugins/alibaba_overflow.nasl
 lib/nessus/plugins/alibaba_pl.nasl
 lib/nessus/plugins/alibaba_tst.nasl
+lib/nessus/plugins/alienform.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,23 +89,32 @@ 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_bat_exec.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_ssl_overflow.nasl
+lib/nessus/plugins/apache_username.nasl
 lib/nessus/plugins/arkeia.nasl
 lib/nessus/plugins/ascend_kill.nasl
 lib/nessus/plugins/asip-status.nasl
+lib/nessus/plugins/asp_net_css.nasl
+lib/nessus/plugins/asp_net_path_disclosure.nasl
 lib/nessus/plugins/asp_source_data.nasl
 lib/nessus/plugins/asp_source_dot.nasl
 lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/auktion_cgi.nasl
 lib/nessus/plugins/auth_enabled.nasl
+lib/nessus/plugins/avengers_news_system_command_execution.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/badblue_directory_traversal.nasl
 lib/nessus/plugins/basilix_inc_files.nasl
 lib/nessus/plugins/bb-hist.nasl
 lib/nessus/plugins/bb-hostsvc.nasl
@@ -61,95 +123,139 @@ 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_covert_overflows.nasl
+lib/nessus/plugins/bind_dnsstorm.nasl
+lib/nessus/plugins/bind_iquery.nasl
 lib/nessus/plugins/bind_query.nasl
 lib/nessus/plugins/bind_version.nasl
 lib/nessus/plugins/bind_vulnerable.nasl
 lib/nessus/plugins/bind_zxfr_bug.nasl
+lib/nessus/plugins/binlogin_overflow_rlogin.nasl
+lib/nessus/plugins/binlogin_overflow_telnet.nasl
 lib/nessus/plugins/bizdb1_search.nasl
+lib/nessus/plugins/blackice_dos.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bootparamd.nasl
 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/cachefsd_overflow.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/cf_debug.nasl
 lib/nessus/plugins/cfinger_format_bug.nasl
 lib/nessus/plugins/cfinger_search.nasl
 lib/nessus/plugins/cfinger_version.nasl
 lib/nessus/plugins/cgibin_browsable.nasl
+lib/nessus/plugins/cgicso_command_execution.nasl
+lib/nessus/plugins/cgicso_cross_site_scripting.nasl
 lib/nessus/plugins/cgiforum.nasl
 lib/nessus/plugins/cgitest.nasl
 lib/nessus/plugins/cgiwrap.nasl
 lib/nessus/plugins/chameleon_smtpd_overflow.nasl
 lib/nessus/plugins/chargen.nasl
+lib/nessus/plugins/check_ports.nasl
 lib/nessus/plugins/checkpoint.nasl
+lib/nessus/plugins/cifs445.nasl
 lib/nessus/plugins/cisco-view-source-dos.nasl
 lib/nessus/plugins/cisco_675.nasl
 lib/nessus/plugins/cisco_675_http_dos.nasl
+lib/nessus/plugins/cisco_aironet_dos.nasl
+lib/nessus/plugins/cisco_ata186_password_circumvent.nasl
 lib/nessus/plugins/cisco_catalyst.nasl
 lib/nessus/plugins/cisco_dos.nasl
+lib/nessus/plugins/cisco_gsr_acl.nasl
+lib/nessus/plugins/cisco_gsr_unreachable.nasl
 lib/nessus/plugins/cisco_http_admin_access.nasl
 lib/nessus/plugins/cisco_http_dos.nasl
+lib/nessus/plugins/cisco_no_pw.nasl
+lib/nessus/plugins/cisco_ssh_multiple_vulns.nasl
+lib/nessus/plugins/cisco_voip_dos.nasl
+lib/nessus/plugins/citrix_find.nasl
 lib/nessus/plugins/cmail_overflow.nasl
+lib/nessus/plugins/cobalt_web_admin_server.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
+lib/nessus/plugins/cross_site_scripting.nasl
+lib/nessus/plugins/csSearch_cgi.nasl
 lib/nessus/plugins/csm_helo.nasl
 lib/nessus/plugins/cvs_detect.nasl
+lib/nessus/plugins/cvs_in_www.nasl
 lib/nessus/plugins/cvsweb_shell.nasl
 lib/nessus/plugins/cvsweb_version.nasl
 lib/nessus/plugins/dansie_cart.nasl
 lib/nessus/plugins/daytime.nasl
+lib/nessus/plugins/db2_dos.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/deltaups_detect.nasl
 lib/nessus/plugins/dhcp.nasl
+lib/nessus/plugins/directoryphp.nasl
 lib/nessus/plugins/directorypro.nasl
 lib/nessus/plugins/dmail_overflow.nasl
 lib/nessus/plugins/dns_xfer.nasl
 lib/nessus/plugins/doc_browsable.nasl
 lib/nessus/plugins/doc_package_browseable.nasl
 lib/nessus/plugins/domino.nasl
+lib/nessus/plugins/domino_authentication_bypass.nasl
 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/dtspcd.nasl
 lib/nessus/plugins/dumpenv.nasl
+lib/nessus/plugins/eDonkey_detect.nasl
+lib/nessus/plugins/echo.nasl
+lib/nessus/plugins/eftp_bufferoverflow.nasl
+lib/nessus/plugins/eftp_directory_traversal.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/faqmanager.nasl
 lib/nessus/plugins/faxsurvey.nasl
+lib/nessus/plugins/fcgi_echo.nasl
+lib/nessus/plugins/find_ap.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/finger_solaris_disclosure.nasl
+lib/nessus/plugins/firewall1_dos.nasl
 lib/nessus/plugins/formhandler.nasl
 lib/nessus/plugins/formmail_pl.nasl
+lib/nessus/plugins/formmail_version_disclosure.nasl
 lib/nessus/plugins/fp_htimage.nasl
 lib/nessus/plugins/frontpage.nasl
 lib/nessus/plugins/frontpage_authors.nasl
@@ -160,13 +266,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 +282,26 @@ 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_w98_devname_dos.nasl
+lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftpgate.nasl
+lib/nessus/plugins/ftpglob.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/gnutella_detect.nasl
 lib/nessus/plugins/goodtech_ftpd_dos.nasl
 lib/nessus/plugins/groupwise_overflow.nasl
+lib/nessus/plugins/groupwise_web_interface_help_hole.nasl
+lib/nessus/plugins/groupwise_web_interface_htmlver_hole.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
@@ -198,18 +312,24 @@ lib/nessus/plugins/hsx.nasl
 lib/nessus/plugins/htdig.nasl
 lib/nessus/plugins/htgrep.nasl
 lib/nessus/plugins/htmlscript.nasl
+lib/nessus/plugins/htsearch_config_switch.nasl
 lib/nessus/plugins/htsearch_location.nasl
+lib/nessus/plugins/http-rpc-epmap.nasl
+lib/nessus/plugins/http_ids_evasion.nasl
 lib/nessus/plugins/http_methods.nasl
 lib/nessus/plugins/http_version.nasl
+lib/nessus/plugins/http_w98_devname_dos.nasl
 lib/nessus/plugins/http_webshopper.nasl
 lib/nessus/plugins/http_webstore.nasl
 lib/nessus/plugins/httpd_boa.nasl
 lib/nessus/plugins/httpd_nobody.nasl
 lib/nessus/plugins/httpver.nasl
+lib/nessus/plugins/hydra.nes
 lib/nessus/plugins/hyperbomb.nasl
 lib/nessus/plugins/i2odialogd.nasl
 lib/nessus/plugins/iChat.nasl
 lib/nessus/plugins/iParty.nasl
+lib/nessus/plugins/ibm_server_code.nasl
 lib/nessus/plugins/icat.nasl
 lib/nessus/plugins/icecap_default_pw.nasl
 lib/nessus/plugins/icecast_overflow.nasl
@@ -217,85 +337,126 @@ 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/ids_evasion.nasl
 lib/nessus/plugins/iis5_isapi_printer.nasl
 lib/nessus/plugins/iis5_printer.nasl
+lib/nessus/plugins/iis5_sample_cross_site.nasl
+lib/nessus/plugins/iis5_sample_path.nasl
 lib/nessus/plugins/iis_anything_idq.nasl
+lib/nessus/plugins/iis_asp_overflow.nasl
 lib/nessus/plugins/iis_authentification_manager.nasl
 lib/nessus/plugins/iis_bdir.nasl
 lib/nessus/plugins/iis_buffer_overflow.nasl
+lib/nessus/plugins/iis_codebrws.nasl
 lib/nessus/plugins/iis_crash.nasl
 lib/nessus/plugins/iis_decode_bug.nasl
 lib/nessus/plugins/iis_dir_traversal.nasl
 lib/nessus/plugins/iis_dos_ussrback.nasl
 lib/nessus/plugins/iis_dot_cnf.nasl
 lib/nessus/plugins/iis_frag_disclosure.nasl
+lib/nessus/plugins/iis_frontpage_dos.nasl
 lib/nessus/plugins/iis_ftp_crash.nasl
+lib/nessus/plugins/iis_htr_isapi.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
 lib/nessus/plugins/iis_repost_asp.nasl
 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/iis_xss_404.nasl
 lib/nessus/plugins/iisadmin.nasl
+lib/nessus/plugins/ike_check.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/imap4_rev1_overflow.nasl
+lib/nessus/plugins/imap_body_overflow.nasl
 lib/nessus/plugins/imap_overflow.nasl
 lib/nessus/plugins/imate_overflow.nasl
+lib/nessus/plugins/imp_session_hijacking.nasl
 lib/nessus/plugins/in_fingerd.nasl
 lib/nessus/plugins/info2www.nasl
+lib/nessus/plugins/informix_traversal.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/jrun_getdir.nasl
+lib/nessus/plugins/jserv_execute.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
 lib/nessus/plugins/kuang2_the_virus.nasl
 lib/nessus/plugins/kw_whois.nasl
+lib/nessus/plugins/labrea.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/libgtop_daemon.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/localweb2k.nasl
+lib/nessus/plugins/logins.nasl
 lib/nessus/plugins/lotus_envid.nasl
 lib/nessus/plugins/lotus_esmtp_overflow.nasl
+lib/nessus/plugins/lotus_notes_openserver_disclosure.nasl
+lib/nessus/plugins/lotus_path_disclosure.nasl
+lib/nessus/plugins/lpd_dvips.nasl
+lib/nessus/plugins/lpd_overflow.nasl
 lib/nessus/plugins/mailman_webmail.nasl
 lib/nessus/plugins/mailnews.nasl
 lib/nessus/plugins/marconi_dos.nasl
 lib/nessus/plugins/master_index_search.nasl
-lib/nessus/plugins/mbdms_overflow.nasl
 lib/nessus/plugins/mdaemon.nasl
 lib/nessus/plugins/mdaemon_dos.nasl
 lib/nessus/plugins/mdaemon_webconfig.nasl
 lib/nessus/plugins/mdaemon_worldclient.nasl
+lib/nessus/plugins/mdbms_overflow.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/mod_python_handle.nasl
+lib/nessus/plugins/mod_ssl_overflow.nasl
+lib/nessus/plugins/mrtg_traversal.nasl
 lib/nessus/plugins/ms_index_server.nasl
+lib/nessus/plugins/ms_siteserver_info_disclosure.nasl
 lib/nessus/plugins/msadcs_dll.nasl
+lib/nessus/plugins/msdtc_dos.nasl
+lib/nessus/plugins/msftp_dos.nasl
 lib/nessus/plugins/mspws_dotdotdot.nasl
 lib/nessus/plugins/msql_overflow.nasl
+lib/nessus/plugins/mssmtp_dos.nasl
 lib/nessus/plugins/mssql_blank_password.nasl
+lib/nessus/plugins/mssql_brute_force.nasl
 lib/nessus/plugins/mssql_ping.nasl
 lib/nessus/plugins/mssqlserver_detect.nasl
 lib/nessus/plugins/mssqlserver_dos.nasl
@@ -303,17 +464,21 @@ 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/multiple_ftpd_dos.nasl
 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 +486,10 @@ 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/netcommerce_sql.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,40 +501,70 @@ 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/nikto_wrapper.nes
+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
+lib/nessus/plugins/nortel_passport_default_pass.nasl
 lib/nessus/plugins/nortel_pwdless1.nasl
 lib/nessus/plugins/nortel_pwdless2.nasl
 lib/nessus/plugins/notes_mta_dos.nasl
 lib/nessus/plugins/novell_border_manager.nasl
-lib/nessus/plugins/novell_gwweb.nasl
+lib/nessus/plugins/novell_groupwise_webacc_information_disclosure.nasl
 lib/nessus/plugins/nph-publish.nasl
 lib/nessus/plugins/nph-test-cgi.nasl
 lib/nessus/plugins/nsm_format_strings.nasl
 lib/nessus/plugins/nt_ftp_guest.nasl
 lib/nessus/plugins/nt_spam.nasl
 lib/nessus/plugins/ntalk_detect.nasl
+lib/nessus/plugins/ntp_open.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_301.nasl
+lib/nessus/plugins/openssh_adv_option.nasl
+lib/nessus/plugins/openssh_afs.nasl
+lib/nessus/plugins/openssh_channel.nasl
 lib/nessus/plugins/openssh_uselogin.nasl
+lib/nessus/plugins/openssh_uselogin_environment.nasl
+lib/nessus/plugins/oracle9i_XSQLServlet_XSQLConfig.nasl
+lib/nessus/plugins/oracle9i_apache_dms.nasl
+lib/nessus/plugins/oracle9i_dad_admin.nasl
+lib/nessus/plugins/oracle9i_globals_dot_jsa.nasl
+lib/nessus/plugins/oracle9i_java_process_manager.nasl
+lib/nessus/plugins/oracle9i_jsp_source.nasl
+lib/nessus/plugins/oracle9i_mod_plsql_overflow.nasl
+lib/nessus/plugins/oracle9i_mod_plsql_traversal.nasl
+lib/nessus/plugins/oracle9i_modplsql_css.nasl
+lib/nessus/plugins/oracle_dos.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/owa-anonymous.nasl
 lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
+lib/nessus/plugins/p-smash.nasl
 lib/nessus/plugins/pagelog_cgi.nasl
 lib/nessus/plugins/pals_cgi.nasl
 lib/nessus/plugins/pam_smb.nasl
 lib/nessus/plugins/passwordless_cayman_router.nasl
 lib/nessus/plugins/passwordless_hp_printer.nasl
+lib/nessus/plugins/pccsmysqladm.nasl
+lib/nessus/plugins/perlIS_dll_bufferoverflow.nasl
 lib/nessus/plugins/perl_browseable.nasl
 lib/nessus/plugins/perl_cal.nasl
 lib/nessus/plugins/perl_cgi.nasl
@@ -380,16 +576,25 @@ lib/nessus/plugins/phonebook.nasl
 lib/nessus/plugins/phorum.nasl
 lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
+lib/nessus/plugins/php4_path_disclosure.nasl
+lib/nessus/plugins/phpMyExplorer.nasl
+lib/nessus/plugins/php_apache_win32_default.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_galleryaddon.nasl
 lib/nessus/plugins/php_nuke_opendir.nasl
+lib/nessus/plugins/php_nuke_sql_debug.nasl
 lib/nessus/plugins/php_overflow.nasl
 lib/nessus/plugins/php_safe_mode.nasl
+lib/nessus/plugins/php_split_mime.nasl
 lib/nessus/plugins/phpix.nasl
+lib/nessus/plugins/phprocketaddin_traversal.nasl
 lib/nessus/plugins/pi3web_isapi.nasl
 lib/nessus/plugins/pimp.nasl
+lib/nessus/plugins/ping_asp.nasl
 lib/nessus/plugins/ping_host.nasl
 lib/nessus/plugins/piranha.nasl
 lib/nessus/plugins/plusmail.nasl
@@ -399,9 +604,11 @@ lib/nessus/plugins/poc32.nasl
 lib/nessus/plugins/pollit.nasl
 lib/nessus/plugins/pop3_overflow.nasl
 lib/nessus/plugins/popserver_detect.nasl
+lib/nessus/plugins/port_shell_execution.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,16 +616,21 @@ 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
 lib/nessus/plugins/proxy_post.nasl
 lib/nessus/plugins/proxy_use.nasl
 lib/nessus/plugins/qpopper.nasl
+lib/nessus/plugins/qpopper2.nasl
 lib/nessus/plugins/qpopper_euidl.nasl
 lib/nessus/plugins/qpopper_list.nasl
+lib/nessus/plugins/quake3_dos.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
@@ -430,6 +642,8 @@ lib/nessus/plugins/resin_traversal.nasl
 lib/nessus/plugins/rexecd.nasl
 lib/nessus/plugins/rfparalyze.nasl
 lib/nessus/plugins/rfpoison.nasl
+lib/nessus/plugins/rh_inetd.nasl
+lib/nessus/plugins/rich_media_ecommerce_stores_sensitive_information_insecurely.nasl
 lib/nessus/plugins/rlogin.nasl
 lib/nessus/plugins/roads_cgi.nasl
 lib/nessus/plugins/rockliffe_mailsite_overflow.nasl
@@ -445,6 +659,7 @@ lib/nessus/plugins/rpc_cmsd.nasl
 lib/nessus/plugins/rpc_database.nasl
 lib/nessus/plugins/rpc_etherstatd.nasl
 lib/nessus/plugins/rpc_fam.nasl
+lib/nessus/plugins/rpc_kcms.nasl
 lib/nessus/plugins/rpc_keyserv.nasl
 lib/nessus/plugins/rpc_llockmgr.nasl
 lib/nessus/plugins/rpc_nfsd.nasl
@@ -465,17 +680,23 @@ 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
+lib/nessus/plugins/rpc_tooltalk_format_string.nasl
 lib/nessus/plugins/rpc_walld.nasl
 lib/nessus/plugins/rpc_ypbind.nasl
 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/rwalld_format_string.nasl
+lib/nessus/plugins/rwhois_format_string.nasl
+lib/nessus/plugins/rwhois_format_string2.nasl
+lib/nessus/plugins/samba_arbitrary_file_creation.nasl
 lib/nessus/plugins/sambar_cgi.nasl
 lib/nessus/plugins/sambar_mailit.nasl
 lib/nessus/plugins/sambar_pagecount.nasl
@@ -486,25 +707,42 @@ 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_bt_switch.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/servletExec_DoS.nasl
+lib/nessus/plugins/servletExec_File_Reading.nasl
+lib/nessus/plugins/servletExec_Path_Disclosure.nasl
+lib/nessus/plugins/sgi_rpc_passwd.nasl
+lib/nessus/plugins/sglmerchant_information_disclosure.nasl
 lib/nessus/plugins/shaft.nasl
+lib/nessus/plugins/shambala_www_dos.nasl
 lib/nessus/plugins/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/silverstream_database.nasl
+lib/nessus/plugins/silverstream_dirlisting.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
@@ -512,10 +750,31 @@ lib/nessus/plugins/smb_crash_winlogon.nasl
 lib/nessus/plugins/smb_dom2sid.nasl
 lib/nessus/plugins/smb_enum_services.nasl
 lib/nessus/plugins/smb_enum_shares.nasl
+lib/nessus/plugins/smb_group_account_op.nasl
+lib/nessus/plugins/smb_group_admin.nasl
+lib/nessus/plugins/smb_group_backup_op.nasl
+lib/nessus/plugins/smb_group_domain_admin.nasl
+lib/nessus/plugins/smb_group_print_op.nasl
+lib/nessus/plugins/smb_group_replicator.nasl
+lib/nessus/plugins/smb_group_system_op.nasl
+lib/nessus/plugins/smb_groups_guest.nasl
+lib/nessus/plugins/smb_host2sid.nasl
 lib/nessus/plugins/smb_lanman_browse_list.nasl
+lib/nessus/plugins/smb_localusers_autodisabled.nasl
+lib/nessus/plugins/smb_localusers_changepw.nasl
+lib/nessus/plugins/smb_localusers_disabled.nasl
+lib/nessus/plugins/smb_localusers_lastpwchange.nasl
+lib/nessus/plugins/smb_localusers_neverloggedon.nasl
+lib/nessus/plugins/smb_localusers_pwexpiry.nasl
 lib/nessus/plugins/smb_login.nasl
 lib/nessus/plugins/smb_login_as_users.nasl
 lib/nessus/plugins/smb_mssql7.nasl
+lib/nessus/plugins/smb_nativelanman.nasl
+lib/nessus/plugins/smb_netusergetaliases.nasl
+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_ms00-029.nasl
 lib/nessus/plugins/smb_nt_ms00-036.nasl
 lib/nessus/plugins/smb_nt_ms00-047.nasl
@@ -534,6 +793,16 @@ 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_nt_ms01-048.nasl
+lib/nessus/plugins/smb_nt_ms02-005.nasl
+lib/nessus/plugins/smb_nt_ms02-006.nasl
+lib/nessus/plugins/smb_nt_ms02-008.nasl
+lib/nessus/plugins/smb_nt_ms02-009.nasl
+lib/nessus/plugins/smb_nt_ms02-016.nasl
+lib/nessus/plugins/smb_nt_ms02-017.nasl
+lib/nessus/plugins/smb_nt_ms02-018.nasl
+lib/nessus/plugins/smb_nt_ms02-024.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
 lib/nessus/plugins/smb_reg_hklm.nasl
 lib/nessus/plugins/smb_reg_missing_winreg.nasl
@@ -549,9 +818,18 @@ lib/nessus/plugins/smb_reg_winlogon_permissions.nasl
 lib/nessus/plugins/smb_reg_winvnc_perms.nasl
 lib/nessus/plugins/smb_registry_access.nasl
 lib/nessus/plugins/smb_registry_full_access.nasl
+lib/nessus/plugins/smb_scope.nasl
+lib/nessus/plugins/smb_sid2localuser.nasl
 lib/nessus/plugins/smb_sid2user.nasl
 lib/nessus/plugins/smb_svc_alerter.nasl
 lib/nessus/plugins/smb_svc_messenger.nasl
+lib/nessus/plugins/smb_users_autodisabled.nasl
+lib/nessus/plugins/smb_users_changepw.nasl
+lib/nessus/plugins/smb_users_disabled.nasl
+lib/nessus/plugins/smb_users_lastpwchange.nasl
+lib/nessus/plugins/smb_users_neverloggedon.nasl
+lib/nessus/plugins/smb_users_pwexpiry.nasl
+lib/nessus/plugins/smb_xp_ms01-059.nasl
 lib/nessus/plugins/smtp_bounce.nasl
 lib/nessus/plugins/smtp_bypass_cisco.nasl
 lib/nessus/plugins/smtp_file.nasl
@@ -561,68 +839,91 @@ lib/nessus/plugins/smtp_program.nasl
 lib/nessus/plugins/smtp_relay.nasl
 lib/nessus/plugins/smtpserver_detect.nasl
 lib/nessus/plugins/snmpXdmid.nasl
+lib/nessus/plugins/snmp_cisco_type.nasl
 lib/nessus/plugins/snmp_default_communities.nasl
 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_oversized_length_field_dos.nasl
+lib/nessus/plugins/snmp_oversized_length_field_two.nasl
+lib/nessus/plugins/snmp_portscan.nes
 lib/nessus/plugins/snmp_processes.nasl
+lib/nessus/plugins/snmp_sysDesc.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/squid_overflows.nasl
+lib/nessus/plugins/ssh1_proto_enabled.nasl
 lib/nessus/plugins/ssh3_passwd.nasl
+lib/nessus/plugins/ssh_AllowedAuthentications.nasl
 lib/nessus/plugins/ssh_crc32.nasl
 lib/nessus/plugins/ssh_detect.nasl
 lib/nessus/plugins/ssh_insertion.nasl
 lib/nessus/plugins/ssh_kerberos.nasl
 lib/nessus/plugins/ssh_overflow.nasl
+lib/nessus/plugins/ssh_proto_version.nasl
+lib/nessus/plugins/ssl_ciphers.nes
 lib/nessus/plugins/stacheldraht.nasl
 lib/nessus/plugins/statd_format_string.nasl
 lib/nessus/plugins/store_cgi.nasl
+lib/nessus/plugins/story.nasl
+lib/nessus/plugins/stream.nasl
+lib/nessus/plugins/stronghold.nasl
 lib/nessus/plugins/subseven.nasl
+lib/nessus/plugins/sun_cobalt_adaptive_firewall_detect.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/third_party_domain.nasl
 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_path_disclosure.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_detect.nasl
 lib/nessus/plugins/ultraseek_dos.nasl
 lib/nessus/plugins/unicast_dos.nasl
 lib/nessus/plugins/upload_cgi.nasl
 lib/nessus/plugins/uploader_exe.nasl
+lib/nessus/plugins/upnp_xp.nasl
 lib/nessus/plugins/ustorekeeper.nasl
 lib/nessus/plugins/uw_imap_overflow.nasl
 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/visualroute_server_detect.nasl
 lib/nessus/plugins/vnc.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
@@ -631,6 +932,7 @@ lib/nessus/plugins/w3msql_overflow.nasl
 lib/nessus/plugins/wayboard.nasl
 lib/nessus/plugins/web_traversal.nasl
 lib/nessus/plugins/webactive_log.nasl
+lib/nessus/plugins/webalizer.nasl
 lib/nessus/plugins/webcart.nasl
 lib/nessus/plugins/webdav.nasl
 lib/nessus/plugins/webdav_iis.nasl
@@ -640,6 +942,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
@@ -648,13 +952,16 @@ lib/nessus/plugins/webshield.nasl
 lib/nessus/plugins/website_pro.nasl
 lib/nessus/plugins/websitepro_overflow.nasl
 lib/nessus/plugins/webspeed.nasl
+lib/nessus/plugins/websphere_xss.nasl
 lib/nessus/plugins/webspirs_cgi.nasl
 lib/nessus/plugins/wftp.nasl
 lib/nessus/plugins/wftp_241_dos.nasl
 lib/nessus/plugins/wftp_dos.nasl
+lib/nessus/plugins/whisker_wrapper.nes
 lib/nessus/plugins/whois_raw.nasl
 lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/windmail.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
@@ -663,6 +970,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
@@ -672,35 +980,25 @@ lib/nessus/plugins/www_too_long_post.nasl
 lib/nessus/plugins/www_too_long_url.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
 lib/nessus/plugins/wwwwais.nasl
+lib/nessus/plugins/xdmcp.nasl
 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/xtux_server.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/zml_cgi_traversal.nasl
 lib/nessus/plugins/zope.nasl
+lib/nessus/plugins/zope_dos.nasl
 lib/nessus/plugins/zope_img_updating.nasl
-lib/nessus/plugins/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_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
-@exec mkdir %D/lib/nessus/reports
-@unexec rmdir %D/lib/nessus/reports 2>/dev/null || true
-@dirrm lib/nessus
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 0626110e3960..e94de66256a1 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	1.0.9
+PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
@@ -19,9 +19,9 @@ MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.sekure.net/pub/nessus/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.3:${PORTSDIR}/security/nessus-libnasl
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
@@ -37,13 +37,17 @@ USE_GTK=	yes
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 
-MAN1=		nessus.1
-MAN8=		nessusd.8 nessus-adduser.8
+CONFIGURE_ARGS+=	--sharedstatedir=${PREFIX}/etc/nessus/com \
+			--localstatedir=${PREFIX}/etc/nessus/var
+
+MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1
+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/distinfo b/security/nessus/distinfo
index 46df0a10cd0a..dced2406aa15 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.9.tar.gz) = 83af77f6879383a58009fa4cdebc7e74
+MD5 (nessus/nessus-core-1.2.2.tar.gz) = ea521c50a64a2785cbd89fe42a415d70
diff --git a/security/nessus/files/patch-aa b/security/nessus/files/patch-aa
new file mode 100644
index 000000000000..102778eb2117
--- /dev/null
+++ b/security/nessus/files/patch-aa
@@ -0,0 +1,13 @@
+--- nessus-mkcert-client.in.orig	Thu Feb 28 18:03:45 2002
++++ nessus-mkcert-client.in	Wed May 29 13:12:17 2002
+@@ -84,8 +84,8 @@
+ 
+ 
+ 
+-NESSUSPRIV="$localstatedir/nessus/CA"
+-NESSUSPUB="$sharedstatedir/nessus/CA"
++NESSUSPRIV="$localstatedir/CA"
++NESSUSPUB="$sharedstatedir/CA"
+ 
+ while [ ! -d "$NESSUSPRIV" ]; do
+     echo_no_nl "Nessus server 'private' directory: "
diff --git a/security/nessus/files/patch-ab b/security/nessus/files/patch-ab
new file mode 100644
index 000000000000..97c1601ff14d
--- /dev/null
+++ b/security/nessus/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/files/patch-ag b/security/nessus/files/patch-ag
deleted file mode 100644
index d30f542889c4..000000000000
--- a/security/nessus/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/files/patch-nessus-html_graph_output.c b/security/nessus/files/patch-nessus-html_graph_output.c
deleted file mode 100644
index a41cf642a092..000000000000
--- a/security/nessus/files/patch-nessus-html_graph_output.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- nessus/html_graph_output.c.old	Thu Jan 17 18:44:40 2002
-+++ nessus/html_graph_output.c	Thu Jan 17 18:47:20 2002
-@@ -65,8 +65,9 @@
- #include "globals.h"
- #include "nsr_output.h"
- 
--
-+#ifndef __FreeBSD__
- static char* strcasestr(char*, char *);
-+#endif 
- static void insert_img(FILE *, char*);
- 
- 
-@@ -90,7 +91,8 @@
- /*
-  * Handy functions
-  */
-- 
-+
-+#ifndef __FreeBSD__ 
- static char * 
- strcasestr(char * haystack, char * needle)
- {
-@@ -109,6 +111,7 @@
-  }
-  return NULL;
- }
-+#endif
- 
- static void
- insert_img(f, name)
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index 4dc6b50f5f6e..909d0c198585 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -1,5 +1,8 @@
 bin/nessus
+bin/nessus-mkcert-client
+bin/nessus-mkrand
 include/nessus/config.h
+include/nessus/includes.h
 include/nessus/nessus-devel.h
 include/nessus/nessusicmp.h
 include/nessus/nessusip.h
@@ -8,10 +11,18 @@ 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 2>/dev/null || true
+@exec mkdir -p %D/etc/nessus/var/nessus/jobs
+@exec mkdir -p %D/etc/nessus/var/nessus/logs
+@exec mkdir -p %D/etc/nessus/var/nessus/users
+@unexec rmdir %D/etc/nessus/var/nessus/jobs 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var/nessus/logs 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var/nessus/users 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var/nessus 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var 2>/dev/null || true
+@unexec rmdir %D/etc/nessus 2>/dev/null || true
+@exec mkdir -p %D/lib/nessus/plugins
 @unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true
 @unexec rmdir %D/lib/nessus 2>/dev/null || true
-@unexec rmdir %D/include/nessus 2>/dev/null || true
-@unexec rmdir %D/etc/nessus 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true