* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/boot0/, sys-freebsd/freebsd-lib/, ...
@ 2014-07-13 3:14 Yuta SATOH
0 siblings, 0 replies; only message in thread
From: Yuta SATOH @ 2014-07-13 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 2bed8a28bd11a8591d938ed885567cbb712cac32
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Jul 12 15:10:18 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Jul 12 15:10:18 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=2bed8a28
boot0,freebsd-{lib,libexec}: fix bug 511698, it's a critical bug.
---
sys-freebsd/boot0/Manifest | 5 ++--
sys-freebsd/boot0/boot0-10.0.0.9999.ebuild | 3 ++-
sys-freebsd/boot0/boot0-9.3.0.9999.ebuild | 3 ++-
.../boot0/files/boot0-add-nossp-cflags.patch | 11 ++++++++
sys-freebsd/freebsd-lib/Manifest | 5 ++--
.../files/freebsd-lib-add-nossp-cflags.patch | 30 ++++++++++++++++++++++
.../freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild | 1 +
.../freebsd-lib/freebsd-lib-9.3.0.9999.ebuild | 1 +
sys-freebsd/freebsd-mk-defs/Manifest | 5 ++--
.../files/freebsd-mk-defs-add-nossp-cflags.patch | 28 ++++++++++++++++++++
.../freebsd-mk-defs-10.0.0.9999.ebuild | 1 +
.../freebsd-mk-defs-9.3.0.9999.ebuild | 1 +
12 files changed, 86 insertions(+), 8 deletions(-)
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 5ca52b9..89e00f9 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,4 +1,5 @@
AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
AUX boot0-9.3-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8
-EBUILD boot0-10.0.0.9999.ebuild 1772 SHA256 00b21d6078ed8a67649ec0f9b7f2c0b20e0f0bdeac9ccf29c64b563f48fc6bf2 SHA512 2eea99df63f70b0b63e1880baec0563cbbc0ff9ad2a66641f56001a560da4b980518d06681951c584118d4f5cc39cbc680b30997d05010bb8a399d592ba6513f WHIRLPOOL 34dafb6ebb5a6c383642838ce3a21901a57dd1d20b64266997702764632dc735f53bd537651487ec2cbba1c8faa0bf9d3a4348b3939652241aaca05439f7d93f
-EBUILD boot0-9.3.0.9999.ebuild 1687 SHA256 b89ca199c5a7984a38eb8dfcbe317d61b470ad57ffa3623e8a9dab91419eada9 SHA512 3b2e878e48d3d195cb760bd6acb81b68a242dfebaa090fca4eaecf2ef2091e3b8b74092dac48074e497e2f002b6575dead4823c56990691103f6a6cb22a697ba WHIRLPOOL 6f9c5ddb5046d0bbfa237cc5b3c76df017a38398efa5dea334147dd4f6bf2fea7c1030ebc6508e65bbeda086f61f244feb5b4b39bd9ec1555087a7e6679d71dd
+AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe
+EBUILD boot0-10.0.0.9999.ebuild 1816 SHA256 687ff6d157bfed3c8cacb5ef8651cb1a10bec0596821a6f91efc34e31cc5be42 SHA512 6fe2922b9366b841e7f3645ca71b8c0597c35e73c56af51971fb6a2a95724048cccb7e2fbe8b1aef1b4962c60a0b7135e983289b7b47fd86545ed4100b5df3f0 WHIRLPOOL 9708d1b5564ff343c1b684a24883ccdc77106b076bcd393961691cdfe34596e4b3e8e8e688740b5f9ebe82ef7dc6a9eb7bf07d632db14decda323336ad5a1552
+EBUILD boot0-9.3.0.9999.ebuild 1731 SHA256 23526e967e810ef69b61c89d2b76e289ff3d564483c2c9c3be0574b7ef5b9489 SHA512 270c12effc457a49fc5701f914c4610f6846e0733c387473cdc2ed2f94a577147b8430dd75c1cb52ca8625f3d32aa2fe58c9fc9420c6e42d9c7a3a9240ca9284 WHIRLPOOL eaada15a89eb1d5ab81cfdf8794e7321a94b845db1cbb3d4bfb9b72c1ccbdf72e177f7a55bf2061161f93ed77da5bc118fa5cd0e71faed08a11c04cadc3bd043
diff --git a/sys-freebsd/boot0/boot0-10.0.0.9999.ebuild b/sys-freebsd/boot0/boot0-10.0.0.9999.ebuild
index bfb5398..194e5e1 100644
--- a/sys-freebsd/boot0/boot0-10.0.0.9999.ebuild
+++ b/sys-freebsd/boot0/boot0-10.0.0.9999.ebuild
@@ -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/boot0-9.3.0.9999.ebuild b/sys-freebsd/boot0/boot0-9.3.0.9999.ebuild
index 39e1705..8db29e4 100644
--- a/sys-freebsd/boot0/boot0-9.3.0.9999.ebuild
+++ b/sys-freebsd/boot0/boot0-9.3.0.9999.ebuild
@@ -24,7 +24,8 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
S="${WORKDIR}/sys/boot"
-PATCHES=( "${FILESDIR}/${PN}-9.3-gcc46.patch" )
+PATCHES=( "${FILESDIR}/${PN}-9.3-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 0000000..abc6a57
--- /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/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 47de53c..dc298ce 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -20,11 +20,12 @@ AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4
AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77
+AUX freebsd-lib-add-nossp-cflags.patch 1193 SHA256 53a844511feca44a9db4ac19de336320398335d18617b39cbc4e66db3f88e861 SHA512 fcb290527381df5b91355ca7f36bb4c770378b014890e7a4d129b7cc28e7c18cb1f87ef9e1b308e0de61b54d767677865969c77a9877d8874f2bec223331f9f8 WHIRLPOOL 20e4a0cd017f9aee59f0e4fa809ae74c855fcb7c7a794e1e71b1e5900390d08a9bdfaf5a36a45b057d6211c056a5fb69adfc688fa2adb0586f115be0aea40219
AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-10.0.0.9999-r1.ebuild 19204 SHA256 db7fff3f5795385173fab86fb5025d5f8ebdb98b63a70c6b3623db7d8d37a1a4 SHA512 bb22114d0a09d47057c40ceaa2ddfefb99b02af45ed5a2ace82890160ce4d1b1959282e2664fedd79f48598f3341587cd0fb6d690289f8f332eda224a9c18a01 WHIRLPOOL 60a0755c5cb550308eeef4017b19e6c8dcec015d4afc87caeb8b63c7b2f6514e5d2c78b2d75dceaa264b3c19c7e92db882207129fc7e7a76e188e34a57934895
-EBUILD freebsd-lib-9.3.0.9999.ebuild 18221 SHA256 c45e817337cfead70472d5f9520ffaf1d635fb6db5004af4f45c96b5c4cfdb02 SHA512 996b157741fce88ee78389ce1220c681dc408296cc1e075435a6f120c0efaa1a306e494408ecb1ad95ca88f11dd086e620c650d5250a084c020ef2d064694d0b WHIRLPOOL 754621d3194e2f400a6b7c59c4d612becb32fb1a41e57686477b3f7fc5a4b935063634eae68b2904ca225b07306c9dbbf6d79cfc337b9fbc4f47f0896591e39a
+EBUILD freebsd-lib-10.0.0.9999-r1.ebuild 19248 SHA256 5cc3f7146a3bfd73aeec95185f2d448d34097afea4b7964fb1b51f902ce0b43e SHA512 a3eb390fdbb18624822e7bdb1c2539854808b28d45fdf2f1e1fbf9017953d4b9e2d483a9311b705cdf5284d1a0440a0e02c9e18fe5cbb30b017511938a1c9c22 WHIRLPOOL 17aae80822ecafab4bd23536f5470994ddcd319dd5bf10cc598db88f19b35aeac1178877bc3a8136cb2fadd0c44a24a307c587c0a60a901df209382e7d7260cd
+EBUILD freebsd-lib-9.3.0.9999.ebuild 18265 SHA256 d83ccba8780d4d71d412b3be8f5b5dd243c9eb9a92de299125c2e34ad3275174 SHA512 aabfae2be91e35c19013e6f57adc7e5bca8c6db04f19a7fb896bd96a4f4e14e2995dee1ab312a020519dd40dc1ff026aca3751eb4ddc9528e8c430d1b6e346b6 WHIRLPOOL 4580f2e636a3c03244f481d011e4ee9f53c70863091c1e1448a68e64db2fb245c015140fd516b5cd37aea19145bcc9c2c957610ccefc2e0ce52b59f8519654ab
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 0000000..00b39f7
--- /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-10.0.0.9999-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild
index 8cb0dfa..7bff55f 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild
@@ -105,6 +105,7 @@ PATCHES=(
"${FILESDIR}/${PN}-bsdxml2expat.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.3.0.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.3.0.9999.ebuild
index c01ed40..ae41cf7 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.3.0.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.3.0.9999.ebuild
@@ -96,6 +96,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/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"
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-07-13 3:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-13 3:14 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/boot0/, sys-freebsd/freebsd-lib/, Yuta SATOH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox