Rebase to 1.15.3

Resolves: rhbz#1881539

.gitignore

@@ -31,3 +31,4 @@
 /go-go-1.14.7-2-openssl-fips.tar.gz
 /go-go-1.15.0-2-openssl-fips.tar.gz
 /go-go-1.15.2-1-openssl-fips.tar.gz
+/go-go-1.15.3-1-openssl-fips.tar.gz

golang.spec

@@ -101,7 +101,7 @@
 
 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
@@ -155,7 +155,12 @@ Patch223: golang-1.15-warnCN.patch
 # rhbz#1888673
 Patch224: net-http-graceful-shutdown.patch
 
-Patch225: x-text.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
@@ -524,6 +529,11 @@ cd ..
 %endif
 
 %changelog
+* Thu Nov 12 2020 David Benoit <dbenoit@redhat.com> - 1.15.3-2
+- 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
 

sources

@@ -1 +1 @@
-5c2f08a6dd3c90948aa383e7adb5c39b  go-go-1.15.2-1-openssl-fips.tar.gz
+1b92c8fcbcaea9c1bffd4cceb20078ae  go-go-1.15.3-1-openssl-fips.tar.gz

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)
+ 			}