Updated patches for new release

7 files changed, 35 insertions, 41 deletions

diff --git a/debian/patches/003-set_correct_runpath.patch b/debian/patches/003-set_correct_runpath.patch
index c7d2f5fc2..e090573d7 100644
--- a/debian/patches/003-set_correct_runpath.patch
+++ b/debian/patches/003-set_correct_runpath.patch
@@ -1,11 +1,11 @@
 --- a/src/Make.cmd
 +++ b/src/Make.cmd
-@@ -13,7 +13,7 @@ include $(QUOTED_GOROOT)/src/Make.common
+@@ -17,7 +17,7 @@ include $(QUOTED_GOROOT)/src/Make.common
  PREREQ+=$(patsubst %,%.make,$(DEPS))
  
  $(TARG): _go_.$O
--	$(LD) -o $@ _go_.$O
-+	$(LD) -o $@ -r $(QUOTED_GOROOT_FINAL)/pkg/$(GOOS)_$(GOARCH) _go_.$O
+-	$(LD) $(LDIMPORTS) -o $@ _go_.$O
++	$(LD) $(LDIMPORTS) -o $@ -r $(QUOTED_GOROOT_FINAL)/pkg/$(GOOS)_$(GOARCH) _go_.$O
  
  _go_.$O: $(GOFILES) $(PREREQ)
- 	$(GC) -o $@ $(GOFILES)
+ 	$(GC) $(GCIMPORTS) -o $@ $(GOFILES)
diff --git a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
index 7752e210f..3cf00e0c5 100644
--- a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
+++ b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
@@ -16,7 +16,7 @@
  )
  
  type status int // status for visited map
-@@ -189,7 +191,11 @@ func install(pkg, parent string) {
+@@ -191,7 +193,11 @@ func install(pkg, parent string) {
  	}
  	for _, p := range dirInfo.imports {
  		if p != "C" {
@@ -28,7 +28,7 @@
 +			}
  		}
  	}
- 	if dirInfo.pkgName == "main" {
+ 
 --- a/src/cmd/goinstall/doc.go
 +++ b/src/cmd/goinstall/doc.go
 @@ -4,6 +4,11 @@
diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index 2147d37f2..694bfd573 100644
--- a/debian/patches/006-fix_kfreebsd_build.patch
+++ b/debian/patches/006-fix_kfreebsd_build.patch
@@ -69,7 +69,7 @@
  #define _DARWIN_C_SOURCE
  #define KERNEL
  #define _DARWIN_USE_64_BIT_INODE
-@@ -54,7 +52,7 @@ includes_Darwin='
+@@ -55,7 +53,7 @@ includes_Darwin='
  #include <netinet/ip_mroute.h>
  '
  
@@ -78,7 +78,7 @@
  #include <sys/types.h>
  #include <sys/event.h>
  #include <sys/socket.h>
-@@ -97,7 +95,7 @@ done
+@@ -98,7 +96,7 @@ done
  
  # Write godefs input.
  (
diff --git a/debian/patches/007-freebsd-hackedutils.patch b/debian/patches/007-freebsd-hackedutils.patch
deleted file mode 100644
index b5f0e0983..000000000
--- a/debian/patches/007-freebsd-hackedutils.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: golang-2011.04.13/src/cmd/8l/asm.c
-===================================================================
---- golang-2011.04.13.orig/src/cmd/8l/asm.c	2011-04-28 09:41:46.000000000 +0200
-+++ golang-2011.04.13/src/cmd/8l/asm.c	2011-04-28 09:45:44.000000000 +0200
-@@ -40,7 +40,7 @@
- #define	Dbufslop	100
- 
- char linuxdynld[] = "/lib/ld-linux.so.2";
--char freebsddynld[] = "/usr/libexec/ld-elf.so.1";
-+char freebsddynld[] = "/lib/ld.so.1";
- 
- int32
- entryvalue(void)
-Index: golang-2011.04.13/src/cmd/6l/asm.c
-===================================================================
---- golang-2011.04.13.orig/src/cmd/6l/asm.c	2011-04-28 09:42:26.000000000 +0200
-+++ golang-2011.04.13/src/cmd/6l/asm.c	2011-04-28 09:45:25.000000000 +0200
-@@ -42,7 +42,7 @@
- #define PADDR(a)	((uint32)(a) & ~0x80000000)
- 
- char linuxdynld[] = "/lib64/ld-linux-x86-64.so.2";
--char freebsddynld[] = "/libexec/ld-elf.so.1";
-+char freebsddynld[] = "/lib/ld-kfreebsd-x86-64.so.1";
- 
- char	zeroes[32];
- 
diff --git a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
new file mode 100644
index 000000000..c86dda68e
--- /dev/null
+++ b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
@@ -0,0 +1,22 @@
+--- a/src/cmd/8l/asm.c
++++ b/src/cmd/8l/asm.c
+@@ -40,7 +40,7 @@
+ #define	Dbufslop	100
+ 
+ char linuxdynld[] = "/lib/ld-linux.so.2";
+-char freebsddynld[] = "/usr/libexec/ld-elf.so.1";
++char freebsddynld[] = "/lib/ld.so.1";
+ 
+ int32
+ entryvalue(void)
+--- a/src/cmd/6l/asm.c
++++ b/src/cmd/6l/asm.c
+@@ -42,7 +42,7 @@
+ #define PADDR(a)	((uint32)(a) & ~0x80000000)
+ 
+ char linuxdynld[] = "/lib64/ld-linux-x86-64.so.2";
+-char freebsddynld[] = "/libexec/ld-elf.so.1";
++char freebsddynld[] = "/lib/ld-kfreebsd-x86-64.so.1";
+ 
+ char	zeroes[32];
+ 
diff --git a/debian/patches/emacs-mode-key-literal-indent b/debian/patches/008-emacs-mode-key-literal-indent.patch
index 7e23facca..6f11ed7ac 100644
--- a/debian/patches/emacs-mode-key-literal-indent
+++ b/debian/patches/008-emacs-mode-key-literal-indent.patch
@@ -1,7 +1,5 @@
-Index: git/misc/emacs/go-mode.el
-===================================================================
---- git.orig/misc/emacs/go-mode.el	2011-02-27 16:04:51.291009005 +0100
-+++ git/misc/emacs/go-mode.el	2011-02-27 16:05:36.000000000 +0100
+--- a/misc/emacs/go-mode.el
++++ b/misc/emacs/go-mode.el
 @@ -7,7 +7,6 @@
  ;;; To do:
  
@@ -10,7 +8,7 @@ Index: git/misc/emacs/go-mode.el
  ;; ** We disagree on the indentation of function literals in arguments
  ;; ** There are bugs with the close brace of struct literals
  ;; * Highlight identifiers according to their syntactic context: type,
-@@ -401,7 +400,7 @@
+@@ -401,7 +400,7 @@ indented one level."
                  (setq first nil))))
  
            ;; case, default, and labels are outdented 1 level
diff --git a/debian/patches/series b/debian/patches/series
index 158864e1e..47b482f66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
-007-freebsd-hackedutils.patch
 001-allow_IPv4_on_IPv6_sockets.patch
 003-set_correct_runpath.patch
 004-dont_reinstall_dependencies_in_goinstall.patch
 005-goinstall_dont_call_home_by_default.patch
-emacs-mode-key-literal-indent
 006-fix_kfreebsd_build.patch
+007-use_native_dynamic_linker_on_kfreebsd.patch
+008-emacs-mode-key-literal-indent.patch