ports/185361: [PATCH] sysutils/munin-common: Update to 2.0.19

Takefu takefu at airport.fm
Tue Dec 31 08:20:00 UTC 2013 

>Number:         185361
>Category:       ports
>Synopsis:       [PATCH] sysutils/munin-common: Update to 2.0.19
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 31 08:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0: Wed Sep 25 14:55:36 JST 2013
>Description:
 munin-common
  relative address

 munin-master
  cron(8) mail
  IPv6 options

 munin-node
  python plugin fix
  perl modules add
  IPv6 options
  SNMP plugin IPv6 fix

Port maintainer (flo at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- munin-common-2.0.19.patch begins here ---
diff -ruN /usr/ports/sysutils/munin-common/distinfo ./distinfo
--- /usr/ports/sysutils/munin-common/distinfo	2013-09-21 22:19:59.000000000 +0900
+++ ./distinfo	2013-12-30 13:51:06.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.17.tar.gz) = cfcc5bf3f8e568574ce897af7c17cc160def280e1ac63cd0796ca300ffef439e
-SIZE (munin-2.0.17.tar.gz) = 1334184
+SHA256 (munin-2.0.19.tar.gz) = 13db9b00d432b92907d61f9f2bd18c2aafca03b2a6e257222fff17aa4ed02896
+SIZE (munin-2.0.19.tar.gz) = 1335496
diff -ruN /usr/ports/sysutils/munin-common/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/sysutils/munin-common/files/patch-Makefile	2012-09-14 07:00:33.000000000 +0900
+++ ./files/patch-Makefile	2013-12-30 17:10:59.000000000 +0900
@@ -1,5 +1,5 @@
---- Makefile.orig	2012-08-31 17:22:50.000000000 +0200
-+++ Makefile	2012-09-08 00:38:17.000000000 +0200
+--- Makefile.orig	2013-12-07 19:55:16.000000000 +0900
++++ Makefile	2013-12-30 17:06:57.000000000 +0900
 @@ -68,11 +68,11 @@

  install-pre: Makefile Makefile.config
@@ -25,3 +25,13 @@
  	$(CHMOD) 0755 $(PLUGSTATE)
  	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d

+@@ -284,8 +284,7 @@
+              -e 's|@@GOODSH@@|$(GOODSH)|g'                      \
+              -e 's|@@BASH@@|$(BASH)|g'                          \
+              -e 's|@@HASSETR@@|$(HASSETR)|g'                    \
+-             --in-place                                         \
+-             ./master/blib/libdoc/Munin::Master::HTMLOld.3pm    \
++             -i ""                                                 \
+              ./master/blib/lib/Munin/Master/HTMLOld.pm          \
+              ./node/blib/sbin/munin-node-configure              \
+              ./node/blib/sbin/munin-node                        \
diff -ruN /usr/ports/sysutils/munin-common/munin.mk ./munin.mk
--- /usr/ports/sysutils/munin-common/munin.mk	2013-09-21 22:19:59.000000000 +0900
+++ ./munin.mk	2013-12-30 14:44:49.000000000 +0900
@@ -1,8 +1,8 @@
-MUNIN_VERSION=	2.0.17
+MUNIN_VERSION=	2.0.19
 MUNIN_SITES=	SF/${PORTNAME}/stable/${MUNIN_VERSION}
-MUNIN_DISTINFO=	${PORTSDIR}/sysutils/munin-common/distinfo
-MUNIN_PATCHES=	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
-		${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
+MUNIN_DISTINFO=	${.CURDIR}/../munin-common/distinfo
+MUNIN_PATCHES=	${.CURDIR}/../munin-common/files/patch-Makefile \
+		${.CURDIR}/../munin-common/files/patch-Makefile.config

 PORTSCOUT=	limit:^2\.0\.

--- munin-common-2.0.19.patch ends here ---


--- munin-master-2.0.19.patch begins here ---
diff -ruN /usr/ports/sysutils/munin-master/Makefile ./Makefile
--- /usr/ports/sysutils/munin-master/Makefile	2013-09-21 08:05:58.000000000 +0900
+++ ./Makefile	2013-12-31 15:28:38.000000000 +0900
@@ -19,7 +19,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 \
@@ -32,7 +31,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 \
@@ -52,6 +50,7 @@
 DISTINFO_FILE=	${MUNIN_DISTINFO}
 ALL_TARGET=	infiles build-master build-man
 INSTALL_TARGET=	install-master-prime
+MUNIN_CRONMAIL?=	root

 MAN3=		Munin::Master::Config.3 \
 		Munin::Master::Group.3 \
@@ -78,9 +77,19 @@

 .include <bsd.port.pre.mk>

+.if ${PORT_OPTIONS:MIPV6}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-master_extras_munin-update_old
+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
+.else
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-master_lib_Munin_Master_Node.pm
+BUILD_DEPENDS+=	p5-IO-Socket-INET>=0:${PORTSDIR}/net/p5-IO-Socket-INET
+RUN_DEPENDS+=	p5-IO-Socket-INET>=0:${PORTSDIR}/net/p5-IO-Socket-INET
+.endif
+
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
+		${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL ${MUNIN_CRONMAIL}

 post-install:
 	@${CHOWN} ${USERS}:${GROUPS} ${DBDIR} ${STATEDIR} ${WWWDIR}
@@ -97,7 +106,7 @@
 		${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \
 	done)
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
+		${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL ${MUNIN_CRONMAIL}
 	@${CAT} ${PKGMESSAGE}

 .include <bsd.port.post.mk>
diff -ruN /usr/ports/sysutils/munin-master/files/extra-patch-master_extras_munin-update_old ./files/extra-patch-master_extras_munin-update_old
--- /usr/ports/sysutils/munin-master/files/extra-patch-master_extras_munin-update_old	1970-01-01 09:00:00.000000000 +0900
+++ ./files/extra-patch-master_extras_munin-update_old	2013-07-02 12:37:02.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;
+@@ -506,12 +506,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-master/files/extra-patch-master_lib_Munin_Master_Node.pm ./files/extra-patch-master_lib_Munin_Master_Node.pm
--- /usr/ports/sysutils/munin-master/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	2013-12-31 15:32:04.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-master/pkg-install ./pkg-install
--- /usr/ports/sysutils/munin-master/pkg-install	2012-07-14 23:29:18.000000000 +0900
+++ ./pkg-install	2013-07-02 12:41:53.000000000 +0900
@@ -1,4 +1,5 @@
 #! /bin/sh
+MUNIN_CRONMAIL=${3:-root}

 ask() {
     local question default answer
@@ -77,7 +78,7 @@
 		newsyslog
 		create_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' <<EOT
 #BEGIN_MUNIN_MAIN
-MAILTO=root
+MAILTO=${MUNIN_CRONMAIL}

 */5 * * * *     ${PKG_PREFIX}/bin/munin-cron
 #END_MUNIN_MAIN
--- munin-master-2.0.19.patch ends here ---


--- munin-node-2.0.19.patch begins here ---
diff -ruN /usr/ports/sysutils/munin-node/Makefile ./Makefile
--- /usr/ports/sysutils/munin-node/Makefile	2013-09-21 22:19:59.000000000 +0900
+++ ./Makefile	2013-09-24 09:43:06.000000000 +0900
@@ -20,7 +20,10 @@
 		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}
@@ -76,6 +79,18 @@

 SUB_FILES=	pkg-message
 USE_RC_SUBR=	munin-node munin-sched
+SUB_LIST=	PERL=${PERL}
+
+.include <bsd.port.options.mk>
+
+.if defined(USE_PYTHON) || defined(USE_PYTHON_RUN)
+MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
+.endif
+
+.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

 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
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-plist ./pkg-plist
--- /usr/ports/sysutils/munin-node/pkg-plist	2013-02-16 22:30:41.000000000 +0900
+++ ./pkg-plist	2013-02-21 07:59:34.000000000 +0900
@@ -224,6 +224,8 @@
 %%DATADIR%%/plugins/varnish_
 %%DATADIR%%/plugins/vmstat
 %%DATADIR%%/plugins/zimbra_
+ at dirrmtry %%DBDIR%%/plugin-state
+ at dirrmtry %%DBDIR%%
 @dirrm %%DATADIR%%/plugins
 @dirrmtry %%DATADIR%%
 @dirrm %%SITE_PERL%%/Munin/Plugin
--- munin-node-2.0.19.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list