update CVE-2022-2879 patch to remove the binary portion and note it in the header

Author: rcrozean

projects/golang/go/1.15/patches/0022-go-1.15.15-eks-archive-tar-limit-size-of-head.patch

@@ -1,8 +1,7 @@
-From e429b5038a364cbe0c9737cf6d21fba2c37a5b1c Mon Sep 17 00:00:00 2001
+From 18bab2267ddb865bbff5f778bf60a115b145bd74 Mon Sep 17 00:00:00 2001
 From: Damien Neil <[email protected]>
 Date: Fri, 2 Sep 2022 20:45:18 -0700
-Subject: [PATCH] [go-1.15.15-eks] archive/tar: limit size of
- headers
+Subject: [PATCH] [release-branch.go1.18] archive/tar: limit size of headers
 
 # AWS EKS
 Backported To: go-1.15.15-eks
@@ -12,6 +11,11 @@ Backported From: release-branch.go1.15
 Source Commit: https://github.com/golang/go/commit/0a723816cd205576945fa57fbdde7e6532d59d08
 EKS Patch Source Commit: 
 
+For building an internal version of go1.15, we removed the binary
+information from this patch caused by ./src/archive/tar/pax-bad-hdr-large.tar.bz2
+it was added to the repo:
+https://github.com/aws/eks-distro-build-tooling/projects/golang/go/1.15/rpmbuild/SOURCE/pax-bad-hdr-large.tar.bz2
+
 # Originial Information
 
 Set a 1MiB limit on special file blocks (PAX headers, GNU long names,
@@ -66,7 +70,7 @@ index cfe24a5e1d..6642364de1 100644
 
  // blockPadding computes the number of bytes needed to pad offset up to the
 diff --git a/src/archive/tar/reader.go b/src/archive/tar/reader.go
-index 4f9135b791..d964c3b6b3 100644
+index 4f9135b791..a776e0be28 100644
 --- a/src/archive/tar/reader.go
 +++ b/src/archive/tar/reader.go
 @@ -104,7 +104,7 @@ func (tr *Reader) next() (*Header, error) {
@@ -142,10 +146,6 @@ index f153b668de..c68a859ad8 100644
  				hdrs    []*Header
  				chksums []string
  				rdbuf   = make([]byte, 8)
-diff --git a/src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2 b/src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2
-new file mode 100644
-index 0000000000..06bf710d3a
-Binary files /dev/null and b/src/archive/tar/testdata/pax-bad-hdr-large.tar.bz2 differ
 diff --git a/src/archive/tar/writer.go b/src/archive/tar/writer.go
 index e80498d03e..893eac00ae 100644
 --- a/src/archive/tar/writer.go
@@ -161,7 +161,7 @@ index e80498d03e..893eac00ae 100644
  			return err // Global headers return here
  		}
 diff --git a/src/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
-index 30556d27d0..4bd69fd548 100644
+index 30556d27d0..cbf6a85525 100644
 --- a/src/archive/tar/writer_test.go
 +++ b/src/archive/tar/writer_test.go
 @@ -1007,6 +1007,33 @@ func TestIssue12594(t *testing.T) {