From 7ff9fcafbdd45e9bb9f1885adcf76e7a91f608ec Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Thu, 24 Aug 2017 19:24:43 -0400
Subject: [PATCH] [dev.boringcrypto] crypto/internal/boring: clear "executable
 stack" bit from syso

Change-Id: Ie9dd13f3ae78a423a231f47e746a38f96768b93c
Reviewed-on: https://go-review.googlesource.com/58830
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---
 src/crypto/internal/boring/build/build.sh     |   2 +-
 .../internal/boring/build/build_in_chroot.sh  |   2 ++
 .../boring/goboringcrypto_linux_amd64.syso    | Bin 7576080 -> 7576080 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/crypto/internal/boring/build/build.sh b/src/crypto/internal/boring/build/build.sh
index 5aa0c051d90..7c50327c2f7 100755
--- a/src/crypto/internal/boring/build/build.sh
+++ b/src/crypto/internal/boring/build/build.sh
@@ -57,7 +57,7 @@ mkdir $chroot/godriver
 cp ../goboringcrypto.h $chroot/godriver
 
 sudo http_proxy=$http_proxy chroot $chroot /root_setup_in_chroot.sh
-sudo chroot --userspec=$USER:$USER $chroot /build_in_chroot.sh
+sudo chroot --userspec=$(id -u):$(id -g) $chroot /build_in_chroot.sh
 cp $chroot/godriver/goboringcrypto_linux_amd64.syso ..
 sha256sum ../goboringcrypto_linux_amd64.syso
 echo DONE
diff --git a/src/crypto/internal/boring/build/build_in_chroot.sh b/src/crypto/internal/boring/build/build_in_chroot.sh
index 84ad953ae7b..b5e5a778b6d 100755
--- a/src/crypto/internal/boring/build/build_in_chroot.sh
+++ b/src/crypto/internal/boring/build/build_in_chroot.sh
@@ -183,6 +183,8 @@ __umodti3:
 	xorl %ecx, %ecx
 	movl %ecx, 0(%ecx)
 	jmp 1b
+
+.section .note.GNU-stack,"",@progbits
 EOF
 clang-4.0 -c -o umod.o umod.s
 
diff --git a/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso b/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso
index b1e56a526a751b9720ade2a6c2261f771cba46c6..89c88e9953a7aec441ddba47afc79866b1e5c0ca 100644
GIT binary patch
delta 252
zcmWN=#Zepp006)N4tEQOAFe@yySuwXf&@>1Yk<cVa37!%X6S-9Wl#d_%tl_{V<O)l
zMTr(8AXc1s2@)kqmLgS}bQv;b$(AG64|#&}6)04sScy_0Wy)2kRHa&tT6O9*X!KK)
zW-VI%(xzR9PF=e7=+&p+fI&lsjTkj%+=NL}rp=f&XWoKEOO~xzwPxLhO<T6@*tKWh
sfkQ`r`{US&Q)m7<cj3~NYd3EF^WU9&53k{mr<dS!IQaJY6b=Qx0LHCgMF0Q*

delta 252
zcmWN=MNI$z006+@?(XjH?(XjH?g8L&0r)VAu+f4y5ePs4xb0p)zJgx=zX%X0NU#v0
z!i0+uDN3{$vEsx_kSIyA6sgjr%aAEcwj8<g<SS69NU;*7%9N{6sY<mPwd&Ms(5OkX
z7OmQ}>(Hr7w;sLv^cyf}$gmNk#*CXVY09)2v*yfOuxQD$6|2^)+puZNwjI0n>^pGi
l$gvZr&YZh&>B_Ymx9;3~@c8lc{r3L*oE-o8^Y&C8{0GY}V50y4