Index: head/net-mgmt/argus3/Makefile =================================================================== --- head/net-mgmt/argus3/Makefile (revision 416644) +++ head/net-mgmt/argus3/Makefile (revision 416645) @@ -1,54 +1,54 @@ # Created by: Stefan Esser # $FreeBSD$ PORTNAME= argus -PORTVERSION= 3.0.8.1 +PORTVERSION= 3.0.8.2 CATEGORIES= net-mgmt security MASTER_SITES= http://qosient.com/argus/src/ \ ftp://qosient.com/pub/argus/src/ MAINTAINER= bofh@FreeBSD.org COMMENT= Generic IP network transaction auditing tool LICENSE= GPLv3 CONFLICTS= argus-2* argus-sasl-2* argus-clients-2* OPTIONS_DEFINE= SASL OPTIONS_DEFAULT=SASL SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SASL_VARS= PKGNAMESUFFIX+=-sasl USE_RC_SUBR= argus USES= bison perl5 GNU_CONFIGURE= yes post-patch: @${REINPLACE_CMD} -e 's#/usr/lib/sasl2#${LOCALBASE}/lib/sasl2#' ${WRKSRC}/argus/ArgusOutput.c pre-install: @${REINPLACE_CMD} -e 's#/usr/bin/perl#${LOCALBASE}/bin/perl#' ${WRKSRC}/bin/argus-lsof @${REINPLACE_CMD} -e 's#/bin/bash#${LOCALBASE}/bin/bash#' ${WRKSRC}/bin/argus-vmstat do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/argus ${STAGEDIR}${PREFIX}/sbin/argus .for i in argus-lsof argus-snmp argus-vmstat argusbug ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${STAGEDIR}${PREFIX}/bin/$i .endfor ${INSTALL_MAN} ${WRKSRC}/man/man5/argus.conf.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_MAN} ${WRKSRC}/man/man8/argus.8 ${STAGEDIR}${PREFIX}/man/man8/ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/Archive ${STAGEDIR}${EXAMPLESDIR}/Config \ ${STAGEDIR}${EXAMPLESDIR}/Deployment ${STAGEDIR}${EXAMPLESDIR}/Startup \ ${STAGEDIR}${EXAMPLESDIR}/System .for i in Archive/argusarchive \ Config/argus.conf \ Deployment/sample \ Startup/argus Startup/README \ System/crontab System/magic ${INSTALL_DATA} ${WRKSRC}/support/$i ${STAGEDIR}${EXAMPLESDIR}/$i .endfor ${CP} ${WRKSRC}/support/Config/argus.conf ${STAGEDIR}${PREFIX}/etc/argus.conf.sample .include Index: head/net-mgmt/argus3/distinfo =================================================================== --- head/net-mgmt/argus3/distinfo (revision 416644) +++ head/net-mgmt/argus3/distinfo (revision 416645) @@ -1,2 +1,3 @@ -SHA256 (argus-3.0.8.1.tar.gz) = 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 -SIZE (argus-3.0.8.1.tar.gz) = 523375 +TIMESTAMP = 1465512231 +SHA256 (argus-3.0.8.2.tar.gz) = ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff +SIZE (argus-3.0.8.2.tar.gz) = 524749 Index: head/net-mgmt/argus3/files/argus.in =================================================================== --- head/net-mgmt/argus3/files/argus.in (revision 416644) +++ head/net-mgmt/argus3/files/argus.in (revision 416645) @@ -1,22 +1,35 @@ #!/bin/sh # PROVIDE: argus # REQUIRE: NETWORKING . /etc/rc.subr name="argus" rcvar=argus_enable load_rc_config $name # Set defaults : ${argus_enable="NO"} : ${argus_procname="%%PREFIX%%/sbin/argus"} : ${argus_flags="-F %%PREFIX%%/etc/argus.conf"} +pidfile=${argus_pidfile:-'/var/run/argus.pid'} required_files="${argus_config}" command=$argus_procname command_args="${argus_flags}" +start_cmd="argus_start" + +argus_start() +{ + if [ -z "$rc_fast" -a -n "$rc_pid" ]; then + echo 1>&2 "${name} already running? (pid=$rc_pid)." + return 1 + fi + echo "Starting ${name}." + /usr/sbin/daemon -p $pidfile ${command} -d ${argus_flags} + _run_rc_postcmd +} run_rc_command "$1"