Attachment 145383 Details for Bug 192395 – munin-node.patch

[patch] munin-node.patch

munin-node.patch (text/plain), 12.59 KB, created by takefu on 2014-08-05 07:22:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-08-05 07:22:37 UTC

Size: 12.59 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/munin-node/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-node/Makefile	2014-04-05 20:18:12.000000000 +0900
>+++ ./Makefile	2014-07-29 15:39:10.000000000 +0900
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	munin
> PORTVERSION=	${MUNIN_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	sysutils perl5
> MASTER_SITES=	${MUNIN_SITES}
> PKGNAMESUFFIX=	-node
>@@ -21,16 +20,19 @@
> 		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
> 		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
> 		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
>-		bash:${PORTSDIR}/shells/bash
>+		bash:${PORTSDIR}/shells/bash\
>+		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS\
>+		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP\
>+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
> 
> DISTINFO_FILE=	${MUNIN_DISTINFO}
> EXTRA_PATCHES+=	${MUNIN_PATCHES}
> USES=		gmake perl5 shebangfix
> PKGMESSAGE=	${WRKDIR}/pkg-message
> REINPLACE_ARGS=	-i ""
>-SHEBANG_FILES=	node/sbin/munin-node
>+SHEBANG_FILES=	node/sbin/munin-node node/sbin/munin-run\
>+		node/sbin/munin-sched node/sbin/munin-node-configure
> 
>-NO_STAGE=	yes
> .include "${.CURDIR}/../munin-common/munin.mk"
> 
> ALL_TARGET=	build-node build-plugins
>@@ -42,41 +44,32 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if defined(WITH_PYTHON)
>+USE_PYTHON_RUN=	yes
>+python_CMD=	${PYTHON_CMD}
>+.endif
>+
> .if ${PORT_OPTIONS:MSNMP}
> BUILD_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
> RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
> .endif
> 
>-MAN1=		munin-node-configure.1 \
>-		munin-node.1 \
>-		munin-run.1 \
>-		munin-sched.1 \
>-		munindoc.1
>-MAN3_NODE=	Munin::Node::Config.3 \
>-		Munin::Node::Configure::Debug.3 \
>-		Munin::Node::Configure::History.3 \
>-		Munin::Node::Configure::HostEnumeration.3 \
>-		Munin::Node::Configure::Plugin.3 \
>-		Munin::Node::Configure::PluginList.3 \
>-		Munin::Node::Logger.3 \
>-		Munin::Node::OS.3 \
>-		Munin::Node::ProxySpooler.3 \
>-		Munin::Node::SNMPConfig.3 \
>-		Munin::Node::Server.3 \
>-		Munin::Node::Service.3 \
>-		Munin::Node::Session.3 \
>-		Munin::Node::SpoolReader.3 \
>-		Munin::Node::SpoolWriter.3 \
>-		Munin::Node::Utils.3
>-MAN3_PLUGIN=	Munin::Plugin.3 \
>-		Munin::Plugin::Pgsql.3 \
>-		Munin::Plugin::SNMP.3
>-MAN3=		${MAN3_NODE} ${MAN3_PLUGIN}
>-MAN5=		munin-node.conf.5
>-MAN8=		munin.8
>+.if ${PORT_OPTIONS:MIPV6}
>+BUILD_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
>+RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
>+.endif
> 
> SUB_FILES=	pkg-message
> USE_RC_SUBR=	munin-node munin-sched
>+SUB_LIST=	PERL=${PERL}
>+
>+.if !defined(WITH_PYTHON)
>+pre-everything::
>+	@${ECHO_MSG} "===>"
>+	@${ECHO_MSG} "===> You can enable Python support by defining the following variable:"
>+	@${ECHO_MSG} "===> WITH_PYTHON=yes   Enable Python support"
>+	@${ECHO_MSG} "===>"
>+.endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
>@@ -97,36 +90,30 @@
> 		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> 
> post-install:
>+	${MKDIR} ${STAGEDIR}/var/munin/plugin-state
>+	${CHMOD} g+w ${STAGEDIR}/var/munin/plugin-state
>+	${CHGRP} ${GROUPS} ${STAGEDIR}/var/munin/plugin-state
> 	@${INSTALL_SCRIPT} ${WRKDIR}/munin-node \
>-		${PREFIX}/etc/rc.d/munin-node
>+		${STAGEDIR}${PREFIX}/etc/rc.d/munin-node
> 	@${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
>-		${ETCDIR}/munin-node.conf.sample
>+		${STAGEDIR}${ETCDIR}/munin-node.conf.sample
> 	@if [ ! -f ${ETCDIR}/munin-node.conf ]; then \
>-		${INSTALL_DATA} ${ETCDIR}/munin-node.conf.sample \
>-			${ETCDIR}/munin-node.conf; \
>+		${INSTALL_DATA} ${STAGEDIR}${ETCDIR}/munin-node.conf.sample \
>+			${STAGEDIR}${ETCDIR}/munin-node.conf; \
> 	fi
> 	@${INSTALL_DATA} ${FILESDIR}/plugins.conf \
>-		${ETCDIR}/plugin-conf.d/plugins.conf.sample
>+		${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample
> 	@if [ ! -f ${ETCDIR}/plugin-conf.d/plugins.conf ]; then \
>-		${INSTALL_DATA} ${ETCDIR}/plugin-conf.d/plugins.conf.sample \
>-			${ETCDIR}/plugin-conf.d/plugins.conf; \
>+		${INSTALL_DATA} ${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample \
>+			${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf; \
> 	fi
>-	@(cd ${WRKSRC}/node/blib/bindoc && for man in ${MAN1}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man1; \
>-	done)
>-	@(cd ${WRKSRC}/node/blib/libdoc && for man in ${MAN3_NODE}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
>-	done)
>-	@(cd ${WRKSRC}/plugins/blib/libdoc && for man in ${MAN3_PLUGIN}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
>-	done)
>-	@(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \
>-	done)
>-	@(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \
>-	done)
>-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
>+	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-node.conf.5\
>+		${STAGEDIR}${PREFIX}/man/man5
>+	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin.8\
>+		${STAGEDIR}${PREFIX}/man/man8
>+	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX}\
>+		STAGEDIR=${STAGEDIR} PERL=${PERL}\
>+		SITE_PERL=-I${STAGEDIR}${SITE_PERL}\
> 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 	@${ECHO} ${PORTVERSION} > /tmp/.munin-node.version
> 	@${CAT} ${PKGMESSAGE}
>diff -ruN /usr/ports/sysutils/munin-node/files/patch-lib-Munin-Plugin-SNMP.pm ./files/patch-lib-Munin-Plugin-SNMP.pm
>--- /usr/ports/sysutils/munin-node/files/patch-lib-Munin-Plugin-SNMP.pm	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/patch-lib-Munin-Plugin-SNMP.pm	2012-09-17 13:01:47.000000000 +0900
>@@ -0,0 +1,38 @@
>+--- plugins/lib/Munin/Plugin/SNMP.pm.orig	2012-09-01 00:22:50.000000000 +0900
>++++ plugins/lib/Munin/Plugin/SNMP.pm	2012-09-17 13:01:05.000000000 +0900
>+@@ -102,7 +102,7 @@
>+ 
>+ =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)?_([^_]+)_(.*)/) {
>+@@ -120,8 +120,9 @@
>+     $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);
>+ }
>+ 
>+ 
>+@@ -203,13 +204,14 @@
>+ 
>+ =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 -ruN /usr/ports/sysutils/munin-node/files/patch-node_lib_Munin_Node_SNMPConfig.pm ./files/patch-node_lib_Munin_Node_SNMPConfig.pm
>--- /usr/ports/sysutils/munin-node/files/patch-node_lib_Munin_Node_SNMPConfig.pm	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/patch-node_lib_Munin_Node_SNMPConfig.pm	2013-09-19 16:01:56.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- node/lib/Munin/Node/SNMPConfig.pm.orig	2013-06-04 01:15:45.000000000 +0900
>++++ node/lib/Munin/Node/SNMPConfig.pm	2013-09-19 15:28:03.000000000 +0900
>+@@ -23,6 +23,7 @@
>+ 
>+     my $version  = $opts{version} || '2c';
>+     my $port     = $opts{port}    || 161;
>++    my $domain   = $opts{domain}  || 'UDP/IPv4';
>+ 
>+     if ($version eq '3') {
>+         # Privacy
>+@@ -58,6 +59,7 @@
>+         hosts     => $hosts,
>+         port      => $port,
>+         version   => $version,
>++        domain    => $domain,
>+         sec_args  => \%sec_args,
>+     );
>+ 
>+@@ -88,6 +90,7 @@
>+ 		-hostname  => $host,
>+         -port      => $self->{port},
>+         -version   => $self->{version},
>++        -domain    => $self->{domain},
>+ 
>+         %{$self->{sec_args}},
>+ 
>diff -ruN /usr/ports/sysutils/munin-node/files/patch-node_sbin_munin-node-configure ./files/patch-node_sbin_munin-node-configure
>--- /usr/ports/sysutils/munin-node/files/patch-node_sbin_munin-node-configure	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/patch-node_sbin_munin-node-configure	2013-09-19 15:58:25.000000000 +0900
>@@ -0,0 +1,38 @@
>+--- node/sbin/munin-node-configure.orig	2013-06-04 01:15:45.000000000 +0900
>++++ node/sbin/munin-node-configure	2013-09-19 15:42:00.000000000 +0900
>+@@ -86,7 +86,7 @@
>+ 	my ($suggest, $shell, $removes, $newer);
>+ 	my $exit_not_error = 1;
>+ 	my @families;
>+-	my (@snmp_hosts, $snmpver, $snmpcomm, $snmpport);
>++	my (@snmp_hosts, $snmpver, $snmpcomm, $snmpport, $snmpdomain);
>+     my ($snmp3username, $snmp3authpass, $snmp3authproto, $snmp3privpass, $snmp3privproto);
>+ 
>+     print_usage_and_exit() unless GetOptions(
>+@@ -114,6 +114,7 @@
>+         'snmp=s'          => \@snmp_hosts,
>+         'snmpversion=s'   => \$snmpver,
>+         'snmpport=i'      => \$snmpport,
>++        'snmpdomain=s'    => \$snmpdomain,
>+         # SNMPv1/2c
>+         'snmpcommunity=s' => \$snmpcomm,
>+         # SNMPv3
>+@@ -142,6 +143,7 @@
>+         hosts        => \@snmp_hosts,
>+         version      => $snmpver,
>+         port         => $snmpport,
>++        domain       => $snmpdomain,
>+ 
>+         community    => $snmpcomm,
>+ 
>+@@ -584,6 +586,10 @@
>+ 
>+ The SNMP port to use [161]
>+ 
>++=item B<< --snmpdomain <domain> >>
>++
>++The SNMP domain (udp/IPv6, tcp/IPv4 or tcp/IPv6) to use ['udp/IPv4']
>++
>+ =item B<SNMP 1/2c authentication>
>+ 
>+ SNMP versions 1 and 2c use a "community string" for authentication.  This is
>diff -ruN /usr/ports/sysutils/munin-node/pkg-install ./pkg-install
>--- /usr/ports/sysutils/munin-node/pkg-install	2013-05-30 08:36:16.000000000 +0900
>+++ ./pkg-install	2014-05-15 16:48:48.000000000 +0900
>@@ -36,7 +36,7 @@
> 
>     if [ -n "$prevver" ]; then
> 	echo -n "Initializing new plugins.."
>-	${PKG_PREFIX}/sbin/munin-node-configure --shell --newer "${prevver%-*}" | sh -x
>+	${PERL} ${SITE_PERL} ${STAGEDIR}${PKG_PREFIX}/sbin/munin-node-configure --shell --newer "${prevver%-*}" | sh -x
>     fi
>     echo "done."
> }
>@@ -80,7 +80,7 @@
>     POST-INSTALL)
> 	if [ -z "${PACKAGE_BUILDING}" ]; then
> 		init_plugins
>-		${PKG_PREFIX}/etc/rc.d/munin-node start
>+		${STAGEDIR}${PKG_PREFIX}/etc/rc.d/munin-node start
> 		newsyslog
> 	fi
> 	;;
>diff -ruN /usr/ports/sysutils/munin-node/pkg-plist ./pkg-plist
>--- /usr/ports/sysutils/munin-node/pkg-plist	2013-02-16 22:30:41.000000000 +0900
>+++ ./pkg-plist	2014-07-29 15:40:47.000000000 +0900
>@@ -1,11 +1,7 @@
> @stopdaemon munin-node
> bin/munindoc
>-@unexec if cmp -s %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; then rm -f %D/%%ETCDIR%%/munin-node.conf ; fi
>-%%ETCDIR%%/munin-node.conf.sample
>-@exec if [ ! -f %D/%%ETCDIR%%/munin-node.conf ] ; then cp -p %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; fi
>-@unexec if cmp -s %D/%%ETCDIR%%/plugin-conf.d/plugins.conf.sample %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; then rm -f %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; fi
>-%%ETCDIR%%/plugin-conf.d/plugins.conf.sample
>-@exec if [ ! -f %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ] ; then cp -p %D/%%ETCDIR%%/plugin-conf.d/plugins.conf.sample %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; fi
>+@sample %%ETCDIR%%/%%USER%%-node.conf.sample
>+@sample %%ETCDIR%%/plugin-conf.d/plugins.conf.sample
> %%SITE_PERL%%/Munin/Node/Config.pm
> %%SITE_PERL%%/Munin/Node/Configure/Debug.pm
> %%SITE_PERL%%/Munin/Node/Configure/History.pm
>@@ -25,6 +21,32 @@
> %%SITE_PERL%%/Munin/Plugin.pm
> %%SITE_PERL%%/Munin/Plugin/Pgsql.pm
> %%SITE_PERL%%/Munin/Plugin/SNMP.pm
>+man/man1/munin-node-configure.1.gz
>+man/man1/munin-node.1.gz
>+man/man1/munin-run.1.gz
>+man/man1/munin-sched.1.gz
>+man/man1/munindoc.1.gz
>+man/man3/Munin::Node::Config.3.gz
>+man/man3/Munin::Node::Configure::Debug.3.gz
>+man/man3/Munin::Node::Configure::History.3.gz
>+man/man3/Munin::Node::Configure::HostEnumeration.3.gz
>+man/man3/Munin::Node::Configure::Plugin.3.gz
>+man/man3/Munin::Node::Configure::PluginList.3.gz
>+man/man3/Munin::Node::Logger.3.gz
>+man/man3/Munin::Node::OS.3.gz
>+man/man3/Munin::Node::ProxySpooler.3.gz
>+man/man3/Munin::Node::SNMPConfig.3.gz
>+man/man3/Munin::Node::Server.3.gz
>+man/man3/Munin::Node::Service.3.gz
>+man/man3/Munin::Node::Session.3.gz
>+man/man3/Munin::Node::SpoolReader.3.gz
>+man/man3/Munin::Node::SpoolWriter.3.gz
>+man/man3/Munin::Node::Utils.3.gz
>+man/man3/Munin::Plugin.3.gz
>+man/man3/Munin::Plugin::Pgsql.3.gz
>+man/man3/Munin::Plugin::SNMP.3.gz
>+man/man5/munin-node.conf.5.gz
>+man/man8/munin.8.gz
> sbin/munin-node
> sbin/munin-node-configure
> sbin/munin-run
>@@ -229,11 +251,11 @@
> @dirrm %%SITE_PERL%%/Munin/Plugin
> @dirrm %%SITE_PERL%%/Munin/Node/Configure
> @dirrm %%SITE_PERL%%/Munin/Node
>-@dirrmtry %%SITE_PERL%%/Munin
> @exec mkdir -p %D/%%ETCDIR%%/plugins
> @dirrmtry %%ETCDIR%%/plugins
> @exec mkdir -p %D/%%ETCDIR%%/plugin-conf.d
> @dirrmtry %%ETCDIR%%/plugin-conf.d
> @dirrmtry %%ETCDIR%%
>+@comment @exec mkdir -p %D/var/munin/plugin-state && chgrp %%GROUP%% %D/var/munin/plugin-state && chmod g+w %D/var/munin/plugin-state
> @cwd /var
> @dirrmtry munin/plugin-state

Actions: View | Diff

Attachments on bug 192395: 145380 | 145382 | 145383