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)

5 files changed, 29 insertions, 11 deletions

diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index 34fd610b1ad..3fd1231b179 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/25 12:45:57 salo Exp $
 
 .include	"../../security/nessus/Makefile.common"
 
@@ -6,7 +6,8 @@ DISTNAME=	libnasl-${VERS}
 
 COMMENT=	Nessus Attack Scripting Language library
 
-WRKSRC=			${WRKDIR}/libnasl
+WRKSRC=		${WRKDIR}/libnasl
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 
diff --git a/security/libnasl/PLIST b/security/libnasl/PLIST
index 7db59c8742a..505d63875b9 100644
--- a/security/libnasl/PLIST
+++ b/security/libnasl/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/04/25 12:45:57 salo Exp $
 bin/nasl
 bin/nasl-config
 include/nessus/nasl.h
 lib/libnasl.la
 man/man1/nasl-config.1
 man/man1/nasl.1
+share/examples/libnasl/nessus_org.pem
+@dirrm share/examples/libnasl
diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk
index bc787aa7b32..d38cb7147e1 100644
--- a/security/libnasl/buildlink3.mk
+++ b/security/libnasl/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:33 rillig Exp $
-# XXX	BUILDLINK_DEPMETHOD.libnasl?=	build
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/25 12:45:57 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNASL_BUILDLINK3_MK:=	${LIBNASL_BUILDLINK3_MK}+
@@ -12,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnasl}
 BUILDLINK_PACKAGES+=	libnasl
 
 .if !empty(LIBNASL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libnasl+=	libnasl>=2.2.3
-BUILDLINK_ABI_DEPENDS.libnasl?=	libnasl>=2.2.3
+BUILDLINK_API_DEPENDS.libnasl+=	libnasl>=2.2.7
+BUILDLINK_ABI_DEPENDS.libnasl?=	libnasl>=2.2.7
 BUILDLINK_PKGSRCDIR.libnasl?=	../../security/libnasl
 .endif	# LIBNASL_BUILDLINK3_MK
 
diff --git a/security/libnasl/distinfo b/security/libnasl/distinfo
index 5da5c1843c9..d0edf2fc933 100644
--- a/security/libnasl/distinfo
+++ b/security/libnasl/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 (libnasl-2.2.6.tar.gz) = 323475d7c11b045abd93f8adad3e7ca7ca05ed0a
-RMD160 (libnasl-2.2.6.tar.gz) = 0c179b3a7d87fe61c8729c4e854b83ab2839031f
-Size (libnasl-2.2.6.tar.gz) = 364643 bytes
+SHA1 (libnasl-2.2.7.tar.gz) = d2d0c5b8ce6e63e08069173b414fa6588837cb46
+RMD160 (libnasl-2.2.7.tar.gz) = 281c6ea87e8eba25152f6f81bdf7186b2ceb9e43
+Size (libnasl-2.2.7.tar.gz) = 364755 bytes
 SHA1 (patch-aa) = dd13fb7ddaf21f313e392e76138bbb66c7bdfbcb
+SHA1 (patch-ab) = 8a8b99ce00f298eae8a18741d966a1ee70cbba1c
diff --git a/security/libnasl/patches/patch-ab b/security/libnasl/patches/patch-ab
new file mode 100644
index 00000000000..1a78741b0d3
--- /dev/null
+++ b/security/libnasl/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2006/04/25 12:45:57 salo Exp $
+
+--- Makefile.orig	2004-07-28 20:07:09.000000000 +0200
++++ Makefile	2006-04-10 13:22:16.000000000 +0200
+@@ -17,8 +17,8 @@
+ 	$(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1
+ 	$(INSTALL) -c -m 0644 doc/nasl.1 $(DESTDIR)${mandir}/man1
+ 	$(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1
+-	test -d $(DESTDIR)${localstatedir}/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/nessus
+-	$(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${localstatedir}/nessus/nessus_org.pem
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)${prefix}/share/examples/libnasl
++	$(BSD_INSTALL_DATA) doc/nessus_org.pem $(DESTDIR)${prefix}/share/examples/libnasl
+ 
+ 
+ 	@echo