Reverted gcc-4.8.2 and move the ssp changes to -r1

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xFD79807F

4 files changed, 68 insertions, 9 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 22a56ee5ce74..f95eecc3b996 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.991 2014/01/10 15:09:25 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.992 2014/01/10 16:02:18 zorry Exp $
+
+*gcc-4.8.2-r1 (10 Jan 2014)
+
+  10 Jan 2014; Magnus Granberg <zorry@gentoo.org> gcc-4.8.2.ebuild,
+  +gcc-4.8.2-r1.ebuild:
+  Reverted gcc-4.8.2 and move the ssp changes to -r1
 
   10 Jan 2014; Magnus Granberg <zorry@gentoo.org> gcc-4.8.2.ebuild:
   Updated it with the default ssp patchset bug 484714
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 07fe6458f4a0..ae2ea3159a10 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -173,7 +173,9 @@ DIST gcc-4.8.1-patches-1.2.tar.bz2 17431 SHA256 964aed7e2c317be99eacbd0f4e7e6190
 DIST gcc-4.8.1-piepatches-v0.5.7.tar.bz2 14260 SHA256 3edd9c0592716a5cd544af470c61448a0c5cb81d15ce0bfcf77e660a15546e60 SHA512 e471c852340cac7acef4540d0e2c266039e284952ec14cdb39cc732fd3572fed47f4912389f658916d9cb300ecd29d52734f2b7c003ef7acb33567af0211688c WHIRLPOOL fb95580a4969f3b447a4097d0ff86d243c71546e145ed7c290110a55339c2367fee2cb3f36b6a8c64e0f07d04c7a512f191eb2d7ab9e93aa759a8fd01d514317
 DIST gcc-4.8.1-uclibc-patches-1.0.tar.bz2 3004 SHA256 365b114f9fff51950a20870edeca0679bd0942ae4fe5d68b8ddc8e488d550aeb SHA512 b79ef258b0dc82286a5e246f7e02c3fe54f4445fe0ce723263853ce1f92a0c9fad4c254e09664d31472de7a7a6eb8e96225bc3a5613dd572ff1037d8c1668220 WHIRLPOOL 76f7485a01c0e81f9c20108c94ea40bcb6f7e739d2f5632eed92c1a2f3778cd620df2b9a663520ca6978c468d0ab6548f491c4ce515924f1e666798f002fee71
 DIST gcc-4.8.1.tar.bz2 86753166 SHA256 545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813 SHA512 1becc874aad77a469069b6d9da4158aae9e013e24afa9364fe4feff9a5094d0673ee7694b3840e892c860f73a56b3ece6174338a8214438c42b9f86dd6c35ea7 WHIRLPOOL c706fa4445bbf4b9503c78b7e03da6adeadc3c736d208edb65059ddf23a08875dfa1ac92ccaafb3dd72ecbceb15a0de5814c62104fb94f99032232fbc50ab82c
+DIST gcc-4.8.2-patches-1.3.tar.bz2 21174 SHA256 d0c9888da346b2b774c3a9ca341579dd05ced36b6631e456cda61d2f6d6171f6 SHA512 57558415d88ea669264c1bbe8288caec9b1dc32091bc5b6346587e1d6ecd3475446c02bc3d9236439a3d45d82d50c44538966d27b0aa16bd5fbdab4bb174d352 WHIRLPOOL 1ef626b2a2da99edc55b21848b17a51832e1b808e7f149227447bd567fcfbd9236ae6622a49394233a02f86cd25e6e95e0478882ca107e0a106711475f3a727c
 DIST gcc-4.8.2-patches-1.4-ssptest.tar.bz2 21292 SHA256 55322472af4f49ed802d1e7a161d1c8713c4e7683bc56e4495fc1d5126ce1fe9 SHA512 2b94d83337dcf744df0fd353778d2eb15ba43fdcd1192e2b367921110a181c40cb2432f59abf0a83361292b319f2ba6c7cce09ff9d4141e732822895c0fe1004 WHIRLPOOL e7c9cffc7d441b938401056037a6857d172e3e5e6218b49d44459d40cf2f806ef5575eda7a682c621403fe8929f93a4b6906202843c64e0b38d89ae723f14f65
+DIST gcc-4.8.2-piepatches-v0.5.8.tar.bz2 14061 SHA256 cf4a945642be8b591805b1089025bd466f4e70d849d9e6dae63848fa750f1b83 SHA512 8e86448c3e251367869a766dd1805d2cf43a8b7da32f15a23c1443ff669336d892ced4ca01b378e79e177b7838ed917c46d6eb992c768bcad76df35da721492c WHIRLPOOL 2aabe13aed7c89bf63f1c3fc605f44ff5edf2a8addbc2baf96ed4711154253f2dc35d54d72e5fb0c797c489a35febb898facddb4a17413110fb8e12d1e20e411
 DIST gcc-4.8.2-piepatches-v0.5.9-ssptest.tar.bz2 13318 SHA256 3e6b2b898c671ee729c40c02a201d9f4e9c1b0b0c4802a5c2f7655be08bd1f75 SHA512 62bad19c26167bc33b9e1b99c05f4bd6fa25ce77a1af003ba467f3db6b15f099ec6b75adb3fa37d41c733a6f5830968d9d784417c89326e4bdf954da670b8236 WHIRLPOOL 3a5396fdcd69eaffed2b53fb6d098cdb0fef1a7647d956c89d6fc3c7737eae6166e2c25968c7fab9f54bb0ea9018c40f64c6133ceac42532f4282a93701162a5
 DIST gcc-4.8.2-uclibc-patches-1.0.tar.bz2 3014 SHA256 040343c06826356b57aabf54bdf6f962cb6173d36c9a1cc63be1238f9a3c7877 SHA512 933894112b937ddbecb66028489f61ef19ac323cbce8d9a13fa32f4325e608feca53f3570a173141d30c9b9dbe1dc3ace6dbff4814cefc1721b2f7a0d1adfd4b WHIRLPOOL f17f3c14bbaf639afc2408d3b1f1132acb191a7953196970aa499087afa62fb28e3a9eb0d0b32e98effd8bca72d474bd3cc96c12b2668062b6c666332a734ecc
 DIST gcc-4.8.2.tar.bz2 85999682 SHA256 09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8 SHA512 2a3927481707b3bb7171076b596d9b69084edac82460df6fb35395592dd1e8fc5665577702ca746d5b454dec68b1c4e31b9de6adc9865d482f4b8736ec648b10 WHIRLPOOL 5ebe564faf13634e7f2744dc13421ce0a3faa06b35d425f4b6983e74a4e93b4c21955823013f7a5530e7ea9e9d0ecfd68cb79950e94333ed3e44aaa4dfbdefe7
@@ -209,14 +211,15 @@ EBUILD gcc-4.7.2-r1.ebuild 1707 SHA256 acad35b0fd52c4b15cf6a969d231fe82fb0cb1748
 EBUILD gcc-4.7.3-r1.ebuild 1699 SHA256 8e86348e05176083dc1f6a0faafe72016e6c79d43e2ba868e8af7c3aa0da0abc SHA512 c9732c4fd06bcbc6d4a18780e81fa58fda96d70b937a71c1f0e3f9ac1b1aad6e94224a621781570a90ccbbd81775d60f6cb80cb02efac658b039f26f82c8e328 WHIRLPOOL 07da86d55988e9d790b373aee5becacb2562eb57770348a258bf76070f24544639999016e57608641a8f6f1a1e6cfd00e3c267fb2f5fe8340992ef650222e767
 EBUILD gcc-4.8.0.ebuild 1515 SHA256 afdeb3b4200099f54b143a0c83cc6235cc973bd1263f32d9f1d990bf4b74eae6 SHA512 2e0952e093524300048c2a3ee72fd3ae0c0f59ada1fa72a506e8f2b7485ae7fa23128815adbb8a35ca85f9ba41bf47a697989edcd2c08b3243d7308777842111 WHIRLPOOL 2d12ec9408cb9950b4c4419d371ab7ab45708417344a6ac55a773f82183c7dcbca56cfdcaa88ba05eeb8ce70282fc059d555fbda48de69412f7c6a4dceca8798
 EBUILD gcc-4.8.1-r1.ebuild 1601 SHA256 f541c33a35e557fd1c8b667c4e5ca407798e53882655cdc25b5ed8131816fab2 SHA512 d5dac50f8fbb01f3ea720d8f105a460a549b1f96c64f0410ab2d951428540648172884b3e22d360750b1e96fc30a7120503ba970227f0fd941b6e9e15e974dd5 WHIRLPOOL 957163a6d29296d27f94d90e5094afede5119b1df3bc8918523be2529c92e9cad56eea2a68ded8f7886279a2d136546184fcfcc6e53c4f29385beced6eb560f5
-EBUILD gcc-4.8.2.ebuild 1610 SHA256 67b6cb04206c429423d602798b9fe70e5c64dac951303e8d055a28463be46df1 SHA512 92e369634d9a24ba87467a4f98b3034e59e159a351e9d54d70ea42140f050ea8bf906a9bc92b6b08a1cfaba113cb928c4642b7d17f422ee31b8b8f9abb333de4 WHIRLPOOL 24adfdca612706ca7d77da120b832b73f59db1da7bc9530091932314f502414155c176d3915a2d99364c0f5d10f45eab752d9e00a339b216b328f5aee1a67539
-MISC ChangeLog 57887 SHA256 fe571391978b1e0a2826b6b867e0507926e720b26c32ff88455450c74d772cbb SHA512 5781e579fea32552e76893a2181c92d331ff598b030007f092a4bbdaad7a88533d405a27e1cbf595edd6b6632b1491ad841154f4e04424e6379c265c52d27116 WHIRLPOOL bc43e8f1c7fab1eb26c1dfb0d9281fb402c6ea62d30267fe2c816ce5eb20ca122734e92eaba76698ec9f7f6e562895140dfaffc0e796165035fab4e77bc67fd6
+EBUILD gcc-4.8.2-r1.ebuild 1613 SHA256 8252683b8fb132e36c2899219287cece92ff31e988237e53acad5c3138cf0c76 SHA512 181f7e618a3e6dada1f1f0a1f894f8971d45e7140648348744c3ec9c40f5e52b3e1091cd6ed8fa20eb70bc84e0319f98061fd796be1c7fe5f7f9135c83b0cd41 WHIRLPOOL f0f31a0020adbaf0d9c196452c43c4e93984265aad328284c81db7f878da9ea310c139b9ffbce97fbfa411f2c35ba6be28c0aeecbd4cd6da96a8d8b060a90779
+EBUILD gcc-4.8.2.ebuild 1594 SHA256 5ba97909f27186bb578668313a7a5aba01522ec74b784cff971e7567c2f9dfa3 SHA512 19f7e48d162aafa7c9b82a73fafe717448232a8e0601a9b625d4ab610a6d8a102679fe7034d67bad2632d2114fd6ea18be9a507675f3ebc5190d96783fd89487 WHIRLPOOL bf62cf2cc2a0486fd74a75552e715517df709250c75805a07751d94523a64383ac96fea3d5bf65e04808692dde02c391e8943f142ac3935c86be2bb809bcc77b
+MISC ChangeLog 58062 SHA256 059c46c7c7cff3c7ba83c65bc38e58cc5ad67fb5667d4dffb111e0cdef8fec59 SHA512 a581eb8d8ee62f251ab9a3cf85fceb2d390822d96e81fd1483cf6a96bec1142e76ab42422d1018b4b0468aa2f73bf99441ce627962d971f9fd96c472b24e2514 WHIRLPOOL 5eb059dd6021dbebf4edbbededfd99300d6a008dda5f8d292a3ece05bed2e834b0c9d5ce8b2cebafce4e1be673223df8157c08bbd418c350254bf927c4e007ea
 MISC ChangeLog-2006 112483 SHA256 108a7803efc91b08dd27ca4a83468637222a0685760f63bce724cb486fbc4022 SHA512 2887a66d03f4e1a9c60c743d7aa22147bdd95900b9e759c760a63f1a60c90008585b10b4f46ecc26e0149427bbdb8b83a9de4546d75e9ad935dd8e5377bf8870 WHIRLPOOL a2e1df0a7cead4373b5aeda333d952407049e1945f0a4e7774e1249e9f08ee33faafe0e74adec28b641bf037b8d6a350f45760a25c15e769b23eadb84b7ea48e
 MISC metadata.xml 2013 SHA256 908c83d1adcb78c343319c0730554e914cd8bc9fa1cf81b1eb86de338372d9df SHA512 36ea07edc9590441d66d49a9a61bd4849c15fac0e23cb49774af8d0b9ba8af4dc9c55ed303535ad6ac3fbdc7dc82f1df01bcdad5320bfef7451633a09b966b12 WHIRLPOOL 87a1601ac7ab333b6fb489458502d0918745b3d8d1e3b7d8ba28a4effc05ef2cac13c580cd28d829cfc0cc421f17c2b82ddb59decb09e24751a1665a409b2625
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlLQDNwACgkQe6JQqv15gH+CPgCfSpDoRn5EeVOdW7/lPBiRAt9R
-fakAnj+UFltMmdEmZWi1IxxQxgIeoXXG
-=fHXp
+iEYEAREIAAYFAlLQGUIACgkQe6JQqv15gH/NGQCdEofK/kTC1xnqL+fvYfz6f1S7
+fs0AnjOz28sBmpLTbaBJNw4g6AMHuOOz
+=AY0P
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-4.8.2-r1.ebuild b/sys-devel/gcc/gcc-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..87b6b8c4f9c7
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.8.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.2-r1.ebuild,v 1.1 2014/01/10 16:02:18 zorry Exp $
+
+PATCH_VER="1.4-ssptest"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.5.9-ssptest"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
+#end Hardened stuff
+
+inherit toolchain
+
+DESCRIPTION="The GNU Compiler Collection"
+
+LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+fi
+
+src_unpack() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	toolchain_src_unpack
+
+	use vanilla && return 0
+	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+}
diff --git a/sys-devel/gcc/gcc-4.8.2.ebuild b/sys-devel/gcc/gcc-4.8.2.ebuild
index fcd0a9855307..383d6fa59484 100644
--- a/sys-devel/gcc/gcc-4.8.2.ebuild
+++ b/sys-devel/gcc/gcc-4.8.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.2.ebuild,v 1.5 2014/01/10 15:09:25 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.2.ebuild,v 1.6 2014/01/10 16:02:18 zorry Exp $
 
-PATCH_VER="1.4-ssptest"
+PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.5.9-ssptest"
+PIE_VER="0.5.8"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default