boot0,freebsd-{lib,libexec}: fix bug 511698, it's a critical bug.

4 files changed, 33 insertions, 2 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 6c622c5..92662a9 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -7,5 +7,6 @@ AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2
 AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
 AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
 AUX freebsd-mk-defs-9.3-gentoo.patch 12275 SHA256 e77676e5604a77d10cb3f245de9e5d12acd37064f9d1220a7bc9b562de8068a6 SHA512 db184d82508f386c7176f68431009c89d97fe1d11a5fcb29579341162b85f1e14d4b8fcbe9b4e2c6bd4b097b4b8c68fb8282b27d56f053cf94eaf43e28b31301 WHIRLPOOL fc1bb6d56b93490a00b9c05273920d8051a3c89ec329efecc2483c8cc60d7fddc907b24bcd82a829e159e3f83a1ff85fc8cf2b7cd1e014f68f1fcf98809cbae0
-EBUILD freebsd-mk-defs-10.0.0.9999.ebuild 771 SHA256 0ca344fabe81b986b96dda8f26db350327a987ef22f89135469463893d3965cb SHA512 a289facabe6b13a086162de780df42f087d83dd132b0dcd4725c6faba644148ed09bde54105c94ed0916060cdac269ad11fe379d17b237969ff486b566168636 WHIRLPOOL ea3eb5d2ae4ce418f2c4b94c0aeef41e489b37d97b628e600fb7742100f8eb9fec3766f19b2c3b7271fa820ee96775fd432b890d679b0a5bbd82323fb6ebf241
-EBUILD freebsd-mk-defs-9.3.0.9999.ebuild 770 SHA256 124a973998334da294f3a00559a1d1a62509e7a76661aa921730872e10544a31 SHA512 2962d1fe2af85eb0fc9624a0a0d59a05638fd3eb4d214ffa82774cc76bf3ae7b8ef83a4e6a2a8450b5f404d90e3fe06f537bcabe5b164e8beee8b2418b2b440e WHIRLPOOL 75a3b0b14c9b55402af8559f98526220ac011363dc0268fbacdf7eff9da0c01cf8faeef80fb6dfe17bd859c9d6ab8d6a750c78334570427e03d5fd2ab7449d42
+AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1
+EBUILD freebsd-mk-defs-10.0.0.9999.ebuild 822 SHA256 d07246a139936e75d6c3d582acbdf69d3f529ec8ce038ff5f07a395e6b9c3334 SHA512 a339f41281ee5896e24b736e75c628d438dcd09dc162caa547c58846a8cbf4fad9b18514fa5683d2db3ac68159ae8018945c0753ee966fbd6334fcdd22d66c7c WHIRLPOOL aa5e407e4169e9b3c67d538a4787a16163cbf5032fb06d2e60e766166f431710fc9c0e03028e5b9b749f0e3bf98899059a627d5ab779b5c1f3a9c2312afa03a1
+EBUILD freebsd-mk-defs-9.3.0.9999.ebuild 821 SHA256 d597737120dbed7881ed5f204445029142fe154fe101c53af2844c04f08b5fb7 SHA512 af4a8af53b30489568481a9b2332abe961cae728489a9e2824150323440d081d47cb6b7f0ebdd5d3a2742603381f5acdb96150818b0e684ae8061b385eeeb499 WHIRLPOOL b14795f4cfdd7c0ba6910fba87404793968558836f4aecc23e9953b089327c3365e5af95c81c7822712d35098e30c7dfa6bbe9da92d902b35c649a5fd8965c66
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
new file mode 100644
index 0000000..8eb80c3
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/show_bug.cgi?id=511698
+
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index e438633..de4a05b 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
+ CFLAGS+=	 -Qunused-arguments
+ .endif # CLANG
+ 
+-.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+-    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
++.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
++    && ${MACHINE_CPUARCH} != "mips"
++.if ${MK_SSP} != "no"
+ # Don't use -Wstack-protector as it breaks world with -Werror.
+ SSP_CFLAGS?=	-fstack-protector
++.else
++# gcc-4.9, -fstack-protector-strong is enabled by default.
++# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
++SSP_CFLAGS=	-fno-stack-protector
++.endif #SSP
+ CFLAGS+=	${SSP_CFLAGS}
+-.endif # SSP && !IA64 && !ARM && !MIPS
++.endif # !IA64 && !ARM && !MIPS
+ 
+ # Allow user-specified additional warning flags
+ CFLAGS+=	${CWARNFLAGS}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.0.0.9999.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.0.0.9999.ebuild
index a7955ba..54a98c8 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.0.0.9999.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.0.0.9999.ebuild
@@ -25,6 +25,7 @@ S="${WORKDIR}/share/mk"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-10.0-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	use userland_GNU && epatch "${FILESDIR}/${PN}-10.0-gnu.patch"
 }
 
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.3.0.9999.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.3.0.9999.ebuild
index 198add9..a261e2d 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.3.0.9999.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.3.0.9999.ebuild
@@ -25,6 +25,7 @@ S="${WORKDIR}/share/mk"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-9.3-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-gnu.patch"
 }