Changes 2.2.11:

* Bug fixes and improvements

10 files changed, 39 insertions, 46 deletions

diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index 66cb9d843a9..679a728826c 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2008/07/14 12:56:12 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/10 11:34:50 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include	"../../security/nessus/Makefile.common"
 
 DISTNAME=	libnasl-${VERS}
-PKGREVISION=	1
 
 COMMENT=	Nessus Attack Scripting Language library
 
diff --git a/security/libnasl/distinfo b/security/libnasl/distinfo
index 50768fe1c46..7a9aee15b7d 100644
--- a/security/libnasl/distinfo
+++ b/security/libnasl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2006/12/17 21:06:23 salo Exp $
+$NetBSD: distinfo,v 1.23 2008/10/10 11:34:50 adam Exp $
 
-SHA1 (libnasl-2.2.9.tar.gz) = b3d9015a54317f6dd66e4148c51e1783534f3b61
-RMD160 (libnasl-2.2.9.tar.gz) = c7f1d5ebd080ed60cb79838601ada8617ec4b9ec
-Size (libnasl-2.2.9.tar.gz) = 366960 bytes
+SHA1 (libnasl-2.2.11.tar.gz) = 21db689dec510fb1f18eabb0ac00696e676069d0
+RMD160 (libnasl-2.2.11.tar.gz) = 2c6bc0d608451e8e82bce22baa7bf5b4d7f55d51
+Size (libnasl-2.2.11.tar.gz) = 367829 bytes
 SHA1 (patch-aa) = dd13fb7ddaf21f313e392e76138bbb66c7bdfbcb
 SHA1 (patch-ab) = 8a8b99ce00f298eae8a18741d966a1ee70cbba1c
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index cd035141c32..ab5f418824f 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2008/07/01 21:27:38 bad Exp $
+# $NetBSD: Makefile,v 1.34 2008/10/10 11:34:50 adam Exp $
 
 .include 	"../../security/nessus/Makefile.common"
 
 DISTNAME=	nessus-core-${VERS}
-PKGREVISION=	2
 
 COMMENT=	Core module of the Nessus Network Security Scanner
 
diff --git a/security/nessus-core/distinfo b/security/nessus-core/distinfo
index 88c5c317059..f0586dc314a 100644
--- a/security/nessus-core/distinfo
+++ b/security/nessus-core/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2006/12/17 21:06:22 salo Exp $
+$NetBSD: distinfo,v 1.23 2008/10/10 11:34:50 adam Exp $
 
-SHA1 (nessus-core-2.2.9.tar.gz) = 25385fd1cece40fd57e26afd42c88515b069c2ba
-RMD160 (nessus-core-2.2.9.tar.gz) = ba911192a78ee1c6ae1a5d64badff9d18ef666a8
-Size (nessus-core-2.2.9.tar.gz) = 674390 bytes
+SHA1 (nessus-core-2.2.11.tar.gz) = 7cd1caef7fae6219e4f4604224f753e71015b5cf
+RMD160 (nessus-core-2.2.11.tar.gz) = f10b87454bb526e518e1a0a5c319a2b5d11efeab
+Size (nessus-core-2.2.11.tar.gz) = 680220 bytes
 SHA1 (patch-aa) = ec63c0c606016033d15289c0ab3cbbc5bf74e64c
 SHA1 (patch-ab) = 9fce5a88d2d9574cd0912fd55ae2a833942e0e22
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 307e26abd91..c242ad8f0c8 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2008/07/14 12:56:12 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2008/10/10 11:34:50 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include 	"../../security/nessus/Makefile.common"
 
 DISTNAME=	nessus-libraries-${VERS}
-PKGREVISION=	1
 COMMENT=	Libs required by the Nessus Network security scanner
 
 WRKSRC=		${WRKDIR}/nessus-libraries
@@ -13,11 +12,13 @@ WRKSRC=		${WRKDIR}/nessus-libraries
 USE_TOOLS+=		bison lex
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \
-			--with-ssl=${BUILDLINK_PREFIX.openssl} \
-			--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--disable-nessuspcap
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--enable-zlib=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ENV+=		CPP=${CPP:Q}
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-libraries/PLIST b/security/nessus-libraries/PLIST
index 78722560bb1..9f975bd1cb8 100644
--- a/security/nessus-libraries/PLIST
+++ b/security/nessus-libraries/PLIST
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/10/10 11:34:50 adam Exp $
 bin/nessus-config
 include/nessus/getopt.h
 include/nessus/harglists.h
 include/nessus/libnessus.h
 include/nessus/libvers.h
-include/nessus/net/bpf.h
-include/nessus/pcap-namedb.h
-include/nessus/pcap.h
 lib/libhosts_gatherer.la
 lib/libnessus.la
-lib/libpcap-nessus.la
 man/man1/nessus-config.1
 @dirrm include/nessus/net
 @dirrm include/nessus
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 35a8d9ff798..284cf8e1314 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2006/12/17 21:06:22 salo Exp $
+$NetBSD: distinfo,v 1.26 2008/10/10 11:34:50 adam Exp $
 
-SHA1 (nessus-libraries-2.2.9.tar.gz) = de1ce2c522d6127a436574a96b1a5ec9873b597c
-RMD160 (nessus-libraries-2.2.9.tar.gz) = a3ce920ff48fcb7879f7026e2b7d271151132787
-Size (nessus-libraries-2.2.9.tar.gz) = 426560 bytes
+SHA1 (nessus-libraries-2.2.11.tar.gz) = 0e4794df390607f224057c1ca9d9ad1bcd8c0b86
+RMD160 (nessus-libraries-2.2.11.tar.gz) = 9c7a2da70ba7d64cdd2fd54e26b280d77da72661
+Size (nessus-libraries-2.2.11.tar.gz) = 428265 bytes
 SHA1 (patch-aa) = c525abf1ccfe4c3921609b91e335fa19b0bcab87
 SHA1 (patch-ab) = 982846ca823fb9f83b2d670f61f78b3b61f6d704
 SHA1 (patch-ac) = ec174bd6ddb7303f53a5e474451ad0f306575682
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 4d74ea20395..dfc87e341c1 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2008/01/18 05:09:39 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2008/10/10 11:34:50 adam Exp $
 
 .include	"../../security/nessus/Makefile.common"
 
-DISTNAME=	nessus-plugins-GPL-${VERS}
-PKGNAME=	nessus-plugins-${VERS}
-PKGREVISION=	1
+DISTNAME=	nessus-plugins-${VERS}
 # nmap.nasl was removed from the pack,
 # http://www.nessus.org/documentation/?doc=nmap-usage
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} nmap.nasl
@@ -15,10 +13,9 @@ COMMENT=	Plugins for the Nessus Network Security Scanner
 
 DEPENDS+=	nmap>=2.0:../../net/nmap
 
-WRKSRC=		${WRKDIR}/nessus-plugins
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	cat gzip
-
+WRKSRC=			${WRKDIR}/nessus-plugins
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		cat gzip
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		CAT=${TOOLS_CAT:Q} GZIP=${TOOLS_GZIP_CMD:Q} \
 			ac_cv_path_MAKE=${MAKE:Q}
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index ad3a7e920c3..9ad71eae6d3 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.23 2006/12/17 21:06:22 salo Exp $
+$NetBSD: distinfo,v 1.24 2008/10/10 11:34:50 adam Exp $
 
-SHA1 (nessus-plugins-GPL-2.2.9.tar.gz) = 39ad84c496f93ee944b60113dbac619a246b3bb2
-RMD160 (nessus-plugins-GPL-2.2.9.tar.gz) = bb2a853f4e7e5041c8d134d12b5a545a9009750e
-Size (nessus-plugins-GPL-2.2.9.tar.gz) = 1064740 bytes
+SHA1 (nessus-plugins-2.2.11.tar.gz) = 5037f7b6551c1cb303e5f5b853b7493e56aa02d9
+RMD160 (nessus-plugins-2.2.11.tar.gz) = 480aa0b57412de681fd6bc7b1b3b5fdec78626db
+Size (nessus-plugins-2.2.11.tar.gz) = 7647308 bytes
 SHA1 (nmap.nasl) = 18a3eb6c03256e89d596804aa879c0d2b3126140
 RMD160 (nmap.nasl) = d3a0e8227b223e67754b073ca7920e073f8d8172
 Size (nmap.nasl) = 16378 bytes
 SHA1 (patch-aa) = e2f564fff440728373abb49947c714d7002fc9da
+SHA1 (patch-ab) = 63260fa70de7d786925869d514be823837448967
diff --git a/security/nessus/Makefile.common b/security/nessus/Makefile.common
index c6e907c806c..535585ba37e 100644
--- a/security/nessus/Makefile.common
+++ b/security/nessus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2008/08/23 07:47:00 obache Exp $
+# $NetBSD: Makefile.common,v 1.32 2008/10/10 11:34:50 adam Exp $
 #
 # Common Makefile for:
 #  * nessus-core
@@ -6,15 +6,15 @@
 #  * nessus-plugins
 #  * libnasl
 
-VERS=		2.2.9
+VERS=		2.2.11
 
 CATEGORIES=	security x11 net
-MASTER_SITES?=	ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${VERS}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${VERS}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${VERS}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${VERS}/src/ \
-		ftp://ftp.wiretapped.net/pub/security/vulnerability-assessment/nessus/nessus-${VERS}/src/ \
-		ftp://ftp.linux.org.tr/pub/mirrors/nessus/nessus-${VERS}/src/
+MASTER_SITES=	http://www.nessus.org/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nessus.org/
+
+FETCH_MESSAGE+=	"Please download ${DISTFILES:Q}"
+FETCH_MESSAGE+=	"manually from ${MASTER_SITES:Q}"
+
+MAKE_JOBS_SAFE=	no