Attachment #251427 for bug #279704

View | Details | Raw Unified | Return to bug 279704
Collapse All | Expand All

Lines 1-6 Link Here

(-)./Makefile (-1 / +1 lines)
1	PORTNAME= munin	1	PORTNAME= munin
2	PORTVERSION= ${MUNIN_VERSION}	2	PORTVERSION= ${MUNIN_VERSION}
3	PORTREVISION= 1	3	#PORTREVISION= 0
4	CATEGORIES= sysutils perl5	4	CATEGORIES= sysutils perl5
5	PKGNAMESUFFIX= -common	5	PKGNAMESUFFIX= -common
6		6

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1704717976	1	TIMESTAMP = 1718249605
2	SHA256 (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 9ea2c8d81b96a19e8f26bb9ee6b2cc35790997a53e574c2d4beaf170e5173553	2	SHA256 (munin-monitoring-munin-2.0.76_GH0.tar.gz) = 77e93349388cc4d9d56844ca434fd54b5fb04b14dba8fa340726251297a8c610
3	SIZE (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 2258514	3	SIZE (munin-monitoring-munin-2.0.76_GH0.tar.gz) = 2258538




--- plugins/node.d/bind9_rndc.in.orig	2018-03-25 14:01:24 UTC
+++ plugins/node.d/bind9_rndc.in
@@ -13,6 +13,7 @@ The following environment variables are 
     env.rndc		/usr/sbin/rndc
     env.rndc_options	
     env.querystats      /var/run/named.stats
+    env.rndckeyfile     /etc/namedb/rndc.key
 
 The user/group that runs the plugin must have read access to the stats
 file.  To change user or group (usually Munin plugins are run as
@@ -62,9 +63,11 @@ License not documented.
 use strict;
 
 my $rndc = defined($ENV{rndc}) ? $ENV{rndc} : '/usr/sbin/rndc';
-my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : '';
+my $rndckeyfile = $ENV{rndckeyfile} ? $ENV{rndckeyfile} : '/etc/namedb/rndc.key';
 my $querystats = $ENV{querystats} || '/var/run/named.stats';
 my %IN;
+my @IN_KEYS;
+my @args = ("$rndc","-k","$rndckeyfile","stats");
 
 # attempt to create log file if it doesn't exist
 if ( ! -r $querystats ) {


Lines 1-6 Link Here

(-)./munin.mk (-1 / +1 lines)
1	LICENSE= GPLv2	1	LICENSE= GPLv2
2		2
3	MUNIN_VERSION= 2.0.75	3	MUNIN_VERSION= 2.0.76
4	USE_GITHUB= yes	4	USE_GITHUB= yes
5	GH_ACCOUNT= munin-monitoring	5	GH_ACCOUNT= munin-monitoring
6	DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo	6	DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo

Lines 1-6 Link Here

(-)./Makefile (-1 / +1 lines)
1	PORTNAME= munin	1	PORTNAME= munin
2	PORTVERSION= ${MUNIN_VERSION}	2	PORTVERSION= ${MUNIN_VERSION}
3	PORTREVISION= 1	3	#PORTREVISION= 0
4	CATEGORIES= sysutils perl5	4	CATEGORIES= sysutils perl5
5	PKGNAMESUFFIX= -master	5	PKGNAMESUFFIX= -master
6		6

Lines 1-6 Link Here

(-)./Makefile (-1 / +1 lines)
1	PORTNAME= munin	1	PORTNAME= munin
2	PORTVERSION= ${MUNIN_VERSION}	2	PORTVERSION= ${MUNIN_VERSION}
3	PORTREVISION= 2	3	#PORTREVISION= 0
4	CATEGORIES= sysutils perl5	4	CATEGORIES= sysutils perl5
5	PKGNAMESUFFIX= -node	5	PKGNAMESUFFIX= -node
6		6

Lines 1-5 Link Here

(-)./Makefile (-2 / +2 lines)
1	PORTNAME= contrib	1	PORTNAME= contrib
2	DISTVERSION= git.2023-12-23	2	DISTVERSION= git.2024-05-15
3	CATEGORIES= sysutils	3	CATEGORIES= sysutils
4	PKGNAMEPREFIX= munin-	4	PKGNAMEPREFIX= munin-
5		5
Lines 15-21 USES= python:env shebangfix uniquefiles:dirs Link Here
15		15
16	USE_GITHUB= yes	16	USE_GITHUB= yes
17	GH_ACCOUNT= munin-monitoring	17	GH_ACCOUNT= munin-monitoring
18	GH_TAGNAME= b963a96	18	GH_TAGNAME= 1f1e5d3
19	GH_TUPLE= shuque:bind9stats:687c94a:bind9stats	19	GH_TUPLE= shuque:bind9stats:687c94a:bind9stats
20		20
21	DUMMYBASE= ""	21	DUMMYBASE= ""

Lines 1-5 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1704795689	1	TIMESTAMP = 1718252838
2	SHA256 (munin-monitoring-contrib-git.2023-12-23-b963a96_GH0.tar.gz) = a5c143334bc97081aee3f786aeac2b50fa1ba31541a0ae8546a0bbe01b9893e1	2	SHA256 (munin-monitoring-contrib-git.2024-05-15-1f1e5d3_GH0.tar.gz) = dc7fd3d749e9455334a13cc20eb8896afe438cdf84d3db3023540ad0c1741454
3	SIZE (munin-monitoring-contrib-git.2023-12-23-b963a96_GH0.tar.gz) = 8851334	3	SIZE (munin-monitoring-contrib-git.2024-05-15-1f1e5d3_GH0.tar.gz) = 8929301
4	SHA256 (shuque-bind9stats-687c94a_GH0.tar.gz) = 48f5987022325869b205f48e17390d631808f8bf60885016733b6ad4ef60e30d	4	SHA256 (shuque-bind9stats-687c94a_GH0.tar.gz) = 48f5987022325869b205f48e17390d631808f8bf60885016733b6ad4ef60e30d
5	SIZE (shuque-bind9stats-687c94a_GH0.tar.gz) = 971648	5	SIZE (shuque-bind9stats-687c94a_GH0.tar.gz) = 971648

Return to bug 279704

Lines 1-24 Link Here

(-)./files/patch-plugins_node.d_bind9__rndc.in (-24 lines)
1	--- plugins/node.d/bind9_rndc.in.orig 2018-03-25 14:01:24 UTC
2	+++ plugins/node.d/bind9_rndc.in
3	@@ -13,6 +13,7 @@ The following environment variables are
4	env.rndc /usr/sbin/rndc
5	env.rndc_options
6	env.querystats /var/run/named.stats
7	+ env.rndckeyfile /etc/namedb/rndc.key
8
9	The user/group that runs the plugin must have read access to the stats
10	file. To change user or group (usually Munin plugins are run as
11	@@ -62,9 +63,11 @@ License not documented.
12	use strict;
13
14	my $rndc = defined($ENV{rndc}) ? $ENV{rndc} : '/usr/sbin/rndc';
15	-my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : '';
16	+my $rndckeyfile = $ENV{rndckeyfile} ? $ENV{rndckeyfile} : '/etc/namedb/rndc.key';
17	my $querystats = $ENV{querystats} \|\| '/var/run/named.stats';
18	my %IN;
19	+my @IN_KEYS;
20	+my @args = ("$rndc","-k","$rndckeyfile","stats");
21
22	# attempt to create log file if it doesn't exist
23	if ( ! -r $querystats ) {
24