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

[Ondřej Surý]

The following commit has been merged in the weekly-debian-sid branch:
commit 74cd1f483a38f537cf98e4469f98013972b40a14
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Feb 29 16:12:15 2012 +0100

    Add more kFreeBSD patches

diff --git a/debian/patches/012-sigfillset_kFreeBSD.patch b/debian/patches/012-sigfillset_kFreeBSD.patch
new file mode 100644
index 0000000..40f01fb
--- /dev/null
+++ b/debian/patches/012-sigfillset_kFreeBSD.patch
@@ -0,0 +1,22 @@
+--- a/src/pkg/runtime/cgo/gcc_freebsd_386.c
++++ b/src/pkg/runtime/cgo/gcc_freebsd_386.c
+@@ -33,7 +33,7 @@ libcgo_sys_thread_start(ThreadStart *ts)
+ 	size_t size;
+ 	int err;
+ 
+-	SIGFILLSET(ign);
++	sigfillset(&ign);
+ 	sigprocmask(SIG_SETMASK, &ign, &oset);
+ 
+ 	pthread_attr_init(&attr);
+--- a/src/pkg/runtime/cgo/gcc_freebsd_amd64.c
++++ b/src/pkg/runtime/cgo/gcc_freebsd_amd64.c
+@@ -33,7 +33,7 @@ libcgo_sys_thread_start(ThreadStart *ts)
+ 	size_t size;
+ 	int err;
+ 
+-	SIGFILLSET(ign);
++	sigfillset(&ign);
+ 	sigprocmask(SIG_SETMASK, &ign, &oset);
+ 
+ 	pthread_attr_init(&attr);
diff --git a/debian/patches/013-kFreeBSD-AI_MASK.patch b/debian/patches/013-kFreeBSD-AI_MASK.patch
new file mode 100644
index 0000000..e67a340
--- /dev/null
+++ b/debian/patches/013-kFreeBSD-AI_MASK.patch
@@ -0,0 +1,9 @@
+--- a/src/pkg/net/cgo_bsd.go
++++ b/src/pkg/net/cgo_bsd.go
+@@ -12,5 +12,5 @@ package net
+ import "C"
+ 
+ func cgoAddrInfoMask() C.int {
+-	return C.AI_MASK
++	return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
+ }
diff --git a/debian/patches/series b/debian/patches/series
index fecd35a..df1559b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 #009-goinstall_can_install_to_GOPATH.patch
 #010-goinstall_check_conf.patch
 011-__FreeBSD_kernel__.patch
+012-sigfillset_kFreeBSD.patch
+013-kFreeBSD-AI_MASK.patch

-- 
Packaging for Google Go