Holger Levsen wrote (27 Nov 2012 10:55:50 GMT) :
> attachment missing :-D

oops. here it is!

commit b2393fcaeae01cfd815da5585084efb8da2f51cf
Author: intrigeri <intrig...@debian.org>
Date:   Tue Nov 27 11:23:44 2012 +0100

    Have master support multi-homed nodes that only listen on IPv4. (Closes: #678662)
    
    This is upstream commit a18229c5, thanks to Michael Renner <r...@amd.co.at> for
    the testing and the patch!

diff --git a/debian/patches/240-master-connect-to-AAAA-and-A-address.patch b/debian/patches/240-master-connect-to-AAAA-and-A-address.patch
new file mode 100644
index 0000000..3486483
--- /dev/null
+++ b/debian/patches/240-master-connect-to-AAAA-and-A-address.patch
@@ -0,0 +1,30 @@
+commit a18229c522e1df5468a7dcb3a2f4c96aca56a761
+Author: Steve Schnepp <steve.schn...@pwkf.org>
+Date:   Tue Nov 27 07:28:43 2012 +0100
+
+    master: connect to AAAA and A address
+    
+    According to Michael Renner in D#678662 :
+    
+    The lack of the "MulitHomed" parameter causes IO::Socket::INET6 to give
+    preferential treatment to AAAA-addresses and fail if they don't yield a socket.
+    When enabling MultiHomed IO::Socket::INET6 will try all returned addresses.
+    
+    See http://search.cpan.org/~shlomif/IO-Socket-INET6-2.69/lib/IO/Socket/INET6.pm#CONSTRUCTOR for detailed information.
+    
+    Thx to Kelsey Cummings for reporting it on the ml.
+    
+    Closes: D#678662
+
+diff --git a/master/lib/Munin/Master/Node.pm b/master/lib/Munin/Master/Node.pm
+index 6549fbf..af9d69e 100644
+--- a/master/lib/Munin/Master/Node.pm
++++ b/master/lib/Munin/Master/Node.pm
+@@ -86,6 +86,7 @@ sub _do_connect {
+ 		PeerPort  => $self->{port} || 4949,
+ 		LocalAddr => $config->{local_address},
+ 		Proto     => 'tcp', 
++		MultiHomed => 1,
+ 		Timeout   => $config->{timeout}
+ 	);
+ 	if (! $self->{reader} ) {
diff --git a/debian/patches/series b/debian/patches/series
index 4f43be9..715552f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 100-DejaVu-Fonts-Path.patch
 237-hddtemp_smartctl-sata-detect.patch
 238-munin-node-ipv6allow.patch
+240-master-connect-to-AAAA-and-A-address.patch

Reply via email to