From aa63eb1732dc5a9e65ddb1f462483c350bc0d20d Mon Sep 17 00:00:00 2001 From: Jakub Čajka Date: Mar 18 2020 12:06:12 +0000 Subject: Rebase to 6412750f32224f6820f781d09b2092c5c358dddc --- 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 e2b13f5..8eea14a 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 a1c45ec99ce6069ffd05e77347bcd86dc518a23e Mon Sep 17 00:00:00 2001 +From c18a74d45153b992cbb5d589acbe97f54cf0a5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 22 Mar 2018 11:49:09 +0100 Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the @@ -11,7 +11,7 @@ Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/time/internal_test.go b/src/time/internal_test.go -index 3bca88e2b9..72f67fcea4 100644 +index 35ce69b228..1cea04ed7e 100644 --- a/src/time/internal_test.go +++ b/src/time/internal_test.go @@ -4,13 +4,15 @@ 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 2859959..2a78e5e 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 7a47d0574255ab272f02ddc398316f8f1f8fb8f8 Mon Sep 17 00:00:00 2001 +From 11da0c303ab6777940ee15c724f4215628c77a6e Mon Sep 17 00:00:00 2001 From: Michael Munday Date: Tue, 17 Jan 2017 11:33:38 -0500 Subject: [PATCH 2/3] syscall: expose IfInfomsg.X__ifi_pad on s390x 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 1a22a85..09a424b 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 8f9335573e12ff7ae0b0be4b5ae555146ea270e7 Mon Sep 17 00:00:00 2001 +From d1b05927313f62551a2e827918f976b6131dfc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 27 May 2019 15:12:53 +0200 Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb diff --git a/VERSION b/VERSION index 639f763..5b18e81 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -devel +65bd07611c Thu Mar 12 01:31:41 2020 +0000 +devel +6412750f32 Wed Mar 18 01:03:36 2020 +0000 diff --git a/golang.spec b/golang.spec index 7d75f3a..fc0ccae 100644 --- a/golang.spec +++ b/golang.spec @@ -108,12 +108,12 @@ %global go_api 1.15 %global go_version 1.15 -%global go_commit 65bd07611c95d66c60eca57932714e6bd0059c54 +%global go_commit 6412750f32224f6820f781d09b2092c5c358dddc %global go_shortcommit %(c=%{go_commit}; echo ${c:0:7}) Name: golang Version: %go_version -Release: 0.9git%{go_shortcommit}%{?dist} +Release: 0.10git%{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 Mar 18 2020 Jakub Čajka - 1.15-0.10git6412750 +- Rebase to 6412750f32224f6820f781d09b2092c5c358dddc + * Thu Mar 12 2020 Jakub Čajka - 1.15-0.9git65bd076 - Rebase to 65bd07611c95d66c60eca57932714e6bd0059c54