Fix SIGABRT failure when compiled with SSP-enabled gcc, bug #511698, patch by Yuta SATOH

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

15 files changed, 172 insertions, 45 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 4f9e3d38acda..3bf5d7023b90 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/boot0
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.49 2013/11/09 09:15:50 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.50 2015/02/18 17:09:17 mgorny Exp $
+
+  18 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +files/boot0-add-nossp-cflags.patch, boot0-9.1.ebuild, boot0-9.2.ebuild:
+  Fix SIGABRT failure when compiled with SSP-enabled gcc, bug #511698, patch by
+  Yuta SATOH
 
 *boot0-9.2 (09 Nov 2013)
 
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 8f9a3b3be064..d1360f667d5e 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4
 AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
+AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-contrib-9.2.tar.bz2 56728584 SHA256 22e8d211c4de223aee7f79146eb552cf9c6b0a87967ec4b5304a9c6ea16e3741 SHA512 badfd51435f1a838fbe0f936331393344e748c35d13f8c6fd67779e47986713ee431829e28deafb0c253f7ce4ece40fd6606ba362ff97a49d17626e766173a5f WHIRLPOOL d054fc61454968fca917c39c95885a0a451cf170fb20a18a62437c940c517b96590fd2dcaa1b36e9a4437027ee851788ffdca97a82351c3af8dca207fd93ef06
 DIST freebsd-contrib-9.2_rc1.tar.bz2 56727056 SHA256 5026afa26e434e934cc9934c74628fa79e8b75b7bee1e214e34f9aae8d1b592d SHA512 8a9a4a522bfd3ce573fbe81f758c6e581f3e2d14d6eb58f7d4f821c850882793b334b59591baf94fa4668acb835895c7de2d4380d74851adb1760eb4e20dc124 WHIRLPOOL da92a22ea65fd3985529b5355be8d11622538b73ec2fb57d005d83b95b59e20e7f763d632ada0edc0be73d33c0dec668f31ae4bb90b421ca7d324a2274d01696
@@ -20,17 +21,29 @@ DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cf
 DIST freebsd-sys-9.2_rc2.tar.bz2 34381761 SHA256 2cf28a18adf0d22c0d141f2ee0c7a8b4167a232b2f488389a1b9777c0fc3259f SHA512 1ac4ae1e04f44bbe9687722fc21633e7ea5e0990327f079dfb3239dca1fc6f92a587e4f5d9fa4ec6112b99ce57297f5394303d5907b04f7a3eaeff7a1c71bac0 WHIRLPOOL 734a3911efcc3253bf8e04eb57130b227b38f9e8666aeb50fc608af42ed8ca080016b3062d59ddc585890693bdb64d4a90a0fa7287a0bc62ede4ad445140223f
 DIST freebsd-sys-9.2_rc3.tar.bz2 34386428 SHA256 86fd03137f39a8544174dd26f4096da022c1ecfa447a1e7c9e4e241428b94947 SHA512 233181db24063e6afe1dc3e17280e2b89a39529961814640bd52d6efa1bd9f9212ab2a467266df7cd1c52654e1759f124df5d4fa439862397816623d46f3af40 WHIRLPOOL 4d7a065decda622550b16b2583b133f9b3d42aca4e6707a53012bbac9e5eb62b2fbdfc84d9cc0b666c9685e8f9abd6c9b7c9f46ce23e7b16a90a05530f45cc9b
 EBUILD boot0-8.2.ebuild 1289 SHA256 40e0e4d5a35139168f684a17063dcc109c2a8b51e24713d90177a057eeba62ce SHA512 79785ee0f577f744dd4087f69333bc76d9624046526d4f9a36f2be9d27e8b68e3d3bb488147996cd95a034ab288274c43bee8ac444776f40c2e9f2f3ed3edb91 WHIRLPOOL b9c59ec699020212e0ce439bde6b3d4acf899e2b6620ce3261f537e1ce05108989b8cff38abd1ab4afc1586e1ba564d1221e420d83c6509ad24f260e1a803d15
-EBUILD boot0-9.1.ebuild 1544 SHA256 2aa41bc79f0c5687bf49c48a831289a0b7ebcc6258dcd6df568a5eff40b91e50 SHA512 7cc5446ed5b3e40973134a384838a31929bea852db661d40cb3f08b09cba8aa26c16143ed3022fc030e3b3c2511efe7d0107f5386228e3b7872c1cd486ab0f1b WHIRLPOOL 923b126868dc7f9a1840241b1601d6fe3fb1015daa8bdad373747c9114238f2991fadaf446b9693a90899517fba6222bbd19fe76d2af729f02d44d7897734ce3
-EBUILD boot0-9.2.ebuild 1785 SHA256 668d526552e5260befae5f4ef7d4b349db223217b1675d2e9eaa5c0151db2174 SHA512 1c85fedf86f1ada6c72c1e93c2984781164cb1bde0ef2b6dc8c1c0388db7cdb2fbeaaa3980239f43648b6ef23b29ac0e1c3adb187f37656c5239ed0418481230 WHIRLPOOL 6f9e8d76efb6a36ad3985fa138be48f800b7dd6bbf864bf13b6579607fc5be401fb10c2ba88e018060fc42a3bec7f8d50a8987cf08943ba351e9e7070f667553
+EBUILD boot0-9.1.ebuild 1586 SHA256 f48b11c0c8cf859582a3ad16d7b8303c645b8e29b1a63d024e90bc014ff1348d SHA512 3c034b9f9b99636e5678ce7bdb89dca59747f8a28473e8e7592e8cb209ee4671b739ee422a633f591d0b007a1e000911c38b4c4dfafbdffcea2a5be40d0894a1 WHIRLPOOL e9ebb57b09f5672e9ce327bbec785c1dab4b88ac17a98c45830587b9b1092012b09603a747e6d275a1253e3189c66ba1f00ebd66b2f12a836516d4d7148c996f
+EBUILD boot0-9.2.ebuild 1827 SHA256 f56f941b2bb031b878932674978dca6f053a24078956a41c6dcf0926b4d95f7d SHA512 6002fa958e2dac83fadfc4cfac98870a621047382ae1cbf1c0f99ca75a2b7dd890f563e478fc1694d9be3d9d12457cd6da3b0221ff837f13d5d2ad43329d2ded WHIRLPOOL 089284369ddc1598916f8644b6516d0ff95a630510f92adcf7701fd5da8bfedd83bdeb1b79bb1c2ffdc37b93b9a35f9ae89e29af338b1d494a2972c555f72ef5
 EBUILD boot0-9.2_rc1.ebuild 1789 SHA256 1c76406d6413c7e03d8146b25363b47d0e14c7f980df31fdf3169d90ee981af3 SHA512 9119090917584e7fd98e24e68355090e758f769062a96003cf3062c2f28e8ba6b44c07d7008b82c96b34621b91f9044f0169413d4b2d1f4febebae12e5956c7c WHIRLPOOL fafea019fa89e3f64873e0186038e1754ae4fdbc63ede73be2d77c3f8b08f92919fccfcfbbe22a2717691ed173f74f22768c3b66635592ef27622ddde4643253
 EBUILD boot0-9.2_rc2.ebuild 1789 SHA256 8ddb730751849f21c5dfeb4afe10db7725248f2bbe0c6e3c9606e11db5bf3e8c SHA512 27ff9c67ad856060c7ab28559a7351155b085c35e267f05fb2941e5f1791384987d62b35fc60be59ee779750b94f556d1eb3395e431b051b9e2ec7410de12ce5 WHIRLPOOL ffee3442b946c34bed028b5747136064240fc3048f3dfcd2d76271af672c5defa25b5415aad24728bf1b9779449eb20a4c764c1bb392c1c0f1c1aa788c785799
 EBUILD boot0-9.2_rc3.ebuild 1789 SHA256 490b8dbac7e715ee337a5d834816f0f474ddcbb5f7572cd8088252ff7b56e74c SHA512 4c8f925ceecd5c426e1cc4f8c0a470251f1367964756976b2bef38efe0adbbe859ac4117f13470bc8c0df2a2a15d05dd3df41c2990d8af185afbaa4efead197b WHIRLPOOL 0566b8192a80126085a34de53fae9413b43235bbb43fd4fd06e513a1f2d13d15f8588626d064ddd58a33077ce17d13b9dd52ce5836e4079209fc02a414686348
-MISC ChangeLog 6941 SHA256 829172cedbd8264708b455c68f884ba42dcefe11ae49453eafb67fb780da3c14 SHA512 adfd7bfa6a9a51996941c09f89f6219ccd4fcc5656c5b29cda051686cbec8b14a1025b401fbf6311e45ac2b41862404f2fc44d8f5da8ab45183d49aab84762a1 WHIRLPOOL cce7d8484d7eec4992cb745859bac0701a33173c3df3da5a6a05a4911a52206d27887dd805a18daa9c62bb34482537a3b0effdd6ee28de88ac803f0245366f74
+MISC ChangeLog 7158 SHA256 ae2c6ca47503089ba49298bbd8b11e4d8070de5b495afa9a414feb4473d45f14 SHA512 484dcc2f37d258f085c54bf5b54066280e8e2d919b47c3488fe895470c1385e321170b629de8eed022b05bbb412aea7f48a92f89c3efbdb1758333b84f3de51a WHIRLPOOL 07e63a8f4599a25f5be1b2670fcac36615ff94880791d2a9649588733cdb1033ee5880faf82c3a3f46defe1a49f59df25ce75d3949eef54ca1e6c8031b3cd216
 MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJ9/UgACgkQvFcC4BYPU0oTswCdHEjj4CDaPkDOJ26AjcZSqTkK
-JFYAn29qOkAO4N3/o792fmFr4KqRtmht
-=4qVl
+iQJ8BAEBCABmBQJU5MdAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8ngP/2dONxUlwGDzq5BZTBSKym0z
+N6ZxJhJFMZ/I95Qh9fLAbBnwLWBr6l/rxpIGbo1sRblzS7W+PcfIPe6TOf02V+dg
+zMBu2KxMU5WS3jiRR2kjsv7F460g62n3IPOFCTV9Vpbop284toDiCghFR4GV2O5k
+yJcwJzhN+DGx80PO3kmgqSFPkYotRAbgRi/a4gyHHXmeZTXHdeF/t8w+l4PIEo1t
+OMKWfUxkAbvW3ZjLw5O0OFVvg/v+6qkBzeqSZqiPTYjU3X0wrmqoELzKdjzvU5NA
+gV+TB+ELGS85K24wWczbtLYEqOrpTJ87J9DDPOxceglzo5j632RFblmw3MNwJP6l
+pXAsTF1lS7W6eRFkPmy3eswgb946I91XPJ1XdKREtPSMpcx1Q1f6zfr7auhttnD9
+93grLJ+C/g9jaXOoVySYOVQEH/OkjdY35CAqgskQtho29wah7MRLwTghBe/xPyAB
+Ealx2FoXJScLJ4htVnnC11v6lcBcWcgI/YBc+Oj/4hwKB2h8UiuIS/q0h9DPlWwB
+lqE+Q1JG4/cjwMAOvKlXwUqWTJS4GPIJDFhJkI7U6kX/WUqIMKSZF3P3i3LCQXjq
+NRaIhSxYzJ+giP/eLEntc9L5MGBLyxEiTRwX02+T8erLCpdCuM51i+DB8YaxHOvp
+8sNY9fJfZRBFh17GxYf8
+=jHlf
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/boot0/boot0-9.1.ebuild b/sys-freebsd/boot0/boot0-9.1.ebuild
index 533390c42095..e6f7b745459b 100644
--- a/sys-freebsd/boot0/boot0-9.1.ebuild
+++ b/sys-freebsd/boot0/boot0-9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.1.ebuild,v 1.3 2013/08/27 23:08:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.1.ebuild,v 1.4 2015/02/18 17:09:17 mgorny Exp $
 
 EAPI=2
 
@@ -22,7 +22,8 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 
 S="${WORKDIR}/sys/boot"
 
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" )
+PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch"
+	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
 
 boot0_use_enable() {
 	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
diff --git a/sys-freebsd/boot0/boot0-9.2.ebuild b/sys-freebsd/boot0/boot0-9.2.ebuild
index e075c5ccc6ea..8b6d023058e4 100644
--- a/sys-freebsd/boot0/boot0-9.2.ebuild
+++ b/sys-freebsd/boot0/boot0-9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2.ebuild,v 1.1 2013/11/09 09:15:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2.ebuild,v 1.2 2015/02/18 17:09:17 mgorny Exp $
 
 EAPI=2
 
@@ -24,7 +24,8 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 
 S="${WORKDIR}/sys/boot"
 
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" )
+PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch"
+	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
 
 boot0_use_enable() {
 	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
new file mode 100644
index 000000000000..abc6a57bf4b0
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/show_bug.cgi?id=511698
+
+diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
+index e0039b9..533dea0 100644
+--- a/sys/boot/Makefile.inc
++++ b/sys/boot/Makefile.inc
+@@ -1,3 +1,3 @@
+ # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $
+ 
+-SSP_CFLAGS=
++SSP_CFLAGS= -fno-stack-protector
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index cee0a6758191..4e8c78c9e0c0 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-lib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.206 2014/03/24 17:49:33 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.207 2015/02/18 17:09:17 mgorny Exp $
+
+  18 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +files/freebsd-lib-add-nossp-cflags.patch, freebsd-lib-9.1-r11.ebuild,
+  freebsd-lib-9.2.ebuild:
+  Fix SIGABRT failure when compiled with SSP-enabled gcc, bug #511698, patch by
+  Yuta SATOH
 
   24 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> freebsd-lib-8.2-r1.ebuild,
   freebsd-lib-9.1-r10.ebuild, freebsd-lib-9.1-r11.ebuild,
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index d414b52a6e47..3cdbf348485c 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -21,6 +21,7 @@ AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9
 AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
 AUX freebsd-lib-9.2-liblink.patch 1694 SHA256 7586ac9aed55c833099840fd0f7b7c119ca9fe35fcce9b507b235ae0ae5aceca SHA512 0d9b33b5bd8b661c1403485ba2005d6c7d34341d1ae6c710a4516583ca9bacee050f71e06c039378b826278db570036a4b8f107833d9151c7a3cdab43f64ceb3 WHIRLPOOL 9b2782a936dc5be5f2d789633b6eb9b68d2f199bbe7dc12c7c86a848191abbedbef942370d233e4398688ef5832e114039126662b9821e2ef04bd7e723e6fe8a
+AUX freebsd-lib-add-nossp-cflags.patch 1193 SHA256 53a844511feca44a9db4ac19de336320398335d18617b39cbc4e66db3f88e861 SHA512 fcb290527381df5b91355ca7f36bb4c770378b014890e7a4d129b7cc28e7c18cb1f87ef9e1b308e0de61b54d767677865969c77a9877d8874f2bec223331f9f8 WHIRLPOOL 20e4a0cd017f9aee59f0e4fa809ae74c855fcb7c7a794e1e71b1e5900390d08a9bdfaf5a36a45b057d6211c056a5fb69adfc688fa2adb0586f115be0aea40219
 AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
@@ -94,21 +95,29 @@ DIST freebsd-usbin-9.2_rc2.tar.bz2 2866526 SHA256 c7140742f1610edba8f9fb99fd7a32
 DIST freebsd-usbin-9.2_rc3.tar.bz2 2866696 SHA256 6ef46645466bf94799a8cfd0465d60a3a0fb444ff96b3e8f2a00fa7cf266d2bb SHA512 e70d6d12588be267b5bf7b9128f49e2805f7b84428b85b8c0a9e93b10b54b362b62b6be01c4ab00c5ea39e84d2f56019c3318ffe75abd946d77bf154e1f258a8 WHIRLPOOL 1b5556928fc1d26baee3366c16eaeefcf58f39e59c0d472f21bf525f8dc1a69e7a7c05492f5d03359b315c9550a823519ed20b9062309725499f6eccb3f60a05
 EBUILD freebsd-lib-8.2-r1.ebuild 15803 SHA256 6ed08aaa4950f1c5f92736e403f27eaaa7e4059f6d8c0d3cb416d5ec3859dd96 SHA512 32abfc388bdfe628634d46a686437cbfbe01d0fb99c85a75a3ccc67869a19ace1c3341b2ca468643a1c0d544ef8ad0b041cd1c882767cab57337813b8b3d8b63 WHIRLPOOL 250d59a4bee40b369d1d683e26e70ac15c02044af13c604c885c41a0463470555ba92124bc58adea34fdd922fbc79406e4c376f9cef08ca6569c7cf432c6a2a8
 EBUILD freebsd-lib-9.1-r10.ebuild 18625 SHA256 9bad00d447b28f362910eaf85782a1caac4da475d4e83cfb6de583456891b3c5 SHA512 1b67821daa1ca31220542d404f8a9268a35462eb0a86bc76882a9e31159af87e62f06dd6d64192b123ea2c019581829cd3da8e9b6bb443279b55d5e3ed4c1d63 WHIRLPOOL 6fc1ec14acc67d2fa6ccf55ddc77aa89bafab102e5fc12dea833dcc2eb0628b5e87e7ae4cdab679e5fecbd688395d794550f1761cc688dcfe8786d0d1c6ad6ba
-EBUILD freebsd-lib-9.1-r11.ebuild 18895 SHA256 74dc68787f7245b5f8a60e8c96ca3d066fb9df00822825ca1b17c959a0b7283c SHA512 c21e69ba33c3f6b01461877df690ea11851a0368e2d05f49aff848475a4ff5289e383454a305577e718328137aeb0fd154f5ca3b841bf890ccad22574737fb78 WHIRLPOOL a599ce12d69025bba9f0e57221f1f64698c975d716f70da8d6fb952957554fe3de49a036813e3015d9f1f10d6ae22821808ba189fa1ed1d91d5862db97db8304
-EBUILD freebsd-lib-9.2.ebuild 18241 SHA256 51af478c38d3ee59573c25e310011acbe3d17cef7d845f83d881258c95baffed SHA512 d494e8f25efc96bdaadf4a672802a3035ec3d5a2548928db7bcdb46c134496a86438ec110a34697d1048c46f2e0cf45ba4485b1ffa302ee48e5ff45bb488c456 WHIRLPOOL 03567642bf782bc57db05fe3c523302e677a1bca9779e8e70a7c63e3f6577c7e2ff04a674ecd7a8a81f90c91bb76ac9f226a919483bdb054dd9a5b33e3e8404a
+EBUILD freebsd-lib-9.1-r11.ebuild 18936 SHA256 a450ef603f4d8ddcfa67a1ab37492e97b06aa6e7ff55d9a52818338def7a2c61 SHA512 dcfe7645fd9c75a6eaa5934fa3975a5584294f31851a724cc63f27cfe6c698206a81553400f09c522649fcbf169107253147f8855c641e323c3abdef1dc344ee WHIRLPOOL 7f6e33a601ceac7fee197eb0ea609cbc6ac2207bc65608585c8f8137f8b052e8f50df8d031c311312af542b83a1a14f85d8559de52bf3091946e6322626ef7db
+EBUILD freebsd-lib-9.2.ebuild 18282 SHA256 5760c4d3575f2c4ebeee6cff154ca3dc97b908d79567275be2a78482e47d3c3d SHA512 9b0b1f3efdd788dec93eb2d3a67bf98e24825b13439d7a888c8add04cdf2bf33d0030cc90ba38f63f2d3a20468fd9e2c3f063ec79621d917c7dc349f49951e31 WHIRLPOOL bfc5436cec8b9d025c6758cc224bb80dee2ac8450381375a465103e56953af2b94230a4753cf9e79fb8a2d7769843fd4d85e8ed434d6cfdbda509d407885c1c1
 EBUILD freebsd-lib-9.2_rc1.ebuild 18245 SHA256 4612d1d7e72dd9bf6fb4e1f75c4c498a8fb01b5fd01cdd6b387d375fc86e532f SHA512 0ca2ad95896ef4b1f87a71af91e35d4539988a56248149b5a5462b6861d14f683a4ae02d914d4f701cb7a558933dd23d0b6b0ad1bc51dd028ba0f60143c17a88 WHIRLPOOL 7d878eda6a245603b4414f0ced9170be65787f48d820a210b2334b7c73677093fe57949cc1ee34ed857520d258a72202d7294cc29495285d6318dff4cf3bf93b
 EBUILD freebsd-lib-9.2_rc2.ebuild 18245 SHA256 f57feb3e766b489cfcf34724f39f781cf600ae553cfa7a8e8227aaaf66a1cc90 SHA512 7e47a37cea6e0d0150e5233bf2d09294dcfe189ada64a74757b4ebf83371ff7f703d98745cc0764e3f2e3a527062791698c8c0cd0ee891e0eb1f49cadec145cc WHIRLPOOL 4a4d71da35ab4efce57787dfc1687cdeaaebf6a3fb747d9b38c93e60e576074ecf0aa1639ae5b27404ebc4f68c0781f020ee1cb3bc99b8f771d2811c8abfa0d3
 EBUILD freebsd-lib-9.2_rc3.ebuild 18245 SHA256 e47cd90122bdbaa22c46c55bc6846135be2f78de273cdf337c0bd0592d239c75 SHA512 b96037063f14d9a44bf1196ae54a17f756ba7e25ab7106c3d31b8e49c6f55f9de545fd9c11e637932636194122d1600d23a38869841132c4a95191ec3b550157 WHIRLPOOL e1cc9cc9f1a057d6992922e051cad1e38d54a610835596b8952bde0dac8272f73238fbd7ba7a8fca7aa97f0ce98129dafd35f5d9cf7f1c9ff90f0c8746c7912b
-MISC ChangeLog 41801 SHA256 540ab5ab46c3d729683f885f57d0adad49e3155fc12e78ba94b2553175b0fc64 SHA512 4b915e5979a9d17da05b7bd459f8d80928516ed81a6f4a08d847c2109d346b04e0a403efebe2de2e6ff27846273f4435989157e673915f447525cfc604820a81 WHIRLPOOL 44f7ecf5c406b2807cf43327a3e0a8c8dd86fe506f7cbf11ed34f0badf422da5543d784ec8bb9acaa11a927ae5bc0afe193628658db18f41eb8261a260863b17
+MISC ChangeLog 42041 SHA256 fb234d81e1035675bc41683cc3810422195d1d675e6ad2e7adae12ba8e2fb438 SHA512 3f60cd339604da3d6d0b82188be418167b29e0e96973d48bdf11c78d24a570f96cfc3a98b292825be873c887106140c18b3c7e55fc580b040162c6ae794ed464 WHIRLPOOL 1188f17a58d5b88966c76362b6527580f3a7ef192d3c08e3556a74654d62f635ba3312246fa710abb7cd3c23cb8fc241311be32ddf1032bde50315505ba766b1
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTMG8TAAoJEEdUh39IaPFNGlQH/ja8+PgLX3P9v9Qhxotq2cPR
-FDnhgaDy5G5y0QI4+c09c4er6XLgQzF6ifruUt1B+NNGNjn648MeaBUGLy1bslJp
-txuMStjyeRuMyVsoqcf9oEfY9K/Me1M5Z3JdbiGq8zoirLuYHmFHLZ3cQoBCP/Qg
-LgLqJFexvwUKiSR79LAd1pMk1tavNveG0rqMj+ZFniFGViG6BkzSid3t7w+KIVwp
-s7nC6MdzfPivGU84vOLPqL/vX0ehjS8MXIzRq2MvpJLTGMtlaFlSIhDbvixwqO+j
-H6ZVuI6A/BDy8P7g1apMLwBFZUYU0sYE2vpf610GvJ3X79t1OWmAZ4GcLzd1S2M=
-=16QY
+iQJ8BAEBCABmBQJU5MdAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/iAP/1ZdNbKajO3hZkMk8Sib2v6Y
+Bc8rGdeIzSY/Vr8nStF4DOREUQYsWVOCSaPtBM2IuSK/LhuAXFer3r3xwWX8LXGV
+u/5EarpZHM1bRR/GKh9oZLqXhn3cVADVX+mIjeOHwKnLP2xtKmbiQV9ohSXoRq1D
+jbSbmIboNMxPERBpfRfx9Qdq5nZgdMr45uNY2U9QwfpLJNMmgwKq5aeVNgrlL/Ru
+i9HHd30yz/4yEG/WUnIprGa64RH3hf5BY09vpGvs3O/FGdF9Y7+wxVYF89fE9D5B
+znvQdpvwApf5Hw/ogIaJPd69jyyUliDvMriH/Saf1kuuQ2kLVtSN/8KP6IfxHWbM
+3SGf/Zs8KacyKscNYRnGN7l7wrhJP86M6Aimfw+GNBDxHqZDTYrFXLK2LjnoBpHd
+kwKNPCkAjOg43ElxD61IYnjdEUKP27+gb/ZhJCE5u1GRX4zqjubccV+rfNns7GYC
+LaqTwVrXXuCxgmYna2URxWGJMZkuLVT/lczwsmT5Y3eS9YpM3mWQFn8anY4CPoKS
+BjLi+lXK/Pxxoi4LsOyWX0jiFotxnJM/HwZ5/JXeC4qiqRvNmMFnJGDfqDKIOupb
+0ZJSP3F9RjiaWTu3UR+CvtB/BOwQE5UQCcr567f5VfJCkFiLKhct+M6mLv9tyH9F
+O3CHH2dzJ7aeiMrexqS2
+=loDw
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch
new file mode 100644
index 000000000000..00b39f750ec1
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch
@@ -0,0 +1,30 @@
+Please do not disable this patch.
+All commands will be non-executable.
+Abort trap: 6 (core dumped) is displayed...
+
+Details see Gentoo Bug #511698.
+https://bugs.gentoo.org/show_bug.cgi?id=511698
+
+diff --git a/lib/libc/Makefile b/lib/libc/Makefile
+index 1cc23b7..7dd458e 100644
+--- a/lib/libc/Makefile
++++ b/lib/libc/Makefile
+@@ -149,6 +149,6 @@ CWARNFLAGS:=	${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
+ # in the future to circumvent this.
+ SSP_CFLAGS:=	${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
+ # Disable stack protection for SSP symbols.
+-SSP_CFLAGS:=	${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
++SSP_CFLAGS:=	${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/:C/^$/-fno-stack-protector/}
+ # Generate stack unwinding tables for cancellation points
+ CANCELPOINTS_CFLAGS:=	${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//}
+diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
+index f92d87d..7a3a2f3 100644
+--- a/lib/csu/Makefile.inc
++++ b/lib/csu/Makefile.inc
+@@ -1,5 +1,5 @@
+ # $FreeBSD: release/9.1.0/lib/csu/Makefile.inc 204757 2010-03-05 13:29:05Z uqs $
+ 
+-SSP_CFLAGS=
++SSP_CFLAGS= -fno-stack-protector
+
+ .include "../Makefile.inc"
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
index e5e0b57d468f..4084c3174b2f 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild,v 1.3 2014/03/24 17:49:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild,v 1.4 2015/02/18 17:09:17 mgorny Exp $
 
 EAPI=5
 
@@ -96,6 +96,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.0-cve-2010-2632.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
+	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	)
 
 # Here we disable and remove source which we don't need or want
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild
index cf1d48903c1e..9887e4c2fc44 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild,v 1.2 2014/03/24 17:49:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild,v 1.3 2015/02/18 17:09:17 mgorny Exp $
 
 EAPI=5
 
@@ -94,6 +94,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.0-netware.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
+	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	)
 
 # Here we disable and remove source which we don't need or want
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index d77b9ed30573..011a75d3afff 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.58 2013/11/09 09:17:03 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.59 2015/02/18 17:09:17 mgorny Exp $
+
+  18 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +files/freebsd-mk-defs-add-nossp-cflags.patch, freebsd-mk-defs-9.1.ebuild,
+  freebsd-mk-defs-9.2.ebuild:
+  Fix SIGABRT failure when compiled with SSP-enabled gcc, bug #511698, patch by
+  Yuta SATOH
 
 *freebsd-mk-defs-9.2 (09 Nov 2013)
 
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 824739b832ac..7a1a53d8e538 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -7,6 +7,7 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
 AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
 AUX freebsd-mk-defs-9.2-gnu.patch 3459 SHA256 90dbc391c659debe8a5844f83e8535e7016243bed2c05570d20b453a71a3fee9 SHA512 6536a80a351dfa8f9de79a98eb3211152e612508ea1ca5057c0c5b2a36f4decf3060b005a3c1bce552539464694dffbcc304904ff9a1f18c27eb420051af3d0e WHIRLPOOL ed7c8b19a563ed2518b00e2a533f772c4f4f405f28be9a56b2ab96fa9a291cdc7ff1331d6217d2b1a85fa4aec5e0f0e63408968da2f32e99938a772b74f45474
+AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1
 DIST freebsd-share-8.2.tar.bz2 3797560 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0 SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 WHIRLPOOL 42326ad6139feadf80509f5e810f6a86009ad3a69aad9550c6355389773c28d5b2f7930eaa852f8442808485d13e5b758ed3420e39048bb3966785e6953119ea
 DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d375c1eeae98f52fb6aded233ac2491d7 SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 WHIRLPOOL 7d15596888ac42af1a0c125591283524ff794dccbf9f6592963602f046a45ca073b10bda43c2d0d662fd3414753de64c05293788e03c4eea67de55d9bc083c11
 DIST freebsd-share-9.2.tar.bz2 6731157 SHA256 9a67395db66bcda4ba261c229462c2444fc29dbeabed380d15479883c20232fa SHA512 601832e5cae189fc9e19a196e35dfbe83d9b44d8716b184d4e83c5564128a08e74ba5ce3c79820f322c88c9f51735121427738159593762ebd6744eef6653f0b WHIRLPOOL b4e6fae08b70d1fdd6780f4ec761b3c6cc79dd960aa03695f4832704a55ef4cd096193a8866fed24b08d351f78530bcb3aa932d8311133269434adbe3b5fd788
@@ -14,17 +15,29 @@ DIST freebsd-share-9.2_rc1.tar.bz2 6731688 SHA256 cdf863443216b221f4c0ad8bfd3441
 DIST freebsd-share-9.2_rc2.tar.bz2 6732594 SHA256 18793d940b2777b311eda78324a452826500fa0503f57f76e87d04d501412b8c SHA512 a6a04c145c9afcdeb04c0dae681f86ac8f9fc26f3393511ab936e4606ef5fac60bece11118ad293d1cb2c235a771de3ffb94693c68ef05abd86f2ae8b34c2d66 WHIRLPOOL 331d72591cb2862732c62079f0d77ed49eb2e9c50ce9ff6fead0efc30b4d49a68213482e8ce4995f8cf6d3e4c573c156307189df649026e8fb892fa60cb43d59
 DIST freebsd-share-9.2_rc3.tar.bz2 6732884 SHA256 2a8c2d9176400eb6daef53a3903b199770fc5b3b9c0fdd82dac42c43d4376627 SHA512 d606179946410a1133dc83a426a7e56f15fee2e043e02e99bb8e74a7ad67b32e53ab6b20d8f2600010c256a0105633e4781ed2985df55502ec1b50030351e380 WHIRLPOOL dc1cad33359839a60a7bc4efc9d32429dcf595dfff3140bd760810a8ceddd5e0d7aaa5d761dee80a2856ea324b43ec29ab0ae5bfde07dc6694c64c4e8f0705b2
 EBUILD freebsd-mk-defs-8.2.ebuild 879 SHA256 212cea22f0e963889075dba7cbdf47a3a4509991c2112965b59bf61a71833bdc SHA512 6303888496e432c17462bd04cc9d42dc10078154aafead4157009214f5e97249601a73d9b3aa6020ba0beeb72ec509f6db260649b3cb35c44edf78030a8545a9 WHIRLPOOL e26d964bf9180115ca6c55097fb520e81f3e1bd493ce20784484dd51768c412a9ad17f3ef8d532da4d21728547de525905da6ba34ebb4adc9b07742149f0f5bd
-EBUILD freebsd-mk-defs-9.1.ebuild 852 SHA256 15ef61bd11d3ccbb39399f58c5d919cf59c3b81938b934c4e3e97cefc154cd17 SHA512 676bd6b00b416fbc9dcf66e584e15d9b5d2916b7bbfc35439de8433572b53410ad654dc3f89819a729cf5f9f15ce7d302e3bb52cca70844ffe8093185aac4a5f WHIRLPOOL 35e347fbb570a58f1a86f65d57a53dd90fac96597e50792d319354a958a1a1eb0a5985b1105c26c68b0910c7c5390081a1a65ea1abc0faab2e553007763d45a8
-EBUILD freebsd-mk-defs-9.2.ebuild 888 SHA256 8be6ece9fe686500d7de3423b731f6c581aebe8cdf713f720aeec5b41e5d34a9 SHA512 61d5d6457f7a3706145df9d30328254e4d91210e3e5dfac03d86a2dd846f1fffadc023c268c9efaaa1fae9b373a904073eded4b4ce00671538ebaaa47c977ce8 WHIRLPOOL a46a76c10e2dbbd2b14c3e7b047a67162e884dc5bc05b2b26cc0f48cd0d723c7af281d1be38da3a55257a6285f59e390f02480587be3732110eb2dad3e5f0587
+EBUILD freebsd-mk-defs-9.1.ebuild 901 SHA256 e0f5a7e50e2ec7eda0c9333004039739ac5de29b3544b72152d0c3ba887647a5 SHA512 fe4ed51be86ef1a15af1e577b5263a4e36e5a78ae085b96af455e1f70bf77f8c22bde3c9f5135e67b70ce9ce02a43d22810ff780ea02c1dd338aeea85f394799 WHIRLPOOL fdabee6e93b6ceacfda48e01b2fe782433643cd6b07d5619f38bb1f0c14e46af1ac23aed6cb46618b75120e98a4bab53da10f6fcd3823eb6fb2ad3d80d62a408
+EBUILD freebsd-mk-defs-9.2.ebuild 937 SHA256 868023af308858daa56d502178f120e1caaf9a5051a22ca62bdf5e962c2b79bf SHA512 01878a72a36585e51f2e954a445ede5120b6f2a399bd2dc7df461d2f17a46591cf3104f94607312f373a63dc4f16f5f03f574a98e02421e96481d4c9be7103c3 WHIRLPOOL e69f778f7b7a0987cdbad308b9424fd9413cd4e8d30a05b2f98e607a598a84aa171029826c626f303ca244aed91040bf8a27873a1c472d21949098620a58ba65
 EBUILD freebsd-mk-defs-9.2_rc1.ebuild 892 SHA256 bf19249955b332b0d423a4e6dd4f8343b89f2ad3b72cd5061c96c3cae7cf6f05 SHA512 9a7a60282cd1ecb6ae3f1d515031a657e1be158a472a8358b846f22e33c2103c78c18bf5904cea65194d89989ca707caa6f0f01c3a7bbcfcc3f97470b945fd78 WHIRLPOOL 999d00fee6358a0567cff45065e3b8ad53bb1a5ee35fc2706ae0cecf93e05a390a615726e351b5592872877f1f3eb9342a1f20bf9161f6bcbad3db4b61dc26e4
 EBUILD freebsd-mk-defs-9.2_rc2.ebuild 892 SHA256 1d882ad5ddb735d29d56d664439ee6b898ea876a7bbc2a3772c832db88181ed3 SHA512 8701b4414f416948d3d16988fef4eed8991a829dee104c8c239144715e0cd3ae622e4a4d71dd8d52251f005622cf22852f1972ecae0961e01c4c02f306cafe6b WHIRLPOOL 98d893079f260f9c89bbf4fe3951d502065aa105db8be0130021bcf64e4f96b12e55b5b07dbac5317beeeddfe8007f1792fe886e8a2b6b8be6b862e80d94190f
 EBUILD freebsd-mk-defs-9.2_rc3.ebuild 892 SHA256 4b9d3d2e52c9bbdbbf2a5334f1066fd80a4e0f76446f4ca736178b0d8c925479 SHA512 4d5fd5d73529c2354acb80266ec5c8c10e8624e11a31b3b2c4886c482cd50e07b361aace2f12388ed0487411ebdd4f87e99ac0e298b3e0a4205137ba020b9b3b WHIRLPOOL 3801cd54fb401de0213c466ed8268c1bd2a4730273e8fe30b306fff75606eea3273d91c6cd85fd69ad973f1392437837f7fbcbc25678151be5c0c72703915f56
-MISC ChangeLog 12100 SHA256 6a2463302f44fafdee7def6f96cbaf22b65f666697fd4f9ebd9cb0cc3b03f971 SHA512 390c452b0824b5004a01f56777a0b21121bfcbd7c349cddf745a063376e61d8ad269b5e73be36af1faac3bdb9091a5e1c69a0e762c110e32957049c243543ef1 WHIRLPOOL d2fa85321adf64a3d5a248e13f05c016f9de257e87c5eb6d99284252b6fe2ee3e1c2a60db0450ddfbc1a8ea14da7f2d09588af28d1c9c59310e57798c0f643e1
+MISC ChangeLog 12349 SHA256 4ce7d7478b62f9e3e322c0386c8e16777d7d27b5037403b5ef266aff5c0f77a3 SHA512 eb53d26b37cf47e0d9b5804be884a1c1e2483744efce747757bc74bf3f14dc3b79c6813cbf6094a68392bf32c83e3d811286ca351b8bbf5bf75f8e5508f683de WHIRLPOOL 1520357d83f39bd9c4ad13508a0d6710c17d659250c680d89229a9dbda0ebd6b907fa826825eb7e41b37351b0eabf30e17c7e5a34b6332da6da75525e15fd701
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJ9/ZAACgkQvFcC4BYPU0pBsgCfXNhFG6bLsxzWaHbPiddf+Knp
-EqEAoKHhB0ufglaYmHiKD864o9xcTcrg
-=fMeo
+iQJ8BAEBCABmBQJU5MdAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpfQQAMBQ2SEYijD+qmuuIUvXEnVa
+V6v4Z7nCNvDqcQgVWjVb0gcdqAVsvEy8O6ULO7y8tUfJPJwGBF2ec1sde7eu55L7
+C4xDAzb/BfJe58lo/GHbBsne1I2x/HZlcbGHE/ochIgz3JGr38YabdA/oN4f9eKG
+7h2lbUgJ9TXQlocGFboz9/SaGeGlgoNgSmkW7k+gkz6A/O7ZL/JbyPQKEXmu1NK4
+UDkk6u50MXGltNaq4jH+NPU7Kqp7ZCAudCGCOp1UtrOXGAd/NUbPtrZMvjvDEp25
+CMU1/LwE/UOInaZOl6DepGKGfYSdOyGbkKXp/Mrda5NnJq5GpZf2CKgzsk02tWDj
+Qr4cClFpREJLwDn7NIxCTudaJ+ewBsekhiSPjpxhWaFowxOacqvsRYYghVOEk4+q
+YqikqQf/K+4j7f5WgjvWJzGKrbIOV1f2eJFy4+XAJLCI+h8/GQ7eevf89DZhZhAV
+PLecv0FoiZ5cdu0Qpw8EW1QJenBJE2Z7NWGnh40s83UNTd99Lasm+qOfZesVQ7uO
+tteKLLEOl+DQgQaWaSveYUuo66x4ouVFlxQAL+RogJYbta8oRoEUpPVklvIgdani
+m9cfyzs5v9d1X4/eE6udfhbVmKLINjERNJiAWAIOaHIuYHnZs/b72pKNg4Zd6Qcr
+skMHMYqtyKvKBMEgpRKw
+=xpla
 -----END PGP SIGNATURE-----
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 000000000000..8eb80c38cc7a
--- /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-9.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
index 8e0bc64bd680..0b572a0b88db 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild,v 1.1 2013/01/27 21:26:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild,v 1.2 2015/02/18 17:09:17 mgorny Exp $
 
 EAPI=3
 
@@ -23,6 +23,7 @@ S="${WORKDIR}/share/mk"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-gnu.patch"
 }
 
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild
index fa66f56314ac..837a5439d335 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild,v 1.1 2013/11/09 09:17:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild,v 1.2 2015/02/18 17:09:17 mgorny Exp $
 
 EAPI=3
 
@@ -25,6 +25,7 @@ S="${WORKDIR}/share/mk"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-gnu.patch"
 }