diff options
author | Anthony G. Basile <basile@opensource.dyc.edu> | 2010-07-17 08:34:25 -0400 |
---|---|---|
committer | Anthony G. Basile <basile@opensource.dyc.edu> | 2010-07-17 08:34:25 -0400 |
commit | ad29d29b03851c6a94fefbb40af2a13590c78626 (patch) | |
tree | ea6aca6ab444ac6c95f948a3f48f3b45af186205 | |
parent | Rebase against current mainline gentoo profiles/hardened (diff) | |
download | hardened-dev-ad29d29b03851c6a94fefbb40af2a13590c78626.tar.gz hardened-dev-ad29d29b03851c6a94fefbb40af2a13590c78626.tar.bz2 hardened-dev-ad29d29b03851c6a94fefbb40af2a13590c78626.zip |
Deprecated ia64/10.0, updated package.mask files
-rw-r--r-- | profiles/hardened/linux/ia64/10.0/deprecated | 7 | ||||
-rw-r--r-- | profiles/hardened/linux/ia64/desktop/parent | 2 | ||||
-rw-r--r-- | profiles/hardened/linux/ia64/developer/parent | 2 | ||||
-rw-r--r-- | profiles/hardened/linux/ia64/make.defaults | 8 | ||||
-rw-r--r-- | profiles/hardened/linux/ia64/server/parent | 2 | ||||
-rw-r--r-- | profiles/hardened/linux/package.mask | 9 | ||||
-rw-r--r-- | profiles/hardened/package.mask | 12 |
7 files changed, 36 insertions, 6 deletions
diff --git a/profiles/hardened/linux/ia64/10.0/deprecated b/profiles/hardened/linux/ia64/10.0/deprecated new file mode 100644 index 00000000..0820adc1 --- /dev/null +++ b/profiles/hardened/linux/ia64/10.0/deprecated @@ -0,0 +1,7 @@ +hardened/linux/ia64 +# Check 'eselect profile list'. +# Find the number that corresponds with the hardened/linux/amd64 profile. +# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink. +# +# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml +# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/ia64/desktop/parent b/profiles/hardened/linux/ia64/desktop/parent new file mode 100644 index 00000000..8bd86303 --- /dev/null +++ b/profiles/hardened/linux/ia64/desktop/parent @@ -0,0 +1,2 @@ +.. +../../../../targets/desktop diff --git a/profiles/hardened/linux/ia64/developer/parent b/profiles/hardened/linux/ia64/developer/parent new file mode 100644 index 00000000..b558d905 --- /dev/null +++ b/profiles/hardened/linux/ia64/developer/parent @@ -0,0 +1,2 @@ +.. +../../../../targets/developer diff --git a/profiles/hardened/linux/ia64/make.defaults b/profiles/hardened/linux/ia64/make.defaults new file mode 100644 index 00000000..a3638e9c --- /dev/null +++ b/profiles/hardened/linux/ia64/make.defaults @@ -0,0 +1,8 @@ +# Copyright 1999-2008 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/10.0/make.defaults,v 1.2 2009/09/30 03:08:33 gengor Exp $ + +# STAGE1_USE does not stack +STAGE1_USE="hardened nptl nptlonly pic" + +USE="-unicode" diff --git a/profiles/hardened/linux/ia64/server/parent b/profiles/hardened/linux/ia64/server/parent new file mode 100644 index 00000000..9c7a1951 --- /dev/null +++ b/profiles/hardened/linux/ia64/server/parent @@ -0,0 +1,2 @@ +.. +../../../../targets/server diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask index e7791d1a..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,8 +10,11 @@ # 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 diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask index 42950cae..6a625a97 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.66 2010/01/12 19:41:53 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.70 2010/07/14 18:13:15 blueness Exp $ # Hardened versions of gcc-4.0* through gcc-4.2* are not available. =sys-devel/gcc-4.0* @@ -10,8 +10,11 @@ # 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 @@ -19,3 +22,6 @@ # =sys-devel/gdb-7.0 is not hardened-ready according to xake & Zorry. # gdb-7.1 works fine. =sys-devel/gdb-7.0* + +# sys-kernel/hardened-sources-2.6.34 in tree for testing Bug 328275 +=sys-kernel/hardened-sources-2.6.34* |