Index: head/security/sshguard/Makefile
===================================================================
--- head/security/sshguard/Makefile	(revision 369817)
+++ head/security/sshguard/Makefile	(revision 369818)
@@ -1,40 +1,40 @@
 # Created by: Mij <mij@bitchx.it>
 # $FreeBSD$
 
 PORTNAME=	sshguard
 PORTVERSION=	1.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/sshguard-${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT?=	Protect hosts from brute force attacks against ssh and other services
 
 CONFLICTS?=	sshguard-ipfilter-1.* sshguard-ipfw-1.* sshguard-pf-1.*
 
 USES=		tar:bzip2
 
 PLIST_FILES=	sbin/sshguard man/man8/sshguard.8.gz
 
 USE_RC_SUBR=	sshguard
 MAKE_ARGS+=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-firewall=${SSHGUARDFW}
 
 SUB_LIST+=	PKGMSG_FWBLOCK=${PKGMSG_FWBLOCK}
 SUB_FILES=	pkg-message
 
 # backend type in { hosts, ipfw, pf }
 SSHGUARDFW?=	hosts
 
 .if ${SSHGUARDFW} == pf
 PKGMSG_FWBLOCK="  To activate or configure PF see http://sshguard.sf.net/doc/setup/blockingpf.html"
 .elif ${SSHGUARDFW} == ipfw
 PKGMSG_FWBLOCK="  Verify that IPFW is active with \"ipfw show\"."
 .elif ${SSHGUARDFW} == hosts
 PKGMSG_FWBLOCK="  Sshguard is going to use /etc/hosts.allow. Please remember to touch /etc/hosts.allow\!"
 .elif ${SSHGUARDFW} == ipfilter
 PKGMSG_FWBLOCK="  Sshguard will use /etc/ipf.rules as ruleset."
 .endif
 
 .include <bsd.port.mk>
Index: head/security/sshguard/files/sshguard.in
===================================================================
--- head/security/sshguard/files/sshguard.in	(revision 369817)
+++ head/security/sshguard/files/sshguard.in	(revision 369818)
@@ -1,92 +1,92 @@
 #!/bin/sh
 #-
 # Copyright (c) 2012 iXsystems, Inc.
 # All rights reserved.
 #
 # Written by: Xin Li <delphij@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # PROVIDE: sshguard
 # REQUIRE: LOGIN cleanvar
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable sshguard:
 # sshguard_enable (bool):	Set to "NO" by default.
 #				Set it to "YES" to enable sshguard
 # sshguard_pidfile (str):	Path to PID file.
 #				Set to "/var/run/sshguard.pid" by default
 # sshguard_watch_logs (str):	Colon splitted list of logs to watch.
 #				Set to "/var/log/auth.log:/var/log/maillog"
 #				by default.
 # The following options directly maps to their command line options,
 # please read manual page sshguard(8) for detailed information:
 # sshguard_blacklist (str):	[thr:]/path/to/blacklist.
 #				Set to "40:/var/db/sshguard/blacklist.db"
 #				by default.
 # sshguard_safety_thresh (int):	Safety threshold.  Set to "40" by default.
 # sshguard_pardon_min_interval (int):
-#				Minimum pardon interval.  Set to "1200"
+#				Minimum pardon interval.  Set to "420"
 #				by default.
 # sshguard_prescribe_interval (int):
-#				Prescribe interval.  Set to "420" by
+#				Prescribe interval.  Set to "1200" by
 #				default.
 # sshguard_whitelistfile (str):	Path to the whitelist.
 #				Set to "%%PREFIX%%/etc/sshguard.whitelist"
 #				by default.
 
 
 . /etc/rc.subr
 
 name=sshguard
 rcvar=sshguard_enable
 
 load_rc_config sshguard
 
 : ${sshguard_enable:=NO}
 : ${sshguard_blacklist=40:/var/db/sshguard/blacklist.db}
 : ${sshguard_safety_thresh=40}
-: ${sshguard_pardon_min_interval=1200}
-: ${sshguard_prescribe_interval=420}
+: ${sshguard_pardon_min_interval=420}
+: ${sshguard_prescribe_interval=1200}
 : ${sshguard_whitelistfile="%%PREFIX%%/etc/sshguard.whitelist"}
 : ${sshguard_watch_logs=/var/log/auth.log:/var/log/maillog}
 
 pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"}
 
 command=/usr/sbin/daemon
 actual_command="%%PREFIX%%/sbin/sshguard"
 procname="${actual_command}"
 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()
 {
 	mkdir -p `dirname ${sshguard_blacklist##*:}`
 	[ -e ${sshguard_whitelistfile} ] || touch ${sshguard_whitelistfile}
 	sshguard_watch_params=`echo ${sshguard_watch_logs} | tr : \\\n | sed -e s/^/-l\ /g | tr \\\n \ `
 }
 
 run_rc_command "$1"