From nobody Fri Nov 04 15:30:21 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N3l1n4T7Cz4h3S6; Fri, 4 Nov 2022 15:30:21 +0000 (UTC) (envelope-from git@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 4N3l1n3z5jz47bq; Fri, 4 Nov 2022 15:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667575821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dvw/hWqyiveg61weCaCS6g3Devhu3Tm7Fahbum+XnEs=; b=yYQNGXpSLq6urUIPQva/4cdg9jU1xeRdEnycdjzRwkczHLO6hFk6jiCwkmn3CUDAZzG1v3 6Kip8Ymsxc8dz/OA1x/Y7fILrhhWzR2vTlk83Iwat+UbdvXV6KSwp3JgK726cEajA8c+CL 1AIdJF6Q73DUlae+q9KnalHHKkMN5JsKbgw0RNR4ik5wXod4hsMT6lHb7LBl6Jo3tE/za7 L96nuOjqArUpnuBk8ZNnETgprwGU9xAYL8/aW5osfqQbaOW2DYAr3h+8D8bJVOG9VW1vnk 1FZGb2lNi5sSH1iH4xMyqYZB2LHjEeKMOgHSpBuAFlCkB/Y1FH2Aimf62xm8oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N3l1n333tz1LPR; Fri, 4 Nov 2022 15:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A4FULY4003847; Fri, 4 Nov 2022 15:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4FULwn003844; Fri, 4 Nov 2022 15:30:21 GMT (envelope-from git) Date: Fri, 4 Nov 2022 15:30:21 GMT Message-Id: <202211041530.2A4FULwn003844@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 55c01f69543c - main - net-mgmt/smokeping: fix bug in FPingContinuous.pm List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55c01f69543c6336bb583857019f5278d4bf90ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667575821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dvw/hWqyiveg61weCaCS6g3Devhu3Tm7Fahbum+XnEs=; b=PS5PeVFp238WDXVp+mqOZndanu/vUC9e5iYcempD3urT03+62nmBQ2w386Hi7LEu1GJmn7 cVeCOXI//XGn+jJFGwk0vRIhRGmUrgoF0Cj6QsYuUqQpAmbJD4qpKV8WBpewVlzbaqiMfM VITpFhwpkeUcgMNP/G/oXGTbdtCUXJpht6Tu8AOkHtJgS+efTDWB2RBWa82GGkjOIwtGuh Fnjskt8dcZaKIn2tgS59HLhgsrnpcFFb96viJlM5cZAIbEftqKd+O1iWmb8dT90DPjpdPh SwmnbW3FjKsZNLDszb6qX090mWS/1qEyEMQS7fQpqyDTJvqRSuLm4W2QoO4y1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667575821; a=rsa-sha256; cv=none; b=Vdl6cTj8k1ttiy8BN33AHvX/eLMhyQb7mh7Ugqlb+/cuoxBozWSH50kykmN+NSNfQvLt2J dlcru7OzRF+vysj7Ii1z3IsO6Y5aRPZKVhh61YpZfnIObTejUYyJjQO290E5e0T47kHyCK q7c9Y2M/XEs0LJFdWXKtLjdHK3ytN1nrtaP4CLxxUjNjQTs2da9RAX0hc3FQl6MyM1i4oG mvvgamx/KgrpBVU7qi4ExdJg9IcH5+NcGQE6cQiIQebhgJEnX120Sj8DGDl/Er8XtXbFtK aUFTv9C1IHhEwVHi2h8UuscsugS/TiGxdWJoL8LbPnxLd3JjKunZl7tIUN2gxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=55c01f69543c6336bb583857019f5278d4bf90ef commit 55c01f69543c6336bb583857019f5278d4bf90ef Author: Eugene Grosbein AuthorDate: 2022-11-04 15:27:04 +0000 Commit: Eugene Grosbein CommitDate: 2022-11-04 15:27:04 +0000 net-mgmt/smokeping: fix bug in FPingContinuous.pm Add patch accepted upstream with bug #341. https://github.com/oetiker/SmokePing/issues/341 PR: 267015 Approved by: rodrigo (maintainer timeout, 3 weeks) --- net-mgmt/smokeping/Makefile | 2 +- .../files/patch-lib_Smokeping_probes_FPingContinuous.pm | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 619e42e43091..a67fa425f303 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -1,6 +1,6 @@ PORTNAME= smokeping PORTVERSION= 2.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt www MAINTAINER= rodrigo@FreeBSD.org diff --git a/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_FPingContinuous.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_FPingContinuous.pm new file mode 100644 index 000000000000..04aa39c2fab9 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_FPingContinuous.pm @@ -0,0 +1,13 @@ +--- lib/Smokeping/probes/FPingContinuous.pm.orig 2021-08-13 06:20:13 UTC ++++ lib/Smokeping/probes/FPingContinuous.pm +@@ -72,8 +72,8 @@ sub new($$$) + my $binary = join(" ", $self->binary); + my $testhost = $self->testhost; + my $return = `$binary -C 1 $testhost 2>&1`; +- $self->{enable}{S} = (`$binary -h 2>&1` =~ /\s-S\s/); +- $self->{enable}{O} = (`$binary -h 2>&1` =~ /\s-O\s/); ++ $self->{enable}{S} = (`$binary -h 2>&1` =~ /\s-S[,\s]/); ++ $self->{enable}{O} = (`$binary -h 2>&1` =~ /\s-O[,\s]/); + croak "ERROR: fping ('$binary -C 1 $testhost') could not be run: $return" + if $return =~ m/not found/; + croak "ERROR: FPing must be installed setuid root or it will not work\n"