From owner-dev-commits-ports-main@freebsd.org Fri Sep 3 17:15:06 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A8CD679058; Fri, 3 Sep 2021 17:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H1PYk0jpvz3mKL; Fri, 3 Sep 2021 17:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00C1DA1; Fri, 3 Sep 2021 17:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 183HF5mC002227; Fri, 3 Sep 2021 17:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 183HF5KM002226; Fri, 3 Sep 2021 17:15:05 GMT (envelope-from git) Date: Fri, 3 Sep 2021 17:15:05 GMT Message-Id: <202109031715.183HF5KM002226@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: 34c43da970f4 - main - lang/go: correct patch size mismatch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34c43da970f4ddf52a5f452af174a833955a6ffe Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2021 17:15:06 -0000 The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=34c43da970f4ddf52a5f452af174a833955a6ffe commit 34c43da970f4ddf52a5f452af174a833955a6ffe Author: Dmitri Goutnik AuthorDate: 2021-09-03 16:53:45 +0000 Commit: Dmitri Goutnik 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 Reported by: Marc Flambard (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@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: