Attachment 247541 Details for Bug 276218 – munin-2.0.75+contrib2023-12-23_b963a96.patch

[patch] munin-2.0.75+contrib2023-12-23_b963a96.patch

munin-2.0.75+contrib2023-12-23_2023-12-23.patch (text/plain), 13.88 KB, created by takefu on 2024-01-09 11:39:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2024-01-09 11:39:21 UTC

Size: 13.88 KB

patch

obsolete

>diff -udprN /usr/ports/sysutils/munin-common/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-common/Makefile	2023-01-27 15:20:37.000000000 +0000
>+++ ./Makefile	2024-01-09 11:06:44.763017000 +0000
>@@ -1,12 +1,13 @@
> 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
>diff -udprN /usr/ports/sysutils/munin-common/distinfo ./distinfo
>--- /usr/ports/sysutils/munin-common/distinfo	2023-03-24 17:57:14.000000000 +0000
>+++ ./distinfo	2024-01-09 04:12:28.511557000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1679676638
>-SHA256 (munin-2.0.73.tar.gz) = 027853d848206d6f1b06c230baeb2b28a47915f8b73a0aad4f18d497c840350a
>-SIZE (munin-2.0.73.tar.gz) = 2252776
>+TIMESTAMP = 1704717976
>+SHA256 (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 9ea2c8d81b96a19e8f26bb9ee6b2cc35790997a53e574c2d4beaf170e5173553
>+SIZE (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 2258514
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-getversion ./files/patch-getversion
>--- /usr/ports/sysutils/munin-common/files/patch-getversion	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-getversion	2024-01-09 04:46:45.760389000 +0000
>@@ -0,0 +1,13 @@
>+--- 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
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-plugins_lib_Munin_Plugin_SNMP.pm ./files/patch-plugins_lib_Munin_Plugin_SNMP.pm
>--- /usr/ports/sysutils/munin-common/files/patch-plugins_lib_Munin_Plugin_SNMP.pm	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-plugins_lib_Munin_Plugin_SNMP.pm	2023-02-21 02:40:05.196505000 +0000
>@@ -0,0 +1,38 @@
>+--- 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
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in ./files/patch-plugins_node.d_bind9__rndc.in
>--- /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-plugins_node.d_bind9__rndc.in	2023-02-21 02:40:05.196605000 +0000
>@@ -0,0 +1,24 @@
>+--- 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 ) {
>+
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-test-mktemp ./files/patch-test-mktemp
>--- /usr/ports/sysutils/munin-common/files/patch-test-mktemp	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-test-mktemp	2023-03-09 03:06:15.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- test-mktemp.orig	2023-02-08 07:57:20 UTC
>++++ test-mktemp
>+@@ -53,7 +53,7 @@ MKTEMP='mktemp -p /tmp/ $1'
>+ testfun temp.XXXXXX
>+ 
>+ # FreeBSD way
>+-MKTEMP="mktemp -t /tmp"
>++MKTEMP="mktemp -t $1"
>+ testfun temp.XXXXXX
>+ 
>+ # Plain mktemp
>diff -udprN /usr/ports/sysutils/munin-common/munin.mk ./munin.mk
>--- /usr/ports/sysutils/munin-common/munin.mk	2023-03-24 17:57:14.000000000 +0000
>+++ ./munin.mk	2024-01-09 10:54:36.422567000 +0000
>@@ -1,7 +1,8 @@
> LICENSE=	GPLv2
> 
>-MUNIN_VERSION=	2.0.73
>-MUNIN_SITES=	SF/munin/stable/${MUNIN_VERSION}
>+MUNIN_VERSION=	2.0.75
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	munin-monitoring
> DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
> PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files
> 
>diff -udprN /usr/ports/sysutils/munin-master/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-master/Makefile	2023-03-24 17:57:14.000000000 +0000
>+++ ./Makefile	2024-01-09 10:47:07.379824000 +0000
>@@ -1,13 +1,14 @@
> 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 \
>@@ -54,7 +55,7 @@ post-install:
> 		${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)
>+	(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
>diff -udprN /usr/ports/sysutils/munin-node/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-node/Makefile	2023-01-27 15:20:37.000000000 +0000
>+++ ./Makefile	2024-01-09 11:04:06.512710000 +0000
>@@ -1,13 +1,14 @@
> PORTNAME=	munin
> PORTVERSION=	${MUNIN_VERSION}
> CATEGORIES=	sysutils perl5
>-MASTER_SITES=	${MUNIN_SITES}
> PKGNAMESUFFIX=	-node
> 
> MAINTAINER=	flo@FreeBSD.org
> COMMENT=	Node-specific part of Munin
> WWW=		https://munin-monitoring.org/
> 
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> BUILD_DEPENDS=	bash:shells/bash \
> 		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
> 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
>@@ -25,6 +26,8 @@ RUN_DEPENDS=	bash:shells/bash \
> 		p5-Net-Server>=0:net/p5-Net-Server
> 
> USES=		cpe gmake perl5 shebangfix
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	munin-monitoring
> USE_RC_SUBR=	munin-asyncd munin-node
> 
> SHEBANG_FILES=	node/bin/munindoc node/sbin/munin-node \
>diff -udprN /usr/ports/sysutils/munin-node/files/patch-test-mktemp ./files/patch-test-mktemp
>--- /usr/ports/sysutils/munin-node/files/patch-test-mktemp	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-test-mktemp	2023-03-26 22:26:12.594875000 +0000
>@@ -0,0 +1,11 @@
>+--- test-mktemp.orig	2019-05-09 03:45:43 UTC
>++++ test-mktemp
>+@@ -53,7 +53,7 @@
>+ testfun temp.XXXXXX
>+ 
>+ # FreeBSD way
>+-MKTEMP="mktemp -t /tmp"
>++MKTEMP="mktemp -t $1"
>+ testfun temp.XXXXXX
>+ 
>+ # Plain mktemp
>diff -udprN /usr/ports/sysutils/munin-common/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-common/Makefile	2023-01-27 15:20:37.000000000 +0000
>+++ ./Makefile	2024-01-09 11:06:44.763017000 +0000
>@@ -1,12 +1,13 @@
> 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
>diff -udprN /usr/ports/sysutils/munin-common/distinfo ./distinfo
>--- /usr/ports/sysutils/munin-common/distinfo	2023-03-24 17:57:14.000000000 +0000
>+++ ./distinfo	2024-01-09 04:12:28.511557000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1679676638
>-SHA256 (munin-2.0.73.tar.gz) = 027853d848206d6f1b06c230baeb2b28a47915f8b73a0aad4f18d497c840350a
>-SIZE (munin-2.0.73.tar.gz) = 2252776
>+TIMESTAMP = 1704717976
>+SHA256 (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 9ea2c8d81b96a19e8f26bb9ee6b2cc35790997a53e574c2d4beaf170e5173553
>+SIZE (munin-monitoring-munin-2.0.75_GH0.tar.gz) = 2258514
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-getversion ./files/patch-getversion
>--- /usr/ports/sysutils/munin-common/files/patch-getversion	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-getversion	2024-01-09 04:46:45.760389000 +0000
>@@ -0,0 +1,13 @@
>+--- 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
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-plugins_lib_Munin_Plugin_SNMP.pm ./files/patch-plugins_lib_Munin_Plugin_SNMP.pm
>--- /usr/ports/sysutils/munin-common/files/patch-plugins_lib_Munin_Plugin_SNMP.pm	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-plugins_lib_Munin_Plugin_SNMP.pm	2023-02-21 02:40:05.196505000 +0000
>@@ -0,0 +1,38 @@
>+--- 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
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in ./files/patch-plugins_node.d_bind9__rndc.in
>--- /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-plugins_node.d_bind9__rndc.in	2023-02-21 02:40:05.196605000 +0000
>@@ -0,0 +1,24 @@
>+--- 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 ) {
>+
>diff -udprN /usr/ports/sysutils/munin-common/files/patch-test-mktemp ./files/patch-test-mktemp
>--- /usr/ports/sysutils/munin-common/files/patch-test-mktemp	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-test-mktemp	2023-03-09 03:06:15.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- test-mktemp.orig	2023-02-08 07:57:20 UTC
>++++ test-mktemp
>+@@ -53,7 +53,7 @@ MKTEMP='mktemp -p /tmp/ $1'
>+ testfun temp.XXXXXX
>+ 
>+ # FreeBSD way
>+-MKTEMP="mktemp -t /tmp"
>++MKTEMP="mktemp -t $1"
>+ testfun temp.XXXXXX
>+ 
>+ # Plain mktemp
>diff -udprN /usr/ports/sysutils/munin-common/munin.mk ./munin.mk
>--- /usr/ports/sysutils/munin-common/munin.mk	2023-03-24 17:57:14.000000000 +0000
>+++ ./munin.mk	2024-01-09 10:54:36.422567000 +0000
>@@ -1,7 +1,8 @@
> LICENSE=	GPLv2
> 
>-MUNIN_VERSION=	2.0.73
>-MUNIN_SITES=	SF/munin/stable/${MUNIN_VERSION}
>+MUNIN_VERSION=	2.0.75
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	munin-monitoring
> DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
> PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files
>

Actions: View | Diff

Attachments on bug 276218: 247541 | 247542