Update libnasl and nessus{-core,-libraries,-plugins} to 2.0.6a.

This also includes changes offered in pr pkg/18734 and pr pkg/20796
submitted by Adrian Portelli. Thanks & Sorry that it took that long to
pick them up.

2.0.6 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Support for the keyword 'default' as a port range in nmap_wrapper.nes
- Fixed a zombie issue in nmap_wrapper.nes
- Fixed various issues which could allow a NASL script to crash the
  NASL interpretor
- Improved the process management in find_services.nes

2.0.5 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Fixed a rare race condition which may make the scan hang
- Fixed SMB related issues
- Entering "default" as the port range will make nessusd scan the ports
  listed in the Nessus services file.
- Even more sigs in find_services.nes
. changes by Julien Bordet (zejames@greyhats.org)
- Added over 3,000 signatures to smtpscan.nasl (thanks to the data
  provided by the Nessus team)

2.0.4 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- fixed the SIGCHLD handler which would not work properly and leave zombies
  on the system
- fixed a race condition when testing a great number of hosts which would
  cause a testing process to slow down a whole audit or even hang it
  totally
- When a great number of host names is passed to nessusd as a target, they
  are resolved by chunks of 64 instead of trying to resolve everything then
  starting the test
- RedHat 9 support (in spite of their attempt to make their distro incompatible
  with everyone else)
. changes by Gabriel L. Somlo <somlo@acns.colostate.edu>
- The nessus can save the reports to stdout and read them from stdin

2.0.3 :
- fixed a compilation error which would prevent find_services from working
  properly

2.0.2 :
. changes by Michel Arboi (arboi@alussinan.org)
- NASL port of smtpscan (original Perl program by Julien Bordet)
- Nasty bug made loop stop prematurely on rare cases
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Re-wrote webmirror.nasl from scratch. The new version has a real parser
  built-in and is much faster
- Added checks for older Microsoft Advisories
- SMB plugins now use NTMLv1 authentication, ie: they don't send passwords
  in clear text over the network any more
- Added new crypto functions, taken from samba, in libnasl/
- Repaired detached scans
- Fixed IP ranges notation (10.1.1-9.1-254 did not work any more)
- Minor bug fixes and enhancements : #234, #233, #230, #229, #228, #225, #222,
  #220, #218, #217, #216, #215, #213, #212, #211, #207, #206, #205
- nessus-update-plugins properly calls chown under FreeBSD, no matter how
  many plugins there are
- find_services.nes recognizes even more protocols
. changes by Xueyong Zhi <zhi@mail.eecis.udel.edu>
- Added NTLMv2 authentication
. changes by Frank Migge (frank.migge@oracle.com)
- nessus-mkcert-client creates the auth/rules file properly

2.0.1 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Minor bugfixes (bugs #180, #183, #185, #188, #189, #195, #197, #202, #203, #204)
- Fixed the "pink" graphical report issue
- Added http keep-alive support in the CGI related plugins
- Fixed a bug in the function get_kb_list() which would not always work
  properly
- Fixed an issue where in some situations, some HTTP services would not
  be tested for flaws if they have not been port-scanned first
- Added new signatures in find_services.nes
. changes by Stephen Friedl (steve@unixwiz.net)
- Fixed bugs and warnings in nessus-libraries

2.0.0 :
. changes by Michel Arboi (arboi@alussinan.org)
- NASL2 : Implement >!< "strings don't match" operator
- NASL2 : fixed a vicious case of freed memory copy.
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Fixed a small bug in the plugin scheduler
- Ported to IRIX
- Several small bugfixes
. changes by Xueyong Zhi <zhi@mail.eecis.udel.edu>
- Added nmap_osfingerprint

1.3.4 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Re-written the process manager for the hosts
- Lots of bugfixes in the plugins text store manager
- New port scanner "synscan" which uses the RTT of the packets to do
  its job.
- Fixed several small issues in nasl and nessusd (bug fixes, code cleanup)
- Added cryptographic hashing functions in NASL
- Added the function get_kb_list() which returns the content of a KB
  without forking the plugin
- Updated the manpages of nessusd and nasl
. changes by Michel Arboi (arboi@alussinan.org)
- Fixed scanner_get_port() when running in standalone mode
- Fixed possible uninitiliazed memory issues in libnasl
- Started to write the NASL2 reference guide (to be found in libnasl/doc/)

1.3.3 :
. changes by Michel Arboi (arboi@alussinan.org)
- Implement bit xor, logical & aithmetic right shift, power
- Fix operator precedence
- Added new NASL functions
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- The plugin texts are not loaded in memory any more, thus reducing
  the consumption of the nessus daemon of two megs. This also speeds up
  the loading of nessusd.
- Fixed a bug in the plugins scheduler (if optimizations were enabled,
  the scan would sometime hang)
- Added a new NASL function (int())
- Fixed strings substraction to handle null values properly
- find_services.nes runs in parallel mode, for improved speed
- new plugin (synscan) which should perform well against firewalled
  hosts (computes the RTT before the scan)

1.3.2 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Added fixes so that nessus-core/nessusd/pluginscheduler.c compiles with
  the latest version of GCC
- Fixed a bug in nessus-libraries/libnessus/bpf_share.c : a timer would not
  be reset, causing plugins which call bpf_next() to sometimes crash
- Set the timer of bpf_share.c to a much lower value, thus making it work
  much better
- Improved tcp_ping()
- Fixed two bugs in the plugins scheduler :
	- If the option "enable dependencies at runtime" is set,
	  it would enable ALL the plugins which are depended on, instead
	  of only those we use ;
	- In some cases, it may terminate too early, thus preventing a scan
	  from being complete
- DESTDIR support

1.3.1 :
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- Rewrote the plugins scheduler (which determines the order in which
  the plugins are to be launched). The new one is much more efficient
  but as a result, it is not possible to accurately determine the
  order in which the plugins will be ran, so the 'plugin name' in
  the client is now totally bogus
- Fixed various issues with NASL scripts so that they work better
  with NASL2
- Fixed bugs relative to the creation of icmp and udp packets in nasl
- Fixed some fatal bugs in the bpf sharer
- NASL scripts do not read /dev/urandom any more, and use time() as a
  random seed instead. As a result, the loading and execution of nasl
  scripts if faster on systems where /dev/urandom can be blocking
- Fixed the tcp NIDS evasion techniques on BSD systems
- Full support for Bugtraq IDs
- The HTML reports add links for URLs, and show the ID number of
  the plugin that issues the report.
- Speed up the calls to arg_get_value() by using a hash of the name
  being searched for.
- Changed the licence of NASL2 to the GPLv2 (with the consent of Michel Arboi)
. changes by Michel Arboi (arboi@alussinan.org)
- Better handling of the arrays in NASL2
. changes by Erik Anderson (eanders@carmichaelsecurity.com)
- CVE and bugtraq cross references
. changes by Jay (jay@kinetic.org)
- Fixed multiple typos in the plugins
. changes by Javier Fernandez-Sanguino (jfernandez@germinus.com)
- Nessus now ships Hydra 2.2
- Fixed various compilation scritps (see bug#63)

1.3.0 :
. changes by Michel Arboi (arboi@alussinan.org)
- Use our own nessus-services file (re-generated at first start to include
  /etc/services and nmap-services)
- Added new families of plugins (ACT_KILL_HOST and ACT_END)
- Rewrote libnasl
. changes by Renaud Deraison (deraison@cvs.nessus.org)
- The 'cancel' button of several file selection dialogs is now working
- Optimized several plugins :
	- Web-related checks now use http_recv() instead of recv()
	- open_priv_sock_tcp() has a lower timeout
	- RPC related checks now use get_rpc_port(), a function equivalent
	  to libc's getrpcport() but with a much smaller timeout
	- Decreased the default value of checks_read_timeout from 15 to 5
- Fixed a bug in the plugin selection GUI which would not refresh
  the list of plugins of a given family properly (bug#3)
- Fixed memory leaks in NASL
- Fixed a bug in nessusd which would make it leak memory when receiving a SIGHUP
  (bug#10)
- Fixed a compatibility problem with Nmap 3.10ALPHA (bug#11)
- Nessus now accepts nmap's U: and T: notation for the port range (bug#5)
- Helped Michel Arboi to give the last touches to the new libnasl
. changes by Erik Anderson (eanders@pobox.com)
- Added CVE and BID links, added urls and removed dead links from the plugins
. changes by Michel Scheidell (scheidell@secnap.net)
- Improved several SMB-related checks
. changes by Rodolfo Baader (rbaader@activesec.biz)
- Quotes and apostrophes are properly escaped in the XML output report

5 files changed, 39 insertions, 39 deletions

diff --git a/security/nessus-libraries/PLIST b/security/nessus-libraries/PLIST
index 10943100e15..75408c99e00 100644
--- a/security/nessus-libraries/PLIST
+++ b/security/nessus-libraries/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/19 18:30:14 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/06/09 17:01:26 frueauf Exp $
 bin/nessus-config
 include/nessus/getopt.h
 include/nessus/harglists.h
@@ -10,18 +10,18 @@ include/nessus/pcap.h
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.la
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.3
-lib/libhosts_gatherer.so.3.7
+lib/libhosts_gatherer.so.2
+lib/libhosts_gatherer.so.2.6
 lib/libnessus.a
 lib/libnessus.la
 lib/libnessus.so
-lib/libnessus.so.3
-lib/libnessus.so.3.7
+lib/libnessus.so.2
+lib/libnessus.so.2.6
 lib/libpcap-nessus.a
 lib/libpcap-nessus.la
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.3
-lib/libpcap-nessus.so.3.7
+lib/libpcap-nessus.so.2
+lib/libpcap-nessus.so.2.6
 man/man1/nessus-config.1
 @dirrm include/nessus/net
 @dirrm include/nessus
diff --git a/security/nessus-libraries/buildlink2.mk b/security/nessus-libraries/buildlink2.mk
index 36bb14ca9fe..42c47ce3a12 100644
--- a/security/nessus-libraries/buildlink2.mk
+++ b/security/nessus-libraries/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/19 18:30:14 frueauf Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/06/09 17:01:26 frueauf Exp $
 #
 
 .if !defined(NESSUS_LIBRARIES_BUILDLINK2_MK)
 NESSUS_LIBRARIES_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			nessus-libraries
-BUILDLINK_DEPENDS.nessus-libraries?=		nessus-libraries>=1.2.7
+BUILDLINK_DEPENDS.nessus-libraries?=		nessus-libraries>=2.0.6a
 BUILDLINK_PKGSRCDIR.nessus-libraries?=		../../security/nessus-libraries
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.nessus-libraries=nessus-libraries
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index b9ba731ae16..27bf8f8cce9 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2002/12/19 18:30:14 frueauf Exp $
+$NetBSD: distinfo,v 1.11 2003/06/09 17:01:26 frueauf Exp $
 
-SHA1 (nessus-libraries-1.2.7.tar.gz) = 99b5f550886d8c6712bacb22a073cb6ba8462bc1
-Size (nessus-libraries-1.2.7.tar.gz) = 397218 bytes
-SHA1 (patch-aa) = bc78c512fb29bc56df28d235195b53079777d7e2
-SHA1 (patch-ac) = b26f7728487ce335296b6a1eb3c3145d8cf5dbc3
+SHA1 (nessus-libraries-2.0.6a.tar.gz) = 26ce978267ed88a69d69500199dd12d75a138edb
+Size (nessus-libraries-2.0.6a.tar.gz) = 414511 bytes
+SHA1 (patch-aa) = c525abf1ccfe4c3921609b91e335fa19b0bcab87
+SHA1 (patch-ac) = ec174bd6ddb7303f53a5e474451ad0f306575682
diff --git a/security/nessus-libraries/patches/patch-aa b/security/nessus-libraries/patches/patch-aa
index 921b2367356..3ffd7295b5d 100644
--- a/security/nessus-libraries/patches/patch-aa
+++ b/security/nessus-libraries/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2002/12/19 18:30:14 frueauf Exp $
+$NetBSD: patch-aa,v 1.4 2003/06/09 17:01:26 frueauf Exp $
 
---- nessus-config.pre.in.orig	Sat Dec 14 15:13:20 2002
-+++ nessus-config.pre.in	Thu Dec 19 15:24:39 2002
+--- nessus-config.pre.in-orig	Sat Feb 22 16:57:49 2003
++++ nessus-config.pre.in	Sun Jun  8 12:54:34 2003
 @@ -48,7 +48,7 @@
  		;;
  	--libs)
  	
--		echo $Xn "-lc -L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
-+		echo $Xn "-lc -Wl,-R$LIBDIR  -L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
+-		echo $Xn "-L$DESTDIR$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
++		echo $Xn "-Wl,-R$DESTDIR$LIBDIR -L$DESTDIR$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
  		;;
  	--cflags)
- 		echo $Xn "$DEFS -I$INCLUDEDIR/nessus $CIPHER_CFLAGS $SSL_CFLAGS $Xc"
+ 		echo $Xn "$DEFS -I$DESTDIR$INCLUDEDIR/nessus $CIPHER_CFLAGS $SSL_CFLAGS $Xc"
diff --git a/security/nessus-libraries/patches/patch-ac b/security/nessus-libraries/patches/patch-ac
index 55aaec1315d..7a076d78865 100644
--- a/security/nessus-libraries/patches/patch-ac
+++ b/security/nessus-libraries/patches/patch-ac
@@ -1,25 +1,25 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 13:18:46 frueauf Exp $
+$NetBSD: patch-ac,v 1.4 2003/06/09 17:01:26 frueauf Exp $
 
---- Makefile.orig	Fri Oct 26 07:54:10 2001
-+++ Makefile	Fri May 10 13:11:04 2002
+--- Makefile-orig	Fri Apr  4 10:40:37 2003
++++ Makefile	Sun Jun  8 12:58:26 2003
 @@ -51,15 +51,17 @@
  	cd libhosts_gatherer && ${MAKE} install
  
  
--	$(INSTALL) -m 0444 include/includes.h ${includedir}/nessus
-+	# Use the includes.h from nessus-core:
-+	#$(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
- 	$(INSTALL) -m 0444 include/getopt.h    ${includedir}/nessus
- 	test -d ${bindir} || ${INSTALL_DIR} -m 755 ${bindir}
--	test -d ${sbindir} || ${INSTALL_DIR} -m 755 ${sbindir}
-+	#test -d ${sbindir} || ${INSTALL_DIR} -m 755 ${sbindir}
- 	$(INSTALL) -m 0755 nessus-config ${bindir}/nessus-config
--	$(INSTALL) -m 0755 uninstall-nessus ${sbindir}/uninstall-nessus
+-	$(INSTALL) -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus
++	# Use the includes.h from nessus-core.
++	#$(INSTALL) -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/libvers.h   $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/getopt.h    $(DESTDIR)${includedir}/nessus
+ 	test -d $(DESTDIR)${bindir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${bindir}
+-	test -d $(DESTDIR)${sbindir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${sbindir}
++	#test -d $(DESTDIR)${sbindir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${sbindir}
+ 	$(INSTALL) -m 0755 nessus-config $(DESTDIR)${bindir}/nessus-config
+-	$(INSTALL) -m 0755 uninstall-nessus $(DESTDIR)${sbindir}/uninstall-nessus
 +	# we use pkg_* tools to deinstall nessus
-+	#$(INSTALL) -m 0755 uninstall-nessus ${sbindir}/uninstall-nessus
- 	test -d ${mandir} || ${INSTALL_DIR} -m 755 ${mandir}
- 	test -d ${mandir}/man1 || ${INSTALL_DIR} -m 755 ${mandir}/man1
- 	$(INSTALL) -m 0644 nessus-config.1 ${mandir}/man1
++	#$(INSTALL) -m 0755 uninstall-nessus $(DESTDIR)${sbindir}/uninstall-nessus
+ 	test -d $(DESTDIR)${mandir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}
+ 	test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
+ 	$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1