[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.09.07-1-48-ge4a4b27

Fri Mar 9 08:43:16 UTC 2012

The following commit has been merged in the weekly-debian-sid branch:
commit 538e92acb15c1b10896c5f4be53bb89995cad53f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Jan 30 15:42:06 2012 +0100

    Update patches for a new release

diff --git a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
index 8800835..c0f7755 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
-@@ -37,6 +37,16 @@ func socket(net string, f, p, t int, la,
+@@ -30,6 +30,16 @@ func socket(net string, f, t, p int, la,
  
- 	setKernelSpecificSockopt(s, f)
+ 	setDefaultSockopts(s, f, t)
  
 +	// Allow IPv4 on IPv6 sockets.
 +	if f == syscall.AF_INET6 {
@@ -22,5 +22,5 @@ Allow IPv4 on IPv6 sockets
 +							       }
 +
  	if la != nil {
- 		e = syscall.Bind(s, la)
- 		if e != 0 {
+ 		err = syscall.Bind(s, la)
+ 		if err != nil {
diff --git a/debian/patches/003-set_correct_runpath.patch b/debian/patches/003-set_correct_runpath.patch
index e090573..47219c4 100644
--- a/debian/patches/003-set_correct_runpath.patch
+++ b/debian/patches/003-set_correct_runpath.patch
@@ -8,4 +8,4 @@
 +	$(LD) $(LDIMPORTS) -o $@ -r $(QUOTED_GOROOT_FINAL)/pkg/$(GOOS)_$(GOARCH) _go_.$O
  
  _go_.$O: $(GOFILES) $(PREREQ)
- 	$(GC) $(GCIMPORTS) -o $@ $(GOFILES)
+ 	$(GC) $(GCFLAGS) $(GCIMPORTS) -o $@ $(GOFILES)
diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index 8513efe..981aa06 100644
--- a/debian/patches/006-fix_kfreebsd_build.patch
+++ b/debian/patches/006-fix_kfreebsd_build.patch
@@ -1,22 +1,3 @@
---- a/src/libmach/Makefile
-+++ b/src/libmach/Makefile
-@@ -49,15 +49,8 @@ OFILES=\
- 	6obj.$O\
- 	8obj.$O\
- 
--ifneq ($(GOHOSTOS),windows)
- OFILES+=\
--	$(shell uname | tr A-Z a-z).$O\
--
--else
--OFILES+=\
--	windows.$O\
--
--endif
-+	$(GOOS).$O\
- 
- HFILES=../../include/mach.h elf.h macho.h obj.h
- 
 --- a/src/cmd/cov/Makefile
 +++ b/src/cmd/cov/Makefile
 @@ -20,11 +20,7 @@ HFILES=\
@@ -49,27 +30,16 @@
  install-linux: install-default
 --- a/src/pkg/syscall/mkerrors.sh
 +++ b/src/pkg/syscall/mkerrors.sh
-@@ -13,9 +13,7 @@ export LC_CTYPE=C
+@@ -15,7 +15,7 @@ GCC=gcc
  
- GCC=gcc
- 
--uname=$(uname)
--
--includes_Linux='
-+includes_linux='
- #define _LARGEFILE_SOURCE
- #define _LARGEFILE64_SOURCE
- #define _FILE_OFFSET_BITS 64
-@@ -44,7 +42,7 @@ includes_Linux='
- #include <netpacket/packet.h>
- '
+ uname=$(uname)
  
 -includes_Darwin='
 +includes_darwin='
  #define _DARWIN_C_SOURCE
  #define KERNEL
  #define _DARWIN_USE_64_BIT_INODE
-@@ -66,7 +64,7 @@ includes_Darwin='
+@@ -37,7 +37,7 @@ includes_Darwin='
  #include <termios.h>
  '
  
@@ -78,18 +48,27 @@
  #include <sys/types.h>
  #include <sys/event.h>
  #include <sys/socket.h>
-@@ -134,7 +132,7 @@ done
+@@ -55,7 +55,7 @@ includes_FreeBSD='
+ #include <netinet/ip_mroute.h>
+ '
  
- # Write godefs input.
- (
+-includes_Linux='
++includes_linux='
+ #define _LARGEFILE_SOURCE
+ #define _LARGEFILE64_SOURCE
+ #define _FILE_OFFSET_BITS 64
+@@ -151,7 +151,7 @@ ccflags="$@"
+ 	echo package syscall
+ 	echo
+ 	echo '/*'
 -	indirect="includes_$(uname)"
 +	indirect="includes_$(GOOS)"
  	echo "${!indirect} $includes"
- 	echo
- 	echo 'enum {'
+ 	echo '*/'
+ 	echo 'import "C"'
 --- a/src/pkg/net/Makefile
 +++ b/src/pkg/net/Makefile
-@@ -43,7 +43,7 @@ GOFILES_freebsd=\
+@@ -82,7 +82,7 @@ GOFILES_freebsd=\
  
  ifeq ($(CGO_ENABLED),1)
  CGOFILES_freebsd=\
diff --git a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
index db3d596..04bf8b8 100644
--- a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
+++ b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
@@ -1,22 +1,22 @@
 --- a/src/cmd/8l/asm.c
 +++ b/src/cmd/8l/asm.c
-@@ -40,7 +40,7 @@
- #define	Dbufslop	100
+@@ -38,7 +38,7 @@
+ #include	"../ld/pe.h"
  
  char linuxdynld[] = "/lib/ld-linux.so.2";
 -char freebsddynld[] = "/usr/libexec/ld-elf.so.1";
 +char freebsddynld[] = "/lib/ld.so.1";
  char openbsddynld[] = "/usr/libexec/ld.so";
+ char netbsddynld[] = "/usr/libexec/ld.elf_so";
  
- int32
 --- a/src/cmd/6l/asm.c
 +++ b/src/cmd/6l/asm.c
-@@ -42,7 +42,7 @@
+@@ -40,7 +40,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 openbsddynld[] = "/usr/libexec/ld.so";
+ char netbsddynld[] = "/libexec/ld.elf_so";
  
- char	zeroes[32];
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
index 37e649e..026b41d 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
-@@ -87,6 +87,10 @@ func main() {
+@@ -121,6 +121,10 @@ func main() {
  	}
  	readPackageList()
  
diff --git a/debian/patches/010-goinstall_check_conf.patch b/debian/patches/010-goinstall_check_conf.patch
index d7e22e9..64657a4 100644
--- a/debian/patches/010-goinstall_check_conf.patch
+++ b/debian/patches/010-goinstall_check_conf.patch
@@ -7,9 +7,9 @@
 -	reportToDashboard = flag.Bool("dashboard", true, "report public packages at "+dashboardURL)
 +	reportToDashboard *bool
  	update            = flag.Bool("u", false, "update already-downloaded packages")
+ 	doGofix           = flag.Bool("fix", false, "gofix each package before building it")
  	doInstall         = flag.Bool("install", true, "build and install")
- 	clean             = flag.Bool("clean", false, "clean the package directory before installing")
-@@ -47,6 +47,16 @@ var (
+@@ -48,6 +48,16 @@ var (
  	verbose           = flag.Bool("v", false, "verbose")
  )
  

-- 
Packaging for Google Go

