From 13dae41f61a51a6384bf55ef7e104a4be48e44d4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2020 00:19:17 +0000
Subject: import golang-1.15.3-2.module+el8.4.0+8764+ced799cf


---

diff --git a/.gitignore b/.gitignore
index a04fffc..5be766c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/go-go-1.15.2-1-openssl-fips.tar.gz
+SOURCES/go-go-1.15.3-1-openssl-fips.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index d7a09d2..f0f706f 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1 +1 @@
-95a0e63d7483c2a4ae3d15e5ce9f5c6706c32a01 SOURCES/go-go-1.15.2-1-openssl-fips.tar.gz
+59d70498286e9d4f6b23ec0022cb4e968577b55c SOURCES/go-go-1.15.3-1-openssl-fips.tar.gz
diff --git a/SOURCES/x-text-infinite-loop.patch b/SOURCES/x-text-infinite-loop.patch
new file mode 100644
index 0000000..ee4fb0f
--- /dev/null
+++ b/SOURCES/x-text-infinite-loop.patch
@@ -0,0 +1,24 @@
+diff --git a/src/vendor/golang.org/x/text/transform/transform.go b/src/vendor/golang.org/x/text/transform/transform.go
+index 520b9ad..48ec64b 100644
+--- a/src/vendor/golang.org/x/text/transform/transform.go
++++ b/src/vendor/golang.org/x/text/transform/transform.go
+@@ -648,7 +648,8 @@ func String(t Transformer, s string) (result string, n int, err error) {
+ 	// Transform the remaining input, growing dst and src buffers as necessary.
+ 	for {
+ 		n := copy(src, s[pSrc:])
+-		nDst, nSrc, err := t.Transform(dst[pDst:], src[:n], pSrc+n == len(s))
++		atEOF := pSrc+n == len(s)
++		nDst, nSrc, err := t.Transform(dst[pDst:], src[:n], atEOF)
+ 		pDst += nDst
+ 		pSrc += nSrc
+ 
+@@ -659,6 +660,9 @@ func String(t Transformer, s string) (result string, n int, err error) {
+ 				dst = grow(dst, pDst)
+ 			}
+ 		} else if err == ErrShortSrc {
++			if atEOF {
++				return string(dst[:pDst]), pSrc, err
++			}
+ 			if nSrc == 0 {
+ 				src = grow(src, 0)
+ 			}
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index 95b1baa..7d17455 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -96,12 +96,12 @@
 %endif
 
 %global go_api 1.15
-%global go_version 1.15.2
+%global go_version 1.15.3
 %global pkg_release 1
 
 Name:           golang
 Version:        %{go_version}
-Release:        1%{?dist}
+Release:        2%{?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
@@ -131,6 +131,7 @@ Provides:       go = %{version}-%{release}
 Requires:       %{name}-bin = %{version}-%{release}
 Requires:       %{name}-src = %{version}-%{release}
 Requires:       openssl-devel
+Requires:       diffutils
 
 # we had been just removing the zoneinfo.zip, but that caused tests to fail for users that 
 # later run `go test -a std`. This makes it only use the zoneinfo.zip where needed in tests.
@@ -154,6 +155,13 @@ Patch223: golang-1.15-warnCN.patch
 # rhbz#1888673
 Patch224: net-http-graceful-shutdown.patch
 
+# Prevent transform from entering infinite loop.
+# We're just picking the change from transform.go
+# because the encoding module is not included
+# as a vendor dependency.
+# https://go-review.googlesource.com/c/text/+/238238
+Patch225: x-text-infinite-loop.patch
+
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
 
@@ -253,6 +261,8 @@ Requires:       %{name} = %{version}-%{release}
 
 %patch224 -p1
 
+%patch225 -p1
+
 cp %{SOURCE1} ./src/runtime/
 
 %build
@@ -519,6 +529,18 @@ cd ..
 %endif
 
 %changelog
+* Mon Nov 16 2020 David Benoit <dbenoit@redhat.com> - 1.15.3-2
+- fix typo in patch file name
+- Related: rhbz#1881539
+
+* Thu Nov 12 2020 David Benoit <dbenoit@redhat.com> - 1.15.3-1
+- Rebase to 1.15.3
+- fix x/text infinite loop
+- Resolves: rhbz#1881539
+
+* Tue Nov 03 2020 Alejandro Sáez <asm@redhat.com> - 1.15.2-2
+- Resolves: rhbz#1850045
+
 * Mon Oct 19 2020 David Benoit <dbenoit@redhat.com> - 1.15.2-1
 - Rebase to 1.15.2
 - fix rhbz#1872622 in commit af9a1b1f6567a1c5273a134d395bfe7bb840b7f8