Date: Fri, 25 Apr 2014 13:08:34 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352123 - in head/security/sshguard: . files Message-ID: <201404251308.s3PD8YUj037072@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Fri Apr 25 13:08:34 2014 New Revision: 352123 URL: http://svnweb.freebsd.org/changeset/ports/352123 QAT: https://qat.redports.org/buildarchive/r352123/ Log: Fix rc script, which I made a bit of a mess of. Really sorry :( Submitted by: se While here, add error checking in pkg-install before replacing syslog.conf with an unknown file! Modified: head/security/sshguard/Makefile head/security/sshguard/files/sshguard.in head/security/sshguard/pkg-deinstall Modified: head/security/sshguard/Makefile ============================================================================== --- head/security/sshguard/Makefile Fri Apr 25 13:05:45 2014 (r352122) +++ head/security/sshguard/Makefile Fri Apr 25 13:08:34 2014 (r352123) @@ -3,7 +3,7 @@ PORTNAME= sshguard PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF/sshguard/sshguard/sshguard-${PORTVERSION} Modified: head/security/sshguard/files/sshguard.in ============================================================================== --- head/security/sshguard/files/sshguard.in Fri Apr 25 13:05:45 2014 (r352122) +++ head/security/sshguard/files/sshguard.in Fri Apr 25 13:08:34 2014 (r352123) @@ -64,7 +64,7 @@ name="sshguard" rcvar="sshguard_enable" -load_rc_config $name +load_rc_config sshguard : ${sshguard_enable:="NO"} : ${sshguard_blacklist="40:/var/db/sshguard/blacklist.db"} @@ -74,14 +74,13 @@ load_rc_config $name : ${sshguard_whitelistfile="%%PREFIX%%/etc/sshguard.whitelist"} : ${sshguard_watch_logs="/var/log/auth.log:/var/log/maillog"} -pidfile=${sshguard_pidfile:-"/var/run/${name}.pid"} +pidfile=${sshguard_pidfile:-"/var/run/sshguard.pid"} command="/usr/sbin/daemon" -actual_command="%%PREFIX%%/sbin/${name}" +actual_command="%%PREFIX%%/sbin/sshguard" procname="${actual_command}" -start_precmd="${name}_prestart" - -command_args="-cf ${actual_command} -b ${sshguard_blacklist} ${sshguard_watch_params} -a ${sshguard_safety_thresh} -p ${sshguard_pardon_min_interval} -s ${sshguard_prescribe_interval} -w ${sshguard_whitelistfile} -i ${sshguard_pidfile}" +start_precmd="sshguard_prestart" +command_args="-cf ${actual_command} -b ${sshguard_blacklist} \${sshguard_watch_params} -a ${sshguard_safety_thresh} -p ${sshguard_pardon_min_interval} -s ${sshguard_prescribe_interval} -w ${sshguard_whitelistfile} -i ${pidfile}" sshguard_prestart() { Modified: head/security/sshguard/pkg-deinstall ============================================================================== --- head/security/sshguard/pkg-deinstall Fri Apr 25 13:05:45 2014 (r352122) +++ head/security/sshguard/pkg-deinstall Fri Apr 25 13:08:34 2014 (r352123) @@ -16,9 +16,12 @@ SSHGUARDCONFLINE="auth.info;authpriv.inf case "$2" in "DEINSTALL") - if (test -f "$SYSLOGCONF" && grep -q '^[^#].*sshguard' "$SYSLOGCONF") + if test -f "$SYSLOGCONF" && grep -q '^[^#].*sshguard' "$SYSLOGCONF" then - TMPFILE=`mktemp -q /tmp/syslogcXX` + if ! TMPFILE=`mktemp -q /tmp/syslogcXX`; then + echo "Couldn't create temporary file" + exit 1 + fi if grep -qx "$SSHGUARDCONFLINE" "$SYSLOGCONF" then # remove default sshguard entry from syslog.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404251308.s3PD8YUj037072>