From ac00e601efac40e9ad4b855ab01e8be263f7d758 Mon Sep 17 00:00:00 2001
From: Jakub Čajka <jcajka@redhat.com>
Date: May 13 2020 06:34:14 +0000
Subject: Rebase to cb11c981df7b4dc40550ab71cc097c25d24d7a71


---

diff --git a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
index 81abf6b..22ff833 100644
--- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
+++ b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
@@ -1,4 +1,4 @@
-From b90903f6bac1ecf1fcc39aafa37448c449ea39bf Mon Sep 17 00:00:00 2001
+From 5fdfd33abdb3bf373969e95a1345f3d7fd1d22ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
 Date: Thu, 22 Mar 2018 11:49:09 +0100
 Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the
@@ -43,7 +43,7 @@ index 35ce69b228..1cea04ed7e 100644
  		zoneSources = zoneSources[len(zoneSources)-1:]
  	}
 diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
-index a7ef10c6bc..b934f5ef41 100644
+index 72829bc9fb..fa3d3ebe0a 100644
 --- a/src/time/zoneinfo_test.go
 +++ b/src/time/zoneinfo_test.go
 @@ -9,6 +9,7 @@ import (
@@ -84,5 +84,5 @@ index c311ddc33f..4e8ed5d9d4 100644
  
  func initLocal() {
 -- 
-2.21.1
+2.21.3
 
diff --git a/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch b/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
index 9c0effe..30a451f 100644
--- a/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
+++ b/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
@@ -1,4 +1,4 @@
-From 2adaff2c0f57a5d93131b0efd1c070b720af120a Mon Sep 17 00:00:00 2001
+From d541772c8c58384cfaac5b1264d10b95b8e5b352 Mon Sep 17 00:00:00 2001
 From: Michael Munday <munday@ca.ibm.com>
 Date: Tue, 17 Jan 2017 11:33:38 -0500
 Subject: [PATCH 2/3] syscall: expose IfInfomsg.X__ifi_pad on s390x
@@ -37,5 +37,5 @@ index 91f5ceff20..59a8b1fccd 100644
  
  type IfAddrmsg struct {
 -- 
-2.21.1
+2.21.3
 
diff --git a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
index 761ced9..4abf7bc 100644
--- a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
+++ b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
@@ -1,4 +1,4 @@
-From 36fc62c6a9faf794bc9537472bb09768fdcf6245 Mon Sep 17 00:00:00 2001
+From 211246713c2230a457a7e2c94c80e39c40228c1e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
 Date: Mon, 27 May 2019 15:12:53 +0200
 Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb
@@ -9,10 +9,10 @@ Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
-index 7f8f8e92be..b80e0647d4 100644
+index 21f55e852f..80c6151ef3 100644
 --- a/src/cmd/go/internal/cfg/cfg.go
 +++ b/src/cmd/go/internal/cfg/cfg.go
-@@ -246,11 +246,11 @@ var (
+@@ -247,11 +247,11 @@ var (
  	GOPPC64  = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", objabi.GOPPC64))
  	GOWASM   = envOr("GOWASM", fmt.Sprint(objabi.GOWASM))
  
@@ -50,5 +50,5 @@ index 40a07fc7e9..50436e32d7 100644
  # download direct from github
  [!net] skip
 -- 
-2.21.1
+2.21.3
 
diff --git a/VERSION b/VERSION
index 0cd7c0e..0344b20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-devel +c79c5e1aa4 Wed Apr 15 12:17:15 2020 +0000
+devel +cb11c981df Tue May 12 19:15:34 2020 +0000
diff --git a/golang.spec b/golang.spec
index 8d7bb06..2859cc8 100644
--- a/golang.spec
+++ b/golang.spec
@@ -108,12 +108,12 @@
 
 %global go_api 1.15
 %global go_version 1.15
-%global go_commit c79c5e1aa427eceb585f839a81d02c5390457a9c
+%global go_commit cb11c981df7b4dc40550ab71cc097c25d24d7a71
 %global go_shortcommit %(c=%{go_commit}; echo ${c:0:7})
 
 Name:           golang
 Version:        %go_version
-Release:        0.14git%{go_shortcommit}%{?dist}
+Release:        0.15git%{go_shortcommit}%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -569,6 +569,9 @@ fi
 %endif
 
 %changelog
+* Wed May 13 2020 Jakub Čajka <jcajka@fedoraproject.org> - 1.15-0.15gitcb11c98
+- Rebase to cb11c981df7b4dc40550ab71cc097c25d24d7a71
+
 * Wed Apr 15 2020 Jakub Čajka <jcajka@fedoraproject.org> - 1.15-0.14gitc79c5e1
 - Rebase to c79c5e1aa427eceb585f839a81d02c5390457a9c