git: 34c43da970f4 - main - lang/go: correct patch size mismatch

[Dmitri Goutnik]

The branch main has been updated by dmgk:

URL: https://cgit.FreeBSD.org/ports/commit/?id=34c43da970f4ddf52a5f452af174a833955a6ffe

commit 34c43da970f4ddf52a5f452af174a833955a6ffe
Author:     Dmitri Goutnik <dmgk at FreeBSD.org>
AuthorDate: 2021-09-03 16:53:45 +0000
Commit:     Dmitri Goutnik <dmgk at FreeBSD.org>
CommitDate: 2021-09-03 17:14:44 +0000

    lang/go: correct patch size mismatch
    
    Github seems to be undecided whether
    782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch size should be 1111 or
    1113 bytes. Give them some time to contemplate and commit this patch to
    the repo for now.
    
    PR:             258253
    Reported by:    Alex <marcarianalexandru at gmail.com>
    Reported by:    Marc Flambard <marc-pub at alluem.fr> (by email)
---
 lang/go/Makefile                                    |  6 +-----
 lang/go/distinfo                                    |  4 +---
 lang/go/files/patch-src_cmd_link_internal_ld_elf.go | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lang/go/Makefile b/lang/go/Makefile
index 7330ec5f1b3f..03c73f09add4 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	go
 PORTVERSION?=	1.17
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH?=	1
 CATEGORIES=	lang
 MASTER_SITES?=	https://golang.org/dl/ \
@@ -11,10 +11,6 @@ MASTER_SITES?=	https://golang.org/dl/ \
 DISTFILES?=	go${PORTVERSION}.src.tar.gz \
 		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
-# backport https://go-review.googlesource.com/c/go/+/346872/ to go1.17
-PATCH_SITES?=	https://github.com/golang/go/commit/
-PATCHFILES?=	782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch:-p1
-
 MAINTAINER=	dmgk at FreeBSD.org
 COMMENT?=	Go programming language
 
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 9ace7a72ac0f..71ac1433b910 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,10 +1,8 @@
-TIMESTAMP = 1630671276
+TIMESTAMP = 1630688901
 SHA256 (go1.17.src.tar.gz) = 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d
 SIZE (go1.17.src.tar.gz) = 22178549
 SHA256 (go-freebsd-arm64-go1.14.tar.xz) = f8b0cf0d323e581c9e3e0d5c217847a3e0294fcc92dbac92a5b02cea9d97ad8d
 SIZE (go-freebsd-arm64-go1.14.tar.xz) = 34944548
-SHA256 (782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch) = af6c73b4c403a7aa7aa7865d25799141d28d29447a613f3c8c6c77f9fa41d7f6
-SIZE (782aa42255163559c5e1c4c2d98c8f28da8cf96b.patch) = 1111
 SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b
 SIZE (go-freebsd-amd64-go1.14.tar.xz) = 35927980
 SHA256 (go-freebsd-arm6-go1.14.tar.xz) = 5846b4bbc6881c6c04daffbdb647d53a5b002a0e177271ecfcabef734b209614
diff --git a/lang/go/files/patch-src_cmd_link_internal_ld_elf.go b/lang/go/files/patch-src_cmd_link_internal_ld_elf.go
new file mode 100644
index 000000000000..2e92eee9efd5
--- /dev/null
+++ b/lang/go/files/patch-src_cmd_link_internal_ld_elf.go
@@ -0,0 +1,15 @@
+Backport https://go-review.googlesource.com/c/go/+/346872/ to go1.17
+--- src/cmd/link/internal/ld/elf.go.orig	2021-08-16 16:29:54 UTC
++++ src/cmd/link/internal/ld/elf.go
+@@ -2028,6 +2028,11 @@ func asmbElf(ctxt *Link) {
+ 		ph := newElfPhdr()
+ 		ph.Type = elf.PT_SUNWSTACK
+ 		ph.Flags = elf.PF_W + elf.PF_R
++	} else if ctxt.HeadType == objabi.Hfreebsd {
++		ph := newElfPhdr()
++		ph.Type = elf.PT_GNU_STACK
++		ph.Flags = elf.PF_W + elf.PF_R
++		ph.Align = uint64(ctxt.Arch.RegSize)
+ 	}
+ 
+ elfobj: