From owner-svn-ports-all@freebsd.org Mon Jan 27 14:00:14 2020 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 ACFB91F7252; Mon, 27 Jan 2020 14:00:14 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 485rwt442nz4Ph1; Mon, 27 Jan 2020 14:00:14 +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 7C3BBAEDB; Mon, 27 Jan 2020 14:00:14 +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 00RE0E1v056452; Mon, 27 Jan 2020 14:00:14 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00RE0BV4056435; Mon, 27 Jan 2020 14:00:11 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202001271400.00RE0BV4056435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 27 Jan 2020 14:00:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524260 - in head/sysutils/munin-common: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/sysutils/munin-common: . files X-SVN-Commit-Revision: 524260 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.29 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: Mon, 27 Jan 2020 14:00:14 -0000 Author: mat Date: Mon Jan 27 14:00:11 2020 New Revision: 524260 URL: https://svnweb.freebsd.org/changeset/ports/524260 Log: Update to 2.0.54. While there, document why patches are there. Modified: head/sysutils/munin-common/distinfo (contents, props changed) head/sysutils/munin-common/files/patch-Makefile (contents, props changed) head/sysutils/munin-common/files/patch-Makefile.config (contents, props changed) head/sysutils/munin-common/files/patch-node_munin-node.conf.in (contents, props changed) head/sysutils/munin-common/files/patch-node_sbin_munin-node (contents, props changed) head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure (contents, props changed) head/sysutils/munin-common/files/patch-node_sbin_munin-run (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in (contents, props changed) head/sysutils/munin-common/munin.mk Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/distinfo Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579522454 -SHA256 (munin-2.0.53.tar.gz) = 30579d1249b420d4d890aafac00ce0f52afba5e74104ced40f9821c49abcd493 -SIZE (munin-2.0.53.tar.gz) = 2263588 +TIMESTAMP = 1580129850 +SHA256 (munin-2.0.54.tar.gz) = 9930cebb0328a15b30edd7f4920ca89b61a24db5f55d0f70d76c00620daec3b3 +SIZE (munin-2.0.54.tar.gz) = 2264058 Modified: head/sysutils/munin-common/files/patch-Makefile ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-Makefile Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +Install things at the correct places. + --- Makefile.orig 2019-11-20 19:39:52 UTC +++ Makefile @@ -95,96 +95,77 @@ install: install-master-prime install-common-prime ins Modified: head/sysutils/munin-common/files/patch-Makefile.config ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile.config Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-Makefile.config Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +Make locations overridables. (Passed as MAKE_ARGS.) + --- Makefile.config.orig 2018-07-24 11:34:38 UTC +++ Makefile.config @@ -17,62 +17,62 @@ Modified: head/sysutils/munin-common/files/patch-node_munin-node.conf.in ============================================================================== --- head/sysutils/munin-common/files/patch-node_munin-node.conf.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-node_munin-node.conf.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,6 @@ +FreeBSD uses wheel as gid 0 +Ignore .sample files, they're sample from packages. + --- node/munin-node.conf.in.orig 2014-11-24 21:46:24 UTC +++ node/munin-node.conf.in @@ -10,7 +10,7 @@ background 1 Modified: head/sysutils/munin-common/files/patch-node_sbin_munin-node ============================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-node Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-node Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,6 @@ +plugins run in taint mode because the uid is changed, so the path must not +contain writable directories. + --- node/sbin/munin-node.orig 2014-11-24 21:46:24 UTC +++ node/sbin/munin-node @@ -54,6 +54,10 @@ sub main Modified: head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure ============================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-node-configure Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,6 @@ +plugins run in taint mode because the uid is changed, so the path must not +contain writable directories. + --- node/sbin/munin-node-configure.orig 2014-11-24 21:46:24 UTC +++ node/sbin/munin-node-configure @@ -23,6 +23,10 @@ use warnings; Modified: head/sysutils/munin-common/files/patch-node_sbin_munin-run ============================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-run Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-run Mon Jan 27 14:00:11 2020 (r524260) @@ -1,6 +1,9 @@ ---- node/sbin/munin-run.orig 2020-01-15 21:12:19 UTC +plugins run in taint mode because the uid is changed, so the path must not +contain writable directories. + +--- node/sbin/munin-run.orig 2020-01-20 19:32:33 UTC +++ node/sbin/munin-run -@@ -110,6 +110,9 @@ sub main +@@ -115,6 +115,9 @@ sub main $ENV{$key} =~ /^(.*)$/s; $ENV{$key} = $1; } Modified: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +Ignore autofs too. + --- plugins/node.d.freebsd/df.in.orig 2018-06-29 00:50:01 UTC +++ plugins/node.d.freebsd/df.in @@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then Modified: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,6 @@ +- iostat returns kB, not MB. +- Remove silly limits on IO + --- plugins/node.d.freebsd/iostat.in.orig 2014-11-24 21:46:24 UTC +++ plugins/node.d.freebsd/iostat.in @@ -41,7 +41,7 @@ fi Modified: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +awk works just fine here. + --- plugins/node.d/ipmi_.in.orig 2017-01-18 20:25:20 UTC +++ plugins/node.d/ipmi_.in @@ -73,7 +73,7 @@ export CONFIG MEASURE Modified: head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +Initialize variable. + --- plugins/node.d/multiping.in.orig 2018-12-19 20:56:49 UTC +++ plugins/node.d/multiping.in @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos Modified: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +awk works just fine here. + --- plugins/node.d/multips_memory.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/multips_memory.in @@ -137,7 +137,7 @@ fi Modified: head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in Mon Jan 27 14:00:11 2020 (r524260) @@ -1,3 +1,5 @@ +Allow overriding some variables. + --- plugins/node.d/nutups_.in.orig 2018-07-24 11:34:38 UTC +++ plugins/node.d/nutups_.in @@ -7,21 +7,25 @@ Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Mon Jan 27 14:00:07 2020 (r524259) +++ head/sysutils/munin-common/munin.mk Mon Jan 27 14:00:11 2020 (r524260) @@ -1,6 +1,6 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.53 +MUNIN_VERSION= 2.0.54 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files