Rework hardened/x86/2.6 profile to inherit from hardened/ instead of hardened/x86

(which is a 2.4-only profile).  Net effect should be no change.

7 files changed, 65 insertions, 69 deletions

diff --git a/profiles/hardened/x86/2.6/README b/profiles/hardened/x86/2.6/README
new file mode 100644
index 000000000000..ae831e2ca8e2
--- /dev/null
+++ b/profiles/hardened/x86/2.6/README
@@ -0,0 +1,7 @@
+This is a hardened profile for 2.6-series kernels on x86.  Note that it inherits from
+hardened, not hardened/x86.  hardened/x86 is for 2.4-series kernel only and masks stuff
+that is only appropriate for 2.6 kernels.  To avoid unnecessary disruption to the 2.4
+profile, and to avoid this 2.6 profile having to undo masks in the 2.4 profile, this
+profile simply inherits from the base hardened profile (parent = ../..).
+
+Kevin F. Quinn <kevquinn@gentoo.org>, 25th June 2006
diff --git a/profiles/hardened/x86/2.6/make.defaults b/profiles/hardened/x86/2.6/make.defaults
index b2de41a4454e..4b199cc2e233 100644
--- a/profiles/hardened/x86/2.6/make.defaults
+++ b/profiles/hardened/x86/2.6/make.defaults
@@ -1,10 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# Copyright 1999-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/make.defaults,v 1.6 2005/07/04 16:58:55 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/make.defaults,v 1.7 2006/06/25 21:23:48 kevquinn Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="${ARCH}"
-GRP_STAGE23_USE="${ARCH} berkdb crypt readline nls ssl tcpd zlib pam pic hardened dlloader"
-USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd zlib"
+USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd userlocales zlib"
+GRP_STAGE23_USE="${ARCH} ${USE}"
 PORTDIR=/usr/portage/
 PKGDIR=${PORTDIR}/packages/${ARCH}/
+
+# x86
+CHOST="i386-pc-linux-gnu"
+CFLAGS="-O2 -mcpu=i386 -pipe -fforce-addr"
+CXXFLAGS="${CFLAGS}"
+
+
diff --git a/profiles/hardened/x86/2.6/package.mask b/profiles/hardened/x86/2.6/package.mask
index c4b544e3ab76..f1e45b061e44 100644
--- a/profiles/hardened/x86/2.6/package.mask
+++ b/profiles/hardened/x86/2.6/package.mask
@@ -1,35 +1,4 @@
--dev-util/rootstrap
--media-plugins/gst-plugins-v4l2
--media-video/transcode
--net-firewall/ipsec-tools
--net-misc/lksctp-tools
--net-misc/mrouted
--sys-apps/hal
--sys-apps/ivman
--sys-apps/raidutils
--sys-cluster/cman-headers
--sys-cluster/cman-kernel
--sys-cluster/dlm-kernel
--sys-cluster/gfs-kernel
--sys-cluster/gnbd-kernel
--x11-misc/linuxwacom
--sys-cluster/cman
--sys-cluster/fence
--sys-cluster/gfs-headers
--sys-cluster/gulm
--sys-cluster/magma-plugins
--sys-cluster/rgmanager
--sys-fs/clvm
--sys-fs/gfs
--sys-power/kpowersave
--sys-power/powersave
--media-libs/libipoddevice
--dev-dotnet/ipod-sharp
--app-pda/dopi
--media-sound/banshee
--media-video/thoggen
--gnome-base/gnome-mount
--gnome-base/gnome-volume-manager
--gnome-extra/hal-device-manager
--sys-apps/pmount
--sys-apps/keyutils
+# Copyright 1999-2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/package.mask,v 1.10 2006/06/25 21:23:48 kevquinn Exp $
+
diff --git a/profiles/hardened/x86/2.6/packages b/profiles/hardened/x86/2.6/packages
index 9bd60979a2a3..cfcec1bef597 100644
--- a/profiles/hardened/x86/2.6/packages
+++ b/profiles/hardened/x86/2.6/packages
@@ -1,21 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation.
+# Copyright 1999-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/packages,v 1.2 2006/01/19 19:03:14 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/packages,v 1.3 2006/06/25 21:23:48 kevquinn Exp $
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
--<sys-kernel/linux-headers-2.5
--<sys-kernel/ac-sources-2.5
--<sys-kernel/ck-sources-2.5
--<sys-kernel/gentoo-sources-2.5
--<sys-kernel/grsec-sources-2.5
--<sys-kernel/hardened-sources-2.5
--<sys-kernel/openmosix-sources-2.5
--<sys-kernel/rsbac-sources-2.5
--<sys-kernel/uclinux-sources-2.5
--<sys-kernel/usermode-sources-2.5
--<sys-kernel/vanilla-sources-2.5
--<sys-kernel/win4lin-sources-2.5
--<sys-kernel/xbox-sources-2.5
+*>=sys-devel/binutils-2.13.90.0.4
+
+>=x11-base/xorg-x11-6.8.0-r4
+
+*sys-devel/bin86
+*sys-devel/libtool
+*sys-libs/pwdb
+*virtual/dev-manager
 
 <virtual/pcmcia-2.5
diff --git a/profiles/hardened/x86/2.6/parent b/profiles/hardened/x86/2.6/parent
index f3229c5b9876..aab0408ceca6 100644
--- a/profiles/hardened/x86/2.6/parent
+++ b/profiles/hardened/x86/2.6/parent
@@ -1 +1 @@
-..
+../..
diff --git a/profiles/hardened/x86/2.6/use.mask b/profiles/hardened/x86/2.6/use.mask
index af8a5c425b23..beb4afd9e428 100644
--- a/profiles/hardened/x86/2.6/use.mask
+++ b/profiles/hardened/x86/2.6/use.mask
@@ -1,15 +1,30 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/use.mask,v 1.7 2006/06/22 16:22:49 wolf31o2 Exp $
-
-# Unmasking this *here* since it requires a 2.6 setup
--input_devices_wacom
-
--nptl
--nptlonly
--hal
--v4l2
--ipod
--uml
--cman
--gulm
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/use.mask,v 1.8 2006/06/25 21:23:48 kevquinn Exp $
+
+
+altivec
+
+-mmx
+-mmx2
+-mmxext
+-sse
+-sse2
+-3dnow
+-3dnowext
+-win32codecs
+-real
+
+# nVidia XvMC support
+-nvidia
+
+# Copied from default-linux/x86 2006-04-02; bug #128490
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-video_cards_nvidia
+-video_cards_fglrx
+-video_cards_vmware
+# Modular X: mask for architectures on which they aren't available
+video_cards_newport
+
diff --git a/profiles/hardened/x86/2.6/virtuals b/profiles/hardened/x86/2.6/virtuals
index be6a626f15a6..d38097b33c98 100644
--- a/profiles/hardened/x86/2.6/virtuals
+++ b/profiles/hardened/x86/2.6/virtuals
@@ -1 +1,4 @@
-virtual/dev-manager sys-fs/udev
+# Copyright 1999-2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/virtuals,v 1.7 2006/06/25 21:23:48 kevquinn Exp $
+