6 files changed, 56 insertions, 59 deletions

diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 0626110e3960..9961c7592fa5 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -1,27 +1,25 @@
-# New ports collection makefile for: 	nessus
-# Date created:		1 May 1999
-# Whom:			Anders Nordby <anders@fix.no>
+# New ports collection makefile for: 	nessus-devel
 #
 # $FreeBSD$
 #
 
-PORTNAME=	nessus
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-devel
+PORTVERSION=	1.1.7
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/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/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/unstable/nessus/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/unstable/nessus-${PORTVERSION}/src/
 DISTNAME=	nessus-core-${PORTVERSION}
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
-LIB_DEPENDS=	nasl.1:${PORTSDIR}/security/nessus-libnasl
+LIB_DEPENDS=	nasl.2:${PORTSDIR}/security/nessus-libnasl-devel
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
@@ -37,13 +35,17 @@ USE_GTK=	yes
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 
+CONFIGURE_ARGS+=	--sharedstatedir=${PREFIX}/etc/nessus/com \
+			--localstatedir=${PREFIX}/etc/nessus/var 
+
 MAN1=		nessus.1
-MAN8=		nessusd.8 nessus-adduser.8
+MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 
 post-install:
-	@${ECHO} "================================================================================"
-	@${ECHO} "Use ${PREFIX}/sbin/update/nessus-update-plugins to update your plugin"
-	@${ECHO} "collection."
-	@${ECHO} "================================================================================"
+.if ! defined(BATCH)
+.if ! exists(${PREFIX}/etc/nessus/var/CA/serverkey.pem)
+	${PREFIX}/sbin/nessus-mkcert
+.endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/nessus-devel/distinfo b/security/nessus-devel/distinfo
index 46df0a10cd0a..758ef9dd4e40 100644
--- a/security/nessus-devel/distinfo
+++ b/security/nessus-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.9.tar.gz) = 83af77f6879383a58009fa4cdebc7e74
+MD5 (nessus/nessus-core-1.1.7.tar.gz) = 6c29c9b7168b014305458e00809e6e1a
diff --git a/security/nessus-devel/files/patch-aa b/security/nessus-devel/files/patch-aa
new file mode 100644
index 000000000000..ff03c508c112
--- /dev/null
+++ b/security/nessus-devel/files/patch-aa
@@ -0,0 +1,13 @@
+--- nessus-install-cert.in.orig	Fri Sep 14 13:09:12 2001
++++ nessus-install-cert.in	Mon Oct  8 13:25:25 2001
+@@ -18,8 +18,8 @@
+ localstatedir=@localstatedir@
+ sharedstatedir=@sharedstatedir@
+ 
+-NESSUSPRIV="$localstatedir/nessus/CA"
+-NESSUSPUB="$sharedstatedir/nessus/CA"
++NESSUSPRIV="$localstatedir/CA"
++NESSUSPUB="$sharedstatedir/CA"
+ if [ ! -d "$NESSUSPRIV" ]; then
+     mkdir -p "$NESSUSPRIV"
+     chmod 700 "$NESSUSPRIV"
diff --git a/security/nessus-devel/files/patch-ab b/security/nessus-devel/files/patch-ab
new file mode 100644
index 000000000000..97c1601ff14d
--- /dev/null
+++ b/security/nessus-devel/files/patch-ab
@@ -0,0 +1,13 @@
+--- nessus-mkcert.in.orig	Fri Sep 14 13:09:12 2001
++++ nessus-mkcert.in	Mon Oct  8 13:25:14 2001
+@@ -64,8 +64,8 @@
+    exit 1
+ esac
+      
+-NESSUSPRIV="$localstatedir/nessus/CA"
+-NESSUSPUB="$sharedstatedir/nessus/CA"
++NESSUSPRIV="$localstatedir/CA"
++NESSUSPUB="$sharedstatedir/CA"
+ if [ ! -d "$NESSUSPRIV" ]; then
+     mkdir -p "$NESSUSPRIV"
+     chmod 700 "$NESSUSPRIV"
diff --git a/security/nessus-devel/files/patch-ag b/security/nessus-devel/files/patch-ag
deleted file mode 100644
index d30f542889c4..000000000000
--- a/security/nessus-devel/files/patch-ag
+++ /dev/null
@@ -1,37 +0,0 @@
---- nessus/preferences.c.orig	Sun Jan 30 12:22:46 2000
-+++ nessus/preferences.c	Sun Jan 30 12:23:27 2000
-@@ -60,27 +60,6 @@
-  if(Alt_rcfile)return Alt_rcfile;
-  else
-   {
--#ifdef ENABLE_CRYPTO_LAYER
--  char *t, *s = peks_get_dirfile (NESSUS_RCFILE);
--  if (s == 0) 
--    return 0 ;
--  /* peks uses another memory management */
--  t = estrdup (s);
--  xfree (s);
--#ifdef _WIN32
--  /* on Windows we have no HOME varable set, by default */
--  if (getenv("HOME") == 0 && (s = peks_get_homedir (0)) != 0) {
--    char *e = strcat (strcpy (pmalloc (strlen (s) + 10), "HOME="), s);
--#   ifdef HAVE__PUTENV
--    _putenv (e);
--#   else
--    putenv (e);
--#   endif
--    xfree (e);
--  }
--#endif /* _WIN32 */
--  return t;
--#else
-   char* home;
-   char * ret;
-   struct passwd * pwd;
-@@ -100,7 +79,6 @@
-    return(ret);
-   } 
-   return(NULL);
--#endif
-  }
- }
diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist
index 4dc6b50f5f6e..ed86cf12f97f 100644
--- a/security/nessus-devel/pkg-plist
+++ b/security/nessus-devel/pkg-plist
@@ -1,5 +1,6 @@
 bin/nessus
 include/nessus/config.h
+include/nessus/includes.h
 include/nessus/nessus-devel.h
 include/nessus/nessusicmp.h
 include/nessus/nessusip.h
@@ -8,7 +9,12 @@ include/nessus/nessustcp.h
 include/nessus/nessusudp.h
 include/nessus/ntcompat.h
 sbin/nessus-adduser
+sbin/nessus-mkcert
+sbin/nessus-rmuser
 sbin/nessusd
+@unexec rmdir %D/var/nessus/jobs 2>/dev/null || true
+@unexec rmdir %D/var/nessus/logs 2>/dev/null || true
+@unexec rmdir %D/var/nessus/users 2>/dev/null || true
 @unexec rmdir %D/var/nessus 2>/dev/null || true
 @unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true
 @unexec rmdir %D/lib/nessus 2>/dev/null || true