Update to version 2.2.7

Approved by <frueauf>

Changes:
- make it work as binary packages,
- remove useless MESSAGE files,
- add nmap.nasl plugin, not included by default upstream,
- make the installation a bit more sane and easier to configure.

2.2.7:
======

Nessus 2.2.7 contains several fixes for bugs which have been found
during the 3.x developement process and have been backported to this
branch. It also slightly extends the NASL language by adding support for
arrays of arrays. We will use this feature in some key plugins (SMB in
particular) within 6 months, so you should definitely upgrade to 2.2.7
or 3.0.x.

nessus-libraries:
- Fixed a NULL pointer dereferencement in the BPF server (this mostly
  affects OpenBSD and FreeBSD < 5)
- The 'service' functions now only deal with the services file provided
- with Nessus (instead of using a mix of /etc/services and others)

libnasl:
- Fixed off-by-one bugs in insstr() and str_replace() which would
  sometimes prevent these two functions from properly dealing with the
  last character of a string
- Fixed tcp_ping() which was too aggressive and may therefore sometimes
  miss a live host
- Fixed a bug in send() which would not properly validate the value of the
  'length' variable
- Now handle arrays of arrays
- Fixed open_priv_sock_tcp() which would report a successful connection
  when timing out

nessusd:
- Properly install the file 'nessus-services' in $prefix/var/nessus/
- Bigger buffer when receiving preferences from the client (to avoid a
  possible truncation of the plugin list in the future)
- Fixed a bug in the preferences parser which would cause nessusd to die
  on startup when processing a malformed preference file

nessus client:
- Fixed an unlikely but potential segmentation fault when viewing the
  report in the GUI
- Erase the credentials from memory after having used them (thanks to
  Sumiut Siddhart for noticing this)

plugins:
- Fixed several bugs in find_services.c which would not properly set the
  key Transport/SSL or which may read some data beyond its buffer
- Fixed a bad #if/#endif clause in nessus_tcp_scanner.c which prevented it
  from recomputing the RTT, hence negatively impacting the performance
- nmap.nasl has been removed from the main distribution (to use nmap from
  within Nessus read http://www.nessus.org/documentation/?doc=nmap-usage)

7 files changed, 58 insertions, 35 deletions

diff --git a/security/nessus-core/MESSAGE b/security/nessus-core/MESSAGE
index 5fa7c9a6a09..d2b1a0fe37b 100644
--- a/security/nessus-core/MESSAGE
+++ b/security/nessus-core/MESSAGE
@@ -1,19 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2004/10/11 22:14:51 reed Exp $
+$NetBSD: MESSAGE,v 1.8 2006/04/25 12:45:57 salo Exp $
 
-Nessus may have placed some files in /var/nessus, ${PREFIX}/etc/nessus,
-${PREFIX}/com/nessus and ${PREFIX}/lib/nessus/reports. If you do not need
-these files any more, be sure to remove them:
-
-	rm -fr ${VARBASE}/nessus
-	rm -fr ${PREFIX}/etc/nessus
-	rm -fr ${PREFIX}/lib/nessus/reports
-	rm -fr ${PREFIX}/com/nessus
-
-Before you can start scanning, you need to create one or more user-accounts
-using "nessus-adduser", generate key using "nessus-mkcert" then start the
-nessus daemon, nessusd, and use the "nessus" GUI program to direct the
-daemon.
+Before you can start scanning, you need to create one or more user accounts
+using "nessus-adduser", generate key (and configuration file, if you lack
+one) using "nessus-mkcert" then start the nessus daemon, "nessusd", and use
+the "nessus" GUI program to manage the daemon.
 
 If you want to start nessusd automatically on system boot, please copy
 ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/nessusd to /etc/rc.d and set
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index c3f6f8a0faf..bf7d236b684 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,21 +1,43 @@
-# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/25 12:45:57 salo Exp $
 
 .include 	"../../security/nessus/Makefile.common"
 
 DISTNAME=	nessus-core-${VERS}
-PKGREVISION=	2
 
 COMMENT=	Core module of the Nessus Network Security Scanner
 
 WRKSRC=		${WRKDIR}/nessus-core
+
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-gtk --with-x --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--enable-gtk
+CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sharedstatedir=${PKG_SYSCONFBASE:Q}
 CONFIGURE_ENV+=		ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \
 			ac_cv_path_GLIBCONFIG="pkg-config glib-2.0"
 
 RCD_SCRIPTS=	nessusd
-PLIST_SUBST+=	VARBASE=${VARBASE:Q}
+
+PKG_SYSCONFSUBDIR?=	nessus
+
+OWN_DIRS_PERMS+=	${VARBASE}/nessus ${ROOT_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
+
+OWN_DIRS+=	${PREFIX}/lib/nessus		\
+		${PREFIX}/lib/nessus/reports	\
+		${PREFIX}/lib/nessus/plugins
+
+MAKE_DIRS+=	${VARBASE}/nessus/jobs		\
+		${VARBASE}/nessus/logs		\
+		${VARBASE}/nessus/tmp		\
+		${VARBASE}/nessus/users
+
+CONF_FILES+=	${BUILDLINK_PREFIX.libnasl}/share/examples/libnasl/nessus_org.pem \
+		${VARBASE}/nessus/nessus_org.pem
+CONF_FILES+=	${PREFIX}/share/examples/nessus/nessus-services	\
+		${VARBASE}/nessus/nessus-services
 
 .include "../../security/libnasl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-core/PLIST b/security/nessus-core/PLIST
index 6d743793ba3..42916db49c9 100644
--- a/security/nessus-core/PLIST
+++ b/security/nessus-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/04/25 12:45:57 salo Exp $
 bin/nessus
 bin/nessus-fetch
 bin/nessus-mkcert-client
@@ -26,10 +26,5 @@ sbin/nessus-mkcert
 sbin/nessus-rmuser
 sbin/nessusd
 share/examples/rc.d/nessusd
-@exec ${MKDIR} %D/lib/nessus/reports
-@unexec ${RMDIR} %D/lib/nessus/reports 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/nessus 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/etc/nessus
-@unexec ${RMDIR} %D/etc/nessus 2>/dev/null || ${TRUE}
-@exec ${MKDIR} ${VARBASE}/nessus
-@unexec ${RMDIR} ${VARBASE}/nessus 2>/dev/null || ${TRUE}
+share/examples/nessus/nessus-services
+@dirrm share/examples/nessus
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index ff10e91a916..265c0552e82 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/25 12:45:57 salo Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NESSUS_CORE_BUILDLINK3_MK:=	${NESSUS_CORE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-core}
 BUILDLINK_PACKAGES+=	nessus-core
 
 .if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.nessus-core+=		nessus-core>=2.2.3
-BUILDLINK_ABI_DEPENDS.nessus-core?=	nessus-core>=2.2.6nb2
+BUILDLINK_API_DEPENDS.nessus-core+=	nessus-core>=2.2.7
+BUILDLINK_ABI_DEPENDS.nessus-core?=	nessus-core>=2.2.7
 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 13a26c4987c..d11f066b6fc 100644
--- a/security/nessus-core/distinfo
+++ b/security/nessus-core/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2006/01/29 17:05:54 adam Exp $
+$NetBSD: distinfo,v 1.21 2006/04/25 12:45:57 salo Exp $
 
-SHA1 (nessus-core-2.2.6.tar.gz) = 878434bbbae4f0edf9cc1c90315e2ee0524eb2e3
-RMD160 (nessus-core-2.2.6.tar.gz) = 2ddd5f2b70a1d4432bb0126d1cac710105e9291f
-Size (nessus-core-2.2.6.tar.gz) = 683530 bytes
+SHA1 (nessus-core-2.2.7.tar.gz) = c261eeb14e0594467f0e1da04a42679f4658c1f4
+RMD160 (nessus-core-2.2.7.tar.gz) = 672bc31cc8283e3248831bb8564c6531d4b55eed
+Size (nessus-core-2.2.7.tar.gz) = 673852 bytes
 SHA1 (patch-aa) = ec63c0c606016033d15289c0ab3cbbc5bf74e64c
+SHA1 (patch-ab) = 9fce5a88d2d9574cd0912fd55ae2a833942e0e22
diff --git a/security/nessus-core/files/nessusd.sh b/security/nessus-core/files/nessusd.sh
index 85fc2ea2f4a..668e73e5c19 100644
--- a/security/nessus-core/files/nessusd.sh
+++ b/security/nessus-core/files/nessusd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: nessusd.sh,v 1.1 2003/06/09 17:01:26 frueauf Exp $
+# $NetBSD: nessusd.sh,v 1.2 2006/04/25 12:45:57 salo Exp $
 #
 
 # PROVIDE: nessusd
@@ -21,7 +21,7 @@ command_args="-D"
 nessusd_setup()
 {
 	echo "Dump of nessusd setup."
-	@PREFIX@/sbin/nessusd -d
+	${command} -d
 }
 
 load_rc_config $name
diff --git a/security/nessus-core/patches/patch-ab b/security/nessus-core/patches/patch-ab
new file mode 100644
index 00000000000..e99dbd4abbf
--- /dev/null
+++ b/security/nessus-core/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.3 2006/04/25 12:45:57 salo Exp $
+
+--- Makefile.orig	2006-01-15 16:37:55.000000000 +0100
++++ Makefile	2006-04-10 13:49:33.000000000 +0200
+@@ -38,7 +38,8 @@
+ 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp
+ 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs
+ 	test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR}
+-	$(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)${prefix}/share/examples/nessus
++	$(BSD_INSTALL_DATA) nessus-services $(DESTDIR)${prefix}/share/examples/nessus
+ 	$(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus