Update patches to new upstream release

4 files changed, 12 insertions, 12 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..b4dcc275d 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)
- 	}
+@@ -35,6 +35,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/005-goinstall_dont_call_home_by_default.patch b/debian/patches/005-goinstall_dont_call_home_by_default.patch
index 1c438d310..5d093f87f 100644
--- a/debian/patches/005-goinstall_dont_call_home_by_default.patch
+++ b/debian/patches/005-goinstall_dont_call_home_by_default.patch
@@ -1,6 +1,6 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -38,7 +38,7 @@ var (
+@@ -36,7 +36,7 @@ var (
  	installedPkgs = make(map[string]bool)
  
  	allpkg            = flag.Bool("a", false, "install all previously installed packages")
@@ -11,7 +11,7 @@
  	clean             = flag.Bool("clean", false, "clean the package directory before installing")
 --- a/src/cmd/goinstall/doc.go
 +++ b/src/cmd/goinstall/doc.go
-@@ -15,7 +15,7 @@ Usage:
+@@ -14,7 +14,7 @@ Usage:
  Flags and default settings:
          -a=false          install all previously installed packages
  	-clean=false      clean the package directory before installing
diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index 635664ea0..6b353eb5e 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='
+@@ -41,7 +39,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='
+@@ -61,7 +59,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
+@@ -105,7 +103,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\
+@@ -35,7 +35,7 @@ GOFILES_freebsd=\
+ 	sock_bsd.go\
  
  CGOFILES_freebsd=\
 -	cgo_bsd.go\
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
index e15458185..f80c7e1f8 100644
--- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch
+++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
@@ -1,8 +1,8 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -61,6 +61,14 @@ func main() {
+@@ -75,6 +75,14 @@ func main() {
+ 		os.Exit(1)
  	}
- 	root += filepath.FromSlash("/src/pkg/")
  
 +	if os.Getuid() != 0 && os.Getenv("GOPATH") == "" {
 +		fmt.Fprintf(os.Stderr, "%s: set $GOPATH to the directory you want packages installed to if you get permission denied error\n", argv0)