Attachment 227637 Details for Bug 258241 – patch to ports system that imports upstream patch

[patch] patch to ports system that imports upstream patch

ports-fc086ce.diff (text/plain), 1.31 KB, created by Mina Galić on 2021-09-03 08:13:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mina Galić

Created: 2021-09-03 08:13:49 UTC

Size: 1.31 KB

patch

obsolete

>diff --git a/lang/go/Makefile b/lang/go/Makefile
>index a0f473ef9112..f4699ed96c4b 100644
>--- a/lang/go/Makefile
>+++ b/lang/go/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	go
> PORTVERSION?=	1.17
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> PORTEPOCH?=	1
> CATEGORIES=	lang
> MASTER_SITES?=	https://golang.org/dl/ \
>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..f38e917638cb
>--- /dev/null
>+++ b/lang/go/files/patch-src_cmd_link_internal_ld_elf.go
>@@ -0,0 +1,26 @@
>+From fc086ce1717cb8ab9dbfbc499edd0dd22775a92e Mon Sep 17 00:00:00 2001
>+From: Keith Randall <khr@golang.org>
>+Date: Wed, 01 Sep 2021 08:33:42 -0700
>+Subject: [PATCH] cmd/link: mark stacks as non-executable on freebsd
>+
>+Fixes #48112
>+
>+Change-Id: I673a5fe61171e5ba3d8ce58daac79391fb4758f9
>+---
>+
>+diff --git src/cmd/link/internal/ld/elf.go src/cmd/link/internal/ld/elf.go
>+index 93f974c..fb75c76 100644
>+--- src/cmd/link/internal/ld/elf.go
>++++ src/cmd/link/internal/ld/elf.go
>+@@ -2025,6 +2025,11 @@
>+ 		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:

Actions: View | Diff

Attachments on bug 258241: 227636 | 227637