Attachment #150669 for bug #195911

Lines 25-30 Link Here

(-)./Makefile (-1 / +6 lines)
25	NO_ARCH= yes	25	NO_ARCH= yes
26		26
27	post-install:	27	post-install:
28	${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR}	28	${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR}\
		29	${STAGEDIR}${SPOOLDIR}
		30	${MKDIR} -m0775 ${STAGEDIR}${DBDIR}
		31	${CHOWN} ${USERS}:${GROUPS} ${STAGEDIR}${LOGDIR}\
		32	${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR}\
		33	${STAGEDIR}${DBDIR}
29		34
30	.include <bsd.port.mk>	35	.include <bsd.port.mk>




--- 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));
   }




--- 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},




 
 
 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)
 
 test-%: %/Build
 	cd $* && $(PERL) Build test --verbose=0 || true




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




--- 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}},
 




 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

Lines 1-6 Link Here

(-)./munin.mk (-1 / +1 lines)
1	MUNIN_VERSION= 2.0.25	1	MUNIN_VERSION= 2.0.25
2	MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION}	2	MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION}
3	DISTINFO_FILE= ${PORTSDIR}/sysutils/munin-common/distinfo	3	DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo
4	PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files	4	PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files
5		5
6	PORTSCOUT= limit:^2\.0\.	6	PORTSCOUT= limit:^2\.0\.




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

Lines 15-17 Link Here

(-)./pkg-plist (+1 lines)
15	@dir(%%USER%%,%%GROUP%%,) %%LOGDIR%%	15	@dir(%%USER%%,%%GROUP%%,) %%LOGDIR%%
16	@dir(%%USER%%,%%GROUP%%,) %%STATEDIR%%	16	@dir(%%USER%%,%%GROUP%%,) %%STATEDIR%%
17	@dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%	17	@dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%
		18	@dir(%%USER%%,%%GROUP%%,0775) %%DBDIR%%

Return to bug 195911

Line 0 Link Here

(-)./files/extra-patch-master_extras_munin-update_old.in (+26 lines)
	1	--- master/extras/munin-update_old.in.orig 2009-08-07 19:38:02.000000000 +0900
	2	+++ master/extras/munin-update_old.in 2011-05-17 18:27:49.000000000 +0900
	3	@@ -28,7 +28,7 @@
	4	use Carp;
	5	use English qw(-no_match_vars);
	6	use Getopt::Long;
	7	-use IO::Socket;
	8	+use IO::Socket::INET6;
	9	use Munin::Common::Defaults;
	10	use Munin::Common::Timeout;
	11	use Munin::Common::TLSClient;
	12	@@ -504,12 +504,12 @@
	13
	14	if (munin_get ($newconf, "local_address"))
	15	{
	16	- $socket = new IO::Socket::INET ('PeerAddr' => "$newconf->{address}:".
	17	+ $socket = new IO::Socket::INET6 ('PeerAddr' => "$newconf->{address}:".
	18	munin_get ($newconf, "port", "4949"),
	19	'LocalAddr' => munin_get ($newconf, "local_address", undef),
	20	'Proto' => "tcp", "Timeout" => munin_get($newconf, "timeout", 60));
	21	} else {
	22	- $socket = new IO::Socket::INET ('PeerAddr' => "$newconf->{address}:".
	23	+ $socket = new IO::Socket::INET6 ('PeerAddr' => "$newconf->{address}:".
	24	munin_get ($newconf, "port", "4949"),
	25	'Proto' => "tcp", "Timeout" => munin_get($newconf, "timeout", 60));
	26	}

Line 0 Link Here

(-)./files/extra-patch-master_lib_Munin_Master_Node.pm (+20 lines)
	1	--- master/lib/Munin/Master/Node.pm.orig 2013-12-07 19:55:16.000000000 +0900
	2	+++ master/lib/Munin/Master/Node.pm 2013-12-31 15:31:51.000000000 +0900
	3	@@ -15,7 +15,7 @@
	4	use Data::Dumper;
	5	use Log::Log4perl qw( :easy );
	6	use Time::HiRes qw( gettimeofday tv_interval );
	7	-use IO::Socket::INET6;
	8	+use IO::Socket::INET;
	9
	10	my $config = Munin::Master::Config->instance()->{config};
	11
	12	@@ -81,7 +81,7 @@
	13	LOGCROAK("[FATAL] '$url' is not a valid address!") unless $uri->scheme;
	14
	15	if ($uri->scheme eq "munin") {
	16	- $self->{reader} = $self->{writer} = IO::Socket::INET6->new(
	17	+ $self->{reader} = $self->{writer} = IO::Socket::INET->new(
	18	PeerAddr => $uri->host,
	19	PeerPort => $self->{port} \|\| 4949,
	20	LocalAddr => $config->{local_address},

Lines 144-154 Link Here

(-)./files/patch-Makefile (-1 / +19 lines)
144		144
145		145
146	install-common-prime: build-common install-common	146	install-common-prime: build-common install-common
		147	@@ -254,7 +238,7 @@
		148	build-common-prime: build-common-pre common/blib/lib/Munin/Common/Defaults.pm build-common
		149
		150	substitute-confvar-inline:
		151	- @perl -p -i -e 's\|\@\@PREFIX\@\@\|$(PREFIX)\|g;' \
		152	+ $(PERL) -e -p -i -e 's\|\@\@PREFIX\@\@\|$(PREFIX)\|g;' \
		153	-e 's\|\@\@CONFDIR\@\@\|$(CONFDIR)\|g;' \
		154	-e 's\|\@\@BINDIR\@\@\|$(BINDIR)\|g;' \
		155	-e 's\|\@\@SBINDIR\@\@\|$(SBINDIR)\|g;' \
		156	@@ -284,7 +268,7 @@
		157	-e 's\|\@\@GOODSH\@\@\|$(GOODSH)\|g;' \
		158	-e 's\|\@\@BASH\@\@\|$(BASH)\|g;' \
		159	-e 's\|\@\@HASSETR\@\@\|$(HASSETR)\|g;' \
		160	- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \
		161	+ ./master/blib/libdoc/Munin::Master::HTMLOld.3 \
		162	./master/blib/lib/Munin/Master/HTMLOld.pm \
		163	./node/blib/sbin/munin-node-configure \
		164	./node/blib/sbin/munin-node \
147	@@ -466,6 +450,7 @@ install-%: %/Build	165	@@ -466,6 +450,7 @@ install-%: %/Build
148	--install_path sbin=$(SBINDIR) \	166	--install_path sbin=$(SBINDIR) \
149	--install_path bindoc=$(MANDIR)/man1 \	167	--install_path bindoc=$(MANDIR)/man1 \
150	--install_path libdoc=$(MANDIR)/man3 \	168	--install_path libdoc=$(MANDIR)/man3 \
151	+ --destdir=$(DESTDIR)	169	+ --destdir=$(DESTDIR)
152		170
153	test-%: %/Build	171	test-%: %/Build
154	cd $* && $(PERL) Build test --verbose=0 \|\| true	172	cd $* && $(PERL) Build test --verbose=0 \|\| true

Line 0 Link Here

(-)./files/patch-lib-Munin-Plugin-SNMP.pm (+38 lines)
	1	--- plugins/lib/Munin/Plugin/SNMP.pm.orig 2012-09-01 00:22:50.000000000 +0900
	2	+++ plugins/lib/Munin/Plugin/SNMP.pm 2012-09-17 13:01:05.000000000 +0900
	3	@@ -102,7 +102,7 @@
	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	@@ -120,8 +120,9 @@
	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	@@ -203,13 +204,14 @@
	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-node_lib_Munin_Node_SNMPConfig.pm (+26 lines)
	1	--- node/lib/Munin/Node/SNMPConfig.pm.orig 2013-06-04 01:15:45.000000000 +0900
	2	+++ node/lib/Munin/Node/SNMPConfig.pm 2013-09-19 15:28:03.000000000 +0900
	3	@@ -23,6 +23,7 @@
	4
	5	my $version = $opts{version} \|\| '2c';
	6	my $port = $opts{port} \|\| 161;
	7	+ my $domain = $opts{domain} \|\| 'UDP/IPv4';
	8
	9	if ($version eq '3') {
	10	# Privacy
	11	@@ -58,6 +59,7 @@
	12	hosts => $hosts,
	13	port => $port,
	14	version => $version,
	15	+ domain => $domain,
	16	sec_args => \%sec_args,
	17	);
	18
	19	@@ -88,6 +90,7 @@
	20	-hostname => $host,
	21	-port => $self->{port},
	22	-version => $self->{version},
	23	+ -domain => $self->{domain},
	24
	25	%{$self->{sec_args}},
	26

Lines 11-13 Link Here

(-)./files/patch-node_sbin_munin-node-configure (+36 lines)
11	use Munin::Common::Defaults;	11	use Munin::Common::Defaults;
12	use Munin::Node::Configure::PluginList;	12	use Munin::Node::Configure::PluginList;
13	use Munin::Node::Configure::Debug;	13	use Munin::Node::Configure::Debug;
		14	@@ -86,7 +86,7 @@
		15	my ($suggest, $shell, $removes, $newer);
		16	my $exit_not_error = 1;
		17	my @families;
		18	- my (@snmp_hosts, $snmpver, $snmpcomm, $snmpport);
		19	+ my (@snmp_hosts, $snmpver, $snmpcomm, $snmpport, $snmpdomain);
		20	my ($snmp3username, $snmp3authpass, $snmp3authproto, $snmp3privpass, $snmp3privproto);
		21
		22	print_usage_and_exit() unless GetOptions(
		23	@@ -114,6 +114,7 @@
		24	'snmp=s' => \@snmp_hosts,
		25	'snmpversion=s' => \$snmpver,
		26	'snmpport=i' => \$snmpport,
		27	+ 'snmpdomain=s' => \$snmpdomain,
		28	# SNMPv1/2c
		29	'snmpcommunity=s' => \$snmpcomm,
		30	# SNMPv3
		31	@@ -142,6 +143,7 @@
		32	hosts => \@snmp_hosts,
		33	version => $snmpver,
		34	port => $snmpport,
		35	+ domain => $snmpdomain,
		36
		37	community => $snmpcomm,
		38
		39	@@ -584,6 +586,10 @@
		40
		41	The SNMP port to use [161]
		42
		43	+=item B<< --snmpdomain <domain> >>
		44	+
		45	+The SNMP domain (udp/IPv6, tcp/IPv4 or tcp/IPv6) to use ['udp/IPv4']
		46	+
		47	=item B<SNMP 1/2c authentication>
		48
		49	SNMP versions 1 and 2c use a "community string" for authentication. This is

Line 0 Link Here

(-)./patch-node_sbin_munin-node-configure (+38 lines)
	1	--- node/sbin/munin-node-configure.orig 2014-12-12 14:36:36.000000000 +0900
	2	+++ node/sbin/munin-node-configure 2014-12-12 14:36:55.000000000 +0900
	3	@@ -90,7 +90,7 @@
	4	my ($suggest, $shell, $removes, $newer);
	5	my $exit_not_error = 1;
	6	my @families;
	7	- my (@snmp_hosts, $snmpver, $snmpcomm, $snmpport);
	8	+ my (@snmp_hosts, $snmpver, $snmpcomm, $snmpport, $snmpdomain);
	9	my ($snmp3username, $snmp3authpass, $snmp3authproto, $snmp3privpass, $snmp3privproto);
	10
	11	print_usage_and_exit() unless GetOptions(
	12	@@ -118,6 +118,7 @@
	13	'snmp=s' => \@snmp_hosts,
	14	'snmpversion=s' => \$snmpver,
	15	'snmpport=i' => \$snmpport,
	16	+ 'snmpdomain=s' => \$snmpdomain,
	17	# SNMPv1/2c
	18	'snmpcommunity=s' => \$snmpcomm,
	19	# SNMPv3
	20	@@ -146,6 +147,7 @@
	21	hosts => \@snmp_hosts,
	22	version => $snmpver,
	23	port => $snmpport,
	24	+ domain => $snmpdomain,
	25
	26	community => $snmpcomm,
	27
	28	@@ -588,6 +590,10 @@
	29
	30	The SNMP port to use [161]
	31
	32	+=item B<< --snmpdomain <domain> >>
	33	+
	34	+The SNMP domain (udp/IPv6, tcp/IPv4 or tcp/IPv6) to use ['udp/IPv4']
	35	+
	36	=item B<SNMP 1/2c authentication>
	37
	38	SNMP versions 1 and 2c use a "community string" for authentication. This is