4 files changed, 4 insertions, 25 deletions
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index 24e34bdd0ea5..3e9414b3824b 100644
--- a/profiles/hardened/linux/package.mask
+++ b/profiles/hardened/linux/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.30 2010/03/26 14:19:15 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.31 2010/04/10 15:35:30 ssuominen Exp $
 
 # Hardened versions of gcc-4.0* through gcc-4.2* are not available.
 =sys-devel/gcc-4.0*
@@ -16,13 +16,6 @@
 # >=sci-libs/acml-3.6 requires gcc-4.2.
 >=sci-libs/acml-3.6
 
-# Mask off glibc-2.4 until the approach for SSP compatibilty is
-# resolved in a way that doesn't break running systems, and we
-# have a sensible upgrade path.  Advise having a static busybox
-# around if you try it in a live system.
-# 2006-03-13 kevquinn
-=sys-libs/glibc-2.4*
-
 # =sys-devel/gdb-7.0 is not hardened-ready according to xake & Zorry.
 # sys-devel/gdb-7.1 works fine
 # 2010-03-26 zorry
diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask
index fca1b9298d11..76bdffe7f84c 100644
--- a/profiles/hardened/linux/package.use.mask
+++ b/profiles/hardened/linux/package.use.mask
@@ -1,12 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.8 2009/10/25 05:50:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.9 2010/04/10 15:35:30 ssuominen Exp $
 
 sys-devel/gcc -hardened
 sys-libs/glibc -hardened
 
-# No -z now support?  Bug #269288.
-sys-devel/binutils gold
-
 # requires gcc-4.4
 app-emulation/wine win64
diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask
index 6dd15da27d2c..47d33aef0d5c 100644
--- a/profiles/hardened/package.mask
+++ b/profiles/hardened/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.67 2010/03/26 01:00:12 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.68 2010/04/10 15:35:30 ssuominen Exp $
 
 # Hardened versions of gcc-4.0* through gcc-4.2* are not available.
 =sys-devel/gcc-4.0*
@@ -16,14 +16,6 @@
 # >=sci-libs/acml-3.6 requires gcc-4.2.
 >=sci-libs/acml-3.6
 
-
-# Mask off glibc-2.4 until the approach for SSP compatibilty is
-# resolved in a way that doesn't break running systems, and we
-# have a sensible upgrade path.  Advise having a static busybox
-# around if you try it in a live system.
-# 2006-03-13 kevquinn
-=sys-libs/glibc-2.4*
-
 # =sys-devel/gdb-7.0 is not hardened-ready according to xake & Zorry.
 # gdb-7.1 works fine.
 =sys-devel/gdb-7.0*
diff --git a/profiles/hardened/package.use.mask b/profiles/hardened/package.use.mask
index 4d9be4ff5d29..07e50249f764 100644
--- a/profiles/hardened/package.use.mask
+++ b/profiles/hardened/package.use.mask
@@ -1,13 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.use.mask,v 1.22 2009/08/05 17:52:39 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.use.mask,v 1.23 2010/04/10 15:35:30 ssuominen Exp $
 
 sys-devel/gcc -hardened
 sys-libs/glibc -hardened
 
-# No -z now support?  Bug #269288.
-sys-devel/binutils gold
-
 # Fails with gcc-3.4.x SSP, bug #230415.
 app-cdr/cdrdao gcdmaster