Updated to current in tree profilesprofiles-old

8 files changed, 34 insertions, 21 deletions

diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index cf25cf16..6781026a 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -1,9 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.mask,v 1.1 2009/09/12 02:42:33 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.mask,v 1.2 2010/05/19 18:07:03 halcy0n Exp $
 
 # These packages do more harm than good on hardened.
 # Users with nVidia GPUs must use the OSS "nouveau" or "nv" Xorg drivers.
 x11-drivers/nvidia-drivers
 media-video/nvidia-settings
 dev-util/nvidia-cuda-sdk
+
+# Depends on x11-drivers/nvidia-drivers
+dev-python/pyopencl
diff --git a/profiles/hardened/linux/amd64/package.use.mask b/profiles/hardened/linux/amd64/package.use.mask
new file mode 100644
index 00000000..6b88846c
--- /dev/null
+++ b/profiles/hardened/linux/amd64/package.use.mask
@@ -0,0 +1,3 @@
+# Maciej Mrozowski <reavertm@gentoo.org> (11 Feb 2010)
+# Depends on >=sys-devel/gdb-7.0 which is masked on hardened
+>=dev-util/kdevelop-3.9.98 cxx
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index f6ed9161..5f3c05b2 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.27 2009/12/01 23:22:10 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.32 2010/06/25 08:54:26 zorry Exp $
 
 # Hardened versions of gcc-4.0* through gcc-4.2* are not available.
 =sys-devel/gcc-4.0*
@@ -10,19 +10,22 @@
 # Mask non-hardened+non-testing gcc-4.3.x releases.
 =sys-devel/gcc-4.3.2*
 
-# No hardened >=sys-devel/gcc-4.4 available.
->=sys-devel/gcc-4.4
+# Hardened >=sys-devel/gcc-4.4.3-r3 >=gcc-4.4.4-r1 available.
+=sys-devel/gcc-4.4.1*
+=sys-devel/gcc-4.4.2*
+=sys-devel/gcc-4.4.3-r2
+=sys-devel/gcc-4.4.4
 
 # >=sci-libs/acml-3.6 requires gcc-4.2.
 >=sci-libs/acml-3.6
 
+# =sys-devel/gdb-7.0 is not hardened-ready according to xake & Zorry.
+# sys-devel/gdb-7.1 works fine
+# 2010-03-26 zorry
+=sys-devel/gdb-7.0*
 
-# 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 is not hardened-ready according to xake & Zorry.
->=sys-devel/gdb-7
+# Can't be used on hardened. See upstream,
+# http://developer.skype.com/jira/browse/SCL-616
+net-im/skype
+net-im/skysentials
+dev-python/skype4py
diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask
index fca1b929..76bdffe7 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/linux/powerpc/package.mask b/profiles/hardened/linux/powerpc/package.mask
index 0f31d908..0628c73c 100644
--- a/profiles/hardened/linux/powerpc/package.mask
+++ b/profiles/hardened/linux/powerpc/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/powerpc/package.mask,v 1.9 2009/12/03 17:48:37 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/package.mask,v 1.11 2010/10/05 23:19:12 alexxy Exp $
 
 # Wulf C. Krueger <philantrop@gentoo.org> (22 Sep 2007)
 # Needs OOo.
diff --git a/profiles/hardened/linux/x86/minimal/make.defaults b/profiles/hardened/linux/x86/minimal/make.defaults
index d66bdee6..41dd0b04 100644
--- a/profiles/hardened/linux/x86/minimal/make.defaults
+++ b/profiles/hardened/linux/x86/minimal/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/minimal/make.defaults,v 1.2 2009/07/09 00:47:49 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/minimal/make.defaults,v 1.3 2010/02/01 11:42:34 gengor Exp $
 
 # - TESTING PROFILE - TESTING PROFILE - 
 #  ------ USE AT YOUR OWN RISK ------
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask
index 9a49c4ca..2128a03d 100644
--- a/profiles/hardened/linux/x86/package.mask
+++ b/profiles/hardened/linux/x86/package.mask
@@ -1,9 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.mask,v 1.5 2009/09/12 02:42:34 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.mask,v 1.6 2010/05/19 18:07:03 halcy0n Exp $
 
 # These packages do more harm than good on hardened.
 # Users with nVidia GPUs must use the OSS "nouveau" or "nv" Xorg drivers.
 x11-drivers/nvidia-drivers
 media-video/nvidia-settings
 dev-util/nvidia-cuda-sdk
+
+# Depends on x11-drivers/nvidia-drivers
+dev-python/pyopencl
diff --git a/profiles/hardened/linux/x86/package.use.mask b/profiles/hardened/linux/x86/package.use.mask
index e1a21132..9a625ba7 100644
--- a/profiles/hardened/linux/x86/package.use.mask
+++ b/profiles/hardened/linux/x86/package.use.mask
@@ -1,6 +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/linux/x86/package.use.mask,v 1.12 2009/10/13 23:02:37 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.use.mask,v 1.13 2010/02/11 18:39:16 reavertm Exp $
+
+# Maciej Mrozowski <reavertm@gentoo.org> (11 Feb 2010)
+# Depends on >=sys-devel/gdb-7.0 which is masked on hardened
+>=dev-util/kdevelop-3.9.98 cxx
 
 # cyrus-sasl doesn't work w/ USE=berkdb (#192753)
 dev-libs/cyrus-sasl berkdb