update to nessus 2.0.9, no response from maintainer

from Richard Johnson <rdump at river dot com> with some cleanup and @extra support from me
2003-11-27 19:53:24 +00:00 · 2003-11-27 19:53:24 +00:00 · adf1740316
commit adf1740316
parent f902d2ceb3
15 changed files with 810 additions and 92 deletions
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.33 2003/02/08 13:21:19 reinhard Exp $
+# $OpenBSD: Makefile,v 1.34 2003/11/27 19:53:24 sturm Exp $

 COMMENT=	"network security scanner"

 PKGNAME=	nessus-${VERS}
 CATEGORIES=	security

-VERS=		1.2.7
+VERS=		2.0.9

 DIST_SUBDIR=	nessus

@ -50,9 +50,11 @@ FLAVOR?=
 CONFIGURE_STYLE=gnu
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/nessus-core \
    ${WRKSRC}/nessus-plugins ${WRKSRC}/libnasl ${WRKSRC}/nessus-libraries
-CONFIGURE_ARGS+=--localstatedir=/var --disable-nessuspcap --sharedstatedir=/var
+CONFIGURE_ARGS+=--localstatedir=/var --disable-nessuspcap \
+		--sharedstatedir=/var --enable-shared --enable-bpf-sharing

 LIB_DEPENDS=	net::net/libnet
+BUILD_DEPENDS=	::devel/bison

 .if empty(FLAVOR:L:Mno_x11)
 LIB_DEPENDS+=	gtk.1.2,gdk.1.2::x11/gtk+
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@ -1,12 +1,12 @@
-MD5 (nessus/libnasl-1.2.7.tar.gz) = 7cbe6ba0a2243e4cdddee186da499153
-MD5 (nessus/nessus-core-1.2.7.tar.gz) = 0dff0b28cc53144a186a1886f4590d5b
-MD5 (nessus/nessus-libraries-1.2.7.tar.gz) = f0daff274e11dac64c294cd57a59579f
-MD5 (nessus/nessus-plugins-1.2.7.tar.gz) = c9a04a6fad043a07ccc9cc7bb14bd726
-RMD160 (nessus/libnasl-1.2.7.tar.gz) = c95c294a9774102f6aa30b2ff956930f3198f4c0
-RMD160 (nessus/nessus-core-1.2.7.tar.gz) = 0017fb64f72a59b47c471c618a3fe138d2a603c2
-RMD160 (nessus/nessus-libraries-1.2.7.tar.gz) = 0823e173c8f33b4751ff6ffd7b281bb1cb2b796a
-RMD160 (nessus/nessus-plugins-1.2.7.tar.gz) = 3dddc9422910036d0bf5980db93cd35ec0e86c1f
-SHA1 (nessus/libnasl-1.2.7.tar.gz) = 2f94e368708bd2ed8e3362c567278f7ae5848fad
-SHA1 (nessus/nessus-core-1.2.7.tar.gz) = f193bfb9635caa83dbea81db9200941733314a76
-SHA1 (nessus/nessus-libraries-1.2.7.tar.gz) = 99b5f550886d8c6712bacb22a073cb6ba8462bc1
-SHA1 (nessus/nessus-plugins-1.2.7.tar.gz) = caf9565452c54f7bdcb4c3dc7d0704469092aec8
+MD5 (nessus/libnasl-2.0.9.tar.gz) = 7626cc58afaa44a3f44f2fb1a31c5ea4
+MD5 (nessus/nessus-core-2.0.9.tar.gz) = 7bdbdb663d87a894cf8f99b33a5eb8b5
+MD5 (nessus/nessus-libraries-2.0.9.tar.gz) = 6bca1afa20e48886cde4fe98308efdf3
+MD5 (nessus/nessus-plugins-2.0.9.tar.gz) = afc233b099a0b36f828d72f891f94721
+RIPEMD160 (nessus/libnasl-2.0.9.tar.gz) = b292588ffde79e417cdcf25237adc8674b5ce4c8
+RIPEMD160 (nessus/nessus-core-2.0.9.tar.gz) = fbdf035ff4edd857cfa68a1599417884f3e02a27
+RIPEMD160 (nessus/nessus-libraries-2.0.9.tar.gz) = 215aaa60e65b4f399ff299d4ce6a37914a0b0c85
+RIPEMD160 (nessus/nessus-plugins-2.0.9.tar.gz) = 9b2c69af6b00719c34f8b7c99f00a640ade08276
+SHA1 (nessus/libnasl-2.0.9.tar.gz) = 1d617d6e9bccf05cf6b63dd9161bd22bdfaef2b9
+SHA1 (nessus/nessus-core-2.0.9.tar.gz) = 737e3749d65ce68c0ea987c4b9969c0ce3a56d17
+SHA1 (nessus/nessus-libraries-2.0.9.tar.gz) = 96bcd68ac71711ee3736f682ea769ca49fd3b11b
+SHA1 (nessus/nessus-plugins-2.0.9.tar.gz) = ff4344c88ac72a7d97e503018efce338d424e037
--- a/security/nessus/files/Makefile
+++ b/security/nessus/files/Makefile
@ -1,5 +1,5 @@
 #
-# $OpenBSD: Makefile,v 1.7 2002/07/04 15:37:03 reinhard Exp $
+# $OpenBSD: Makefile,v 1.8 2003/11/27 19:53:24 sturm Exp $
 #
 #   Makefile wrapper for nessus
 #
@ -17,7 +17,7 @@ install:
 	@for dir in @@NESSUS_DIRS@@ ; do \
 	   echo ">> Installing $$dir" ; \
 	   (cd $$dir ; \
-	    make prefix=${PREFIX} \
+	    make prefix=${TRUEPREFIX} \
 		localstatedir=${DESTDIR}/var \
 		sysconfdir=${PREFIX}/share/examples \
 		sharedstatedir=${DESTDIR}/var \
--- a/security/nessus/patches/patch-libnasl_Makefile
+++ b/security/nessus/patches/patch-libnasl_Makefile
@ -1,12 +1,12 @@
-$OpenBSD: patch-libnasl_Makefile,v 1.2 2002/05/25 10:38:58 reinhard Exp $
--- libnasl/Makefile.orig	Tue Oct 16 11:54:04 2001
-+++ libnasl/Makefile	Tue Apr 30 13:42:13 2002
+$OpenBSD: patch-libnasl_Makefile,v 1.3 2003/11/27 19:53:24 sturm Exp $
+--- libnasl/Makefile.orig	2003-01-21 08:27:53.000000000 -0600
+++ libnasl/Makefile	2003-09-29 14:15:27.000000000 -0500
@@ -8,7 +8,7 @@ nasl.tmpl: nasl.tmpl.in configure
 	touch $@
 
 install ::
 -	cd nasl && ${MAKE} install
 +	cd nasl && ${MAKE} prefix=${prefix} install
- 	test -d ${includedir}/nessus || $(INSTALL_DIR) -m 755 ${includedir}/nessus
- 	$(INSTALL) -c -m 0444 include/nasl.h ${includedir}/nessus
- 	test -d ${bindir} || $(INSTALL_DIR) -m 755 ${bindir}
+ 	test -d $(DESTDIR)${includedir}/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${includedir}/nessus
+ 	$(INSTALL) -c -m 0444 include/nasl.h $(DESTDIR)${includedir}/nessus
+ 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
--- a/security/nessus/patches/patch-libnasl_nasl_Makefile
+++ b/security/nessus/patches/patch-libnasl_nasl_Makefile
@ -1,11 +1,11 @@
-$OpenBSD: patch-libnasl_nasl_Makefile,v 1.1 2002/07/04 15:37:03 reinhard Exp $
--- libnasl/nasl/Makefile.orig	Mon Oct 15 12:58:07 2001
-+++ libnasl/nasl/Makefile	Mon Jun 24 18:20:33 2002
-@@ -42,7 +42,6 @@ libnasl.la : cflags $(OBJS)
+$OpenBSD: patch-libnasl_nasl_Makefile,v 1.2 2003/11/27 19:53:24 sturm Exp $
+--- libnasl/nasl/Makefile.orig	2003-04-02 04:46:24.000000000 -0600
+++ libnasl/nasl/Makefile	2003-09-29 14:22:22.000000000 -0500
+@@ -103,7 +103,6 @@ libnasl.la : cflags $(OBJS)
 install : libnasl.la nasl
- 	test -d ${libdir} || $(INSTALL_DIR) -m 755 ${libdir}
- 	$(LIBTOOL) --mode install $(INSTALL) libnasl.la ${libdir}/libnasl.la
-	$(LIBTOOL) --finish ${libdir}
- 	$(INSTALL) nasl ${bindir}/
- nessus_extensions.o : cflags nessus_extensions.c
- 	$(COMPILE) -c nessus_extensions.c 
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+ 	$(LIBTOOL) --mode install $(INSTALL) libnasl.la $(DESTDIR)${libdir}/libnasl.la
+-	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
+ 	$(INSTALL) nasl $(DESTDIR)${bindir}/
+ 
--- a/security/nessus/patches/patch-nessus-core_nessus_tmpl_in
+++ b/security/nessus/patches/patch-nessus-core_nessus_tmpl_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-nessus-core_nessus_tmpl_in,v 1.5 2002/10/12 13:04:22 reinhard Exp $
--- nessus-core/nessus.tmpl.in.orig	Fri Sep 27 00:23:16 2002
-+++ nessus-core/nessus.tmpl.in	Sat Oct 12 09:27:00 2002
-@@ -139,7 +139,7 @@ MAN_NESSUSD_8=@man_nessusd_8@
- # C compiler options
- NESSCFLAGS=@NESSCFLAGS@
- NASLCFLAGS=@NASLCFLAGS@
-NESSUS_CFLAGS=$(CWARN) $(include) $(NESSCFLAGS) $(NASLCFLAGS) $(NESSUS_DIRECTORIES)
-+NESSUS_CFLAGS=$(CWARN) $(include) $(NESSCFLAGS) $(NASLCFLAGS) $(NESSUS_DIRECTORIES) -I@includedir@
- CFLAGS=@CFLAGS@ 
- 
- LIBS=@LIBS@
--- a/security/nessus/patches/patch-nessus-libraries_Makefile
+++ b/security/nessus/patches/patch-nessus-libraries_Makefile
@ -1,14 +1,14 @@
-$OpenBSD: patch-nessus-libraries_Makefile,v 1.3 2002/05/25 10:38:58 reinhard Exp $
--- nessus-libraries/Makefile.orig	Fri Oct 26 00:54:10 2001
-+++ nessus-libraries/Makefile	Tue Apr 30 13:16:23 2002
+$OpenBSD: patch-nessus-libraries_Makefile,v 1.4 2003/11/27 19:53:24 sturm Exp $
+--- nessus-libraries/Makefile.orig	2003-04-04 02:40:37.000000000 -0600
+++ nessus-libraries/Makefile	2003-09-29 14:26:05.000000000 -0500
@@ -47,8 +47,8 @@ pcap-distclean:
 install : $(PCAP_INSTALL)
- 	test -d ${prefix} || ${INSTALL_DIR} -m 755 ${prefix}
- 	test -d ${includedir}/nessus || ${INSTALL_DIR} -m 755 ${includedir}/nessus
+ 	test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix}
+ 	test -d $(DESTDIR)${includedir}/nessus || ${INSTALL_DIR} -m 755 $(DESTDIR)${includedir}/nessus
 -	cd libnessus && ${MAKE} install
 -	cd libhosts_gatherer && ${MAKE} install
 +	cd libnessus && ${MAKE} prefix=${prefix} install
 +	cd libhosts_gatherer && ${MAKE} prefix=${prefix} install
 
 
- 	$(INSTALL) -m 0444 include/includes.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus
--- a/security/nessus/patches/patch-nessus-libraries_configure
+++ b/security/nessus/patches/patch-nessus-libraries_configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-nessus-libraries_configure,v 1.6 2002/10/12 13:04:22 reinhard Exp $
--- nessus-libraries/configure.orig	Thu Sep 26 23:43:53 2002
-+++ nessus-libraries/configure	Sat Oct 12 09:27:00 2002
-@@ -5363,7 +5363,7 @@ fi
+$OpenBSD: patch-nessus-libraries_configure,v 1.7 2003/11/27 19:53:24 sturm Exp $
+--- nessus-libraries/configure.orig	2003-04-16 12:58:28.000000000 -0500
+++ nessus-libraries/configure	2003-09-29 13:05:52.000000000 -0500
+@@ -5364,7 +5364,7 @@ fi
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
--- a/security/nessus/patches/patch-nessus-libraries_libhosts_gatherer_Makefile
+++ b/security/nessus/patches/patch-nessus-libraries_libhosts_gatherer_Makefile
@ -1,11 +1,11 @@
-$OpenBSD: patch-nessus-libraries_libhosts_gatherer_Makefile,v 1.1 2002/07/04 15:37:03 reinhard Exp $
--- nessus-libraries/libhosts_gatherer/Makefile.orig	Thu Nov 15 08:13:22 2001
-+++ nessus-libraries/libhosts_gatherer/Makefile	Mon Jun 24 18:18:24 2002
+$OpenBSD: patch-nessus-libraries_libhosts_gatherer_Makefile,v 1.2 2003/11/27 19:53:24 sturm Exp $
+--- nessus-libraries/libhosts_gatherer/Makefile.orig	2003-04-06 21:06:49.000000000 -0500
+++ nessus-libraries/libhosts_gatherer/Makefile	2003-09-29 14:26:53.000000000 -0500
@@ -19,7 +19,6 @@ test : libhosts_gatherer.la 
 install : libhosts_gatherer.la
- 	test -d ${libdir} || $(INSTALL_DIR) -m 755 ${libdir}
- 	$(LIBTOOL) --mode install $(INSTALL) libhosts_gatherer.la ${libdir} 
-	$(LIBTOOL) --finish ${libdir}
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+ 	$(LIBTOOL) --mode install $(INSTALL) libhosts_gatherer.la $(DESTDIR)${libdir} 
+-	$(LIBTOOL) --finish $(DESTDIR)${libdir}
 	
 libhosts_gatherer.la : $(OBJS)
 	$(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
--- a/security/nessus/patches/patch-nessus-libraries_libnessus_Makefile
+++ b/security/nessus/patches/patch-nessus-libraries_libnessus_Makefile
@ -1,11 +1,11 @@
-$OpenBSD: patch-nessus-libraries_libnessus_Makefile,v 1.2 2002/10/12 13:04:22 reinhard Exp $
--- nessus-libraries/libnessus/Makefile.orig	Thu Sep 19 15:30:02 2002
-+++ nessus-libraries/libnessus/Makefile	Sat Oct 12 09:27:00 2002
-@@ -79,7 +79,6 @@ libnessus.la: $(OBJS)
+$OpenBSD: patch-nessus-libraries_libnessus_Makefile,v 1.3 2003/11/27 19:53:24 sturm Exp $
+--- nessus-libraries/libnessus/Makefile.orig	2003-02-02 07:40:41.000000000 -0600
+++ nessus-libraries/libnessus/Makefile	2003-09-29 14:27:29.000000000 -0500
+@@ -96,7 +96,6 @@ libnessus.la: $(OBJS)
 install : libnessus.la
- 	test -d ${libdir} || $(INSTALL_DIR) -m 755 ${libdir}
- 	$(LIBTOOL) --mode install $(INSTALL) libnessus.la ${libdir}/libnessus.la
-	$(LIBTOOL) --finish ${libdir}
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+ 	$(LIBTOOL) --mode install $(INSTALL) libnessus.la $(DESTDIR)${libdir}/libnessus.la
+-	$(LIBTOOL) --finish $(DESTDIR)${libdir}
 
 distclean : clean
 
--- a/security/nessus/patches/patch-nessus-plugins_configure
+++ b/security/nessus/patches/patch-nessus-plugins_configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-nessus-plugins_configure,v 1.2 2002/10/12 13:04:22 reinhard Exp $
--- nessus-plugins/configure.orig	Thu Sep 26 16:29:17 2002
-+++ nessus-plugins/configure	Sat Oct 12 09:27:00 2002
-@@ -5325,7 +5325,7 @@ fi
+$OpenBSD: patch-nessus-plugins_configure,v 1.3 2003/11/27 19:53:24 sturm Exp $
+--- nessus-plugins/configure.orig	2003-09-30 03:55:08.000000000 +0200
+++ nessus-plugins/configure	2003-11-24 21:59:16.000000000 +0100
+@@ -5314,7 +5314,7 @@ fi
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
--- a/security/nessus/pkg/INSTALL
+++ b/security/nessus/pkg/INSTALL
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.4 2003/04/26 14:55:32 sturm Exp $
+# $OpenBSD: INSTALL,v 1.5 2003/11/27 19:53:24 sturm Exp $
 #
 # Post-installation script for nessus port
 #
@ -14,20 +14,17 @@ umask 022

 if [ x$2 = xPOST-INSTALL ]
 then
-	# See if ${CONFIGDIR} exists; if it doesn't, create and populate.
+	# See if ${CONFIGDIR} exists; if it doesn't, create it.
 	if [ -d ${CONFIGDIR} ]
 	then
 		cat <<EOT

 +---------------
-| Example configuration files have been copied to
-| $PREFIX/share/examples/nessus.  Your existing ${CONFIGDIR} has
-| been left untouched.
+| Your existing ${CONFIGDIR} has been left untouched.
 +---------------
 EOT
 	else
 		mkdir -p ${CONFIGDIR}
-		cp -R $PREFIX/share/examples/nessus/* ${CONFIGDIR}
 	fi

 	# Make /var/nessus directory for logs and pidfile and etc.
--- a/security/nessus/pkg/MESSAGE
+++ b/security/nessus/pkg/MESSAGE
@ -1,6 +1,6 @@

 +---------------
-| If you have not already installed nmap 2.3BETA or a newer version
+| If you have not already installed nmap 3.00 or a newer version
 | in ${PREFIX}/bin, you may wish to do so in order to enable some
 | checks which will otherwise return false negatives.
 +---------------
--- a/security/nessus/pkg/PFRAG.shared
+++ b/security/nessus/pkg/PFRAG.shared
@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.12 2003/02/08 13:21:19 reinhard Exp $
-lib/libhosts_gatherer.so.3.7
-lib/libnasl.so.3.7
-lib/libnessus.so.3.7
+@comment $OpenBSD: PFRAG.shared,v 1.13 2003/11/27 19:53:24 sturm Exp $
+lib/libhosts_gatherer.so.2.9
+lib/libnasl.so.2.9
+lib/libnessus.so.2.9
 DYNLIBDIR(%D/lib)
--- a/security/nessus/pkg/PLIST
+++ b/security/nessus/pkg/PLIST