[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.09.07-1-48-ge4a4b27

[Ondřej Surý]

The following commit has been merged in the weekly-debian-sid branch:
commit ebc7411a7a2bb71e8fad9c6b3efdbc6db58a7d65
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Jan 30 15:51:23 2012 +0100

    Use new syntax in IPv6 patch

diff --git a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
index c0f7755..01bb0c7 100644
--- a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
+++ b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
@@ -7,19 +7,18 @@ Allow IPv4 on IPv6 sockets
 
 --- a/src/pkg/net/sock.go
 +++ b/src/pkg/net/sock.go
-@@ -30,6 +30,16 @@ func socket(net string, f, t, p int, la,
+@@ -30,6 +30,15 @@ func socket(net string, f, t, p int, la,
  
  	setDefaultSockopts(s, f, t)
  
 +	// Allow IPv4 on IPv6 sockets.
 +	if f == syscall.AF_INET6 {
-+	   e = syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6,
-+	       syscall.IPV6_V6ONLY, 0)
-+	       			    if e != 0 {
-+				       	 syscall.Close(s)
-+							return nil, os.Errno(e)
-+							       }
-+							       }
++		err = syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 0)
++		if err != nil {
++			closesocket(s)
++			return nil, err
++		}
++	}
 +
  	if la != nil {
  		err = syscall.Bind(s, la)

-- 
Packaging for Google Go