Update nessus suite to version 1.2.2, from security/nessus-*-devel ports.

Give maintainership to udo.schweigert@siemens.com, who already maintains
the -devel ports.

6 files changed, 49 insertions, 27 deletions

diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 56314a2..576e081 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
@@ -18,8 +17,9 @@ MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
+DISTNAME=	nessus-libraries-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 66155b7..af30856 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.0.9.tar.gz) = 9de5bad530f193afd75ff843578dfefc
+MD5 (nessus/nessus-libraries-1.2.2.tar.gz) = d0899306ba952a10ed7c719de7183b6f
diff --git a/security/nessus-libraries/files/patch-aa b/security/nessus-libraries/files/patch-aa
index 91463f7..9d914ce 100644
--- a/security/nessus-libraries/files/patch-aa
+++ b/security/nessus-libraries/files/patch-aa
@@ -1,11 +1,10 @@
---- nessus-config.pre.in.orig	Fri Nov 17 20:46:14 2000
-+++ nessus-config.pre.in	Wed Nov 14 12:01:46 2001
-@@ -45,7 +45,7 @@
- 		;;
- 	--libs)
- 	
--		echo $Xn "-L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
-+		echo $Xn "-lc -L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
- 		;;
- 	--cflags)
- 		echo $Xn "-I$INCLUDEDIR $DEFS -I$INCLUDEDIR/nessus $CIPHER_CFLAGS $Xc"
+--- Makefile.orig	Thu May 31 15:51:08 2001
++++ Makefile	Wed Oct 10 20:16:14 2001
+@@ -46,7 +46,6 @@
+ 	cd libhosts_gatherer && ${MAKE} install
+ 	cd libpcap-nessus && ${MAKE} install 
+ 
+-	$(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
diff --git a/security/nessus-libraries/files/patch-ab b/security/nessus-libraries/files/patch-ab
new file mode 100644
index 0000000..472a39e
--- /dev/null
+++ b/security/nessus-libraries/files/patch-ab
@@ -0,0 +1,12 @@
+--- configure.orig	Tue Oct 16 19:56:40 2001
++++ configure	Thu Oct 18 06:13:41 2001
+@@ -5074,7 +5074,8 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(PREFIX)/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
diff --git a/security/nessus-libraries/files/patch-ac b/security/nessus-libraries/files/patch-ac
new file mode 100644
index 0000000..d99314b
--- /dev/null
+++ b/security/nessus-libraries/files/patch-ac
@@ -0,0 +1,15 @@
+--- libpcap-nessus/configure.orig	Mon Jul 31 11:09:51 2000
++++ libpcap-nessus/configure	Wed May 29 12:07:45 2002
+@@ -391,9 +391,9 @@
+     if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+       echo "configure: warning: $ac_option: invalid host type" 1>&2
+     fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
++#    if test "x$nonopt" != xNONE; then
++#      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++#    fi
+     nonopt="$ac_option"
+     ;;
+ 
diff --git a/security/nessus-libraries/pkg-plist b/security/nessus-libraries/pkg-plist
index dc3368d..61a338b 100644
--- a/security/nessus-libraries/pkg-plist
+++ b/security/nessus-libraries/pkg-plist
@@ -1,27 +1,23 @@
 bin/nessus-config
 include/nessus/getopt.h
 include/nessus/harglists.h
-include/nessus/includes.h
 include/nessus/libnessus.h
 include/nessus/libvers.h
-include/nessus/net/bpf.h
 include/nessus/pcap-namedb.h
 include/nessus/pcap.h
-include/peks/messages.h
-include/peks/peks.h
+include/nessus/net/bpf.h
 lib/libhosts_gatherer.a
+lib/libhosts_gatherer.la
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.1
+lib/libhosts_gatherer.so.3
 lib/libnessus.a
+lib/libnessus.la
 lib/libnessus.so
-lib/libnessus.so.1
+lib/libnessus.so.3
 lib/libpcap-nessus.a
+lib/libpcap-nessus.la
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.1
-lib/libpeks.a
-lib/libpeks.la
-lib/libpeks.so
-lib/libpeks.so.8
+lib/libpcap-nessus.so.3
+sbin/uninstall-nessus
 @dirrm include/nessus/net
 @dirrm include/nessus
-@dirrm include/peks