Update patches to new weekly release

3 files changed, 12 insertions, 12 deletions

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 5d093f87f..1a99ce0bd 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
-@@ -36,7 +36,7 @@ var (
+@@ -35,7 +35,7 @@ var (
  	installedPkgs = make(map[string]bool)
  
  	allpkg            = flag.Bool("a", false, "install all previously installed packages")
@@ -8,7 +8,7 @@
 +	reportToDashboard = flag.Bool("dashboard", false, "report public packages at "+dashboardURL)
  	logPkgs           = flag.Bool("log", true, "log installed packages to $GOROOT/goinstall.log for use by -a")
  	update            = flag.Bool("u", false, "update already-downloaded packages")
- 	clean             = flag.Bool("clean", false, "clean the package directory before installing")
+ 	doInstall         = flag.Bool("install", true, "build and install")
 --- a/src/cmd/goinstall/doc.go
 +++ b/src/cmd/goinstall/doc.go
 @@ -14,7 +14,7 @@ Usage:
@@ -17,6 +17,6 @@
  	-clean=false      clean the package directory before installing
 -	-dashboard=true   tally public packages on godashboard.appspot.com
 +	-dashboard=false  tally public packages on godashboard.appspot.com
+ 	-install=true     build and install the package and its dependencies
  	-log=true         log installed packages to $GOROOT/goinstall.log for use by -a
- 	-u=false          update already-downloaded packages
- 	-v=false          verbose operation
+ 	-nuke=false       remove the target object and clean before installing
diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index 6b353eb5e..691b8c2c0 100644
--- a/debian/patches/006-fix_kfreebsd_build.patch
+++ b/debian/patches/006-fix_kfreebsd_build.patch
@@ -19,7 +19,7 @@
  
 --- a/src/cmd/cov/Makefile
 +++ b/src/cmd/cov/Makefile
-@@ -23,11 +23,7 @@ LIB=\
+@@ -20,11 +20,7 @@ HFILES=\
  NOINSTALL=1
  include ../../Make.ccmd
  
@@ -34,7 +34,7 @@
  install-linux: install-default
 --- a/src/cmd/prof/Makefile
 +++ b/src/cmd/prof/Makefile
-@@ -19,11 +19,7 @@ LIB=\
+@@ -16,11 +16,7 @@ OFILES=\
  NOINSTALL=1
  include ../../Make.ccmd
  
@@ -60,7 +60,7 @@
  #define _LARGEFILE_SOURCE
  #define _LARGEFILE64_SOURCE
  #define _FILE_OFFSET_BITS 64
-@@ -41,7 +39,7 @@ includes_Linux='
+@@ -43,7 +41,7 @@ includes_Linux='
  #include <netpacket/packet.h>
  '
  
@@ -69,8 +69,8 @@
  #define _DARWIN_C_SOURCE
  #define KERNEL
  #define _DARWIN_USE_64_BIT_INODE
-@@ -61,7 +59,7 @@ includes_Darwin='
- #include <netinet/ip_mroute.h>
+@@ -65,7 +63,7 @@ includes_Darwin='
+ #include <termios.h>
  '
  
 -includes_FreeBSD='
@@ -78,7 +78,7 @@
  #include <sys/types.h>
  #include <sys/event.h>
  #include <sys/socket.h>
-@@ -105,7 +103,7 @@ done
+@@ -110,7 +108,7 @@ done
  
  # Write godefs input.
  (
@@ -89,7 +89,7 @@
  	echo 'enum {'
 --- a/src/pkg/net/Makefile
 +++ b/src/pkg/net/Makefile
-@@ -35,7 +35,7 @@ GOFILES_freebsd=\
+@@ -36,7 +36,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 258f2ba3d..be2a3965f 100644
--- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch
+++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
@@ -1,6 +1,6 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -75,6 +75,14 @@ func main() {
+@@ -77,6 +77,14 @@ func main() {
  		os.Exit(1)
  	}