7 files changed, 55 insertions, 82 deletions

diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 0626110e3960..e94de66256a1 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	1.0.9
+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/ \
@@ -19,9 +19,9 @@ MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.sekure.net/pub/nessus/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.3:${PORTSDIR}/security/nessus-libnasl
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
@@ -37,13 +37,17 @@ USE_GTK=	yes
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 
-MAN1=		nessus.1
-MAN8=		nessusd.8 nessus-adduser.8
+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:
-	@${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/distinfo b/security/nessus/distinfo
index 46df0a10cd0a..dced2406aa15 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.0.9.tar.gz) = 83af77f6879383a58009fa4cdebc7e74
+MD5 (nessus/nessus-core-1.2.2.tar.gz) = ea521c50a64a2785cbd89fe42a415d70
diff --git a/security/nessus/files/patch-aa b/security/nessus/files/patch-aa
new file mode 100644
index 000000000000..102778eb2117
--- /dev/null
+++ b/security/nessus/files/patch-aa
@@ -0,0 +1,13 @@
+--- nessus-mkcert-client.in.orig	Thu Feb 28 18:03:45 2002
++++ nessus-mkcert-client.in	Wed May 29 13:12:17 2002
+@@ -84,8 +84,8 @@
+ 
+ 
+ 
+-NESSUSPRIV="$localstatedir/nessus/CA"
+-NESSUSPUB="$sharedstatedir/nessus/CA"
++NESSUSPRIV="$localstatedir/CA"
++NESSUSPUB="$sharedstatedir/CA"
+ 
+ while [ ! -d "$NESSUSPRIV" ]; do
+     echo_no_nl "Nessus server 'private' directory: "
diff --git a/security/nessus/files/patch-ab b/security/nessus/files/patch-ab
new file mode 100644
index 000000000000..97c1601ff14d
--- /dev/null
+++ b/security/nessus/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/files/patch-ag b/security/nessus/files/patch-ag
deleted file mode 100644
index d30f542889c4..000000000000
--- a/security/nessus/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/files/patch-nessus-html_graph_output.c b/security/nessus/files/patch-nessus-html_graph_output.c
deleted file mode 100644
index a41cf642a092..000000000000
--- a/security/nessus/files/patch-nessus-html_graph_output.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- nessus/html_graph_output.c.old	Thu Jan 17 18:44:40 2002
-+++ nessus/html_graph_output.c	Thu Jan 17 18:47:20 2002
-@@ -65,8 +65,9 @@
- #include "globals.h"
- #include "nsr_output.h"
- 
--
-+#ifndef __FreeBSD__
- static char* strcasestr(char*, char *);
-+#endif 
- static void insert_img(FILE *, char*);
- 
- 
-@@ -90,7 +91,8 @@
- /*
-  * Handy functions
-  */
-- 
-+
-+#ifndef __FreeBSD__ 
- static char * 
- strcasestr(char * haystack, char * needle)
- {
-@@ -109,6 +111,7 @@
-  }
-  return NULL;
- }
-+#endif
- 
- static void
- insert_img(f, name)
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index 4dc6b50f5f6e..909d0c198585 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -1,5 +1,8 @@
 bin/nessus
+bin/nessus-mkcert-client
+bin/nessus-mkrand
 include/nessus/config.h
+include/nessus/includes.h
 include/nessus/nessus-devel.h
 include/nessus/nessusicmp.h
 include/nessus/nessusip.h
@@ -8,10 +11,18 @@ 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 2>/dev/null || true
+@exec mkdir -p %D/etc/nessus/var/nessus/jobs
+@exec mkdir -p %D/etc/nessus/var/nessus/logs
+@exec mkdir -p %D/etc/nessus/var/nessus/users
+@unexec rmdir %D/etc/nessus/var/nessus/jobs 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var/nessus/logs 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var/nessus/users 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var/nessus 2>/dev/null || true
+@unexec rmdir %D/etc/nessus/var 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
 @unexec rmdir %D/lib/nessus 2>/dev/null || true
-@unexec rmdir %D/include/nessus 2>/dev/null || true
-@unexec rmdir %D/etc/nessus 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true