ports/64578: maintainer-update of security/nessus-*

Udo Schweigert udo.schweigert at siemens.com
Mon Mar 22 16:50:20 UTC 2004 

>Number:         64578
>Category:       ports
>Synopsis:       maintainer-update of security/nessus-*
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 22 08:50:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:


>Description:

Maintainer-update of the security/nessus-* ports:

	- Adopt the standard nessus directory structure, reducing the number
	  of files in ${PREFIX}/etc/nessus. Move existing files to the
	  right places

	- Add SIZE to distinfo.

	- Bump PORTREVISION.


>How-To-Repeat:
>Fix:

diff -ru /usr/ports/security/nessus/Makefile nessus/Makefile
--- /usr/ports/security/nessus/Makefile	Mon Mar 15 06:08:03 2004
+++ nessus/Makefile	Mon Mar 22 17:40:47 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	nessus
 PORTVERSION=	2.0.10a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -37,14 +37,12 @@
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 
-CONFIGURE_ARGS+=	--sharedstatedir=${PREFIX}/etc/nessus/com \
-			--localstatedir=${PREFIX}/etc/nessus/var
-
 MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1
 MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 
 post-install:
-.if ! exists(${PREFIX}/etc/nessus/var/CA/serverkey.pem)
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/move_nessus
+.if ! exists(${PREFIX}/var/CA/serverkey.pem)
 .if ! defined(BATCH)
 	${PREFIX}/sbin/nessus-mkcert
 .else
diff -ru /usr/ports/security/nessus/distinfo nessus/distinfo
--- /usr/ports/security/nessus/distinfo	Fri Jan 23 12:00:57 2004
+++ nessus/distinfo	Mon Mar 22 17:35:55 2004
@@ -1 +1,2 @@
 MD5 (nessus/nessus-core-2.0.10a.tar.gz) = bd9d62375adc5d6b9e38879a8cee108d
+SIZE (nessus/nessus-core-2.0.10a.tar.gz) = 649493
diff -ru /usr/ports/security/nessus/pkg-plist nessus/pkg-plist
--- /usr/ports/security/nessus/pkg-plist	Wed Jun 19 13:13:09 2002
+++ nessus/pkg-plist	Sat Jan 31 19:04:43 2004
@@ -14,14 +14,13 @@
 sbin/nessus-mkcert
 sbin/nessus-rmuser
 sbin/nessusd
- at exec mkdir -p %D/etc/nessus/var/nessus/jobs
- at exec mkdir -p %D/etc/nessus/var/nessus/logs
- at exec mkdir -p %D/etc/nessus/var/nessus/users
- at unexec rmdir %D/etc/nessus/var/nessus/jobs 2>/dev/null || true
- at unexec rmdir %D/etc/nessus/var/nessus/logs 2>/dev/null || true
- at unexec rmdir %D/etc/nessus/var/nessus/users 2>/dev/null || true
- at unexec rmdir %D/etc/nessus/var/nessus 2>/dev/null || true
- at unexec rmdir %D/etc/nessus/var 2>/dev/null || true
+ at exec mkdir -p %D/var/nessus/jobs
+ at exec mkdir -p %D/var/nessus/logs
+ at exec mkdir -p %D/var/nessus/users
+ at unexec rmdir %D/var/nessus/jobs 2>/dev/null || true
+ at unexec rmdir %D/var/nessus/logs 2>/dev/null || true
+ at unexec rmdir %D/var/nessus/users 2>/dev/null || true
+ at unexec rmdir %D/var/nessus 2>/dev/null || true
 @unexec rmdir %D/etc/nessus 2>/dev/null || true
 @exec mkdir -p %D/lib/nessus/plugins
 @unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true
diff -ru /usr/ports/security/nessus/scripts/move_nessus nessus/scripts/move_nessus
--- /usr/ports/security/nessus/scripts/move_nessus	Thu Jan  1 01:00:00 1970
+++ nessus/scripts/move_nessus	Wed Jan 28 16:57:32 2004
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# $FreeBSD: $
+#
+# set -x
+
+trap ' cleanup ' 0
+trap ' echo_signal; exit 1' 1 2 3 15
+
+cleanup() {
+	# No tmp file to remove up to now ;-)
+}
+
+echo_signal() {
+  echo "Got Signal -- aborting `basename $0`"
+}
+
+PATH=/bin:/usr/bin
+
+
+if [ -f $PREFIX/etc/nessus/nessusd.conf ]; then
+  mv $PREFIX/etc/nessus/nessusd.conf $PREFIX/etc/nessus/nessusd.conf.bak
+  sed	-e "s,/usr/local/etc/nessus/var,/usr/local/var,g" \
+	-e "s,/usr/local/etc/nessus/com,/usr/local/com,g" \
+	$PREFIX/etc/nessus/nessusd.conf.bak > $PREFIX/etc/nessus/nessusd.conf
+fi
+if [ -d $PREFIX/etc/nessus/var/nessus/users ]; then
+  printf "\n\nMigrating nessus to default directory scheme\n"
+  printf "============================================\n\n"
+  cd $PREFIX/etc/nessus/var/nessus/users
+  for i in *; do 
+    if [ $i != '*' ]; then 
+      mv $i $PREFIX/var/nessus/users
+      printf "Moving nessus user %s\n" $i
+    fi
+  done
+  printf "\n"
+fi
+if [ ! -d $PREFIX/com/CA ]; then
+  if [ -d $PREFIX/etc/nessus/com/CA ]; then
+    if [ ! -d $PREFIX/com ]; then
+      mkdir -m 755 $PREFIX/com
+    fi
+    mv $PREFIX/etc/nessus/com/CA $PREFIX/com/CA
+  fi
+  if [ -d $PREFIX/etc/nessus/var/CA ]; then
+    if [ ! -d $PREFIX/var/CA ]; then
+      mv $PREFIX/etc/nessus/var/CA $PREFIX/var/CA
+    fi
+  fi
+fi
diff -ru /usr/ports/security/nessus-libnasl/Makefile nessus-libnasl/Makefile
--- /usr/ports/security/nessus-libnasl/Makefile	Mon Mar 15 06:08:03 2004
+++ nessus-libnasl/Makefile	Mon Mar 22 17:40:12 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	nessus-libnasl
 PORTVERSION=	2.0.10a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -27,9 +27,6 @@
 
 USE_BISON=	YES
 USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	--sharedstatedir=${PREFIX}/etc/nessus/com \
-		--localstatedir=${PREFIX}/etc/nessus/var
-
 INSTALLS_SHLIB=	YES
 
 MAN1=		nasl.1 nasl-config.1
diff -ru /usr/ports/security/nessus-libnasl/distinfo nessus-libnasl/distinfo
--- /usr/ports/security/nessus-libnasl/distinfo	Fri Jan 23 12:00:57 2004
+++ nessus-libnasl/distinfo	Mon Mar 22 17:36:12 2004
@@ -1 +1,2 @@
 MD5 (nessus/libnasl-2.0.10a.tar.gz) = 59e0c0ed0fbe1fcf35cdfe004e32b37f
+SIZE (nessus/libnasl-2.0.10a.tar.gz) = 343047
diff -ru /usr/ports/security/nessus-libraries/Makefile nessus-libraries/Makefile
--- /usr/ports/security/nessus-libraries/Makefile	Mon Mar 15 06:08:03 2004
+++ nessus-libraries/Makefile	Mon Mar 22 17:40:22 2004
@@ -10,7 +10,7 @@
 
 PORTNAME=	nessus-libraries
 PORTVERSION=	2.0.10a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -28,8 +28,7 @@
 
 USE_BISON=	YES
 USE_LIBTOOL_VER=13
-CONFIGURE_ARGS=	--enable-cipher --sharedstatedir=${PREFIX}/etc/nessus/com \
-		--localstatedir=${PREFIX}/etc/nessus/var
+CONFIGURE_ARGS=	--enable-cipher
 .if defined(WITH_NESSUS_BPF_SHARE)
 CONFIGURE_ARGS+=	--enable-bpf-sharing
 .endif
diff -ru /usr/ports/security/nessus-libraries/distinfo nessus-libraries/distinfo
--- /usr/ports/security/nessus-libraries/distinfo	Fri Jan 23 12:00:57 2004
+++ nessus-libraries/distinfo	Mon Mar 22 17:36:22 2004
@@ -1 +1,2 @@
 MD5 (nessus/nessus-libraries-2.0.10a.tar.gz) = b0c1f429792b7517197bdeadb5f3ecb9
+SIZE (nessus/nessus-libraries-2.0.10a.tar.gz) = 418370
diff -ru /usr/ports/security/nessus-plugins/Makefile nessus-plugins/Makefile
--- /usr/ports/security/nessus-plugins/Makefile	Wed Feb  4 06:08:48 2004
+++ nessus-plugins/Makefile	Mon Mar 22 17:40:37 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	nessus-plugins
 PORTVERSION=	2.0.10a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -30,8 +30,7 @@
 WRKSRC=		${WRKDIR}/nessus-plugins
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fetchcmd=wget --sharedstatedir=${PREFIX}/etc/nessus/com \
-		--localstatedir=${PREFIX}/etc/nessus/var
+CONFIGURE_ARGS=	--with-fetchcmd=wget
 
 MAN1=		nessus-build.1
 MAN8=		nessus-update-plugins.8
diff -ru /usr/ports/security/nessus-plugins/distinfo nessus-plugins/distinfo
--- /usr/ports/security/nessus-plugins/distinfo	Fri Jan 23 12:00:57 2004
+++ nessus-plugins/distinfo	Mon Mar 22 17:36:32 2004
@@ -1 +1,2 @@
 MD5 (nessus/nessus-plugins-2.0.10a.tar.gz) = dda0829b6a70086edcec2c5000d06a21
+SIZE (nessus/nessus-plugins-2.0.10a.tar.gz) = 1443420
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list