- cross your fingers profile updates for 2.4 and 2.6 kernels for the 2005 release cycle

6 files changed, 47 insertions, 22 deletions

diff --git a/profiles/hardened/amd64/virtuals b/profiles/hardened/amd64/virtuals
index 8e3b855be090..de1df25f7684 100644
--- a/profiles/hardened/amd64/virtuals
+++ b/profiles/hardened/amd64/virtuals
@@ -1,6 +1,9 @@
-virtual/alsa            sys-kernel/hardened-dev-sources
-virtual/kernel          sys-kernel/linux26-headers
-virtual/linux-sources   sys-kernel/hardened-dev-sources
+# Copyright 1999-2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/virtuals,v 1.10 2005/01/21 22:20:21 solar Exp $
+
+virtual/alsa            sys-kernel/hardened-sources
+virtual/kernel          sys-kernel/linux-headers
 virtual/bootloader	sys-boot/grub-static
-virtual/os-headers	sys-kernel/linux26-headers
+virtual/os-headers	sys-kernel/linux-headers
 virtual/dev-manager	sys-fs/devfsd
diff --git a/profiles/hardened/ppc/virtuals b/profiles/hardened/ppc/virtuals
index 140e847be3f0..13df85437558 100644
--- a/profiles/hardened/ppc/virtuals
+++ b/profiles/hardened/ppc/virtuals
@@ -1,11 +1,8 @@
 # Copyright 2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/virtuals,v 1.2 2005/01/09 19:19:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/virtuals,v 1.3 2005/01/21 22:20:21 solar Exp $
 
-virtual/alsa            sys-kernel/hardened-dev-sources
+virtual/alsa            sys-kernel/hardened-sources
 virtual/bootloader      sys-boot/yaboot
 virtual/jdk             dev-java/ibm-jdk-bin
 virtual/jre             dev-java/ibm-jre-bin
-virtual/kernel          sys-kernel/linux26-headers
-virtual/linux-sources   sys-kernel/hardened-dev-sources
-virtual/os-headers      sys-kernel/linux26-headers
diff --git a/profiles/hardened/virtuals b/profiles/hardened/virtuals
index 396b672f6286..aed1b54f4242 100644
--- a/profiles/hardened/virtuals
+++ b/profiles/hardened/virtuals
@@ -1,7 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/virtuals,v 1.8 2005/01/09 19:19:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/virtuals,v 1.9 2005/01/21 22:20:21 solar Exp $
 
 virtual/kernel		sys-kernel/linux
 virtual/os-headers	sys-kernel/linux-headers
 virtual/modutils	sys-apps/module-init-tools
+virtual/linux-sources	sys-kernel/hardened-sources
diff --git a/profiles/hardened/x86/2.6/packages b/profiles/hardened/x86/2.6/packages
new file mode 100644
index 000000000000..7b10483f0673
--- /dev/null
+++ b/profiles/hardened/x86/2.6/packages
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 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.1 2005/01/21 22:20:21 solar 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
diff --git a/profiles/hardened/x86/2.6/virtuals b/profiles/hardened/x86/2.6/virtuals
index 2ffbe88b6b3f..e69de29bb2d1 100644
--- a/profiles/hardened/x86/2.6/virtuals
+++ b/profiles/hardened/x86/2.6/virtuals
@@ -1,8 +0,0 @@
-# Copyright 1999-2004 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.4 2005/01/09 19:19:32 solar Exp $
-
-virtual/alsa			sys-kernel/hardened-dev-sources
-virtual/linux-sources		sys-kernel/hardened-dev-sources
-virtual/os-headers		sys-kernel/linux26-headers
-virtual/kernel			sys-kernel/linux26-headers
diff --git a/profiles/hardened/x86/packages b/profiles/hardened/x86/packages
index 86f8c995f92d..76dc8b576c66 100644
--- a/profiles/hardened/x86/packages
+++ b/profiles/hardened/x86/packages
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.7 2005/01/04 06:52:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.8 2005/01/21 22:20:21 solar Exp $
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
@@ -44,4 +44,17 @@
 *sys-libs/pwdb
 *virtual/dev-manager
 
-#masking gcc3.4
+# masking 2.6 kernels/headers
+<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