svn commit: r438042 - in head/mail/sa-utils: . files

[Matthew Seaman]

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=$?