[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.09.07-1-48-ge4a4b27
Ondřej Surý
ondrej at sury.org
Fri Mar 9 08:43:27 UTC 2012
The following commit has been merged in the weekly-debian-sid branch:
commit cf1429e94b4a9de0b5b2f43f22337093e34aeaa5
Author: Ondřej Surý <ondrej at sury.org>
Date: Wed Feb 29 11:30:27 2012 +0100
Update IPv6 patch to new release
diff --git a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
index 01bb0c7..b8571ab 100644
--- a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
+++ b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
@@ -7,9 +7,9 @@ Allow IPv4 on IPv6 sockets
--- a/src/pkg/net/sock.go
+++ b/src/pkg/net/sock.go
-@@ -30,6 +30,15 @@ func socket(net string, f, t, p int, la,
-
- setDefaultSockopts(s, f, t)
+@@ -33,6 +33,15 @@ func socket(net string, f, t, p int, la,
+ return nil, err
+ }
+ // Allow IPv4 on IPv6 sockets.
+ if f == syscall.AF_INET6 {
@@ -20,6 +20,6 @@ Allow IPv4 on IPv6 sockets
+ }
+ }
+
+ var bla syscall.Sockaddr
if la != nil {
- err = syscall.Bind(s, la)
- if err != nil {
+ bla, err = listenerSockaddr(s, f, la, toAddr)
--
Packaging for Google Go
More information about the Pkg-google-commits
mailing list