[tor-commits] [tor-browser-build/master] Compile go-webrtc with a non executable stack

[gk at torproject.org]

commit 24f585bf1851bfa022128a5b587b7c0940ec775c
Author: Cecylia Bocovich <cohosh at torproject.org>
Date:   Mon May 13 22:44:22 2019 +0000

    Compile go-webrtc with a non executable stack
    
    Ensure that cgo programs can be built with the nonexecstack ld flag
    
    Fix for bug #30451
---
 projects/go-webrtc/config | 2 +-
 projects/go/config        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config
index 5dbee5f..ba1e801 100644
--- a/projects/go-webrtc/config
+++ b/projects/go-webrtc/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/keroserene/go-webrtc.git
-git_hash: dcbfc825aa33471253a5da1834d499257e05d557
+git_hash: ed20e74ef428d6149a95bab8e63afb47af55c204
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/go/config b/projects/go/config
index c039b04..792da10 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -15,6 +15,10 @@ var:
     export GOARCH=[% c("var/GOARCH") %]
     export GOPATH=/var/tmp/dist/gopath
     export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH"
+    [% IF c("var/linux") -%]
+      export CGO_LDFLAGS_ALLOW="-z|noexecstack"
+      export CGO_LDFLAGS="-z noexecstack"
+    [% END -%]
     [% IF c("var/linux-i686") -%]
       export CGO_ENABLED=1
     [% END -%]