From 7d97257830588e67b2e586451d9bbf1a6679b39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
Date: Mon, 1 Apr 2019 13:41:56 +0200
Subject: [PATCH] Rebase to 1.11.6 Fix CVE-2019-9741 Fix requirement for %preun
 (instead of %postun) scriptlet thanks to Tim Landscheidt Use weak deps for
 SCM deps Resolves: BZ#1688233

---
 .gitignore  |  1 +
 golang.spec | 15 +++++++++++----
 sources     |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e10e22..a55c8ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /go1.11.2.src.tar.gz
 /go1.11.4.src.tar.gz
 /go1.11.5.src.tar.gz
+/go1.11.6.src.tar.gz
diff --git a/golang.spec b/golang.spec
index 0485432..d435867 100644
--- a/golang.spec
+++ b/golang.spec
@@ -102,10 +102,10 @@
 %endif
 
 %global go_api 1.11
-%global go_version 1.11.5
+%global go_version 1.11.6
 
 Name:           golang
-Version:        1.11.5
+Version:        1.11.6
 Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -265,13 +265,13 @@ Obsoletes:      golang-vet < 0-12.1
 Obsoletes:      golang-cover < 0-12.1
 
 Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+Requires(preun): %{_sbindir}/update-alternatives
 
 # We strip the meta dependency, but go does require glibc.
 # This is an odd issue, still looking for a better fix.
 Requires:       glibc
 Requires:       gcc
-Requires:       git, subversion, mercurial
+Recommends:     git, subversion, mercurial
 %description    bin
 %{summary}
 
@@ -546,6 +546,13 @@ fi
 %endif
 
 %changelog
+* Fri Mar 15 2019 Jakub Čajka <jcajka@redhat.com> - 1.11.6-1
+- Rebase to 1.11.6
+- Fix CVE-2019-9741
+- Fix requirement for %preun (instead of %postun) scriptlet thanks to Tim Landscheidt
+- Use weak deps for SCM deps
+- Resolves: BZ#1688233
+
 * Sun Jan 27 2019 Jakub Čajka <jcajka@redhat.com> - 1.11.5-1
 - Rebase to go1.11.5
 - Fix for CVE-2019-6486
diff --git a/sources b/sources
index 06d5eb7..e4381cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.11.5.src.tar.gz) = 63500238e8d73e4b29279ee3eb9242960de93ccd3b52bacc4009f45cf123cb8edfe5f519d38c5b07bdf2a810925758511ff3255310a056113d0169f78be1d2f6
+SHA512 (go1.11.6.src.tar.gz) = bc29df69a08a4e9e703de72b5eda5f2d63b78f18f3e7a1173eae5c6dd767f29f1b865a2fc3f692e15277df2d45e74ee17875b275eb3fc50aac2b88082e618bf5