fix up selinux profile inheritance, to fix bug #186489.

14 files changed, 41 insertions, 1 deletions

diff --git a/profiles/selinux/2005.1/alpha/deprecated b/profiles/selinux/2005.1/alpha/deprecated
index 1e5adaaf092c..04373f4d86b4 100644
--- a/profiles/selinux/2005.1/alpha/deprecated
+++ b/profiles/selinux/2005.1/alpha/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/alpha
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/alpha/parent b/profiles/selinux/2005.1/alpha/parent
index f3229c5b9876..9f9d2cbed246 100644
--- a/profiles/selinux/2005.1/alpha/parent
+++ b/profiles/selinux/2005.1/alpha/parent
@@ -1 +1,2 @@
+../../../base
 ..
diff --git a/profiles/selinux/2005.1/amd64/deprecated b/profiles/selinux/2005.1/amd64/deprecated
index 3ffbd1a5b15d..26e5b413e17a 100644
--- a/profiles/selinux/2005.1/amd64/deprecated
+++ b/profiles/selinux/2005.1/amd64/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/amd64
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/amd64/parent b/profiles/selinux/2005.1/amd64/parent
index f3229c5b9876..9f9d2cbed246 100644
--- a/profiles/selinux/2005.1/amd64/parent
+++ b/profiles/selinux/2005.1/amd64/parent
@@ -1 +1,2 @@
+../../../base
 ..
diff --git a/profiles/selinux/2005.1/mips/mips64/deprecated b/profiles/selinux/2005.1/mips/mips64/deprecated
index 974b1cd1037c..422c18afae30 100644
--- a/profiles/selinux/2005.1/mips/mips64/deprecated
+++ b/profiles/selinux/2005.1/mips/mips64/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/mips
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/mips/mips64/parent b/profiles/selinux/2005.1/mips/mips64/parent
index f3229c5b9876..e91d035d8615 100644
--- a/profiles/selinux/2005.1/mips/mips64/parent
+++ b/profiles/selinux/2005.1/mips/mips64/parent
@@ -1 +1,2 @@
+../../../../base
 ..
diff --git a/profiles/selinux/2005.1/ppc/deprecated b/profiles/selinux/2005.1/ppc/deprecated
index c848b66e1a9a..988be5cfb7e9 100644
--- a/profiles/selinux/2005.1/ppc/deprecated
+++ b/profiles/selinux/2005.1/ppc/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/ppc
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/ppc/parent b/profiles/selinux/2005.1/ppc/parent
index f3229c5b9876..9f9d2cbed246 100644
--- a/profiles/selinux/2005.1/ppc/parent
+++ b/profiles/selinux/2005.1/ppc/parent
@@ -1 +1,2 @@
+../../../base
 ..
diff --git a/profiles/selinux/2005.1/sparc64/deprecated b/profiles/selinux/2005.1/sparc64/deprecated
index 3fca874a14e2..c224a261e181 100644
--- a/profiles/selinux/2005.1/sparc64/deprecated
+++ b/profiles/selinux/2005.1/sparc64/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/sparc64
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/sparc64/parent b/profiles/selinux/2005.1/sparc64/parent
index f3229c5b9876..9f9d2cbed246 100644
--- a/profiles/selinux/2005.1/sparc64/parent
+++ b/profiles/selinux/2005.1/sparc64/parent
@@ -1 +1,2 @@
+../../../base
 ..
diff --git a/profiles/selinux/2005.1/x86/deprecated b/profiles/selinux/2005.1/x86/deprecated
index 46f05b68a74a..ad717714b0af 100644
--- a/profiles/selinux/2005.1/x86/deprecated
+++ b/profiles/selinux/2005.1/x86/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/x86
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/x86/hardened/deprecated b/profiles/selinux/2005.1/x86/hardened/deprecated
index 7c4a61e987ba..c8e3abf09cfb 100644
--- a/profiles/selinux/2005.1/x86/hardened/deprecated
+++ b/profiles/selinux/2005.1/x86/hardened/deprecated
@@ -1,3 +1,8 @@
 selinux/2007.0/x86/hardened
 See http://www.gentoo.org/proj/en/hardened/selinux/selinux20061-upg.xml
 for details.
+
+If you plan to continue to use this profile for a while,
+please make sure that your portage is up to date:
+
+# emerge -n '>=sys-apps/portage-2.1.2.0'
diff --git a/profiles/selinux/2005.1/x86/parent b/profiles/selinux/2005.1/x86/parent
index f3229c5b9876..9f9d2cbed246 100644
--- a/profiles/selinux/2005.1/x86/parent
+++ b/profiles/selinux/2005.1/x86/parent
@@ -1 +1,2 @@
+../../../base
 ..
diff --git a/profiles/selinux/parent b/profiles/selinux/parent
deleted file mode 100644
index eb001c6e8ab8..000000000000
--- a/profiles/selinux/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base