From udo.schweigert@siemens.com  Wed Oct 23 06:14:48 2013
Return-Path: <udo.schweigert@siemens.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 15EBC101
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Oct 2013 06:14:48 +0000 (UTC)
	(envelope-from udo.schweigert@siemens.com)
Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 9A51B245E
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Oct 2013 06:14:47 +0000 (UTC)
Received: from mail3.siemens.de (localhost [127.0.0.1])
	by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id r9N6Ejdn019371
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Oct 2013 08:14:45 +0200
Received: from mars.cert.siemens.com (mars.cert.siemens.com [139.25.19.9])
	by mail3.siemens.de (8.13.6/8.13.6) with ESMTP id r9N6EjLk016547
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Oct 2013 08:14:45 +0200
Received: from alaska.cert.siemens.de (alaska.cert.siemens.com [139.25.6.64])
	by mars.cert.siemens.com (8.14.7/8.14.7/$SiemensCERT: trunk/mail/cert.mc.pre 6573 2013-03-29 22:52:06Z ust $) with ESMTP id r9N6Ejij044764
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Oct 2013 08:14:45 +0200 (CEST)
	(envelope-from ust@cert.siemens.de)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.com [139.25.6.64] (may be forged))
	by alaska.cert.siemens.de (8.14.7/8.14.7/$Ust: trunk/hosts/alaska/mail/config.mc 9525 2013-05-06 05:58:13Z ust $) with ESMTP id r9N6Ejlb099371
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Oct 2013 08:14:45 +0200 (CEST)
	(envelope-from ust@alaska.cert.siemens.de)
Received: (from ust@localhost)
	by alaska.cert.siemens.de (8.14.7/8.14.7/$Ust: trunk/hosts/alaska/mail/submit.mc 9525 2013-05-06 05:58:13Z ust $) id r9N6EjpQ066250;
	Wed, 23 Oct 2013 08:14:45 +0200 (CEST)
	(envelope-from ust)
Message-Id: <201310230614.r9N6EjpQ066250@alaska.cert.siemens.de>
Date: Wed, 23 Oct 2013 08:14:45 +0200 (CEST)
From: Udo Schweigert <udo.schweigert@siemens.com>
Reply-To: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update of security/nessus
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         183221
>Category:       ports
>Synopsis:       maintainer-update of security/nessus
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tijl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 23 06:20:01 UTC 2013
>Closed-Date:    Mon Nov 11 19:58:10 CET 2013
>Last-Modified:  Mon Nov 11 19:58:10 CET 2013
>Originator:     Udo Schweigert
>Release:        FreeBSD 8.4-RELEASE-p4 amd64
>Organization:
>Environment:
>Description:
Maintainer update of mail/mutt:

	- Fix build on FreeBSd-8.x

Committer: new file to be added to repo: files/patch-nessus-Makefile

>How-To-Repeat:
>Fix:

diff -ru /usr/ports/security/nessus/files/patch-nessus-Makefile nessus/files/patch-nessus-Makefile
--- /usr/ports/security/nessus/files/patch-nessus-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ nessus/files/patch-nessus-Makefile	2013-10-23 08:01:43.000000000 +0200
@@ -0,0 +1,11 @@
+--- nessus/Makefile.orig	2003-02-22 14:47:43.000000000 +0100
++++ nessus/Makefile	2013-10-23 08:00:26.000000000 +0200
+@@ -3,7 +3,7 @@
+ GTKLIBS= $(GTKCONFIG_LIBS) $(GLIBCONFIG_LIBS)
+ INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b -Igdchart0.94b/gd1.3
+ LIBS = `$(NESSUSCONFIG) --libs` $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \
+-	$(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm 
++	$(RUN_LIBS) $(C_R_LIB) -L gdchart0.94b/gd1.3 -lgd -lm 
+ 
+ NESSUS_INCLUDE=`sh ./cflags`	
+ 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tijl 
Responsible-Changed-By: tijl 
Responsible-Changed-When: Thu Oct 24 15:55:47 CEST 2013 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183221 

From: Tijl Coosemans <tijl@FreeBSD.org>
To: bug-followup@FreeBSD.org, udo.schweigert@siemens.com
Cc:  
Subject: Re: ports/183221: maintainer-update of security/nessus
Date: Fri, 25 Oct 2013 22:23:53 +0200

 On Fri, 25 Oct 2013 22:22:30 +0200 Tijl Coosemans wrote:
 > Please review the attached patch.  Feel free to make/suggest any changes.
 
 Build logs: https://redports.org/buildarchive/20131025175701-42709/

From: Tijl Coosemans <tijl@FreeBSD.org>
To: bug-followup@FreeBSD.org, udo.schweigert@siemens.com
Cc:  
Subject: Re: ports/183221: maintainer-update of security/nessus
Date: Fri, 25 Oct 2013 22:22:30 +0200

 --Sig_/AG/l1LGbNLzyw2Ty2cBZcQP
 Content-Type: multipart/mixed; boundary="MP_/+pb0c8c0fRjr9mWq00gkTmW"
 
 --MP_/+pb0c8c0fRjr9mWq00gkTmW
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Hi,
 
 Please review the attached patch.  Feel free to make/suggest any changes.
 
 I discovered that the real problem was that the makefiles in the packages
 aren't safe for parallel building so simply adding MAKE_JOBS_UNSAFE is
 enough to fix this PR.  At first I tried to fix the makefiles but it's
 just too much work.  In one makefile there are multiple targets that call
 make on the same subdirectory so when those targets are built in parallel
 there are multiple jobs building that subdir at the same time.  And that's
 not all, that subdir does the same with its own subdir... so adding
 MAKE_JOBS_UNSAFE is the easiest.
 
 Additional changes in the patch (mostly in order of appearance):
 - Move DIST_SUBDIR up.  This seems to be where portlint wants it.
 - Add LICENSE.
 - Use new style LIB_DEPENDS.
 - Remove pkg-deinstall from SUB_FILES and move files/pkg-deinstall.in to
   pkg-deinstall.  In pkg-deinstall replace %%PKGNAME%% with plain "nessus"
   and %%PREFIX%% with ${PKG_PREFIX}.
 - Add a GTK2 user option that replaces the GNOME auto-detection.
 - Add nessusd.conf to SUB_FILES and move files/nessusd.conf to
   files/nessusd.conf.in.  In files/nessusd.conf.in replace ${PREFIX} with
   %%PREFIX%%.  This allows removing the first SED in post-install.
 - Also remove the second SED in post-install because nessusd.rules doesn't
   contain ${PREFIX}.
 - Install nessusd.conf and nessud.rules using INSTALL_DATA.  This allows
   removing the CHMOD in post-install.
 - Support staging:
   * Move manpages to pkg-plist.
   * Remove "if [...] ${CP} ..." from post-install.  This is handled from
     pkg-plist.
   * Move messages about certificate creation to pkg-message.  I also
     removed the cert target because it seems less useful now, but let
     me know if you want to keep it.
 - Remove move_nessus script.  All configurations should have been moved
   by now.
 - Add var/nessus/tmp to pkg-plist.
 
 --MP_/+pb0c8c0fRjr9mWq00gkTmW
 Content-Type: text/x-patch
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=nessus.patch
 
 Index: security/nessus/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/Makefile	(revision 331559)
 +++ security/nessus/Makefile	(working copy)
 @@ -3,7 +3,7 @@
 =20
  PORTNAME=3D	nessus
  PORTVERSION=3D	2.2.9
 -PORTREVISION=3D	1
 +PORTREVISION=3D	2
  CATEGORIES=3D	security
  MASTER_SITES=3D	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/=
  \
  		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
 @@ -11,71 +11,32 @@ MASTER_SITES=3D	ftp://ftp.nessus.org/pub/n
  		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
  		ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/
  DISTNAME=3D	nessus-core-${PORTVERSION}
 +DIST_SUBDIR=3D	nessus
 =20
  MAINTAINER=3D	udo.schweigert@siemens.com
  COMMENT=3D	Security scanner: looks for vulnerabilities in a given network
 =20
 -LIB_DEPENDS=3D	nasl.4:${PORTSDIR}/security/nessus-libnasl
 +LICENSE=3D	GPLv2
 =20
 -DIST_SUBDIR=3D	nessus
 -WRKSRC=3D		${WRKDIR}/nessus-core
 -SUB_FILES=3D	pkg-deinstall
 -SUB_LIST=3D	PKGNAME=3D${PKGNAME}
 +LIB_DEPENDS=3D	libnasl.so:${PORTSDIR}/security/nessus-libnasl
 +
 +OPTIONS_DEFINE=3D	GTK2
 +OPTIONS_DEFAULT=3DGTK2
 +
 +GTK2_CONFIGURE_ENABLE=3D	gtk
 +GTK2_USES=3D	pkgconfig
 +GTK2_USE=3D	GNOME=3Dgtk20
 =20
  GNU_CONFIGURE=3D	yes
 +MAKE_JOBS_UNSAFE=3D	yes
 +SUB_FILES=3D	nessusd.conf
  USE_RC_SUBR=3D	nessusd
 -WANT_GNOME=3D	yes
 -.if defined(WITHOUT_NESSUS_GTK) || defined(WITHOUT_GTK)
 -WITHOUT_GNOME=3D	yes
 -.endif
 -
 -NO_STAGE=3D	yes
 -.include <bsd.port.pre.mk>
 -
 -.if ${HAVE_GNOME:Mgtk20}!=3D""
 -USE_GNOME+=3D	gtk20
 -PKGNAMESUFFIX+=3D	-gtk2
 -.elif ${HAVE_GNOME:Mgtk12}!=3D""
 -USE_GNOME+=3D	gtk12
 -PKGNAMESUFFIX+=3D	-gtk
 -.else
 -CONFIGURE_ARGS+=3D--disable-gtk
 -.endif
 -
 -MAN1=3D		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1 nessus-fetch.1
 -MAN8=3D		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 +WRKSRC=3D		${WRKDIR}/nessus-core
 =20
  post-install:
 -	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.conf \
 -		> ${PREFIX}/etc/nessus/nessusd.conf.dist
 -	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.rules \
 -		> ${PREFIX}/etc/nessus/nessusd.rules.dist
 -	@${CHMOD} 644 ${PREFIX}/etc/nessus/nessusd.conf.dist \
 -		${PREFIX}/etc/nessus/nessusd.rules.dist
 -	@if [ ! -f ${PREFIX}/etc/nessus/nessusd.conf ]; then \
 -		${CP} -p ${PREFIX}/etc/nessus/nessusd.conf.dist \
 -			${PREFIX}/etc/nessus/nessusd.conf; \
 -	fi
 -	@if [ ! -f ${PREFIX}/etc/nessus/nessusd.rules ]; then \
 -		${CP} -p ${PREFIX}/etc/nessus/nessusd.rules.dist \
 -			${PREFIX}/etc/nessus/nessusd.rules; \
 -	fi
 -	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/move_nessus
 -.if ! exists(${PREFIX}/var/CA/serverkey.pem)
 -	@${ECHO} ""
 -	@${ECHO} "***************************************************************=
 ***********"
 -	@${ECHO} "To create and install a new certificate, type \"make cert\""
 -	@${ECHO} "***************************************************************=
 ***********"
 -	@${ECHO} ""
 -.endif
 -	@${CAT} ${PKGMESSAGE}
 -
 -cert:
 -	@${ECHO} ""
 -	@${ECHO} "***************************************************************=
 ***********"
 -	@${ECHO} "The new certificate will be saved into ${PREFIX}/var/CA/serverk=
 ey.pem"
 -	@${ECHO} "***************************************************************=
 ***********"
 -	@${ECHO} ""
 -	${PREFIX}/sbin/nessus-mkcert
 +	${INSTALL_DATA} ${WRKDIR}/nessusd.conf \
 +		${STAGEDIR}${ETCDIR}/nessusd.conf.dist
 +	${INSTALL_DATA} ${FILESDIR}/nessusd.rules \
 +		${STAGEDIR}${ETCDIR}/nessusd.rules.dist
 =20
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Property changes on: security/nessus/Makefile
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: security/nessus/files/nessusd.conf
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/files/nessusd.conf	(revision 331559)
 +++ security/nessus/files/nessusd.conf	(working copy)
 @@ -1,120 +0,0 @@
 -# Configuration file of the Nessus Security Scanner
 -
 -
 -
 -# Every line starting with a '#' is a comment
 -
 -# Path to the security checks folder :=20
 -plugins_folder =3D ${PREFIX}/lib/nessus/plugins
 -
 -# Maximum number of simultaneous hosts tested :=20
 -max_hosts =3D 30
 -
 -# Maximum number of simultaneous checks against each host tested :=20
 -max_checks =3D 10
 -
 -# Niceness. If set to 'yes', nessusd will renice itself to 10.
 -be_nice =3D no
 -
 -# Log file (or 'syslog') :=20
 -logfile =3D ${PREFIX}/var/nessus/logs/nessusd.messages
 -
 -# Shall we log every details of the attack ?
 -log_whole_attack =3D yes
 -
 -# Log the name of the plugins that are loaded by the server ?
 -log_plugins_name_at_load =3D no
 -
 -# Dump file for debugging output, use `-' for stdout
 -dumpfile =3D ${PREFIX}/var/nessus/logs/nessusd.dump
 -
 -# Rules file :=20
 -rules =3D ${PREFIX}/etc/nessus/nessusd.rules
 -
 -# Users database :=20
 -users =3D ${PREFIX}/etc/nessus/nessusd.users
 -
 -# CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
 -cgi_path =3D /cgi-bin:/scripts
 -
 -# Range of the ports the port scanners will scan :=20
 -# 'default' means that Nessus will scan ports found in its
 -# services file.
 -port_range =3D default
 -
 -# Optimize the test (recommanded) :=20
 -optimize_test =3D yes
 -
 -# Language of the plugins :
 -language =3D english
 -
 -
 -
 -# Optimization :=20
 -# Read timeout for the sockets of the tests :=20
 -checks_read_timeout =3D 5
 -# Ports against which two plugins should not be run simultaneously :
 -# non_simult_ports =3D Services/www, 139, Services/finger
 -non_simult_ports =3D 139, 445
 -# Maximum lifetime of a plugin (in seconds) :=20
 -plugins_timeout =3D 320
 -
 -
 -# Safe checks rely on banner grabbing :
 -safe_checks =3D yes
 -
 -
 -# Automatically activate the plugins that are depended on
 -auto_enable_dependencies =3D yes
 -
 -
 -# Designate hosts by MAC address, not IP address (useful for DHCP networks)
 -use_mac_addr =3D no
 -
 -
 -#--- Knowledge base saving (can be configured by the client) :
 -# Save the knowledge base on disk :=20
 -save_knowledge_base =3D no
 -# Restore the KB for each test :
 -kb_restore =3D no
 -# Only test hosts whose KB we do not have :
 -only_test_hosts_whose_kb_we_dont_have =3D no
 -# Only test hosts whose KB we already have :
 -only_test_hosts_whose_kb_we_have =3D no
 -# KB test replay :
 -kb_dont_replay_scanners =3D no
 -kb_dont_replay_info_gathering =3D no
 -kb_dont_replay_attacks =3D no
 -kb_dont_replay_denials =3D no
 -kb_max_age =3D 864000
 -#--- end of the KB section
 -
 -# Can users upload their plugins ?
 -plugin_upload =3D no
 -# Suffixes of the plugins the user can upload :
 -plugin_upload_suffixes =3D .nasl, .inc
 -# Name of the user who can remotely update the plugins
 -admin_user =3D root
 -
 -
 -# If this option is set, Nessus will not scan a network incrementally
 -# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to
 -# slice the workload throughout the whole network (ie: it will scan
 -# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on...
 -slice_network_addresses =3D no
 -
 -# Should consider all the NASL scripts as being signed ? (unsafe if set to=
  'yes')
 -nasl_no_signature_check =3D no
 -
 -#end.
 -#
 -# Added by nessus-mkcert
 -#
 -cert_file=3D${PREFIX}/com/CA/servercert.pem
 -key_file=3D${PREFIX}/var/CA/serverkey.pem
 -ca_file=3D${PREFIX}/com/CA/cacert.pem
 -# If you decide to protect your private key with a password,=20
 -# uncomment and change next line
 -# pem_password=3Dpassword
 -# If you want to force the use of a client certificate, uncomment next line
 -# force_pubkey_auth =3D yes
 Index: security/nessus/files/nessusd.conf.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/files/nessusd.conf.in	(revision 0)
 +++ security/nessus/files/nessusd.conf.in	(working copy)
 @@ -0,0 +1,120 @@
 +# Configuration file of the Nessus Security Scanner
 +
 +
 +
 +# Every line starting with a '#' is a comment
 +
 +# Path to the security checks folder :=20
 +plugins_folder =3D %%PREFIX%%/lib/nessus/plugins
 +
 +# Maximum number of simultaneous hosts tested :=20
 +max_hosts =3D 30
 +
 +# Maximum number of simultaneous checks against each host tested :=20
 +max_checks =3D 10
 +
 +# Niceness. If set to 'yes', nessusd will renice itself to 10.
 +be_nice =3D no
 +
 +# Log file (or 'syslog') :=20
 +logfile =3D %%PREFIX%%/var/nessus/logs/nessusd.messages
 +
 +# Shall we log every details of the attack ?
 +log_whole_attack =3D yes
 +
 +# Log the name of the plugins that are loaded by the server ?
 +log_plugins_name_at_load =3D no
 +
 +# Dump file for debugging output, use `-' for stdout
 +dumpfile =3D %%PREFIX%%/var/nessus/logs/nessusd.dump
 +
 +# Rules file :=20
 +rules =3D %%PREFIX%%/etc/nessus/nessusd.rules
 +
 +# Users database :=20
 +users =3D %%PREFIX%%/etc/nessus/nessusd.users
 +
 +# CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
 +cgi_path =3D /cgi-bin:/scripts
 +
 +# Range of the ports the port scanners will scan :=20
 +# 'default' means that Nessus will scan ports found in its
 +# services file.
 +port_range =3D default
 +
 +# Optimize the test (recommanded) :=20
 +optimize_test =3D yes
 +
 +# Language of the plugins :
 +language =3D english
 +
 +
 +
 +# Optimization :=20
 +# Read timeout for the sockets of the tests :=20
 +checks_read_timeout =3D 5
 +# Ports against which two plugins should not be run simultaneously :
 +# non_simult_ports =3D Services/www, 139, Services/finger
 +non_simult_ports =3D 139, 445
 +# Maximum lifetime of a plugin (in seconds) :=20
 +plugins_timeout =3D 320
 +
 +
 +# Safe checks rely on banner grabbing :
 +safe_checks =3D yes
 +
 +
 +# Automatically activate the plugins that are depended on
 +auto_enable_dependencies =3D yes
 +
 +
 +# Designate hosts by MAC address, not IP address (useful for DHCP networks)
 +use_mac_addr =3D no
 +
 +
 +#--- Knowledge base saving (can be configured by the client) :
 +# Save the knowledge base on disk :=20
 +save_knowledge_base =3D no
 +# Restore the KB for each test :
 +kb_restore =3D no
 +# Only test hosts whose KB we do not have :
 +only_test_hosts_whose_kb_we_dont_have =3D no
 +# Only test hosts whose KB we already have :
 +only_test_hosts_whose_kb_we_have =3D no
 +# KB test replay :
 +kb_dont_replay_scanners =3D no
 +kb_dont_replay_info_gathering =3D no
 +kb_dont_replay_attacks =3D no
 +kb_dont_replay_denials =3D no
 +kb_max_age =3D 864000
 +#--- end of the KB section
 +
 +# Can users upload their plugins ?
 +plugin_upload =3D no
 +# Suffixes of the plugins the user can upload :
 +plugin_upload_suffixes =3D .nasl, .inc
 +# Name of the user who can remotely update the plugins
 +admin_user =3D root
 +
 +
 +# If this option is set, Nessus will not scan a network incrementally
 +# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to
 +# slice the workload throughout the whole network (ie: it will scan
 +# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on...
 +slice_network_addresses =3D no
 +
 +# Should consider all the NASL scripts as being signed ? (unsafe if set to=
  'yes')
 +nasl_no_signature_check =3D no
 +
 +#end.
 +#
 +# Added by nessus-mkcert
 +#
 +cert_file=3D%%PREFIX%%/com/CA/servercert.pem
 +key_file=3D%%PREFIX%%/var/CA/serverkey.pem
 +ca_file=3D%%PREFIX%%/com/CA/cacert.pem
 +# If you decide to protect your private key with a password,=20
 +# uncomment and change next line
 +# pem_password=3Dpassword
 +# If you want to force the use of a client certificate, uncomment next line
 +# force_pubkey_auth =3D yes
 
 Property changes on: security/nessus/files/nessusd.conf.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: security/nessus/files/pkg-deinstall.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/files/pkg-deinstall.in	(revision 331559)
 +++ security/nessus/files/pkg-deinstall.in	(working copy)
 @@ -1,37 +0,0 @@
 -#!/bin/sh
 -#
 -# $FreeBSD$
 -#
 -
 -ECHO_CMD=3Decho
 -
 -case $2 in
 -POST-DEINSTALL)
 -  ${ECHO_CMD}
 -  ${ECHO_CMD} "The %%PKGNAME%% server package has been deleted."
 -  ${ECHO_CMD} "If you're *not* upgrading and won't be using"
 -  ${ECHO_CMD} "it any longer, you may want to issue the"
 -  ${ECHO_CMD} "following commands:"
 -  ${ECHO_CMD}
 -  if [ -d %%PREFIX%%/var/nessus ]; then
 -    ${ECHO_CMD} "- to delete the nessus server permanently (losing all dat=
 a):"
 -    ${ECHO_CMD} "  rm -Rf %%PREFIX%%/var/nessus"
 -    ${ECHO_CMD}
 -  fi
 -  rm_dir=3D""
 -  if [ -d %%PREFIX%%/com/CA ]; then
 -    rm_dir=3D" %%PREFIX%%/com/CA"
 -  fi
 -  if [ -d %%PREFIX%%/var/CA ]; then
 -    rm_dir=3D"$rm_dir %%PREFIX%%/var/CA"
 -  fi
 -  if [ "x$rm_dir" !=3D "x" ]; then
 -    ${ECHO_CMD} "- to remove the Certificate Authority associated with nes=
 sus:"
 -    ${ECHO_CMD} "  rm -Rf$rm_dir"
 -    ${ECHO_CMD}
 -  fi
 -  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
 -  ${ECHO_CMD} "nessusd and updating the plugins."
 -  ${ECHO_CMD}
 -  ;;
 -esac
 Index: security/nessus/pkg-deinstall
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/pkg-deinstall	(revision 0)
 +++ security/nessus/pkg-deinstall	(working copy)
 @@ -0,0 +1,37 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +
 +ECHO_CMD=3Decho
 +
 +case $2 in
 +POST-DEINSTALL)
 +  ${ECHO_CMD}
 +  ${ECHO_CMD} "The nessus server package has been deleted."
 +  ${ECHO_CMD} "If you're *not* upgrading and won't be using"
 +  ${ECHO_CMD} "it any longer, you may want to issue the"
 +  ${ECHO_CMD} "following commands:"
 +  ${ECHO_CMD}
 +  if [ -d ${PKG_PREFIX}/var/nessus ]; then
 +    ${ECHO_CMD} "- to delete the nessus server permanently (losing all dat=
 a):"
 +    ${ECHO_CMD} "  rm -Rf ${PKG_PREFIX}/var/nessus"
 +    ${ECHO_CMD}
 +  fi
 +  rm_dir=3D""
 +  if [ -d ${PKG_PREFIX}/com/CA ]; then
 +    rm_dir=3D" ${PKG_PREFIX}/com/CA"
 +  fi
 +  if [ -d ${PKG_PREFIX}/var/CA ]; then
 +    rm_dir=3D"$rm_dir ${PKG_PREFIX}/var/CA"
 +  fi
 +  if [ "x$rm_dir" !=3D "x" ]; then
 +    ${ECHO_CMD} "- to remove the Certificate Authority associated with nes=
 sus:"
 +    ${ECHO_CMD} "  rm -Rf$rm_dir"
 +    ${ECHO_CMD}
 +  fi
 +  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
 +  ${ECHO_CMD} "nessusd and updating the plugins."
 +  ${ECHO_CMD}
 +  ;;
 +esac
 
 Property changes on: security/nessus/pkg-deinstall
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: svn:keywords
 ## -0,0 +1 ##
 +FreeBSD=3D%H
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: security/nessus/pkg-message
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/pkg-message	(revision 331559)
 +++ security/nessus/pkg-message	(working copy)
 @@ -8,3 +8,7 @@ Available variables you add/set to /etc/
  - nessusd_enable (bool):      Set to "NO" by default.
                                Set it to "YES" to enable nessusd.
  - nessusd_flags (str):        Set to "-D" by default.
 +
 +**************************************************************************
 +To create and install a new certificate, run nessus-mkcert
 +**************************************************************************
 
 Property changes on: security/nessus/pkg-message
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: security/nessus/pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/pkg-plist	(revision 331559)
 +++ security/nessus/pkg-plist	(working copy)
 @@ -17,20 +17,31 @@ include/nessus/nessusraw.h
  include/nessus/nessustcp.h
  include/nessus/nessusudp.h
  include/nessus/ntcompat.h
 +man/man1/nessus.1.gz
 +man/man1/nessus-mkrand.1.gz
 +man/man1/nessus-mkcert-client.1.gz
 +man/man1/nessus-fetch.1.gz
 +man/man8/nessusd.8.gz
 +man/man8/nessus-adduser.8.gz
 +man/man8/nessus-mkcert.8.gz
 +man/man8/nessus-rmuser.8.gz
  sbin/nessus-adduser
  sbin/nessus-check-signature
  sbin/nessus-mkcert
  sbin/nessus-rmuser
  sbin/nessusd
 +var/nessus/nessus-services
  @exec mkdir -p %D/var/nessus/jobs
  @exec mkdir -p %D/var/nessus/logs
 +@exec mkdir -p %D/var/nessus/tmp
  @exec mkdir -p %D/var/nessus/users
  @unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/ne=
 ssus/logs/nessusd.messages 2> /dev/null; fi || true
  @dirrmtry var/nessus/jobs
  @dirrmtry var/nessus/logs
 +@dirrmtry var/nessus/tmp
  @dirrmtry var/nessus/users
 -var/nessus/nessus-services
  @dirrmtry var/nessus
 +@dirrmtry var
  @dirrmtry etc/nessus
  @exec mkdir -p %D/lib/nessus/plugins
  @dirrmtry lib/nessus/plugins
 
 Property changes on: security/nessus/pkg-plist
 ___________________________________________________________________
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: security/nessus/scripts/move_nessus
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- security/nessus/scripts/move_nessus	(revision 331559)
 +++ security/nessus/scripts/move_nessus	(working copy)
 @@ -1,62 +0,0 @@
 -#!/bin/sh
 -#
 -# $FreeBSD: /tmp/pcvs/ports/security/nessus/scripts/move_nessus,v 1.3 2004=
 -12-12 21:37:53 sem Exp $
 -#
 -# 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=3D/bin:/usr/bin
 -
 -
 -if [ -f $PREFIX/etc/nessus/nessusd.conf ]; then
 -  if grep -q "$PREFIX/etc/nessus/var" $PREFIX/etc/nessus/nessusd.conf; then
 -    mv $PREFIX/etc/nessus/nessusd.conf $PREFIX/etc/nessus/nessusd.conf.bak
 -    sed	-e "s,$PREFIX/etc/nessus/var,$PREFIX/var,g" \
 -	-e "s,$PREFIX/etc/nessus/com,$PREFIX/com,g" \
 -	$PREFIX/etc/nessus/nessusd.conf.bak > $PREFIX/etc/nessus/nessusd.conf
 -  fi
 -fi
 -if [ -d $PREFIX/etc/nessus/var/nessus/users ]; then
 -  rmdir $PREFIX/etc/nessus/var/nessus/users > /dev/null 2>/dev/null
 -  if [ $? -gt 0 ]; then
 -    printf "\n\nMigrating nessus to default directory scheme\n"
 -    printf "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n\=
 n"
 -    cd $PREFIX/etc/nessus/var/nessus/users
 -    for i in *; do=20
 -      if [ $i !=3D '*' ]; then=20
 -        mv $i $PREFIX/var/nessus/users
 -        printf "Moving nessus user %s\n" $i
 -      fi
 -    done
 -    cd $PREFIX
 -    rmdir $PREFIX/etc/nessus/var/nessus/users > /dev/null 2>/dev/null
 -    printf "\n"
 -  fi
 -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
 -cd $PREFIX
 -rmdir $PREFIX/etc/nessus/var > /dev/null 2>/dev/null
 -rmdir $PREFIX/etc/nessus/com > /dev/null 2>/dev/null
 -exit 0
 
 --MP_/+pb0c8c0fRjr9mWq00gkTmW--
 
 --Sig_/AG/l1LGbNLzyw2Ty2cBZcQP
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iF4EAREKAAYFAlJq0wsACgkQfoCS2CCgtivztAD/V9DcSU/xCvUSzsn9Q4gh6tcq
 hNFd2FPqb6GF8U3HImAA/jTlD/Gf1jyvsQBnHUxhLl+saL09hdIOExV7O3Ytvfr9
 =4ZJe
 -----END PGP SIGNATURE-----
 
 --Sig_/AG/l1LGbNLzyw2Ty2cBZcQP--

From: Tijl Coosemans <tijl@FreeBSD.org>
To: udo.schweigert@siemens.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183221: maintainer-update of security/nessus
Date: Sat, 9 Nov 2013 16:30:57 +0100

 On Fri, 25 Oct 2013 22:22:30 +0200 Tijl Coosemans wrote:
 > Please review the attached patch.  Feel free to make/suggest any changes.
 > 
 > I discovered that the real problem was that the makefiles in the packages
 > aren't safe for parallel building so simply adding MAKE_JOBS_UNSAFE is
 > enough to fix this PR.  At first I tried to fix the makefiles but it's
 > just too much work.  In one makefile there are multiple targets that call
 > make on the same subdirectory so when those targets are built in parallel
 > there are multiple jobs building that subdir at the same time.  And that's
 > not all, that subdir does the same with its own subdir... so adding
 > MAKE_JOBS_UNSAFE is the easiest.
 > 
 > Additional changes in the patch (mostly in order of appearance):
 > - Move DIST_SUBDIR up.  This seems to be where portlint wants it.
 > - Add LICENSE.
 > - Use new style LIB_DEPENDS.
 > - Remove pkg-deinstall from SUB_FILES and move files/pkg-deinstall.in to
 >   pkg-deinstall.  In pkg-deinstall replace %%PKGNAME%% with plain "nessus"
 >   and %%PREFIX%% with ${PKG_PREFIX}.
 > - Add a GTK2 user option that replaces the GNOME auto-detection.
 > - Add nessusd.conf to SUB_FILES and move files/nessusd.conf to
 >   files/nessusd.conf.in.  In files/nessusd.conf.in replace ${PREFIX} with
 >   %%PREFIX%%.  This allows removing the first SED in post-install.
 > - Also remove the second SED in post-install because nessusd.rules doesn't
 >   contain ${PREFIX}.
 > - Install nessusd.conf and nessud.rules using INSTALL_DATA.  This allows
 >   removing the CHMOD in post-install.
 > - Support staging:
 >   * Move manpages to pkg-plist.
 >   * Remove "if [...] ${CP} ..." from post-install.  This is handled from
 >     pkg-plist.
 >   * Move messages about certificate creation to pkg-message.  I also
 >     removed the cert target because it seems less useful now, but let
 >     me know if you want to keep it.
 > - Remove move_nessus script.  All configurations should have been moved
 >   by now.
 > - Add var/nessus/tmp to pkg-plist.
 
 Have you had a chance to look into this?

From: "Schweigert, Udo" <Udo.Schweigert@siemens.com>
To: Tijl Coosemans <tijl@freebsd.org>
Cc: Udo Schweigert <Udo.Schweigert@siemens.com>, bug-followup@freebsd.org
Subject: Re: ports/183221: maintainer-update of security/nessus
Date: Sun, 10 Nov 2013 15:17:09 +0100

 On Sat, Nov 09, 2013 at 16:30:57 +0100, Tijl Coosemans wrote:
 > Have you had a chance to look into this?
 > 
 
 Sorry, I thought I already had answered (which I hadn't). Anyway: this is
 completely OK for me and it works flawlessly.
 
 Thanks for the work on this.
 
 
 Udo

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183221: commit references a PR
Date: Mon, 11 Nov 2013 18:48:38 +0000 (UTC)

 Author: tijl
 Date: Mon Nov 11 18:48:29 2013
 New Revision: 333529
 URL: http://svnweb.freebsd.org/changeset/ports/333529
 
 Log:
   - Add LICENSE.
   - New LIB_DEPENDS syntax.
   - Staging.
   - Replace gtk detection with GTK2 option.
   - Mark MAKE_JOBS_UNSAFE for now.  One Makefile has mutilple targets that
     each call make in the same subdirectory and the Makefile in that
     directory does the same with one of its subdirectories.
   - Move files/nessusd.conf to files/nessusd.conf.in and add it to SUB_FILES
     instead of calling sed from post-install.
   - Move files/pkg-deinstall.in to pkg-deinstall and replace %%PREFIX%%
     with ${PKG_PREFIX}.
   - Remove scripts/move_nessus.  It was used to migrate configuration data
     to a new location.
   
   PR:		ports/183221
   Approved by:	"Schweigert, Udo" <Udo.Schweigert@siemens.com> (maintainer)
 
 Added:
   head/security/nessus/files/nessusd.conf.in   (contents, props changed)
      - copied, changed from r333526, head/security/nessus/files/nessusd.conf
   head/security/nessus/pkg-deinstall   (contents, props changed)
      - copied, changed from r331559, head/security/nessus/files/pkg-deinstall.in
 Deleted:
   head/security/nessus/files/nessusd.conf
   head/security/nessus/files/pkg-deinstall.in
   head/security/nessus/scripts/
 Modified:
   head/security/nessus/Makefile   (contents, props changed)
   head/security/nessus/pkg-message   (contents, props changed)
   head/security/nessus/pkg-plist   (contents, props changed)
 
 Modified: head/security/nessus/Makefile
 ==============================================================================
 --- head/security/nessus/Makefile	Mon Nov 11 17:54:33 2013	(r333528)
 +++ head/security/nessus/Makefile	Mon Nov 11 18:48:29 2013	(r333529)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	nessus
  PORTVERSION=	2.2.9
 -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/ \
 @@ -11,71 +11,32 @@ MASTER_SITES=	ftp://ftp.nessus.org/pub/n
  		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
  		ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/
  DISTNAME=	nessus-core-${PORTVERSION}
 +DIST_SUBDIR=	nessus
  
  MAINTAINER=	udo.schweigert@siemens.com
  COMMENT=	Security scanner: looks for vulnerabilities in a given network
  
 -LIB_DEPENDS=	nasl.4:${PORTSDIR}/security/nessus-libnasl
 +LICENSE=	GPLv2
  
 -DIST_SUBDIR=	nessus
 -WRKSRC=		${WRKDIR}/nessus-core
 -SUB_FILES=	pkg-deinstall
 -SUB_LIST=	PKGNAME=${PKGNAME}
 +LIB_DEPENDS=	libnasl.so:${PORTSDIR}/security/nessus-libnasl
 +
 +OPTIONS_DEFINE=	GTK2
 +OPTIONS_DEFAULT=GTK2
 +
 +GTK2_CONFIGURE_ENABLE=	gtk
 +GTK2_USES=	pkgconfig
 +GTK2_USE=	GNOME=gtk20
  
  GNU_CONFIGURE=	yes
 +MAKE_JOBS_UNSAFE=	yes
 +SUB_FILES=	nessusd.conf
  USE_RC_SUBR=	nessusd
 -WANT_GNOME=	yes
 -.if defined(WITHOUT_NESSUS_GTK) || defined(WITHOUT_GTK)
 -WITHOUT_GNOME=	yes
 -.endif
 -
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 -
 -.if ${HAVE_GNOME:Mgtk20}!=""
 -USE_GNOME+=	gtk20
 -PKGNAMESUFFIX+=	-gtk2
 -.elif ${HAVE_GNOME:Mgtk12}!=""
 -USE_GNOME+=	gtk12
 -PKGNAMESUFFIX+=	-gtk
 -.else
 -CONFIGURE_ARGS+=--disable-gtk
 -.endif
 -
 -MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1 nessus-fetch.1
 -MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 +WRKSRC=		${WRKDIR}/nessus-core
  
  post-install:
 -	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.conf \
 -		> ${PREFIX}/etc/nessus/nessusd.conf.dist
 -	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.rules \
 -		> ${PREFIX}/etc/nessus/nessusd.rules.dist
 -	@${CHMOD} 644 ${PREFIX}/etc/nessus/nessusd.conf.dist \
 -		${PREFIX}/etc/nessus/nessusd.rules.dist
 -	@if [ ! -f ${PREFIX}/etc/nessus/nessusd.conf ]; then \
 -		${CP} -p ${PREFIX}/etc/nessus/nessusd.conf.dist \
 -			${PREFIX}/etc/nessus/nessusd.conf; \
 -	fi
 -	@if [ ! -f ${PREFIX}/etc/nessus/nessusd.rules ]; then \
 -		${CP} -p ${PREFIX}/etc/nessus/nessusd.rules.dist \
 -			${PREFIX}/etc/nessus/nessusd.rules; \
 -	fi
 -	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/move_nessus
 -.if ! exists(${PREFIX}/var/CA/serverkey.pem)
 -	@${ECHO} ""
 -	@${ECHO} "**************************************************************************"
 -	@${ECHO} "To create and install a new certificate, type \"make cert\""
 -	@${ECHO} "**************************************************************************"
 -	@${ECHO} ""
 -.endif
 -	@${CAT} ${PKGMESSAGE}
 -
 -cert:
 -	@${ECHO} ""
 -	@${ECHO} "**************************************************************************"
 -	@${ECHO} "The new certificate will be saved into ${PREFIX}/var/CA/serverkey.pem"
 -	@${ECHO} "**************************************************************************"
 -	@${ECHO} ""
 -	${PREFIX}/sbin/nessus-mkcert
 +	${INSTALL_DATA} ${WRKDIR}/nessusd.conf \
 +		${STAGEDIR}${ETCDIR}/nessusd.conf.dist
 +	${INSTALL_DATA} ${FILESDIR}/nessusd.rules \
 +		${STAGEDIR}${ETCDIR}/nessusd.rules.dist
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Copied and modified: head/security/nessus/files/nessusd.conf.in (from r333526, head/security/nessus/files/nessusd.conf)
 ==============================================================================
 --- head/security/nessus/files/nessusd.conf	Mon Nov 11 17:26:22 2013	(r333526, copy source)
 +++ head/security/nessus/files/nessusd.conf.in	Mon Nov 11 18:48:29 2013	(r333529)
 @@ -5,7 +5,7 @@
  # Every line starting with a '#' is a comment
  
  # Path to the security checks folder : 
 -plugins_folder = ${PREFIX}/lib/nessus/plugins
 +plugins_folder = %%PREFIX%%/lib/nessus/plugins
  
  # Maximum number of simultaneous hosts tested : 
  max_hosts = 30
 @@ -17,7 +17,7 @@ max_checks = 10
  be_nice = no
  
  # Log file (or 'syslog') : 
 -logfile = ${PREFIX}/var/nessus/logs/nessusd.messages
 +logfile = %%PREFIX%%/var/nessus/logs/nessusd.messages
  
  # Shall we log every details of the attack ?
  log_whole_attack = yes
 @@ -26,13 +26,13 @@ log_whole_attack = yes
  log_plugins_name_at_load = no
  
  # Dump file for debugging output, use `-' for stdout
 -dumpfile = ${PREFIX}/var/nessus/logs/nessusd.dump
 +dumpfile = %%PREFIX%%/var/nessus/logs/nessusd.dump
  
  # Rules file : 
 -rules = ${PREFIX}/etc/nessus/nessusd.rules
 +rules = %%PREFIX%%/etc/nessus/nessusd.rules
  
  # Users database : 
 -users = ${PREFIX}/etc/nessus/nessusd.users
 +users = %%PREFIX%%/etc/nessus/nessusd.users
  
  # CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
  cgi_path = /cgi-bin:/scripts
 @@ -110,9 +110,9 @@ nasl_no_signature_check = no
  #
  # Added by nessus-mkcert
  #
 -cert_file=${PREFIX}/com/CA/servercert.pem
 -key_file=${PREFIX}/var/CA/serverkey.pem
 -ca_file=${PREFIX}/com/CA/cacert.pem
 +cert_file=%%PREFIX%%/com/CA/servercert.pem
 +key_file=%%PREFIX%%/var/CA/serverkey.pem
 +ca_file=%%PREFIX%%/com/CA/cacert.pem
  # If you decide to protect your private key with a password, 
  # uncomment and change next line
  # pem_password=password
 
 Copied and modified: head/security/nessus/pkg-deinstall (from r331559, head/security/nessus/files/pkg-deinstall.in)
 ==============================================================================
 --- head/security/nessus/files/pkg-deinstall.in	Fri Oct 25 07:11:22 2013	(r331559, copy source)
 +++ head/security/nessus/pkg-deinstall	Mon Nov 11 18:48:29 2013	(r333529)
 @@ -8,22 +8,22 @@ ECHO_CMD=echo
  case $2 in
  POST-DEINSTALL)
    ${ECHO_CMD}
 -  ${ECHO_CMD} "The %%PKGNAME%% server package has been deleted."
 +  ${ECHO_CMD} "The nessus server package has been deleted."
    ${ECHO_CMD} "If you're *not* upgrading and won't be using"
    ${ECHO_CMD} "it any longer, you may want to issue the"
    ${ECHO_CMD} "following commands:"
    ${ECHO_CMD}
 -  if [ -d %%PREFIX%%/var/nessus ]; then
 +  if [ -d ${PKG_PREFIX}/var/nessus ]; then
      ${ECHO_CMD} "- to delete the nessus server permanently (losing all data):"
 -    ${ECHO_CMD} "  rm -Rf %%PREFIX%%/var/nessus"
 +    ${ECHO_CMD} "  rm -Rf ${PKG_PREFIX}/var/nessus"
      ${ECHO_CMD}
    fi
    rm_dir=""
 -  if [ -d %%PREFIX%%/com/CA ]; then
 -    rm_dir=" %%PREFIX%%/com/CA"
 +  if [ -d ${PKG_PREFIX}/com/CA ]; then
 +    rm_dir=" ${PKG_PREFIX}/com/CA"
    fi
 -  if [ -d %%PREFIX%%/var/CA ]; then
 -    rm_dir="$rm_dir %%PREFIX%%/var/CA"
 +  if [ -d ${PKG_PREFIX}/var/CA ]; then
 +    rm_dir="$rm_dir ${PKG_PREFIX}/var/CA"
    fi
    if [ "x$rm_dir" != "x" ]; then
      ${ECHO_CMD} "- to remove the Certificate Authority associated with nessus:"
 
 Modified: head/security/nessus/pkg-message
 ==============================================================================
 --- head/security/nessus/pkg-message	Mon Nov 11 17:54:33 2013	(r333528)
 +++ head/security/nessus/pkg-message	Mon Nov 11 18:48:29 2013	(r333529)
 @@ -8,3 +8,7 @@ Available variables you add/set to /etc/
  - nessusd_enable (bool):      Set to "NO" by default.
                                Set it to "YES" to enable nessusd.
  - nessusd_flags (str):        Set to "-D" by default.
 +
 +**************************************************************************
 +To create and install a new certificate, run nessus-mkcert
 +**************************************************************************
 
 Modified: head/security/nessus/pkg-plist
 ==============================================================================
 --- head/security/nessus/pkg-plist	Mon Nov 11 17:54:33 2013	(r333528)
 +++ head/security/nessus/pkg-plist	Mon Nov 11 18:48:29 2013	(r333529)
 @@ -17,20 +17,31 @@ include/nessus/nessusraw.h
  include/nessus/nessustcp.h
  include/nessus/nessusudp.h
  include/nessus/ntcompat.h
 +man/man1/nessus.1.gz
 +man/man1/nessus-mkrand.1.gz
 +man/man1/nessus-mkcert-client.1.gz
 +man/man1/nessus-fetch.1.gz
 +man/man8/nessusd.8.gz
 +man/man8/nessus-adduser.8.gz
 +man/man8/nessus-mkcert.8.gz
 +man/man8/nessus-rmuser.8.gz
  sbin/nessus-adduser
  sbin/nessus-check-signature
  sbin/nessus-mkcert
  sbin/nessus-rmuser
  sbin/nessusd
 +var/nessus/nessus-services
  @exec mkdir -p %D/var/nessus/jobs
  @exec mkdir -p %D/var/nessus/logs
 +@exec mkdir -p %D/var/nessus/tmp
  @exec mkdir -p %D/var/nessus/users
  @unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/nessus/logs/nessusd.messages 2> /dev/null; fi || true
  @dirrmtry var/nessus/jobs
  @dirrmtry var/nessus/logs
 +@dirrmtry var/nessus/tmp
  @dirrmtry var/nessus/users
 -var/nessus/nessus-services
  @dirrmtry var/nessus
 +@dirrmtry var
  @dirrmtry etc/nessus
  @exec mkdir -p %D/lib/nessus/plugins
  @dirrmtry lib/nessus/plugins
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: tijl 
State-Changed-When: Mon Nov 11 19:57:36 CET 2013 
State-Changed-Why:  
Committed in r333529. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183221 
>Unformatted:
