Update patch to new weekly release

6 files changed, 10 insertions, 24 deletions

diff --git a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
index 66013fdbe..b4dcc275d 100644
--- a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
+++ b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
@@ -7,7 +7,7 @@ Allow IPv4 on IPv6 sockets
 
 --- a/src/pkg/net/sock.go
 +++ b/src/pkg/net/sock.go
-@@ -34,6 +34,16 @@ func socket(net string, f, p, t int, la,
+@@ -35,6 +35,16 @@ func socket(net string, f, p, t int, la,
  
  	setKernelSpecificSockopt(s, f)
  
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 4f32f408e..7f8e672f1 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
-@@ -40,7 +38,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
-@@ -59,7 +57,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>
-@@ -102,7 +100,7 @@ done
+@@ -105,7 +103,7 @@ done
  
  # Write godefs input.
  (
@@ -89,7 +89,7 @@
  	echo 'enum {'
 --- a/src/pkg/net/Makefile
 +++ b/src/pkg/net/Makefile
-@@ -32,7 +32,7 @@ GOFILES_freebsd=\
+@@ -33,7 +33,7 @@ GOFILES_freebsd=\
  	sock_bsd.go\
  
  CGOFILES_freebsd=\
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
index e15458185..258f2ba3d 100644
--- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch
+++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
@@ -1,14 +1,14 @@
 --- 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)
 +	}
 +
-+	if root != defaultRoot.path {
++	if runtime.GOROOT() != defaultRoot.path {
 +		logfile = filepath.Join(defaultRoot.path, "goinstall.log")
 +	}
 +
diff --git a/debian/patches/010-dont_update_standard_packages.patch b/debian/patches/010-dont_update_standard_packages.patch
deleted file mode 100644
index 94d6f3e28..000000000
--- a/debian/patches/010-dont_update_standard_packages.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cmd/goinstall/main.go
-+++ b/src/cmd/goinstall/main.go
-@@ -169,8 +169,8 @@ func install(pkg, parent string) {
- 		dir = pkg
- 		local = true
- 	} else if isStandardPath(pkg) {
--		dir = filepath.Join(root, filepath.FromSlash(pkg))
--		local = true
-+		visit[pkg] = done
-+		return
- 	} else {
- 		proot = findPkgroot(pkg)
- 		err := download(pkg, proot.srcDir())
diff --git a/debian/patches/series b/debian/patches/series
index f87072eb7..11d541638 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 007-use_native_dynamic_linker_on_kfreebsd.patch
 008-emacs-mode-key-literal-indent.patch
 009-goinstall_can_install_to_GOPATH.patch
-010-dont_update_standard_packages.patch