restructure make.defaults and add hardened/pie-ssp x86 subprofile

9 files changed, 46 insertions, 50 deletions

diff --git a/profiles/selinux/2004.1/amd64/make.defaults b/profiles/selinux/2004.1/amd64/make.defaults
index bcd3de630191..fdf10a7d2aa8 100644
--- a/profiles/selinux/2004.1/amd64/make.defaults
+++ b/profiles/selinux/2004.1/amd64/make.defaults
@@ -1,19 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/make.defaults,v 1.2 2004/11/22 02:10:35 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/make.defaults,v 1.3 2004/11/24 00:57:28 pebenito Exp $
 
-USE="amd64 berkdb crypt multilib ncurses pam python readline selinux ssl zlib"
-STAGE1_USE="multilib selinux"
-GRP_STAGE23_USE="amd64 berkdb crypt multilib ncurses pam python readline selinux ssl zlib"
+USE="amd64"
+STAGE1_USE="multilib"
+GRP_STAGE23_USE="amd64"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
-FEATURES="autoconfig sandbox strict sfperms"
-POLICYDIR="/etc/security/selinux/src/policy"
+FEATURES="sandbox"
 
 CONF_LIBDIR="lib"
 CONF_MULTILIBDIR="lib32"
-
-PORTAGE_T="portage_t"
-PORTAGE_FETCH_T="portage_fetch_t"
-PORTAGE_SANDBOX_T="portage_sandbox_t"
diff --git a/profiles/selinux/2004.1/amd64/virtuals b/profiles/selinux/2004.1/amd64/virtuals
index 465d6ac292a2..a24f357d6006 100644
--- a/profiles/selinux/2004.1/amd64/virtuals
+++ b/profiles/selinux/2004.1/amd64/virtuals
@@ -1,9 +1,9 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/virtuals,v 1.1 2004/09/20 00:38:34 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/amd64/virtuals,v 1.2 2004/11/24 00:57:28 pebenito Exp $
 
 virtual/os-headers		sys-kernel/linux26-headers
 virtual/alsa			sys-kernel/gentoo-dev-sources
 virtual/kernel			sys-kernel/linux26-headers
 virtual/linux-sources		sys-kernel/gentoo-dev-sources
-virtual/bootloader		sys-boot/grub-static
+virtual/bootloader		sys-boot/grub
diff --git a/profiles/selinux/2004.1/ppc/make.defaults b/profiles/selinux/2004.1/ppc/make.defaults
index 98e87f43b1a5..13e26de5b497 100644
--- a/profiles/selinux/2004.1/ppc/make.defaults
+++ b/profiles/selinux/2004.1/ppc/make.defaults
@@ -1,17 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/make.defaults,v 1.8 2004/11/22 02:11:03 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/make.defaults,v 1.9 2004/11/24 00:57:28 pebenito Exp $
 
-ARCH="ppc"
-
-USE="ppc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
-STAGE1_USE="selinux"
-GRP_STAGE23_USE="ppc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
+USE="ppc"
+GRP_STAGE23_USE="ppc"
 
+ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
-POLICYDIR="/etc/security/selinux/src/policy"
-FEATURES="strict sfperms"
-
-PORTAGE_T="portage_t"
-PORTAGE_FETCH_T="portage_fetch_t"
-PORTAGE_SANDBOX_T="portage_sandbox_t"
diff --git a/profiles/selinux/2004.1/sparc64/make.defaults b/profiles/selinux/2004.1/sparc64/make.defaults
index 05d4ee84e63e..ce7a826cb144 100644
--- a/profiles/selinux/2004.1/sparc64/make.defaults
+++ b/profiles/selinux/2004.1/sparc64/make.defaults
@@ -1,20 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/make.defaults,v 1.9 2004/11/22 02:11:03 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/make.defaults,v 1.10 2004/11/24 00:57:28 pebenito Exp $
 
-ARCH="sparc"
+USE="sparc"
+GRP_STAGE23_USE="sparc"
 
+ARCH="sparc"
 PROFILE_ARCH="sparc64"
-
-USE="sparc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
-STAGE1_USE="selinux"
-GRP_STAGE23_USE="sparc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
-
 ACCEPT_KEYWORDS="sparc"
-FEATURES="strict sfperms"
-
-POLICYDIR="/etc/security/selinux/src/policy"
-
-PORTAGE_T="portage_t"
-PORTAGE_FETCH_T="portage_fetch_t"
-PORTAGE_SANDBOX_T="portage_sandbox_t"
diff --git a/profiles/selinux/2004.1/x86/hardened/make.defaults b/profiles/selinux/2004.1/x86/hardened/make.defaults
new file mode 100644
index 000000000000..1715141cbd49
--- /dev/null
+++ b/profiles/selinux/2004.1/x86/hardened/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/hardened/make.defaults,v 1.1 2004/11/24 00:57:28 pebenito Exp $
+
+USE="dlloader hardened pic pie"
+GRP_STAGE23_USE="dlloader hardened pic pie"
diff --git a/profiles/selinux/2004.1/x86/hardened/parent b/profiles/selinux/2004.1/x86/hardened/parent
new file mode 100644
index 000000000000..927839b58910
--- /dev/null
+++ b/profiles/selinux/2004.1/x86/hardened/parent
@@ -0,0 +1,5 @@
+# Copyright 1999-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/hardened/parent,v 1.1 2004/11/24 00:57:28 pebenito Exp $
+
+..
diff --git a/profiles/selinux/2004.1/x86/make.defaults b/profiles/selinux/2004.1/x86/make.defaults
index 4c5828a70169..e5820939e589 100644
--- a/profiles/selinux/2004.1/x86/make.defaults
+++ b/profiles/selinux/2004.1/x86/make.defaults
@@ -1,16 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/make.defaults,v 1.7 2004/11/22 02:11:03 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/make.defaults,v 1.8 2004/11/24 00:57:28 pebenito Exp $
 
-USE="x86 berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
-STAGE1_USE="selinux"
-GRP_STAGE23_USE="x86 berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
+USE="x86"
+GRP_STAGE23_USE="x86"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
-FEATURES="strict sfperms"
-POLICYDIR="/etc/security/selinux/src/policy"
-
-PORTAGE_T="portage_t"
-PORTAGE_FETCH_T="portage_fetch_t"
-PORTAGE_SANDBOX_T="portage_sandbox_t"
+FEATURES="sandbox"
diff --git a/profiles/selinux/2004.1/x86/virtuals b/profiles/selinux/2004.1/x86/virtuals
index 2a7323c566d6..bbf999090697 100644
--- a/profiles/selinux/2004.1/x86/virtuals
+++ b/profiles/selinux/2004.1/x86/virtuals
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/virtuals,v 1.6 2004/09/30 15:37:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/x86/virtuals,v 1.7 2004/11/24 00:57:28 pebenito Exp $
 
 virtual/bootloader	sys-boot/grub
-virtual/linux-sources	sys-kernel/selinux-sources
+virtual/linux-sources	sys-kernel/hardened-dev-sources
diff --git a/profiles/selinux/make.defaults b/profiles/selinux/make.defaults
new file mode 100644
index 000000000000..cc22c0073e98
--- /dev/null
+++ b/profiles/selinux/make.defaults
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/make.defaults,v 1.1 2004/11/24 00:57:28 pebenito Exp $
+
+USE="berkdb crypt ncurses pam python readline selinux ssl zlib"
+STAGE1_USE="selinux"
+GRP_STAGE23_USE="berkdb crypt ncurses pam python readline selinux ssl zlib"
+
+FEATURES="autoconfig strict sfperms"
+POLICYDIR="/etc/security/selinux/src/policy"
+
+PORTAGE_T="portage_t"
+PORTAGE_FETCH_T="portage_fetch_t"
+PORTAGE_SANDBOX_T="portage_sandbox_t"