- Update nessus to 2.2.0

- ok'ed frueauf

Local security checks over SSH : Nessus can now log into the remote hosts
to determine their patch levels and missing updates

A rewritten internal knowledge base API : the new knowledge base API makes
KB access faster and lets the plugins store any amount of data

An improved internal communication between the various nessusd processes, thus
reducing the overhead it takes to handle the results of the plugins and pass
them to the client

An improved plugin scheduler which reduces the time Nessus needs to organize
the order in which plugins should be launched

Sensitive scripts (which can execute commands over SSH) are cryptographically
signed

8 files changed, 22 insertions, 25 deletions

diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 973cb191f0b..6d13553d519 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/02 00:01:04 adrianp Exp $
 
 DISTNAME=	nessus-core-${VERS}
-PKGREVISION=	1
 .include 	"../nessus/Makefile.common"
 
 COMMENT=	Core module of the Nessus Network Security Scanner
diff --git a/security/nessus-core/PLIST b/security/nessus-core/PLIST
index 4b38131d4e1..237c41a2f63 100644
--- a/security/nessus-core/PLIST
+++ b/security/nessus-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/07/22 15:00:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/11/02 00:01:04 adrianp Exp $
 bin/nessus
 bin/nessus-mkcert-client
 bin/nessus-mkrand
@@ -19,6 +19,7 @@ man/man8/nessus-mkcert.8
 man/man8/nessus-rmuser.8
 man/man8/nessusd.8
 sbin/nessus-adduser
+sbin/nessus-check-signature
 sbin/nessus-mkcert
 sbin/nessus-rmuser
 sbin/nessusd
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index c3f89ac2ec0..0c48b6cc870 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/22 15:00:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/11/02 00:01:04 adrianp Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NESSUS_CORE_BUILDLINK3_MK:=	${NESSUS_CORE_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-core}
 BUILDLINK_PACKAGES+=	nessus-core
 
 .if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-core+=	nessus-core>=2.0.12
-BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.0.12
+BUILDLINK_DEPENDS.nessus-core+=	nessus-core>=2.2.0
 BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
 .endif	# NESSUS_CORE_BUILDLINK3_MK
 
diff --git a/security/nessus-core/distinfo b/security/nessus-core/distinfo
index 2fd351cc99a..ab6ef2ebdeb 100644
--- a/security/nessus-core/distinfo
+++ b/security/nessus-core/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2004/07/22 15:00:50 adam Exp $
+$NetBSD: distinfo,v 1.15 2004/11/02 00:01:04 adrianp Exp $
 
-SHA1 (nessus-core-2.0.12.tar.gz) = 64481020b33ba65c64949970abdeab78ee083480
-Size (nessus-core-2.0.12.tar.gz) = 649412 bytes
-SHA1 (patch-aa) = 9de405b5786aedad69d10eae74b3b8fa7ba0ac84
+SHA1 (nessus-core-2.2.0.tar.gz) = 89c35d2ab4941d42f11729894039a1af1d697ef6
+Size (nessus-core-2.2.0.tar.gz) = 688545 bytes
+SHA1 (patch-aa) = ec63c0c606016033d15289c0ab3cbbc5bf74e64c
diff --git a/security/nessus-core/patches/patch-aa b/security/nessus-core/patches/patch-aa
index 82d53e8772f..0933809a0cc 100644
--- a/security/nessus-core/patches/patch-aa
+++ b/security/nessus-core/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/05/19 16:23:12 adam Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/02 00:01:04 adrianp Exp $
 
---- nessusd/Makefile.orig	2003-01-31 14:44:45.000000000 +0000
-+++ nessusd/Makefile
-@@ -50,7 +50,7 @@ ${make_bindir}/nessusd : nessusd
- 	cp nessusd ${make_bindir}/nessusd
+--- nessusd/Makefile.orig	2004-10-29 17:39:48.000000000 +0100
++++ nessusd/Makefile	2004-10-29 17:40:25.000000000 +0100
+@@ -53,7 +53,7 @@
+ 	cp nessus-check-signature ${make_bindir}/nessus-check-signature
  
  nessusd : cflags $(OBJS)
 -	$(CC) $(LDFLAGS) $(NESSUS_INCLUDE) $(OBJS)  -o nessusd $(LIBS)
 +	$(CC) $(LDFLAGS) $(NESSUS_INCLUDE) $(OBJS)  -o nessusd $(LIBS) $(RUN_LIBS)
  
- users.o : cflags users.c users.h
- 	$(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c users.c 
+ nessus-check-signature : cflags nessus-check-signature.o
+ 	$(CC) $(LDFLAGS) $(NESSUS_INCLUDE) nessus-check-signature.o  -o nessus-check-signature $(LIBS)
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 67d380cb1cf..fc3880cbc3c 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2004/10/14 16:43:15 gavan Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/02 00:01:56 adrianp Exp $
 
 DISTNAME=	nessus-libraries-${VERS}
-PKGREVISION=	1
 .include 	"../nessus/Makefile.common"
 
 COMMENT=	Libs required by the Nessus Network security scanner
diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk
index 80dcff298b2..b902e5f6640 100644
--- a/security/nessus-libraries/buildlink3.mk
+++ b/security/nessus-libraries/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/11/02 00:01:56 adrianp Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 NESSUS_LIBRARIES_BUILDLINK3_MK:=	${NESSUS_LIBRARIES_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-libraries}
 BUILDLINK_PACKAGES+=	nessus-libraries
 
 .if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-libraries+=	nessus-libraries>=2.0.12
-BUILDLINK_RECOMMENDED.nessus-libraries+=	nessus-libraries>=2.0.12nb1
+BUILDLINK_DEPENDS.nessus-libraries+=	nessus-libraries>=2.2.0
 BUILDLINK_PKGSRCDIR.nessus-libraries?=	../../security/nessus-libraries
 .endif	# NESSUS_LIBRARIES_BUILDLINK3_MK
 
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index b201df0b0f4..3a847956ea7 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2004/07/22 14:59:53 adam Exp $
+$NetBSD: distinfo,v 1.17 2004/11/02 00:01:56 adrianp Exp $
 
-SHA1 (nessus-libraries-2.0.12.tar.gz) = a392ba312e0a5b99cfe275957488a53af0a6557e
-Size (nessus-libraries-2.0.12.tar.gz) = 418922 bytes
+SHA1 (nessus-libraries-2.2.0.tar.gz) = abfe9b9d9acf6dcec2297447fbc579a2bfa33969
+Size (nessus-libraries-2.2.0.tar.gz) = 423869 bytes
 SHA1 (patch-aa) = c525abf1ccfe4c3921609b91e335fa19b0bcab87
 SHA1 (patch-ac) = ec174bd6ddb7303f53a5e474451ad0f306575682