added support for bug 6148 to the pie-ssp patch, the bounds checker fails with some hunks but coupled with the pie-ssp patch it applies good

4 files changed, 15 insertions, 10 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 1f9132c5708f..97f443de03aa 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.188 2004/03/06 13:35:00 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.189 2004/03/06 17:22:47 pappy Exp $
+
+  06 Mar 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
+  added support for bug 6148 to the pie-ssp patch, the bounds checker fails with
+  some hunks but coupled with the pie-ssp patch it applies good
 
   06 Mar 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild:
   added v5 version for hardened pie ssp patch, this will be the release version
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 21359c57ca69..3faeb2ed0233 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -15,7 +15,7 @@ MD5 660074fa86b8cf9f8f2b1e019b367d10 gcc-3.3.3.ebuild 21995
 MD5 bd281971d3658dd49f02f647b97c4eeb gcc-3.3.1-r5.ebuild 18002
 MD5 9e0ef8cb2bdf509dc39e7a4dc11f4f12 gcc-3.2.3-r3.ebuild 19841
 MD5 a18ba0e1ee7104324747ea7e48bc3bde gcc-3.0.4-r6.ebuild 8734
-MD5 0473eb2f3170290c76b49efdc0b5e755 gcc-3.3.3-r1.ebuild 23090
+MD5 7234e89eda62cd6faf334ae0ec070ca4 gcc-3.3.3-r1.ebuild 23225
 MD5 9b8734298131d849185f1e9cbe4b42eb gcc-3.1.1-r1.ebuild 9591
 MD5 14cf69f1206d85356781dd2ad63eb7ca gcc-3.3.2-r4.ebuild 20741
 MD5 9a1b8330dd0094a8e27e53edf7f67d58 gcc-3.2.2.ebuild 16081
@@ -24,7 +24,7 @@ MD5 591e5cb9a9737b7712643eccae1745f0 gcc-3.2-r5.ebuild 12882
 MD5 878b7184447786f3a855d7e6f3f1cad5 gcc-3.3.2-r6.ebuild 21281
 MD5 ba88d0ddfc983b09757fb3d4c8175063 gcc-3.1-r8.ebuild 9772
 MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965
-MD5 98e54d119ec43b3408d03228004216af ChangeLog 39874
+MD5 f40056cac758e6aecdba44cb99099b90 ChangeLog 40092
 MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
 MD5 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259
 MD5 14d12044f2847cc4e3bc1212efbb0196 gcc-3.2.3-r2.ebuild 17302
@@ -46,7 +46,7 @@ MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
 MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
 MD5 41e5a58d926345eb32e6a2ba3ab17031 files/digest-gcc-3.3.2-r6 361
 MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
-MD5 b81a994b7b2f86efd753802e1b8efbc8 files/digest-gcc-3.3.3-r1 441
+MD5 325b57521edbfc16d8027b5916887cdd files/digest-gcc-3.3.3-r1 439
 MD5 ac529391146ca1021405f8ec7a4b0579 files/digest-gcc-3.3.3_pre20040130 138
 MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040215 138
 MD5 523970c128b929fe7c7cf36508ebd1d5 files/gcc-2.95.3-new-atexit.diff 13604
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.3-r1 b/sys-devel/gcc/files/digest-gcc-3.3.3-r1
index 25f63ab0ccce..3eae6db840b7 100644
--- a/sys-devel/gcc/files/digest-gcc-3.3.3-r1
+++ b/sys-devel/gcc/files/digest-gcc-3.3.3-r1
@@ -3,4 +3,4 @@ MD5 4b757459fb3d0e69031a86de80320ad9 gcc-3.3.3-patches-1.0.tar.bz2 23675
 MD5 c6f0f4baae3ef904ba8886d7ef99938d gcc-3.3.3-branch-update-20040217.patch.bz2 150987
 MD5 b62b5856753294821c4cea8bd28ffe1d protector-3.3-7.tar.gz 25068
 MD5 7bfc29747dfc5fa614b5ac366bf38224 gcc-3.3.3-manpages.tar.bz2 137822
-MD5 64116021ddf205bfeefe54cc4323c439 gcc-3.3.2-v5-nodefault-pie-ssp.patch 12508
+MD5 d41d8cd98f00b204e9800998ecf8427e pie-ssp-bounds-checking-3.3.3-v7.patch 0
diff --git a/sys-devel/gcc/gcc-3.3.3-r1.ebuild b/sys-devel/gcc/gcc-3.3.3-r1.ebuild
index 9a0c307ef77e..e5dd1a0fdad0 100644
--- a/sys-devel/gcc/gcc-3.3.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r1.ebuild,v 1.7 2004/03/06 13:35:01 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r1.ebuild,v 1.8 2004/03/06 17:22:47 pappy Exp $
 
 IUSE="static nls bootstrap java build X multilib nogcj hardened"
 
@@ -97,10 +97,11 @@ fi
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${P}-manpages.tar.bz2"
 
-PIE_SSP_PATCH="gcc-3.3.2-v5-nodefault-pie-ssp.patch"
-# this will move to /space/distfiles when the package becomes available via ~arch
+# remember that this will move to /space/distfiles when the package becomes available via ~arch
+# bug #6148 - the bounds checking patch interferes with gcc.c, so we stick them both together ;-)
+PIE_SSP_BOUNDS_PATCH="pie-ssp-bounds-checking-3.3.3-v7.patch"
 SRC_URI="${SRC_URI}
-	hardened? ( http://dev.gentoo.org/~pappy/gentoo-projects/hardened-gcc/gentoo/distrib/4.0.3.3.2/noarch/${PIE_SSP_PATCH} )"
+	hardened? ( http://dev.gentoo.org/~pappy/gentoo-projects/hardened-gcc/gentoo/distrib/4.0.3.3.2/noarch/${PIE_SSP_BOUNDS_PATCH} )"
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers and support for hardened PIE and SSP"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
@@ -345,7 +346,7 @@ src_unpack() {
 	# This patch enables improved PIE and SSP behaviour but does not
 	# enable it by default ...
 
-	cd ${WORKDIR}/${P}; epatch "${DISTDIR}/${PIE_SSP_PATCH}"
+	cd ${WORKDIR}/${P}; epatch "${DISTDIR}/${PIE_SSP_BOUNDS_PATCH}"
 
 	release_version="${release_version}, pie-${PIE_VER}"