FreeBSD Bugzilla – Attachment 150501 Details for
Bug 195911
[PATCH] sysutils/munin-common: add Python knob
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
munin.patch
munin.patch (text/plain), 25.98 KB, created by
takefu
on 2014-12-12 06:31:48 UTC
(
hide
)
Description:
munin.patch
Filename:
MIME Type:
Creator:
takefu
Created:
2014-12-12 06:31:48 UTC
Size:
25.98 KB
patch
obsolete
>diff -ruN /usr/ports/sysutils/munin-common/Makefile ./Makefile >--- /usr/ports/sysutils/munin-common/Makefile 2014-11-26 22:08:24.000000000 +0900 >+++ ./Makefile 2014-12-12 14:10:34.000000000 +0900 >@@ -25,6 +25,11 @@ > NO_ARCH= yes > > post-install: >- ${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR} >+ ${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR}\ >+ ${STAGEDIR}${SPOOLDIR} >+ ${MKDIR} -m0775 ${STAGEDIR}${DBDIR} >+ ${CHOWN} ${USERS}:${GROUPS} ${STAGEDIR}${LOGDIR}\ >+ ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR}\ >+ ${STAGEDIR}${DBDIR} > > .include <bsd.port.mk> >diff -ruN /usr/ports/sysutils/munin-common/files/extra-patch-master_extras_munin-update_old.in ./files/extra-patch-master_extras_munin-update_old.in >--- /usr/ports/sysutils/munin-common/files/extra-patch-master_extras_munin-update_old.in 1970-01-01 09:00:00.000000000 +0900 >+++ ./files/extra-patch-master_extras_munin-update_old.in 2014-02-25 09:30:40.000000000 +0900 >@@ -0,0 +1,26 @@ >+--- master/extras/munin-update_old.in.orig 2009-08-07 19:38:02.000000000 +0900 >++++ master/extras/munin-update_old.in 2011-05-17 18:27:49.000000000 +0900 >+@@ -28,7 +28,7 @@ >+ use Carp; >+ use English qw(-no_match_vars); >+ use Getopt::Long; >+-use IO::Socket; >++use IO::Socket::INET6; >+ use Munin::Common::Defaults; >+ use Munin::Common::Timeout; >+ use Munin::Common::TLSClient; >+@@ -504,12 +504,12 @@ >+ >+ if (munin_get ($newconf, "local_address")) >+ { >+- $socket = new IO::Socket::INET ('PeerAddr' => "$newconf->{address}:". >++ $socket = new IO::Socket::INET6 ('PeerAddr' => "$newconf->{address}:". >+ munin_get ($newconf, "port", "4949"), >+ 'LocalAddr' => munin_get ($newconf, "local_address", undef), >+ 'Proto' => "tcp", "Timeout" => munin_get($newconf, "timeout", 60)); >+ } else { >+- $socket = new IO::Socket::INET ('PeerAddr' => "$newconf->{address}:". >++ $socket = new IO::Socket::INET6 ('PeerAddr' => "$newconf->{address}:". >+ munin_get ($newconf, "port", "4949"), >+ 'Proto' => "tcp", "Timeout" => munin_get($newconf, "timeout", 60)); >+ } >diff -ruN /usr/ports/sysutils/munin-common/files/extra-patch-master_lib_Munin_Master_Node.pm ./files/extra-patch-master_lib_Munin_Master_Node.pm >--- /usr/ports/sysutils/munin-common/files/extra-patch-master_lib_Munin_Master_Node.pm 1970-01-01 09:00:00.000000000 +0900 >+++ ./files/extra-patch-master_lib_Munin_Master_Node.pm 2014-03-21 10:10:49.000000000 +0900 >@@ -0,0 +1,20 @@ >+--- master/lib/Munin/Master/Node.pm.orig 2013-12-07 19:55:16.000000000 +0900 >++++ master/lib/Munin/Master/Node.pm 2013-12-31 15:31:51.000000000 +0900 >+@@ -15,7 +15,7 @@ >+ use Data::Dumper; >+ use Log::Log4perl qw( :easy ); >+ use Time::HiRes qw( gettimeofday tv_interval ); >+-use IO::Socket::INET6; >++use IO::Socket::INET; >+ >+ my $config = Munin::Master::Config->instance()->{config}; >+ >+@@ -81,7 +81,7 @@ >+ LOGCROAK("[FATAL] '$url' is not a valid address!") unless $uri->scheme; >+ >+ if ($uri->scheme eq "munin") { >+- $self->{reader} = $self->{writer} = IO::Socket::INET6->new( >++ $self->{reader} = $self->{writer} = IO::Socket::INET->new( >+ PeerAddr => $uri->host, >+ PeerPort => $self->{port} || 4949, >+ LocalAddr => $config->{local_address}, >diff -ruN /usr/ports/sysutils/munin-common/files/patch-Makefile ./files/patch-Makefile >--- /usr/ports/sysutils/munin-common/files/patch-Makefile 2014-11-26 00:07:23.000000000 +0900 >+++ ./files/patch-Makefile 2014-12-11 09:36:42.000000000 +0900 >@@ -144,11 +144,29 @@ > > > install-common-prime: build-common install-common >+@@ -254,7 +238,7 @@ >+ build-common-prime: build-common-pre common/blib/lib/Munin/Common/Defaults.pm build-common >+ >+ substitute-confvar-inline: >+- @perl -p -i -e 's|\@\@PREFIX\@\@|$(PREFIX)|g;' \ >++ $(PERL) -e -p -i -e 's|\@\@PREFIX\@\@|$(PREFIX)|g;' \ >+ -e 's|\@\@CONFDIR\@\@|$(CONFDIR)|g;' \ >+ -e 's|\@\@BINDIR\@\@|$(BINDIR)|g;' \ >+ -e 's|\@\@SBINDIR\@\@|$(SBINDIR)|g;' \ >+@@ -284,7 +268,7 @@ >+ -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \ >+ -e 's|\@\@BASH\@\@|$(BASH)|g;' \ >+ -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \ >+- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \ >++ ./master/blib/libdoc/Munin::Master::HTMLOld.3 \ >+ ./master/blib/lib/Munin/Master/HTMLOld.pm \ >+ ./node/blib/sbin/munin-node-configure \ >+ ./node/blib/sbin/munin-node \ > @@ -466,6 +450,7 @@ install-%: %/Build > --install_path sbin=$(SBINDIR) \ > --install_path bindoc=$(MANDIR)/man1 \ > --install_path libdoc=$(MANDIR)/man3 \ >-+ --destdir=$(DESTDIR) >++ --destdir=$(DESTDIR) > > test-%: %/Build > cd $* && $(PERL) Build test --verbose=0 || true >diff -ruN /usr/ports/sysutils/munin-common/files/patch-lib-Munin-Plugin-SNMP.pm ./files/patch-lib-Munin-Plugin-SNMP.pm >--- /usr/ports/sysutils/munin-common/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-common/files/patch-node_lib_Munin_Node_SNMPConfig.pm ./files/patch-node_lib_Munin_Node_SNMPConfig.pm >--- /usr/ports/sysutils/munin-common/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-common/files/patch-node_sbin_munin-node-configure ./files/patch-node_sbin_munin-node-configure >--- /usr/ports/sysutils/munin-common/files/patch-node_sbin_munin-node-configure 2014-12-11 00:52:14.000000000 +0900 >+++ ./files/patch-node_sbin_munin-node-configure 2014-12-12 14:39:41.000000000 +0900 >@@ -11,3 +11,39 @@ > use Munin::Common::Defaults; > use Munin::Node::Configure::PluginList; > use Munin::Node::Configure::Debug; >+@@ -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-common/munin.mk ./munin.mk >--- /usr/ports/sysutils/munin-common/munin.mk 2014-12-11 00:52:14.000000000 +0900 >+++ ./munin.mk 2014-12-11 09:38:39.000000000 +0900 >@@ -1,6 +1,6 @@ > MUNIN_VERSION= 2.0.25 > MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION} >-DISTINFO_FILE= ${PORTSDIR}/sysutils/munin-common/distinfo >+DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo > PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files > > PORTSCOUT= limit:^2\.0\. >diff -ruN /usr/ports/sysutils/munin-common/patch-node_sbin_munin-node-configure ./patch-node_sbin_munin-node-configure >--- /usr/ports/sysutils/munin-common/patch-node_sbin_munin-node-configure 1970-01-01 09:00:00.000000000 +0900 >+++ ./patch-node_sbin_munin-node-configure 2014-12-12 14:37:34.000000000 +0900 >@@ -0,0 +1,38 @@ >+--- node/sbin/munin-node-configure.orig 2014-12-12 14:36:36.000000000 +0900 >++++ node/sbin/munin-node-configure 2014-12-12 14:36:55.000000000 +0900 >+@@ -90,7 +90,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( >+@@ -118,6 +118,7 @@ >+ 'snmp=s' => \@snmp_hosts, >+ 'snmpversion=s' => \$snmpver, >+ 'snmpport=i' => \$snmpport, >++ 'snmpdomain=s' => \$snmpdomain, >+ # SNMPv1/2c >+ 'snmpcommunity=s' => \$snmpcomm, >+ # SNMPv3 >+@@ -146,6 +147,7 @@ >+ hosts => \@snmp_hosts, >+ version => $snmpver, >+ port => $snmpport, >++ domain => $snmpdomain, >+ >+ community => $snmpcomm, >+ >+@@ -588,6 +590,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-common/pkg-plist ./pkg-plist >--- /usr/ports/sysutils/munin-common/pkg-plist 2014-10-03 01:37:02.000000000 +0900 >+++ ./pkg-plist 2014-10-29 11:13:29.000000000 +0900 >@@ -15,3 +15,4 @@ > @dir(%%USER%%,%%GROUP%%,) %%LOGDIR%% > @dir(%%USER%%,%%GROUP%%,) %%STATEDIR%% > @dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%% >+@dir(%%USER%%,%%GROUP%%,0775) %%DBDIR%% >diff -ruN /usr/ports/sysutils/munin-master/Makefile ./Makefile >--- /usr/ports/sysutils/munin-master/Makefile 2014-11-26 22:08:24.000000000 +0900 >+++ ./Makefile 2014-12-12 14:05:23.000000000 +0900 >@@ -20,7 +20,6 @@ > p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \ > p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \ > p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ >- p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \ > p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ > p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \ > p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ >@@ -33,7 +32,6 @@ > p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \ > p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \ > p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ >- p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \ > p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ > p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \ > p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ >@@ -51,16 +49,47 @@ > ALL_TARGET= infiles build-master build-man > INSTALL_TARGET= install-master-prime > NO_ARCH= yes >+MUNIN_CRONMAIL?= root > > SUB_FILES= pkg-message > PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} >+SCRIPTS_ENV+= MUNIN_CRONMAIL=${MUNIN_CRONMAIL} >+ >+OPTIONS_DEFINE= IPV6 >+ >+IPV6_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-master_extras_munin-update_old.in >+IPV6_BUILD_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 >+IPV6_RUN_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 >+ >+.include <bsd.port.pre.mk> >+ >+.if !${PORT_OPTIONS:MIPV6} >+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-master_lib_Munin_Master_Node.pm >+.endif >+ >+post-patch: >+ @${REINPLACE_CMD}\ >+ -e 's|@@CONFDIR@@|${ETCDIR}|'\ >+ -e 's|@@DBDIR@@|${DBDIR}|'\ >+ -e 's|@@LOGDIR@@|${LOGDIR}|'\ >+ -e 's|@@HTMLDIR@@|${WWWDIR}|'\ >+ -e 's|@@STATEDIR@@|${STATEDIR}|'\ >+ -e 's|@@VERSION@@|${MUNIN_VERSION}|'\ >+ ${WRKSRC}/master/lib/Munin/Master/HTMLOld.pm > > post-install: > (cd ${WRKSRC}/build/doc; \ >- ${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; \ >+ ${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 >+ ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state >+ ${MKDIR} ${STAGEDIR}${ETCDIR}/munin-conf.d >+ ${INSTALL_DATA} ${WRKSRC}/build/master/munin.conf \ >+ ${STAGEDIR}${PREFIX}/etc/munin/munin.conf.sample >+ ${INSTALL_DATA} ${WRKSRC}/build/master/www/munin-htaccess\ >+ ${STAGEDIR}${WWWDIR}/.htaccess.sample > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >diff -ruN /usr/ports/sysutils/munin-master/pkg-install ./pkg-install >--- /usr/ports/sysutils/munin-master/pkg-install 2014-10-27 23:43:47.000000000 +0900 >+++ ./pkg-install 2014-11-27 17:06:18.000000000 +0900 >@@ -82,7 +82,7 @@ > newsyslog > create_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' <<EOT > #BEGIN_MUNIN_MAIN >-MAILTO=root >+MAILTO=${MUNIN_CRONMAIL:-root} > > */5 * * * * ${PKG_PREFIX}/bin/munin-cron > #END_MUNIN_MAIN >diff -ruN /usr/ports/sysutils/munin-master/pkg-plist ./pkg-plist >--- /usr/ports/sysutils/munin-master/pkg-plist 2014-11-26 00:07:23.000000000 +0900 >+++ ./pkg-plist 2014-12-12 14:03:15.000000000 +0900 >@@ -1,38 +1,6 @@ > bin/munin-check > bin/munin-cron > @sample %%ETCDIR%%/munin.conf.sample >-@sample %%ETCDIR%%/static/definitions.html.sample >-@sample %%ETCDIR%%/static/dynazoom.html.sample >-@sample %%ETCDIR%%/static/favicon.ico.sample >-@sample %%ETCDIR%%/static/formatdate.js.sample >-@sample %%ETCDIR%%/static/logo-h.png.sample >-@sample %%ETCDIR%%/static/logo.png.sample >-@sample %%ETCDIR%%/static/querystring.js.sample >-@sample %%ETCDIR%%/static/style-1.2.css.sample >-@sample %%ETCDIR%%/static/style-new.css.sample >-@sample %%ETCDIR%%/static/style.css.sample >-@sample %%ETCDIR%%/static/zoom.js.sample >-@sample %%ETCDIR%%/templates/munin-categoryview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-day.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-month.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-week.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-year.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-domainview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-dynazoom.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-nodeview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-overview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-problemview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-serviceview.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/bottom_navigation.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/footer.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/generated_by.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/head.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_navigation.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_path.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/navigation.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/path.tmpl.sample > %%SITE_PERL%%/Munin/Master/Config.pm > %%SITE_PERL%%/Munin/Master/GraphOld.pm > %%SITE_PERL%%/Munin/Master/Group.pm >@@ -48,6 +16,38 @@ > %%SITE_PERL%%/Munin/Master/UpdateWorker.pm > %%SITE_PERL%%/Munin/Master/Utils.pm > %%SITE_PERL%%/Munin/Master/Worker.pm >+%%ETCDIR%%/static/definitions.html >+%%ETCDIR%%/static/dynazoom.html >+%%ETCDIR%%/static/favicon.ico >+%%ETCDIR%%/static/formatdate.js >+%%ETCDIR%%/static/logo-h.png >+%%ETCDIR%%/static/logo.png >+%%ETCDIR%%/static/querystring.js >+%%ETCDIR%%/static/style-1.2.css >+%%ETCDIR%%/static/style-new.css >+%%ETCDIR%%/static/style.css >+%%ETCDIR%%/static/zoom.js >+%%ETCDIR%%/templates/munin-comparison-day.tmpl >+%%ETCDIR%%/templates/munin-comparison-month.tmpl >+%%ETCDIR%%/templates/munin-comparison-week.tmpl >+%%ETCDIR%%/templates/munin-comparison-year.tmpl >+%%ETCDIR%%/templates/munin-categoryview.tmpl >+%%ETCDIR%%/templates/munin-dynazoom.tmpl >+%%ETCDIR%%/templates/munin-domainview.tmpl >+%%ETCDIR%%/templates/munin-nodeview.tmpl >+%%ETCDIR%%/templates/munin-overview.tmpl >+%%ETCDIR%%/templates/munin-problemview.tmpl >+%%ETCDIR%%/templates/munin-serviceview.tmpl >+%%ETCDIR%%/templates/partial/bottom_navigation.tmpl >+%%ETCDIR%%/templates/partial/footer.tmpl >+%%ETCDIR%%/templates/partial/generated_by.tmpl >+%%ETCDIR%%/templates/partial/head.tmpl >+%%ETCDIR%%/templates/partial/logo_navigation.tmpl >+%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl >+%%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl >+%%ETCDIR%%/templates/partial/logo_path.tmpl >+%%ETCDIR%%/templates/partial/navigation.tmpl >+%%ETCDIR%%/templates/partial/path.tmpl > man/man3/Munin::Master::Config.3.gz > man/man3/Munin::Master::Group.3.gz > man/man3/Munin::Master::GroupRepository.3.gz >@@ -81,3 +81,4 @@ > @dir %%ETCDIR%%/munin-conf.d > @dir(%%USER%%,%%GROUP%%,) %%WWWDIR%% > @dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIR%%/cgi-tmp >+@dir(%%USER%%,%%GROUP%%,0775) %%DBDIR%%/plugin-state >diff -ruN /usr/ports/sysutils/munin-master/Makefile ./Makefile >--- /usr/ports/sysutils/munin-master/Makefile 2014-11-26 22:08:24.000000000 +0900 >+++ ./Makefile 2014-12-12 14:05:23.000000000 +0900 >@@ -20,7 +20,6 @@ > p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \ > p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \ > p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ >- p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \ > p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ > p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \ > p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ >@@ -33,7 +32,6 @@ > p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \ > p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \ > p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ >- p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \ > p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ > p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \ > p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ >@@ -51,16 +49,47 @@ > ALL_TARGET= infiles build-master build-man > INSTALL_TARGET= install-master-prime > NO_ARCH= yes >+MUNIN_CRONMAIL?= root > > SUB_FILES= pkg-message > PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} >+SCRIPTS_ENV+= MUNIN_CRONMAIL=${MUNIN_CRONMAIL} >+ >+OPTIONS_DEFINE= IPV6 >+ >+IPV6_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-master_extras_munin-update_old.in >+IPV6_BUILD_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 >+IPV6_RUN_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 >+ >+.include <bsd.port.pre.mk> >+ >+.if !${PORT_OPTIONS:MIPV6} >+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-master_lib_Munin_Master_Node.pm >+.endif >+ >+post-patch: >+ @${REINPLACE_CMD}\ >+ -e 's|@@CONFDIR@@|${ETCDIR}|'\ >+ -e 's|@@DBDIR@@|${DBDIR}|'\ >+ -e 's|@@LOGDIR@@|${LOGDIR}|'\ >+ -e 's|@@HTMLDIR@@|${WWWDIR}|'\ >+ -e 's|@@STATEDIR@@|${STATEDIR}|'\ >+ -e 's|@@VERSION@@|${MUNIN_VERSION}|'\ >+ ${WRKSRC}/master/lib/Munin/Master/HTMLOld.pm > > post-install: > (cd ${WRKSRC}/build/doc; \ >- ${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; \ >+ ${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 >+ ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state >+ ${MKDIR} ${STAGEDIR}${ETCDIR}/munin-conf.d >+ ${INSTALL_DATA} ${WRKSRC}/build/master/munin.conf \ >+ ${STAGEDIR}${PREFIX}/etc/munin/munin.conf.sample >+ ${INSTALL_DATA} ${WRKSRC}/build/master/www/munin-htaccess\ >+ ${STAGEDIR}${WWWDIR}/.htaccess.sample > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >diff -ruN /usr/ports/sysutils/munin-master/pkg-install ./pkg-install >--- /usr/ports/sysutils/munin-master/pkg-install 2014-10-27 23:43:47.000000000 +0900 >+++ ./pkg-install 2014-11-27 17:06:18.000000000 +0900 >@@ -82,7 +82,7 @@ > newsyslog > create_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' <<EOT > #BEGIN_MUNIN_MAIN >-MAILTO=root >+MAILTO=${MUNIN_CRONMAIL:-root} > > */5 * * * * ${PKG_PREFIX}/bin/munin-cron > #END_MUNIN_MAIN >diff -ruN /usr/ports/sysutils/munin-master/pkg-plist ./pkg-plist >--- /usr/ports/sysutils/munin-master/pkg-plist 2014-11-26 00:07:23.000000000 +0900 >+++ ./pkg-plist 2014-12-12 14:03:15.000000000 +0900 >@@ -1,38 +1,6 @@ > bin/munin-check > bin/munin-cron > @sample %%ETCDIR%%/munin.conf.sample >-@sample %%ETCDIR%%/static/definitions.html.sample >-@sample %%ETCDIR%%/static/dynazoom.html.sample >-@sample %%ETCDIR%%/static/favicon.ico.sample >-@sample %%ETCDIR%%/static/formatdate.js.sample >-@sample %%ETCDIR%%/static/logo-h.png.sample >-@sample %%ETCDIR%%/static/logo.png.sample >-@sample %%ETCDIR%%/static/querystring.js.sample >-@sample %%ETCDIR%%/static/style-1.2.css.sample >-@sample %%ETCDIR%%/static/style-new.css.sample >-@sample %%ETCDIR%%/static/style.css.sample >-@sample %%ETCDIR%%/static/zoom.js.sample >-@sample %%ETCDIR%%/templates/munin-categoryview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-day.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-month.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-week.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-comparison-year.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-domainview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-dynazoom.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-nodeview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-overview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-problemview.tmpl.sample >-@sample %%ETCDIR%%/templates/munin-serviceview.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/bottom_navigation.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/footer.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/generated_by.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/head.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_navigation.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/logo_path.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/navigation.tmpl.sample >-@sample %%ETCDIR%%/templates/partial/path.tmpl.sample > %%SITE_PERL%%/Munin/Master/Config.pm > %%SITE_PERL%%/Munin/Master/GraphOld.pm > %%SITE_PERL%%/Munin/Master/Group.pm >@@ -48,6 +16,38 @@ > %%SITE_PERL%%/Munin/Master/UpdateWorker.pm > %%SITE_PERL%%/Munin/Master/Utils.pm > %%SITE_PERL%%/Munin/Master/Worker.pm >+%%ETCDIR%%/static/definitions.html >+%%ETCDIR%%/static/dynazoom.html >+%%ETCDIR%%/static/favicon.ico >+%%ETCDIR%%/static/formatdate.js >+%%ETCDIR%%/static/logo-h.png >+%%ETCDIR%%/static/logo.png >+%%ETCDIR%%/static/querystring.js >+%%ETCDIR%%/static/style-1.2.css >+%%ETCDIR%%/static/style-new.css >+%%ETCDIR%%/static/style.css >+%%ETCDIR%%/static/zoom.js >+%%ETCDIR%%/templates/munin-comparison-day.tmpl >+%%ETCDIR%%/templates/munin-comparison-month.tmpl >+%%ETCDIR%%/templates/munin-comparison-week.tmpl >+%%ETCDIR%%/templates/munin-comparison-year.tmpl >+%%ETCDIR%%/templates/munin-categoryview.tmpl >+%%ETCDIR%%/templates/munin-dynazoom.tmpl >+%%ETCDIR%%/templates/munin-domainview.tmpl >+%%ETCDIR%%/templates/munin-nodeview.tmpl >+%%ETCDIR%%/templates/munin-overview.tmpl >+%%ETCDIR%%/templates/munin-problemview.tmpl >+%%ETCDIR%%/templates/munin-serviceview.tmpl >+%%ETCDIR%%/templates/partial/bottom_navigation.tmpl >+%%ETCDIR%%/templates/partial/footer.tmpl >+%%ETCDIR%%/templates/partial/generated_by.tmpl >+%%ETCDIR%%/templates/partial/head.tmpl >+%%ETCDIR%%/templates/partial/logo_navigation.tmpl >+%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl >+%%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl >+%%ETCDIR%%/templates/partial/logo_path.tmpl >+%%ETCDIR%%/templates/partial/navigation.tmpl >+%%ETCDIR%%/templates/partial/path.tmpl > man/man3/Munin::Master::Config.3.gz > man/man3/Munin::Master::Group.3.gz > man/man3/Munin::Master::GroupRepository.3.gz >@@ -81,3 +81,4 @@ > @dir %%ETCDIR%%/munin-conf.d > @dir(%%USER%%,%%GROUP%%,) %%WWWDIR%% > @dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIR%%/cgi-tmp >+@dir(%%USER%%,%%GROUP%%,0775) %%DBDIR%%/plugin-state
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=150501">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195911
:
150501
|
150669
|
150670
|
150671