Attachment #247542 for bug #276218




PORTNAME=	munin
PORTVERSION=	${MUNIN_VERSION}
CATEGORIES=	sysutils perl5
MASTER_SITES=	${MUNIN_SITES}
PKGNAMESUFFIX=	-common

MAINTAINER=	flo@FreeBSD.org
COMMENT=	Common components between a munin node and server
WWW=		https://munin-monitoring.org/

LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
		p5-Net-SSLeay>=0:security/p5-Net-SSLeay

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1679676638	1	TIMESTAMP = 1704717976
2	SHA256 (munin-2.0.73.tar.gz) = 027853d848206d6f1b06c230baeb2b28a47915f8b73a0aad4f18d497c840350a	2	SHA256 (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 9ea2c8d81b96a19e8f26bb9ee6b2cc35790997a53e574c2d4beaf170e5173553
3	SIZE (munin-2.0.73.tar.gz) = 2252776	3	SIZE (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 2258514




--- getversion.orig	2023-10-25 08:03:45 UTC
+++ getversion
@@ -74,8 +74,8 @@ generate_version_string_from_dir() {
 
 if [ -s "RELEASE" ]; then
     cat RELEASE
-elif [ "`git rev-parse --is-inside-work-tree 2>/dev/null`" = "true" ]; then
-    generate_version_string
+#elif [ "`git rev-parse --is-inside-work-tree 2>/dev/null`" = "true" ]; then
+#    generate_version_string
 elif [ -n "`generate_version_string_from_dir`" ]; then
     generate_version_string_from_dir
 else




--- plugins/lib/Munin/Plugin/SNMP.pm.orig	2014-11-24 21:46:24 UTC
+++ plugins/lib/Munin/Plugin/SNMP.pm
@@ -104,7 +104,7 @@ well.
 
 =cut
 
-    my ($host, $port, $version, $tail);
+    my ($host, $port, $version, $tail, $domain);
 
     # Decode plugin/symlink name and extract meaning from it - if possible.
     if ($0 =~ /^(?:.*\/)?snmp(v3)?_([^_]+)_(.*)/) {
@@ -122,8 +122,9 @@ well.
     $host    = $ENV{host}    || $host    || die "Could not find hostname";
     $version = $ENV{version} || $version || '2';
     $port    = $ENV{port}    || $port    || 161;
+    $domain  = $ENV{domain}  || $domain  || 'UDP/IPv4';
 
-    return ($host, $port, $version, $tail);
+    return ($host, $port, $version, $tail, $domain);
 }
 
 
@@ -205,13 +206,14 @@ Security is handled differently for vers
 
 =cut
 
-    my ($host, $port, $version, $tail) = config_session();
+    my ($host, $port, $version, $tail, $domain) = config_session();
 
     # Common options.
     my @options = (
         -hostname => $host,
         -port     => $port,
         -version  => $version,
+        -domain   => $domain,
     );
 
     # User defined options




--- 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 ) {


Line 0 Link Here

(-)./files/patch-test-mktemp (+11 lines)
	1	--- test-mktemp.orig 2023-02-08 07:57:20 UTC
	2	+++ test-mktemp
	3	@@ -53,7 +53,7 @@ MKTEMP='mktemp -p /tmp/ $1'
	4	testfun temp.XXXXXX
	5
	6	# FreeBSD way
	7	-MKTEMP="mktemp -t /tmp"
	8	+MKTEMP="mktemp -t $1"
	9	testfun temp.XXXXXX
	10
	11	# Plain mktemp

Lines 1-7 Link Here

(-)./munin.mk (-2 / +3 lines)
1	LICENSE= GPLv2	1	LICENSE= GPLv2
2		2
3	MUNIN_VERSION= 2.0.73	3	MUNIN_VERSION= 2.0.75
4	MUNIN_SITES= SF/munin/stable/${MUNIN_VERSION}	4	USE_GITHUB= yes
		5	GH_ACCOUNT= munin-monitoring
5	DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo	6	DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo
6	PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files	7	PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files
7		8




PORTNAME=	munin
PORTVERSION=	${MUNIN_VERSION}
CATEGORIES=	sysutils perl5
MASTER_SITES=	${MUNIN_SITES}
PKGNAMESUFFIX=	-master

MAINTAINER=	flo@FreeBSD.org
COMMENT=	Collector part of Munin
WWW=		https://munin-monitoring.org/

LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
		p5-CGI>=0:www/p5-CGI \
		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \

		${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
		${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \
	)
	(cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do ${MV} $$i $$i.sample; done)
	${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample
	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-master.newsyslog
	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/cron.d

Lines 1-13 Link Here

(-)./Makefile (-1 / +4 lines)
1	PORTNAME= munin	1	PORTNAME= munin
2	PORTVERSION= ${MUNIN_VERSION}	2	PORTVERSION= ${MUNIN_VERSION}
3	CATEGORIES= sysutils perl5	3	CATEGORIES= sysutils perl5
4	MASTER_SITES= ${MUNIN_SITES}
5	PKGNAMESUFFIX= -node	4	PKGNAMESUFFIX= -node
6		5
7	MAINTAINER= flo@FreeBSD.org	6	MAINTAINER= flo@FreeBSD.org
8	COMMENT= Node-specific part of Munin	7	COMMENT= Node-specific part of Munin
9	WWW= https://munin-monitoring.org/	8	WWW= https://munin-monitoring.org/
10		9
		10	LICENSE_FILE= ${WRKSRC}/COPYING
		11
11	BUILD_DEPENDS= bash:shells/bash \	12	BUILD_DEPENDS= bash:shells/bash \
12	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \	13	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
13	p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \	14	p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
Lines 25-30 RUN_DEPENDS= bash:shells/bash \ Link Here
25	p5-Net-Server>=0:net/p5-Net-Server	26	p5-Net-Server>=0:net/p5-Net-Server
26		27
27	USES= cpe gmake perl5 shebangfix	28	USES= cpe gmake perl5 shebangfix
		29	USE_GITHUB= yes
		30	GH_ACCOUNT= munin-monitoring
28	USE_RC_SUBR= munin-asyncd munin-node	31	USE_RC_SUBR= munin-asyncd munin-node
29		32
30	SHEBANG_FILES= node/bin/munindoc node/sbin/munin-node \	33	SHEBANG_FILES= node/bin/munindoc node/sbin/munin-node \

Line 0 Link Here

(-)./files/patch-test-mktemp (+11 lines)
	1	--- test-mktemp.orig 2019-05-09 03:45:43 UTC
	2	+++ test-mktemp
	3	@@ -53,7 +53,7 @@
	4	testfun temp.XXXXXX
	5
	6	# FreeBSD way
	7	-MKTEMP="mktemp -t /tmp"
	8	+MKTEMP="mktemp -t $1"
	9	testfun temp.XXXXXX
	10
	11	# Plain mktemp




PORTNAME=	contrib
DISTVERSION=	git.2023-12-23
CATEGORIES=	sysutils
PKGNAMEPREFIX=	munin-



USE_GITHUB=	yes
GH_ACCOUNT=	munin-monitoring
GH_TAGNAME=	b963a96
GH_TUPLE=	shuque:bind9stats:687c94a:bind9stats

DUMMYBASE=	""
SHEBANG_REGEX=	./(${EXAMPLES_DIRS:ts|})/.*
SHEBANG_LANG=	expect gawk python3 zsh
python3_CMD=	${LOCALBASE}/bin/python${PYTHON_DEFAULT}
zsh_CMD=	${LOCALBASE}/bin/zsh
ruby_OLD_CMD=	${DUMMYBASE}/opt/csw/bin/ruby

# Most of the installed files are scripts, so give them a "correct" mode.
BINMODE=	755

Lines 1-5 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1674846762	1	TIMESTAMP = 1704795689
2	SHA256 (munin-monitoring-contrib-git.2023-01-14-4f22f27_GH0.tar.gz) = 680aa8fccf51b2073c64f6c5fd43be784cd8531a3ca234cfe592d51ca3683ad9	2	SHA256 (munin-monitoring-contrib-git.2023-12-23-b963a96_GH0.tar.gz) = a5c143334bc97081aee3f786aeac2b50fa1ba31541a0ae8546a0bbe01b9893e1
3	SIZE (munin-monitoring-contrib-git.2023-01-14-4f22f27_GH0.tar.gz) = 8795693	3	SIZE (munin-monitoring-contrib-git.2023-12-23-b963a96_GH0.tar.gz) = 8851334
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 276218

Lines 1-12 Link Here

(-)./Makefile (-1 / +2 lines)
1	PORTNAME= munin	1	PORTNAME= munin
2	PORTVERSION= ${MUNIN_VERSION}	2	PORTVERSION= ${MUNIN_VERSION}
3	CATEGORIES= sysutils perl5	3	CATEGORIES= sysutils perl5
4	MASTER_SITES= ${MUNIN_SITES}
5	PKGNAMESUFFIX= -common	4	PKGNAMESUFFIX= -common
6		5
7	MAINTAINER= flo@FreeBSD.org	6	MAINTAINER= flo@FreeBSD.org
8	COMMENT= Common components between a munin node and server	7	COMMENT= Common components between a munin node and server
9	WWW= https://munin-monitoring.org/	8	WWW= https://munin-monitoring.org/
		9
		10	LICENSE_FILE= ${WRKSRC}/COPYING
10		11
11	BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \	12	BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \
12	p5-Net-SSLeay>=0:security/p5-Net-SSLeay	13	p5-Net-SSLeay>=0:security/p5-Net-SSLeay

Line 0 Link Here

(-)./files/patch-getversion (+13 lines)
	1	--- getversion.orig 2023-10-25 08:03:45 UTC
	2	+++ getversion
	3	@@ -74,8 +74,8 @@ generate_version_string_from_dir() {
	4
	5	if [ -s "RELEASE" ]; then
	6	cat RELEASE
	7	-elif [ "`git rev-parse --is-inside-work-tree 2>/dev/null`" = "true" ]; then
	8	- generate_version_string
	9	+#elif [ "`git rev-parse --is-inside-work-tree 2>/dev/null`" = "true" ]; then
	10	+# generate_version_string
	11	elif [ -n "`generate_version_string_from_dir`" ]; then
	12	generate_version_string_from_dir
	13	else

Line 0 Link Here

(-)./files/patch-plugins_lib_Munin_Plugin_SNMP.pm (+38 lines)
	1	--- plugins/lib/Munin/Plugin/SNMP.pm.orig 2014-11-24 21:46:24 UTC
	2	+++ plugins/lib/Munin/Plugin/SNMP.pm
	3	@@ -104,7 +104,7 @@ well.
	4
	5	=cut
	6
	7	- my ($host, $port, $version, $tail);
	8	+ my ($host, $port, $version, $tail, $domain);
	9
	10	# Decode plugin/symlink name and extract meaning from it - if possible.
	11	if ($0 =~ /^(?:.\/)?snmp(v3)?_([^_]+)_(.)/) {
	12	@@ -122,8 +122,9 @@ well.
	13	$host = $ENV{host} \|\| $host \|\| die "Could not find hostname";
	14	$version = $ENV{version} \|\| $version \|\| '2';
	15	$port = $ENV{port} \|\| $port \|\| 161;
	16	+ $domain = $ENV{domain} \|\| $domain \|\| 'UDP/IPv4';
	17
	18	- return ($host, $port, $version, $tail);
	19	+ return ($host, $port, $version, $tail, $domain);
	20	}
	21
	22
	23	@@ -205,13 +206,14 @@ Security is handled differently for vers
	24
	25	=cut
	26
	27	- my ($host, $port, $version, $tail) = config_session();
	28	+ my ($host, $port, $version, $tail, $domain) = config_session();
	29
	30	# Common options.
	31	my @options = (
	32	-hostname => $host,
	33	-port => $port,
	34	-version => $version,
	35	+ -domain => $domain,
	36	);
	37
	38	# User defined options

Line 0 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

Lines 1-13 Link Here

(-)./Makefile (-2 / +3 lines)
1	PORTNAME= munin	1	PORTNAME= munin
2	PORTVERSION= ${MUNIN_VERSION}	2	PORTVERSION= ${MUNIN_VERSION}
3	CATEGORIES= sysutils perl5	3	CATEGORIES= sysutils perl5
4	MASTER_SITES= ${MUNIN_SITES}
5	PKGNAMESUFFIX= -master	4	PKGNAMESUFFIX= -master
6		5
7	MAINTAINER= flo@FreeBSD.org	6	MAINTAINER= flo@FreeBSD.org
8	COMMENT= Collector part of Munin	7	COMMENT= Collector part of Munin
9	WWW= https://munin-monitoring.org/	8	WWW= https://munin-monitoring.org/
10		9
		10	LICENSE_FILE= ${WRKSRC}/COPYING
		11
11	BUILD_DEPENDS= munin-common>=${MUNIN_VERSION}:sysutils/munin-common \	12	BUILD_DEPENDS= munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
12	p5-CGI>=0:www/p5-CGI \	13	p5-CGI>=0:www/p5-CGI \
13	p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \	14	p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
Lines 54-60 post-install: Link Here
54	${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \	55	${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
55	${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \	56	${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \
56	)	57	)
57	(cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done)	58	(cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do ${MV} $$i $$i.sample; done)
58	${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample	59	${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample
59	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-master.newsyslog	60	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-master.newsyslog
60	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/cron.d	61	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/cron.d

Lines 1-5 Link Here

(-)./Makefile (-3 / +4 lines)
1	PORTNAME= contrib	1	PORTNAME= contrib
2	DISTVERSION= git.2023-01-14	2	DISTVERSION= git.2023-12-23
3	CATEGORIES= sysutils	3	CATEGORIES= sysutils
4	PKGNAMEPREFIX= munin-	4	PKGNAMEPREFIX= munin-
5		5
Lines 15-28 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= 4f22f27	18	GH_TAGNAME= b963a96
19	GH_TUPLE= shuque:bind9stats:687c94a:bind9stats	19	GH_TUPLE= shuque:bind9stats:687c94a:bind9stats
20		20
		21	DUMMYBASE= ""
21	SHEBANG_REGEX= ./(${EXAMPLES_DIRS:ts\|})/.*	22	SHEBANG_REGEX= ./(${EXAMPLES_DIRS:ts\|})/.*
22	SHEBANG_LANG= expect gawk python3 zsh	23	SHEBANG_LANG= expect gawk python3 zsh
23	python3_CMD= ${LOCALBASE}/bin/python${PYTHON_DEFAULT}	24	python3_CMD= ${LOCALBASE}/bin/python${PYTHON_DEFAULT}
24	zsh_CMD= ${LOCALBASE}/bin/zsh	25	zsh_CMD= ${LOCALBASE}/bin/zsh
25	ruby_OLD_CMD= /opt/csw/bin/ruby	26	ruby_OLD_CMD= ${DUMMYBASE}/opt/csw/bin/ruby
26		27
27	# Most of the installed files are scripts, so give them a "correct" mode.	28	# Most of the installed files are scripts, so give them a "correct" mode.
28	BINMODE= 755	29	BINMODE= 755