From owner-svn-ports-all@freebsd.org  Sat Apr  8 13:02:37 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC0C0D34908;
 Sat,  8 Apr 2017 13:02:37 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 ADD15A17;
 Sat,  8 Apr 2017 13:02:37 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v38D2aOC059782;
 Sat, 8 Apr 2017 13:02:36 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v38D2acB059780;
 Sat, 8 Apr 2017 13:02:36 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201704081302.v38D2acB059780@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: matthew set sender to
 matthew@FreeBSD.org using -f
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Sat, 8 Apr 2017 13:02:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r438042 - in head/mail/sa-utils: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Apr 2017 13:02:38 -0000

Author: matthew
Date: Sat Apr  8 13:02:36 2017
New Revision: 438042
URL: https://svnweb.freebsd.org/changeset/ports/438042

Log:
  Update to 0.04.
  
  Correctly apply the anticongestion sleep time.  Pointy hat to me for
  copying too literally.
  
  PR:		181556
  Reported by:	asomers

Modified:
  head/mail/sa-utils/Makefile
  head/mail/sa-utils/files/sa-utils.in

Modified: head/mail/sa-utils/Makefile
==============================================================================
--- head/mail/sa-utils/Makefile	Sat Apr  8 12:40:51 2017	(r438041)
+++ head/mail/sa-utils/Makefile	Sat Apr  8 13:02:36 2017	(r438042)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sa-utils
-PORTVERSION=	0.03
+PORTVERSION=	0.04
 CATEGORIES=	mail
 MASTER_SITES=	# none
 DISTFILES=	# none

Modified: head/mail/sa-utils/files/sa-utils.in
==============================================================================
--- head/mail/sa-utils/files/sa-utils.in	Sat Apr  8 12:40:51 2017	(r438041)
+++ head/mail/sa-utils/files/sa-utils.in	Sat Apr  8 13:02:36 2017	(r438042)
@@ -142,14 +142,12 @@ case "$daily_sa_enable" in
 		;;
 	esac
 
-	if [ "$1" != -nodelay ]; then
-	    # In FreeBSD 12.0 the anticongestion function should be used
-	    # instead of a hard-coded sleep
-	    if [ -n "$anticongestion_sleeptime" ]; then
-		anticongestion
-	    else
-		${SLEEP} $(random)
-	    fi
+	# In FreeBSD 12.0 the anticongestion function should be used
+	# instead of a hard-coded sleep
+	if [ -n "$anticongestion_sleeptime" ]; then
+	    anticongestion
+	else
+	    sleep $( jot -r 1 0 300 )
 	fi
 
 	update_rules || rc=$?