Bug#774324: unblock: golang/2:1.3.3-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-CC: paultag@debian.org
Please unblock golang/2:1.3.3-1; this includes a number of good
bugfixes over 1.3.2-1, which I've detailed in d/changelog (which is in
the attached debdiff).
♥,
- Tianon
4096R / B42F 6819 007F 00F8 8E36 4FD4 036A 9C25 BF35 7DD4
diff -Nru golang-1.3.2/VERSION golang-1.3.3/VERSION
--- golang-1.3.2/VERSION 2014-09-25 22:46:55.000000000 +0000
+++ golang-1.3.3/VERSION 2014-10-01 01:50:25.000000000 +0000
@@ -1 +1 @@
-go1.3.2
\ No newline at end of file
+go1.3.3
\ No newline at end of file
diff -Nru golang-1.3.2/debian/changelog golang-1.3.3/debian/changelog
--- golang-1.3.2/debian/changelog 2014-09-26 21:21:47.000000000 +0000
+++ golang-1.3.3/debian/changelog 2014-12-12 21:11:08.000000000 +0000
@@ -1,3 +1,18 @@
+golang (2:1.3.3-1) unstable; urgency=medium
+
+ * New upstream version (https://code.google.com/p/go/source/list?name=go1.3.3)
+ - time: removed from tests now obsolete assumption about Australian tz
+ abbreviations
+ - net: temporarily skip TestAcceptIgnoreSomeErrors
+ - runtime: hide cgocallback_gofunc calling cgocallbackg from linker
+ - runtime: fix GOTRACEBACK reading on Windows, Plan 9
+ - nacltest.bash: unset GOROOT
+ - cmd/5l, cmd/6l, cmd/8l: fix nacl binary corruption bug
+ * Add Paul and myself as uploaders. Many, many thanks to Michael for his work
+ so far on this package (and hopefully more to come).
+
+ -- Tianon Gravi <admwiggin@gmail.com> Fri, 12 Dec 2014 16:11:02 -0500
+
golang (2:1.3.2-1) unstable; urgency=medium
* New upstream version
diff -Nru golang-1.3.2/debian/control golang-1.3.3/debian/control
--- golang-1.3.2/debian/control 2014-09-26 21:18:48.000000000 +0000
+++ golang-1.3.3/debian/control 2014-12-12 20:44:54.000000000 +0000
@@ -2,7 +2,10 @@
Source: golang
Section: devel
Priority: optional
-Maintainer: Michael Stapelberg <stapelberg@debian.org>
+Maintainer: Go Compiler Team <pkg-golang-devel@lists.alioth.debian.org>
+Uploaders: Michael Stapelberg <stapelberg@debian.org>,
+ Paul Tagliamonte <paultag@debian.org>,
+ Tianon Gravi <admwiggin@gmail.com>
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-golang/golang.git
Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase
diff -Nru golang-1.3.2/debian/control.base golang-1.3.3/debian/control.base
--- golang-1.3.2/debian/control.base 2014-09-26 21:18:48.000000000 +0000
+++ golang-1.3.3/debian/control.base 2014-12-12 20:44:54.000000000 +0000
@@ -1,7 +1,10 @@
Source: golang
Section: devel
Priority: optional
-Maintainer: Michael Stapelberg <stapelberg@debian.org>
+Maintainer: Go Compiler Team <pkg-golang-devel@lists.alioth.debian.org>
+Uploaders: Michael Stapelberg <stapelberg@debian.org>,
+ Paul Tagliamonte <paultag@debian.org>,
+ Tianon Gravi <admwiggin@gmail.com>
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-golang/golang.git
Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase
@@ -101,7 +104,8 @@
Package: golang-mode
Architecture: all
-Depends: ${misc:Depends}, emacs23 | emacsen, emacsen-common (>= 1.4.14)
+Depends: ${misc:Depends}, emacs | emacsen, emacsen-common (>= 2.0.8)
+Conflicts: emacsen-common (<< 2.0.0)
Suggests: golang-go
Description: Go programming language - mode for GNU Emacs
This package provides a GNU Emacs major mode for editing code in
diff -Nru golang-1.3.2/debian/watch golang-1.3.3/debian/watch
--- golang-1.3.2/debian/watch 2014-09-26 21:18:48.000000000 +0000
+++ golang-1.3.3/debian/watch 2014-12-12 20:44:54.000000000 +0000
@@ -1,2 +1,4 @@
version=3
-http://golang.org/dl/ .*/go([0-9.]*)\.src\.tar\.gz
+opts=\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+ http://golang.org/dl/ .*/go(\d\S*)\.src\.tar\.gz
diff -Nru golang-1.3.2/doc/devel/release.html golang-1.3.3/doc/devel/release.html
--- golang-1.3.2/doc/devel/release.html 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/doc/devel/release.html 2014-10-01 01:50:20.000000000 +0000
@@ -32,6 +32,11 @@
See the <a href="//code.google.com/p/go/source/list?name=release-branch.go1.3&r=go1.3.2">change history</a> for details.
</p>
+<p>
+go1.3.3 (released 2014/09/30) includes further bug fixes to cgo, the runtime package, and the nacl port.
+See the <a href="//code.google.com/p/go/source/list?name=release-branch.go1.3&r=go1.3.3">change history</a> for details.
+</p>
+
<h2 id="go1.2">go1.2 (released 2013/12/01)</h2>
<p>
diff -Nru golang-1.3.2/src/cmd/5l/asm.c golang-1.3.3/src/cmd/5l/asm.c
--- golang-1.3.2/src/cmd/5l/asm.c 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/cmd/5l/asm.c 2014-10-01 01:50:23.000000000 +0000
@@ -599,10 +599,10 @@
if(iself)
goto ElfSym;
case Hplan9:
- symo = HEADR+segtext.len+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
break;
ElfSym:
- symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(HEADR+segrodata.filelen, INITRND)+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
symo = rnd(symo, INITRND);
break;
}
diff -Nru golang-1.3.2/src/cmd/6l/asm.c golang-1.3.3/src/cmd/6l/asm.c
--- golang-1.3.2/src/cmd/6l/asm.c 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/cmd/6l/asm.c 2014-10-01 01:50:23.000000000 +0000
@@ -689,10 +689,10 @@
case Hplan9:
case Helf:
debug['s'] = 1;
- symo = HEADR+segtext.len+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
break;
case Hdarwin:
- symo = rnd(HEADR+segtext.len, INITRND)+rnd(segdata.filelen, INITRND)+machlink;
+ symo = segdata.fileoff+rnd(segdata.filelen, INITRND)+machlink;
break;
case Hlinux:
case Hfreebsd:
@@ -701,11 +701,11 @@
case Hdragonfly:
case Hsolaris:
case Hnacl:
- symo = rnd(HEADR+segtext.len, INITRND)+rnd(segrodata.len, INITRND)+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
symo = rnd(symo, INITRND);
break;
case Hwindows:
- symo = rnd(HEADR+segtext.filelen, PEFILEALIGN)+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
symo = rnd(symo, PEFILEALIGN);
break;
}
diff -Nru golang-1.3.2/src/cmd/8l/asm.c golang-1.3.3/src/cmd/8l/asm.c
--- golang-1.3.2/src/cmd/8l/asm.c 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/cmd/8l/asm.c 2014-10-01 01:50:20.000000000 +0000
@@ -619,17 +619,17 @@
if(iself)
goto Elfsym;
case Hplan9:
- symo = HEADR+segtext.filelen+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
break;
case Hdarwin:
- symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(segdata.filelen, INITRND)+machlink;
+ symo = segdata.fileoff+rnd(segdata.filelen, INITRND)+machlink;
break;
Elfsym:
- symo = rnd(HEADR+segtext.filelen, INITRND)+rnd(HEADR+segrodata.filelen, INITRND)+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
symo = rnd(symo, INITRND);
break;
case Hwindows:
- symo = rnd(HEADR+segtext.filelen, PEFILEALIGN)+segdata.filelen;
+ symo = segdata.fileoff+segdata.filelen;
symo = rnd(symo, PEFILEALIGN);
break;
}
diff -Nru golang-1.3.2/src/nacltest.bash golang-1.3.3/src/nacltest.bash
--- golang-1.3.2/src/nacltest.bash 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/nacltest.bash 2014-10-01 01:50:23.000000000 +0000
@@ -45,6 +45,7 @@
exit 1
fi
GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH ./make.bash
+unset GOROOT
# Build zip file embedded in package syscall.
gobin=${GOBIN:-$(pwd)/../bin}
diff -Nru golang-1.3.2/src/pkg/net/net_windows_test.go golang-1.3.3/src/pkg/net/net_windows_test.go
--- golang-1.3.2/src/pkg/net/net_windows_test.go 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/pkg/net/net_windows_test.go 2014-10-01 01:50:23.000000000 +0000
@@ -16,6 +16,8 @@
)
func TestAcceptIgnoreSomeErrors(t *testing.T) {
+ t.Skip("skipping temporarily, see issue 8662")
+
recv := func(ln Listener) (string, error) {
c, err := ln.Accept()
if err != nil {
diff -Nru golang-1.3.2/src/pkg/runtime/asm_amd64.s golang-1.3.3/src/pkg/runtime/asm_amd64.s
--- golang-1.3.2/src/pkg/runtime/asm_amd64.s 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/pkg/runtime/asm_amd64.s 2014-10-01 01:50:23.000000000 +0000
@@ -784,7 +784,8 @@
MOVQ BP, -8(DI)
LEAQ -(8+8)(DI), SP
MOVQ R8, 0(SP)
- CALL runtime·cgocallbackg(SB)
+ MOVQ $runtime·cgocallbackg(SB), AX // hide function call from linker
+ CALL AX
MOVQ 0(SP), R8
// Restore g->sched (== m->curg->sched) from saved values.
diff -Nru golang-1.3.2/src/pkg/runtime/runtime.c golang-1.3.3/src/pkg/runtime/runtime.c
--- golang-1.3.2/src/pkg/runtime/runtime.c 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/pkg/runtime/runtime.c 2014-10-01 01:50:23.000000000 +0000
@@ -138,8 +138,6 @@
syscall·envs.array = (byte*)s;
syscall·envs.len = n;
syscall·envs.cap = n;
-
- traceback_cache = ~(uint32)0;
}
int32
@@ -343,6 +341,16 @@
{
byte *p;
intgo i, n;
+ bool tmp;
+
+ // gotraceback caches the GOTRACEBACK setting in traceback_cache.
+ // gotraceback can be called before the environment is available.
+ // traceback_cache must be reset after the environment is made
+ // available, in order for the environment variable to take effect.
+ // The code is fixed differently in Go 1.4.
+ // This is a limited fix for Go 1.3.3.
+ traceback_cache = ~(uint32)0;
+ runtime·gotraceback(&tmp);
p = runtime·getenv("GODEBUG");
if(p == nil)
diff -Nru golang-1.3.2/src/pkg/time/format_test.go golang-1.3.3/src/pkg/time/format_test.go
--- golang-1.3.2/src/pkg/time/format_test.go 2014-09-25 22:46:54.000000000 +0000
+++ golang-1.3.3/src/pkg/time/format_test.go 2014-10-01 01:50:24.000000000 +0000
@@ -183,39 +183,45 @@
}
}
-func TestParseInSydney(t *testing.T) {
- loc, err := LoadLocation("Australia/Sydney")
+func TestParseInLocation(t *testing.T) {
+ // Check that Parse (and ParseInLocation) understand that
+ // Feb 01 AST (Arabia Standard Time) and Feb 01 AST (Atlantic Standard Time)
+ // are in different time zones even though both are called AST
+
+ baghdad, err := LoadLocation("Asia/Baghdad")
if err != nil {
t.Fatal(err)
}
- // Check that Parse (and ParseInLocation) understand
- // that Feb EST and Aug EST are different time zones in Sydney
- // even though both are called EST.
- t1, err := ParseInLocation("Jan 02 2006 MST", "Feb 01 2013 EST", loc)
+ t1, err := ParseInLocation("Jan 02 2006 MST", "Feb 01 2013 AST", baghdad)
if err != nil {
t.Fatal(err)
}
- t2 := Date(2013, February, 1, 00, 00, 00, 0, loc)
+ t2 := Date(2013, February, 1, 00, 00, 00, 0, baghdad)
if t1 != t2 {
- t.Fatalf("ParseInLocation(Feb 01 2013 EST, Sydney) = %v, want %v", t1, t2)
+ t.Fatalf("ParseInLocation(Feb 01 2013 AST, Baghdad) = %v, want %v", t1, t2)
}
_, offset := t1.Zone()
- if offset != 11*60*60 {
- t.Fatalf("ParseInLocation(Feb 01 2013 EST, Sydney).Zone = _, %d, want _, %d", offset, 11*60*60)
+ if offset != 3*60*60 {
+ t.Fatalf("ParseInLocation(Feb 01 2013 AST, Baghdad).Zone = _, %d, want _, %d", offset, 3*60*60)
+ }
+
+ blancSablon, err := LoadLocation("America/Blanc-Sablon")
+ if err != nil {
+ t.Fatal(err)
}
- t1, err = ParseInLocation("Jan 02 2006 MST", "Aug 01 2013 EST", loc)
+ t1, err = ParseInLocation("Jan 02 2006 MST", "Feb 01 2013 AST", blancSablon)
if err != nil {
t.Fatal(err)
}
- t2 = Date(2013, August, 1, 00, 00, 00, 0, loc)
+ t2 = Date(2013, February, 1, 00, 00, 00, 0, blancSablon)
if t1 != t2 {
- t.Fatalf("ParseInLocation(Aug 01 2013 EST, Sydney) = %v, want %v", t1, t2)
+ t.Fatalf("ParseInLocation(Feb 01 2013 AST, Blanc-Sablon) = %v, want %v", t1, t2)
}
_, offset = t1.Zone()
- if offset != 10*60*60 {
- t.Fatalf("ParseInLocation(Aug 01 2013 EST, Sydney).Zone = _, %d, want _, %d", offset, 10*60*60)
+ if offset != -4*60*60 {
+ t.Fatalf("ParseInLocation(Feb 01 2013 AST, Blanc-Sablon).Zone = _, %d, want _, %d", offset, -4*60*60)
}
}
Reply to: