From 83eab7dde284e6060d4e426c274d3b1400ca5908 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 3 Dec 2011 20:28:07 +0000 Subject: [PATCH] Disable fortify patches with older glibcs #362315 by Leonid Volnitsky. Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- sys-devel/gcc/ChangeLog | 6 +++++- sys-devel/gcc/Manifest | 14 +++++++------- sys-devel/gcc/gcc-4.6.0.ebuild | 8 +++++++- sys-devel/gcc/gcc-4.6.1-r1.ebuild | 8 +++++++- sys-devel/gcc/gcc-4.6.2.ebuild | 8 +++++++- 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 3de5ec6676b7..aba94ad3b1fa 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.835 2011/12/03 02:36:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.836 2011/12/03 20:28:07 vapier Exp $ + + 03 Dec 2011; Mike Frysinger gcc-4.6.0.ebuild, + gcc-4.6.1-r1.ebuild, gcc-4.6.2.ebuild: + Disable fortify patches with older glibcs #362315 by Leonid Volnitsky. 03 Dec 2011; Mike Frysinger gcc-4.0.4.ebuild, gcc-4.3.3-r2.ebuild, gcc-4.3.4.ebuild: diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 85bf8a5a09b7..5b9b1bbe17bb 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -178,15 +178,15 @@ EBUILD gcc-4.4.6-r1.ebuild 1720 RMD160 9efe10a352e92897cc6691560c915c7c7c5829fa EBUILD gcc-4.5.1-r1.ebuild 1724 RMD160 dabac95091738214a64d6d244b1f947d679fc559 SHA1 599949002715e90e1c77e4fd7d810bcee855e38c SHA256 d511735848d360970549e58ec4922973f8d296338aa7396f35ab61e5fcab3b09 EBUILD gcc-4.5.2.ebuild 1721 RMD160 09a18301829997ba1b9fd4854e3848949f712b99 SHA1 eddae49045c97b3d66773b7f16cdcc919fac825b SHA256 b862988c2dacff60388b2396d9c37ca280767405995e30fd9779c0acbef1fdc3 EBUILD gcc-4.5.3-r1.ebuild 1621 RMD160 4f6e377dc194782f7a19be85dbab8b5086bea4df SHA1 0e7941f07f1a42fbcc81142b4dca55adc672d023 SHA256 7fef42809de74a4012f58660dd560f03618c5c4d68de21ae526dc5272e3475ca -EBUILD gcc-4.6.0.ebuild 1424 RMD160 3f16ce3fead818bd961426f47c90120efee82230 SHA1 8c86f20615fe3bac03e28285c7c7538e8873ce5c SHA256 37288180163326d20b5ae1d2377825d21d629cc7d6c48f367e49625499ebe898 -EBUILD gcc-4.6.1-r1.ebuild 1427 RMD160 b47e981f34bb1682be6da23f731d7286da6223f1 SHA1 b43dfe5c268edaa388a7ca462f4079aa8abf35a8 SHA256 2503edcde80046e6a2d4b98609a39083f0d6d0942b95fc69fa85c53ccab196c3 -EBUILD gcc-4.6.2.ebuild 1424 RMD160 722b7e4ce00647878e2948412847641956235bc7 SHA1 e3b22265d6701c2a1c5b6a2cdcaf49a37aa88d18 SHA256 1a69d4af13d4eed14fa51fe147960584e7c361bd132fd837472feb77f3d59337 -MISC ChangeLog 146694 RMD160 d86258e91e83937b22ac198642c8026c250cf0a5 SHA1 35bdb1095a003d800a1b3f0d371026de6ea6b080 SHA256 543d8c653f5b32219e7527fd5f0b7152011c65d9318a82cf8ea728976a699533 +EBUILD gcc-4.6.0.ebuild 1668 RMD160 ccb624695eccdd04bd862dc43b03aa6618fee9ed SHA1 622319f39ff17aaa0d254dea7e4280d34abfbfb0 SHA256 231e31c3f0a0efb72bb6b535206a04d85c055ee9080cfcd782484749e8ef156c +EBUILD gcc-4.6.1-r1.ebuild 1671 RMD160 cf83c62ded40ae7fe7e521998d274a4acbdec0e3 SHA1 d309a8449b9b738620581562c2819532807c7bbd SHA256 ab57e547505717207db11929d25b4bc47be5b97a71fb6807aae81479f6de0b7d +EBUILD gcc-4.6.2.ebuild 1668 RMD160 410eb128c1c2fa3075a75807036d460720392708 SHA1 ffa81718a588416c3f2c89dd00cdc28e33955b91 SHA256 3649cadf3dbb4515e4112f496e7828c7fe459ccdba2702b34dec5f02186559f9 +MISC ChangeLog 146877 RMD160 90202aee8db684436bcf8add963fc3a763dd40f0 SHA1 77cd73e8f2eb0e312f9a2492a6d272fa039bfec4 SHA256 69948385d28d8a1888c02205b132c3e36d434a939e05bdf0fdaa5d6de32624c3 MISC metadata.xml 1928 RMD160 4420ab41b404109eb0b1d84962b45f3b60f5c44a SHA1 c75c2c3e6c196ffc34775b365b77c416ad81c558 SHA256 d44004fffc35aa9e568a9b5119d333fe2e4f0669df4fd0d7fc21c3078667ac4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7Ziz4ACgkQaC/OocHi7JZZ/wD9HO3YgYI9jyAZwjNXAKehc6jj -ZvXglG57DPOtTQJI8VAA/0vB8Rgty8EHnOToQTvZVCdGQuT6mmT+0i0OmRD+1Cr/ -=BzLK +iF4EAREIAAYFAk7ahmUACgkQaC/OocHi7JbmdgD8CBeUOsXe+zd3d2apCMmpfVeS +VM4GbsG+HRKbBNkOFowA/1RtTYFTERzBxtA4YcsGROlevRkjM9VnVIxccJOVk6+7 +=P/Ke -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc/gcc-4.6.0.ebuild b/sys-devel/gcc/gcc-4.6.0.ebuild index 066798d41799..6cbc56d92d80 100644 --- a/sys-devel/gcc/gcc-4.6.0.ebuild +++ b/sys-devel/gcc/gcc-4.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.0.ebuild,v 1.6 2011/11/09 19:22:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.0.ebuild,v 1.7 2011/12/03 20:28:07 vapier Exp $ PATCH_VER="1.2" UCLIBC_VER="1.0" @@ -36,6 +36,12 @@ if [[ ${CATEGORY} != cross-* ]] ; then fi src_unpack() { + if has_version '=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + toolchain_src_unpack use vanilla && return 0 diff --git a/sys-devel/gcc/gcc-4.6.1-r1.ebuild b/sys-devel/gcc/gcc-4.6.1-r1.ebuild index 1ecf00650b89..fff785e92041 100644 --- a/sys-devel/gcc/gcc-4.6.1-r1.ebuild +++ b/sys-devel/gcc/gcc-4.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.1-r1.ebuild,v 1.3 2011/11/09 19:22:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.1-r1.ebuild,v 1.4 2011/12/03 20:28:07 vapier Exp $ PATCH_VER="1.0" UCLIBC_VER="1.0" @@ -36,6 +36,12 @@ if [[ ${CATEGORY} != cross-* ]] ; then fi src_unpack() { + if has_version '=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + toolchain_src_unpack use vanilla && return 0 diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild index 980ed5cbdcc3..678b67a952a0 100644 --- a/sys-devel/gcc/gcc-4.6.2.ebuild +++ b/sys-devel/gcc/gcc-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.2 2011/11/09 19:22:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.3 2011/12/03 20:28:07 vapier Exp $ PATCH_VER="1.0" UCLIBC_VER="1.0" @@ -36,6 +36,12 @@ if [[ ${CATEGORY} != cross-* ]] ; then fi src_unpack() { + if has_version '=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + toolchain_src_unpack use vanilla && return 0 -- 2.26.2