updates for new selinux policies: masks for profiles that dont have glibc 2.4, and add local use flag for selinux-desktop.

7 files changed, 47 insertions, 4 deletions

diff --git a/profiles/default-linux/alpha/2006.1/package.mask b/profiles/default-linux/alpha/2006.1/package.mask
index f8916210dea7..4fcdcb1a6667 100644
--- a/profiles/default-linux/alpha/2006.1/package.mask
+++ b/profiles/default-linux/alpha/2006.1/package.mask
@@ -2,24 +2,30 @@
 # but this keeps repoman happy since they require >=glibc-2.4
 # 20061008 pebenito
 >=sys-apps/policycoreutils-1.30.30
+sec-policy/selinux-acpi
 >=sec-policy/selinux-apache-20060101
 >=sec-policy/selinux-arpwatch-20060101
 >=sec-policy/selinux-asterisk-20060101
 >=sec-policy/selinux-audio-entropyd-20060101
+sec-policy/selinux-avahi
 >=sec-policy/selinux-base-policy-20060101
 >=sec-policy/selinux-bind-20060101
+sec-policy/selinux-bluez
 >=sec-policy/selinux-clamav-20060101
 >=sec-policy/selinux-clockspeed-20060101
 >=sec-policy/selinux-courier-imap-20060101
 >=sec-policy/selinux-cyrus-sasl-20060101
 >=sec-policy/selinux-daemontools-20060101
 >=sec-policy/selinux-dante-20060101
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
 >=sec-policy/selinux-dhcp-20060101
 >=sec-policy/selinux-distcc-20060101
 >=sec-policy/selinux-djbdns-20060101
 >=sec-policy/selinux-ftpd-20060101
 >=sec-policy/selinux-gnupg-20060101
 >=sec-policy/selinux-gpm-20060101
+sec-policy/selinux-hal
 >=sec-policy/selinux-ipsec-tools-20060101
 >=sec-policy/selinux-jabber-server-20060101
 >=sec-policy/selinux-kerberos-20060101
@@ -32,6 +38,7 @@
 >=sec-policy/selinux-ntp-20060101
 >=sec-policy/selinux-openldap-20060101
 >=sec-policy/selinux-openvpn-20060101
+sec-policy/selinux-pcmcia
 >=sec-policy/selinux-portmap-20060101
 >=sec-policy/selinux-postfix-20060101
 >=sec-policy/selinux-postgresql-20060101
diff --git a/profiles/default-linux/alpha/no-nptl/package.mask b/profiles/default-linux/alpha/no-nptl/package.mask
index 02009c9091b8..41beaaeb3521 100644
--- a/profiles/default-linux/alpha/no-nptl/package.mask
+++ b/profiles/default-linux/alpha/no-nptl/package.mask
@@ -11,24 +11,30 @@
 >=sys-libs/libselinux-1.30.29
 >=sys-libs/libsemanage-1.6.17
 >=sys-apps/policycoreutils-1.30.30
+sec-policy/selinux-acpi
 >=sec-policy/selinux-apache-20060101
 >=sec-policy/selinux-arpwatch-20060101
 >=sec-policy/selinux-asterisk-20060101
+sec-policy/selinux-avahi
 >=sec-policy/selinux-audio-entropyd-20060101
 >=sec-policy/selinux-base-policy-20060101
 >=sec-policy/selinux-bind-20060101
+sec-policy/selinux-bluez
 >=sec-policy/selinux-clamav-20060101
 >=sec-policy/selinux-clockspeed-20060101
 >=sec-policy/selinux-courier-imap-20060101
 >=sec-policy/selinux-cyrus-sasl-20060101
 >=sec-policy/selinux-daemontools-20060101
 >=sec-policy/selinux-dante-20060101
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
 >=sec-policy/selinux-dhcp-20060101
 >=sec-policy/selinux-distcc-20060101
 >=sec-policy/selinux-djbdns-20060101
 >=sec-policy/selinux-ftpd-20060101
 >=sec-policy/selinux-gnupg-20060101
 >=sec-policy/selinux-gpm-20060101
+sec-policy/selinux-hal
 >=sec-policy/selinux-ipsec-tools-20060101
 >=sec-policy/selinux-jabber-server-20060101
 >=sec-policy/selinux-kerberos-20060101
@@ -41,6 +47,7 @@
 >=sec-policy/selinux-ntp-20060101
 >=sec-policy/selinux-openldap-20060101
 >=sec-policy/selinux-openvpn-20060101
+sec-policy/selinux-pcmcia
 >=sec-policy/selinux-portmap-20060101
 >=sec-policy/selinux-postfix-20060101
 >=sec-policy/selinux-postgresql-20060101
diff --git a/profiles/default-linux/mips/package.mask b/profiles/default-linux/mips/package.mask
index 6f75fdd2354f..1964362d172c 100644
--- a/profiles/default-linux/mips/package.mask
+++ b/profiles/default-linux/mips/package.mask
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/package.mask,v 1.7 2006/10/30 23:14:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/package.mask,v 1.8 2006/11/22 05:46:22 pebenito Exp $
 
 # Mask gcc-4.x and >=mips-sources-2.6.17 (unmasked in 2006.1/* Profiles)
 >=sys-devel/gcc-4.0
@@ -23,24 +23,30 @@ sys-devel/gcc-mips64
 >=sys-libs/libselinux-1.30.29
 >=sys-libs/libsemanage-1.6.17
 >=sys-apps/policycoreutils-1.30.30
+sec-policy/selinux-acpi
 >=sec-policy/selinux-apache-20060101
 >=sec-policy/selinux-arpwatch-20060101
 >=sec-policy/selinux-asterisk-20060101
 >=sec-policy/selinux-audio-entropyd-20060101
+sec-policy/selinux-avahi
 >=sec-policy/selinux-base-policy-20060101
 >=sec-policy/selinux-bind-20060101
+sec-policy/selinux-bluez
 >=sec-policy/selinux-clamav-20060101
 >=sec-policy/selinux-clockspeed-20060101
 >=sec-policy/selinux-courier-imap-20060101
 >=sec-policy/selinux-cyrus-sasl-20060101
 >=sec-policy/selinux-daemontools-20060101
 >=sec-policy/selinux-dante-20060101
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
 >=sec-policy/selinux-dhcp-20060101
 >=sec-policy/selinux-distcc-20060101
 >=sec-policy/selinux-djbdns-20060101
 >=sec-policy/selinux-ftpd-20060101
 >=sec-policy/selinux-gnupg-20060101
 >=sec-policy/selinux-gpm-20060101
+sec-policy/selinux-hal
 >=sec-policy/selinux-ipsec-tools-20060101
 >=sec-policy/selinux-jabber-server-20060101
 >=sec-policy/selinux-kerberos-20060101
@@ -53,6 +59,7 @@ sys-devel/gcc-mips64
 >=sec-policy/selinux-ntp-20060101
 >=sec-policy/selinux-openldap-20060101
 >=sec-policy/selinux-openvpn-20060101
+sec-policy/selinux-pcmcia
 >=sec-policy/selinux-portmap-20060101
 >=sec-policy/selinux-postfix-20060101
 >=sec-policy/selinux-postgresql-20060101
diff --git a/profiles/default-linux/sparc/sparc64/2006.1/package.mask b/profiles/default-linux/sparc/sparc64/2006.1/package.mask
index b3db5cffb386..a4f8b136a3ee 100644
--- a/profiles/default-linux/sparc/sparc64/2006.1/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2006.1/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.1/package.mask,v 1.6 2006/10/30 23:14:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.1/package.mask,v 1.7 2006/11/22 05:46:22 pebenito Exp $
 
 # Jason Wever <weeve@gentoo.org>
 # gradm requires 64 bit support, which doesn't exist in this profile
@@ -21,24 +21,30 @@
 >=sys-libs/libselinux-1.30.29
 >=sys-libs/libsemanage-1.6.17
 >=sys-apps/policycoreutils-1.30.30
+sec-policy/selinux-acpi
 >=sec-policy/selinux-apache-20060101
 >=sec-policy/selinux-arpwatch-20060101
 >=sec-policy/selinux-asterisk-20060101
 >=sec-policy/selinux-audio-entropyd-20060101
+sec-policy/selinux-avahi
 >=sec-policy/selinux-base-policy-20060101
 >=sec-policy/selinux-bind-20060101
+sec-policy/selinux-bluez
 >=sec-policy/selinux-clamav-20060101
 >=sec-policy/selinux-clockspeed-20060101
 >=sec-policy/selinux-courier-imap-20060101
 >=sec-policy/selinux-cyrus-sasl-20060101
 >=sec-policy/selinux-daemontools-20060101
 >=sec-policy/selinux-dante-20060101
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
 >=sec-policy/selinux-dhcp-20060101
 >=sec-policy/selinux-distcc-20060101
 >=sec-policy/selinux-djbdns-20060101
 >=sec-policy/selinux-ftpd-20060101
 >=sec-policy/selinux-gnupg-20060101
 >=sec-policy/selinux-gpm-20060101
+sec-policy/selinux-hal
 >=sec-policy/selinux-ipsec-tools-20060101
 >=sec-policy/selinux-jabber-server-20060101
 >=sec-policy/selinux-kerberos-20060101
@@ -51,6 +57,7 @@
 >=sec-policy/selinux-ntp-20060101
 >=sec-policy/selinux-openldap-20060101
 >=sec-policy/selinux-openvpn-20060101
+sec-policy/selinux-pcmcia
 >=sec-policy/selinux-portmap-20060101
 >=sec-policy/selinux-postfix-20060101
 >=sec-policy/selinux-postgresql-20060101
diff --git a/profiles/default-linux/x86/no-nptl/package.mask b/profiles/default-linux/x86/no-nptl/package.mask
index 9594e547a168..f7139ee5770a 100644
--- a/profiles/default-linux/x86/no-nptl/package.mask
+++ b/profiles/default-linux/x86/no-nptl/package.mask
@@ -12,24 +12,30 @@ media-plugins/banshee-official-plugins
 >=sys-libs/libselinux-1.30.29 
 >=sys-libs/libsemanage-1.6.17
 >=sys-apps/policycoreutils-1.30.30
+sec-policy/selinux-acpi
 >=sec-policy/selinux-apache-20060101
 >=sec-policy/selinux-arpwatch-20060101
 >=sec-policy/selinux-asterisk-20060101
 >=sec-policy/selinux-audio-entropyd-20060101
+sec-policy/selinux-avahi
 >=sec-policy/selinux-base-policy-20060101
 >=sec-policy/selinux-bind-20060101
+sec-policy/selinux-bluez
 >=sec-policy/selinux-clamav-20060101
 >=sec-policy/selinux-clockspeed-20060101
 >=sec-policy/selinux-courier-imap-20060101
 >=sec-policy/selinux-cyrus-sasl-20060101
 >=sec-policy/selinux-daemontools-20060101
 >=sec-policy/selinux-dante-20060101
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
 >=sec-policy/selinux-dhcp-20060101
 >=sec-policy/selinux-distcc-20060101
 >=sec-policy/selinux-djbdns-20060101
 >=sec-policy/selinux-ftpd-20060101
 >=sec-policy/selinux-gnupg-20060101
 >=sec-policy/selinux-gpm-20060101
+sec-policy/selinux-hal
 >=sec-policy/selinux-ipsec-tools-20060101
 >=sec-policy/selinux-jabber-server-20060101
 >=sec-policy/selinux-kerberos-20060101
@@ -42,6 +48,7 @@ media-plugins/banshee-official-plugins
 >=sec-policy/selinux-ntp-20060101
 >=sec-policy/selinux-openldap-20060101
 >=sec-policy/selinux-openvpn-20060101
+sec-policy/selinux-pcmcia
 >=sec-policy/selinux-portmap-20060101
 >=sec-policy/selinux-postfix-20060101
 >=sec-policy/selinux-postgresql-20060101
diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask
index 6c128e0e5425..6257e6fcbf07 100644
--- a/profiles/hardened/package.mask
+++ b/profiles/hardened/package.mask
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.13 2006/10/30 23:14:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.14 2006/11/22 05:46:22 pebenito Exp $
 
 # This file is additional masking for the hardened profile
 
@@ -37,24 +37,30 @@ media-video/nvidia-settings
 >=sys-libs/libselinux-1.30.29
 >=sys-libs/libsemanage-1.6.17
 >=sys-apps/policycoreutils-1.30.30
+sec-policy/selinux-acpi
 >=sec-policy/selinux-apache-20060101
 >=sec-policy/selinux-arpwatch-20060101
 >=sec-policy/selinux-asterisk-20060101
 >=sec-policy/selinux-audio-entropyd-20060101
+sec-policy/selinux-avahi
 >=sec-policy/selinux-base-policy-20060101
 >=sec-policy/selinux-bind-20060101
+sec-policy/selinux-bluez
 >=sec-policy/selinux-clamav-20060101
 >=sec-policy/selinux-clockspeed-20060101
 >=sec-policy/selinux-courier-imap-20060101
 >=sec-policy/selinux-cyrus-sasl-20060101
 >=sec-policy/selinux-daemontools-20060101
 >=sec-policy/selinux-dante-20060101
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
 >=sec-policy/selinux-dhcp-20060101
 >=sec-policy/selinux-distcc-20060101
 >=sec-policy/selinux-djbdns-20060101
 >=sec-policy/selinux-ftpd-20060101
 >=sec-policy/selinux-gnupg-20060101
 >=sec-policy/selinux-gpm-20060101
+sec-policy/selinux-hal
 >=sec-policy/selinux-ipsec-tools-20060101
 >=sec-policy/selinux-jabber-server-20060101
 >=sec-policy/selinux-kerberos-20060101
@@ -67,6 +73,7 @@ media-video/nvidia-settings
 >=sec-policy/selinux-ntp-20060101
 >=sec-policy/selinux-openldap-20060101
 >=sec-policy/selinux-openvpn-20060101
+sec-policy/selinux-pcmcia
 >=sec-policy/selinux-portmap-20060101
 >=sec-policy/selinux-postfix-20060101
 >=sec-policy/selinux-postgresql-20060101
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ea10a8cd116c..8845b170ac9a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2371 2006/11/22 03:48:53 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2372 2006/11/22 05:46:21 pebenito Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -1478,6 +1478,7 @@ sci-visualization/labplot:kexi - Import and export data from/to MySQL, PostgreSQ
 sci-visualization/opendx:cdf - Adds cdf data exchange format support
 sci-visualization/opendx:hdf - Adds support for the Hierarchical Data Format
 sci-visualization/paraview:hdf5 - Adds support for the Hierarchical Data Format v5
+sec-policy/selinux-desktop:avahi - Add avahi SELinux policy.
 sys-apps/acl:nfs - add support for NFS acls
 sys-apps/busybox:make-symlinks - Create all the appropriate symlinks in /bin and /sbin
 sys-apps/busybox:savedconfig - Adds support to user defined configs