diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-05-23 09:46:56 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-05-23 11:04:16 +0200 |
| commit | b7fe98bf42064ecb5807c035ebf7f22d0f9500b0 (patch) | |
| tree | 9506e589e37e1af59b140c7c3be6fd75ae6a7e9c | |
| parent | 4e5e42a1c1a9eb757743648c48df70cbd42635db (diff) | |
| download | golang-b7fe98bf42064ecb5807c035ebf7f22d0f9500b0.tar.gz | |
Refreshed patches for new weekly release
| -rw-r--r-- | debian/patches/001-allow_IPv4_on_IPv6_sockets.patch | 6 | ||||
| -rw-r--r-- | debian/patches/006-fix_kfreebsd_build.patch | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch index 0007fe62a..66013fdbe 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 -@@ -44,6 +44,16 @@ func socket(net string, f, p, t int, la, - syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 0) - } +@@ -34,6 +34,16 @@ func socket(net string, f, p, t int, la, + + setKernelSpecificSockopt(s, f) + // Allow IPv4 on IPv6 sockets. + if f == syscall.AF_INET6 { diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch index 635664ea0..4f32f408e 100644 --- a/debian/patches/006-fix_kfreebsd_build.patch +++ b/debian/patches/006-fix_kfreebsd_build.patch @@ -60,7 +60,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE #define _FILE_OFFSET_BITS 64 -@@ -36,7 +34,7 @@ includes_Linux=' +@@ -40,7 +38,7 @@ includes_Linux=' #include <netpacket/packet.h> ' @@ -69,7 +69,7 @@ #define _DARWIN_C_SOURCE #define KERNEL #define _DARWIN_USE_64_BIT_INODE -@@ -55,7 +53,7 @@ includes_Darwin=' +@@ -59,7 +57,7 @@ includes_Darwin=' #include <netinet/ip_mroute.h> ' @@ -78,7 +78,7 @@ #include <sys/types.h> #include <sys/event.h> #include <sys/socket.h> -@@ -98,7 +96,7 @@ done +@@ -102,7 +100,7 @@ done # Write godefs input. ( @@ -89,8 +89,8 @@ echo 'enum {' --- a/src/pkg/net/Makefile +++ b/src/pkg/net/Makefile -@@ -31,7 +31,7 @@ GOFILES_freebsd=\ - port.go\ +@@ -32,7 +32,7 @@ GOFILES_freebsd=\ + sock_bsd.go\ CGOFILES_freebsd=\ - cgo_bsd.go\ |