From owner-svn-ports-head@freebsd.org Tue May 15 07:37:49 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6037EE5A03; Tue, 15 May 2018 07:37:49 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76A837D19B; Tue, 15 May 2018 07:37:49 +0000 (UTC) (envelope-from mat@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 5794A272; Tue, 15 May 2018 07:37:49 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4F7bnEZ083853; Tue, 15 May 2018 07:37:49 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4F7bnrE083851; Tue, 15 May 2018 07:37:49 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201805150737.w4F7bnrE083851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 15 May 2018 07:37:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469997 - in head/sysutils: munin-common/files munin-node X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/sysutils: munin-common/files munin-node X-SVN-Commit-Revision: 469997 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 07:37:50 -0000 Author: mat Date: Tue May 15 07:37:48 2018 New Revision: 469997 URL: https://svnweb.freebsd.org/changeset/ports/469997 Log: On FreeBSD 10, sh handles ${foo:-} differently, and creates an empty argument, which ping does not like. PR: 228149 Reported by: Niels Bakker Sponsored by: Absolight Added: head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in (contents, props changed) Modified: head/sysutils/munin-node/Makefile (contents, props changed) Added: head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in Tue May 15 07:37:48 2018 (r469997) @@ -0,0 +1,11 @@ +Can be removed when 10.4 goes out of support. + +--- plugins/node.d/ping_.in.orig 2018-03-28 19:36:43 UTC ++++ plugins/node.d/ping_.in +@@ -91,5 +91,5 @@ fi + + + # shellcheck disable=SC2086 +-"${ping:-$PING}" ${ping_args:-'-c 2'} "${host}" ${ping_args2:-} \ ++"${ping:-$PING}" ${ping_args:-'-c 2'} "${host}" ${ping_args2:- } \ + | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Tue May 15 07:17:24 2018 (r469996) +++ head/sysutils/munin-node/Makefile Tue May 15 07:37:48 2018 (r469997) @@ -3,6 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node