From owner-svn-ports-all@freebsd.org Tue Feb 2 08:14:07 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 397A352A210; Tue, 2 Feb 2021 08:14:07 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DVHdq19SWz4d6x; Tue, 2 Feb 2021 08:14:07 +0000 (UTC) (envelope-from rodrigo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B4152E84; Tue, 2 Feb 2021 08:14:07 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1128E644095429; Tue, 2 Feb 2021 08:14:06 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1128E63N095428; Tue, 2 Feb 2021 08:14:06 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <202102020814.1128E63N095428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Tue, 2 Feb 2021 08:14:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563789 - in head/net-mgmt/smokeping: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in head/net-mgmt/smokeping: . files X-SVN-Commit-Revision: 563789 X-SVN-Commit-Repository: ports 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.34 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: Tue, 02 Feb 2021 08:14:07 -0000 Author: rodrigo Date: Tue Feb 2 08:14:06 2021 New Revision: 563789 URL: https://svnweb.freebsd.org/changeset/ports/563789 Log: net-mgmt/smokeping: fix mail loop issue Integrate upstream patch[1] to fix mail loop issue #183[2]. This is a one-line patch without complexity who can be removed as soon as the upstream releases a new version. [1] https://github.com/oetiker/SmokePing/commit/e9004e8bbeb30d33778afaf70a5f8b95ff38d6ba [2] https://github.com/oetiker/SmokePing/issues/183 PR: 253161 Submitted by: OlivierW Modified: head/net-mgmt/smokeping/Makefile head/net-mgmt/smokeping/files/patch-lib_Smokeping.pm Modified: head/net-mgmt/smokeping/Makefile ============================================================================== --- head/net-mgmt/smokeping/Makefile Tue Feb 2 07:50:22 2021 (r563788) +++ head/net-mgmt/smokeping/Makefile Tue Feb 2 08:14:06 2021 (r563789) @@ -3,7 +3,7 @@ PORTNAME= smokeping PORTVERSION= 2.7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt www MAINTAINER= rodrigo@FreeBSD.org Modified: head/net-mgmt/smokeping/files/patch-lib_Smokeping.pm ============================================================================== --- head/net-mgmt/smokeping/files/patch-lib_Smokeping.pm Tue Feb 2 07:50:22 2021 (r563788) +++ head/net-mgmt/smokeping/files/patch-lib_Smokeping.pm Tue Feb 2 08:14:06 2021 (r563789) @@ -1,5 +1,14 @@ ---- lib/Smokeping.pm.orig 2018-02-02 21:14:55 UTC +--- lib/Smokeping.pm.orig 2021-02-01 12:05:21 UTC +++ lib/Smokeping.pm +@@ -1889,7 +1889,7 @@ sub check_alerts { + $gotalert = $match unless $gotalert; + my $edgetrigger = $alert->{edgetrigger} eq 'yes'; + my $what; +- if ($edgetrigger and $prevmatch != $match) { ++ if ($edgetrigger and ($prevmatch ? 0 : 1 ) != ($match ? 0 : 1)) { + $what = ($prevmatch == 0 ? "was raised" : "was cleared"); + } + if (not $edgetrigger and $match) { @@ -4306,7 +4306,7 @@ sub main (;$) { if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; } if($opt{reload}) {