[Pkg-golang-commits] [golang] 03/04: Delete d/patches/cl-28850.patch, applied upstream.

[Michael Hudson-Doyle]

This is an automated email from the git hooks/post-receive script.

mwhudson-guest pushed a commit to branch golang-1.7
in repository golang.

commit 4a682ce38e9d7f6f35f4ee5b31f69f6446f8d0b9
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Thu Oct 20 09:06:27 2016 +1300

    Delete d/patches/cl-28850.patch, applied upstream.
---
 debian/changelog                            |  1 +
 debian/patches/cl-28850.patch               | 34 -----------------------------
 debian/patches/cl-29995--tzdata-2016g.patch |  4 +---
 debian/patches/series                       |  1 -
 src/time/time_test.go                       |  7 ++++--
 5 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f5c3e3..5d322ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 golang-1.7 (1.7.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Delete d/patches/cl-28850.patch, applied upstream. 
 
  -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Thu, 20 Oct 2016 09:01:24 +1300
 
diff --git a/debian/patches/cl-28850.patch b/debian/patches/cl-28850.patch
deleted file mode 100644
index f663470..0000000
--- a/debian/patches/cl-28850.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d38d59ffb5d56c838b1ed7cc346b8d63398b5452 Mon Sep 17 00:00:00 2001
-From: Michael Munday <munday at ca.ibm.com>
-Date: Thu, 8 Sep 2016 19:27:24 -0400
-Subject: [PATCH] runtime: fix SIGILL in checkvectorfacility on s390x
-Origin: https://golang.org/cl/28850
-Bug: https://golang.org/issue/17032
-Applied-Upstream: 1.7.2
-
-STFLE does not necessarily write to all the double-words that are
-requested. It is therefore necessary to clear the target memory
-before calling STFLE in order to ensure that the facility list does
-not contain false positives.
-
-Fixes #17032.
-
-Change-Id: I7bec9ade7103e747b72f08562fe57e6f091bd89f
-Reviewed-on: https://go-review.googlesource.com/28850
-Reviewed-by: Brad Fitzpatrick <bradfitz at golang.org>
----
- src/runtime/asm_s390x.s | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/runtime/asm_s390x.s b/src/runtime/asm_s390x.s
-index cf0ed1a..928fe37 100644
---- a/src/runtime/asm_s390x.s
-+++ b/src/runtime/asm_s390x.s
-@@ -20,6 +20,7 @@ TEXT runtime·checkvectorfacility(SB),NOSPLIT,$32-0
- 	MOVD    $2, R0
- 	MOVD	R1, tmp-32(SP)
- 	MOVD    $x-24(SP), R1
-+	XC	$24, 0(R1), 0(R1)
- //      STFLE   0(R1)
- 	WORD    $0xB2B01000
- 	MOVBZ   z-8(SP), R1
diff --git a/debian/patches/cl-29995--tzdata-2016g.patch b/debian/patches/cl-29995--tzdata-2016g.patch
index f5fed82..6c60949 100644
--- a/debian/patches/cl-29995--tzdata-2016g.patch
+++ b/debian/patches/cl-29995--tzdata-2016g.patch
@@ -17,11 +17,9 @@ TryBot-Result: Gobot Gobot <gobot at golang.org>
  src/time/time_test.go | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/src/time/time_test.go b/src/time/time_test.go
-index 68236fd..2e47d08 100644
 --- a/src/time/time_test.go
 +++ b/src/time/time_test.go
-@@ -943,8 +943,11 @@ func TestLoadFixed(t *testing.T) {
+@@ -939,8 +939,11 @@
  	// but Go and most other systems use "east is positive".
  	// So GMT+1 corresponds to -3600 in the Go zone, not +3600.
  	name, offset := Now().In(loc).Zone()
diff --git a/debian/patches/series b/debian/patches/series
index 3ce5652..14031e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-cl-28850.patch
 cl-29995--tzdata-2016g.patch
diff --git a/src/time/time_test.go b/src/time/time_test.go
index b7ebb37..c9665ea 100644
--- a/src/time/time_test.go
+++ b/src/time/time_test.go
@@ -939,8 +939,11 @@ func TestLoadFixed(t *testing.T) {
 	// but Go and most other systems use "east is positive".
 	// So GMT+1 corresponds to -3600 in the Go zone, not +3600.
 	name, offset := Now().In(loc).Zone()
-	if name != "GMT+1" || offset != -1*60*60 {
-		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q, %d", name, offset, "GMT+1", -1*60*60)
+	// The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
+	// on earlier versions; we accept both. (Issue #17276).
+	if !(name == "GMT+1" || name == "-01") || offset != -1*60*60 {
+		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q or %q, %d",
+			name, offset, "GMT+1", "-01", -1*60*60)
 	}
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git