From owner-svn-ports-all@FreeBSD.ORG Fri Apr 25 13:08:35 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4D34A5A; Fri, 25 Apr 2014 13:08:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83F8A11AD; Fri, 25 Apr 2014 13:08:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PD8ZNu037077; Fri, 25 Apr 2014 13:08:35 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PD8YUj037072; Fri, 25 Apr 2014 13:08:34 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201404251308.s3PD8YUj037072@svn.freebsd.org> From: Chris Rees Date: Fri, 25 Apr 2014 13:08:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352123 - in head/security/sshguard: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 13:08:35 -0000 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