Push hardened/x86/2.6 down to hardened/x86 take two

7 files changed, 44 insertions, 0 deletions

diff --git a/profiles/hardened/x86/2.6/profile.bashrc b/profiles/hardened/x86/2.6/profile.bashrc
new file mode 100644
index 000000000000..e2dff2243109
--- /dev/null
+++ b/profiles/hardened/x86/2.6/profile.bashrc
@@ -0,0 +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/x86/2.6/profile.bashrc,v 1.1 2009/03/24 17:29:22 gengor Exp $
+
+if [[ "${EBUILD_PHASE}" == "setup" ]]
+then
+	echo
+	ewarn "The hardened/x86/2.6 profile is deprecated.  This profile has been"
+	ewarn "pushed down to hardened/x86.  Please update your /etc/make.profile"
+	ewarn "symlink to use the hardened/x86 profile.  See: eselect profile list"
+	echo
+fi
diff --git a/profiles/hardened/x86/README b/profiles/hardened/x86/README
new file mode 100644
index 000000000000..ae831e2ca8e2
--- /dev/null
+++ b/profiles/hardened/x86/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/minimal/make.defaults b/profiles/hardened/x86/minimal/make.defaults
new file mode 100644
index 000000000000..9a0ed8f4c7c6
--- /dev/null
+++ b/profiles/hardened/x86/minimal/make.defaults
@@ -0,0 +1,17 @@
+# Copyright 2007 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/minimal/make.defaults,v 1.1 2009/03/24 17:29:22 gengor Exp $
+
+# - TESTING PROFILE - TESTING PROFILE - 
+#  ------ USE AT YOUR OWN RISK ------
+
+ARCH="x86"
+ACCEPT_KEYWORDS="${ARCH}"
+USE="-* ${ARCH} crypt hardened minimal multicall ncurses pic readline zlib"
+PORTDIR=/usr/portage/
+PKGDIR=${PORTDIR}/packages/${ARCH}/
+
+CFLAGS="-Os -pipe"
+CXXFLAGS="${CFLAGS}"
+FEATURES="sandbox sfperms strict nodoc noinfo noman autoconfig"
+
diff --git a/profiles/hardened/x86/minimal/parent b/profiles/hardened/x86/minimal/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/hardened/x86/minimal/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/x86/minimal/use.mask b/profiles/hardened/x86/minimal/use.mask
new file mode 100644
index 000000000000..6645969ef058
--- /dev/null
+++ b/profiles/hardened/x86/minimal/use.mask
@@ -0,0 +1,2 @@
+pam
+nls
diff --git a/profiles/hardened/x86/minimal/virtuals b/profiles/hardened/x86/minimal/virtuals
new file mode 100644
index 000000000000..590fb8492d5a
--- /dev/null
+++ b/profiles/hardened/x86/minimal/virtuals
@@ -0,0 +1 @@
+virtual/ssh	net-misc/dropbear
diff --git a/profiles/hardened/x86/package.use b/profiles/hardened/x86/package.use
new file mode 100644
index 000000000000..9a3642cd84e2
--- /dev/null
+++ b/profiles/hardened/x86/package.use
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.2 (see bug #61732)
+
+# cyrus-sasl doesn't work w/ USE=berkdb (#192753)
+dev-libs/cyrus-sasl gdbm