Fix up SELinux profile issues from #336692. Move maskings out of global package.mask to base/package.mask and inerit that profile in SELinux profile.

4 files changed, 89 insertions, 82 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 1b0ce4e46b4e..de1e76c36839 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4557 2010/09/13 20:19:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4558 2010/09/14 13:08:13 pebenito Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  14 Sep 2010; Chris PeBenito <pebenito@gentoo.org> base/package.mask,
+  package.mask, +selinux/parent:
+  Fix up SELinux profile issues from #336692. Move maskings out of global
+  package.mask to base/package.mask and inerit that profile in SELinux
+  profile.
+
   13 Sep 2010; Ulrich Mueller <ulm@gentoo.org> package.mask:
   Mask app-emacs/gnus for removal.
 
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index e719b30fe320..c5b671d1202b 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.9 2010/09/11 10:21:52 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.10 2010/09/14 13:08:13 pebenito Exp $
 
 # Theo Chatzimichos <tampakrap@gentoo.org> (11 Sept 2010)
 # Mask KDE 4.5.1 bug 336158
@@ -265,3 +265,82 @@
 ~kde-base/systemsettings-4.5.1   
 ~kde-base/thumbnailers-4.5.1     
 ~kde-base/umbrello-4.5.1
+
+# Diego E. Pettenò <flameeyes@gentoo.org> (25 Apr 2010)
+#  on behalf of QA team <qa@gentoo.org
+#
+# Mask SElinux packages on all the profile and unmask it only for
+# selinux itself; automagic dependencies can break systems otherwise
+#
+# Please keep this mask in sync between profiles/package.mask and
+# selinux/package.mask (with - prefix there).
+app-admin/setools
+dev-python/python-selinux
+dev-python/sepolgen
+sys-apps/checkpolicy
+sys-apps/policycoreutils
+sys-libs/libselinux
+sys-libs/libsemanage
+sec-policy/selinux-acpi
+sec-policy/selinux-apache
+sec-policy/selinux-arpwatch
+sec-policy/selinux-asterisk
+sec-policy/selinux-audio-entropyd
+sec-policy/selinux-avahi
+sec-policy/selinux-base-policy
+sec-policy/selinux-bind
+sec-policy/selinux-bluez
+sec-policy/selinux-clamav
+sec-policy/selinux-clockspeed
+sec-policy/selinux-courier-imap
+sec-policy/selinux-cups
+sec-policy/selinux-cyrus-sasl
+sec-policy/selinux-daemontools
+sec-policy/selinux-dante
+sec-policy/selinux-dbus
+sec-policy/selinux-desktop
+sec-policy/selinux-dhcp
+sec-policy/selinux-distcc
+sec-policy/selinux-djbdns
+sec-policy/selinux-dnsmasq
+sec-policy/selinux-ftpd
+sec-policy/selinux-games
+sec-policy/selinux-gnupg
+sec-policy/selinux-gpm
+sec-policy/selinux-hal
+sec-policy/selinux-inetd
+sec-policy/selinux-ipsec-tools
+sec-policy/selinux-jabber-server
+sec-policy/selinux-kerberos
+sec-policy/selinux-logrotate
+sec-policy/selinux-lpd
+sec-policy/selinux-munin
+sec-policy/selinux-mysql
+sec-policy/selinux-nfs
+sec-policy/selinux-ntop
+sec-policy/selinux-ntp
+sec-policy/selinux-openldap
+sec-policy/selinux-openvpn
+sec-policy/selinux-pcmcia
+sec-policy/selinux-portmap
+sec-policy/selinux-postfix
+sec-policy/selinux-postgresql
+sec-policy/selinux-ppp
+sec-policy/selinux-privoxy
+sec-policy/selinux-procmail
+sec-policy/selinux-publicfile
+sec-policy/selinux-pyzor
+sec-policy/selinux-qmail
+sec-policy/selinux-razor
+sec-policy/selinux-samba
+sec-policy/selinux-screen
+sec-policy/selinux-snmpd
+sec-policy/selinux-snort
+sec-policy/selinux-spamassassin
+sec-policy/selinux-squid
+sec-policy/selinux-stunnel
+sec-policy/selinux-sudo
+sec-policy/selinux-tcpd
+sec-policy/selinux-tftpd
+sec-policy/selinux-ucspi-tcp
+sec-policy/selinux-wireshark
diff --git a/profiles/package.mask b/profiles/package.mask
index ad88aaf985dc..0c43aeb2ced0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11941 2010/09/13 20:23:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11942 2010/09/14 13:08:13 pebenito Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -683,85 +683,6 @@ net-misc/asterisk-app_nv_faxdetect
 # Replaced by >sci-libs/netcdf-4.0
 sci-libs/libnc-dap
 
-# Diego E. Pettenò <flameeyes@gentoo.org> (25 Apr 2010)
-#  on behalf of QA team <qa@gentoo.org
-#
-# Mask SElinux packages on all the profile and unmask it only for
-# selinux itself; automagic dependencies can break systems otherwise
-#
-# Please keep this mask in sync between profiles/package.mask and
-# selinux/package.mask (with - prefix there).
-app-admin/setools
-dev-python/python-selinux
-dev-python/sepolgen
-sys-apps/checkpolicy
-sys-apps/policycoreutils
-sys-libs/libselinux
-sys-libs/libsemanage
-sec-policy/selinux-acpi
-sec-policy/selinux-apache
-sec-policy/selinux-arpwatch
-sec-policy/selinux-asterisk
-sec-policy/selinux-audio-entropyd
-sec-policy/selinux-avahi
-sec-policy/selinux-base-policy
-sec-policy/selinux-bind
-sec-policy/selinux-bluez
-sec-policy/selinux-clamav
-sec-policy/selinux-clockspeed
-sec-policy/selinux-courier-imap
-sec-policy/selinux-cups
-sec-policy/selinux-cyrus-sasl
-sec-policy/selinux-daemontools
-sec-policy/selinux-dante
-sec-policy/selinux-dbus
-sec-policy/selinux-desktop
-sec-policy/selinux-dhcp
-sec-policy/selinux-distcc
-sec-policy/selinux-djbdns
-sec-policy/selinux-dnsmasq
-sec-policy/selinux-ftpd
-sec-policy/selinux-games
-sec-policy/selinux-gnupg
-sec-policy/selinux-gpm
-sec-policy/selinux-hal
-sec-policy/selinux-inetd
-sec-policy/selinux-ipsec-tools
-sec-policy/selinux-jabber-server
-sec-policy/selinux-kerberos
-sec-policy/selinux-logrotate
-sec-policy/selinux-lpd
-sec-policy/selinux-munin
-sec-policy/selinux-mysql
-sec-policy/selinux-nfs
-sec-policy/selinux-ntop
-sec-policy/selinux-ntp
-sec-policy/selinux-openldap
-sec-policy/selinux-openvpn
-sec-policy/selinux-pcmcia
-sec-policy/selinux-portmap
-sec-policy/selinux-postfix
-sec-policy/selinux-postgresql
-sec-policy/selinux-ppp
-sec-policy/selinux-privoxy
-sec-policy/selinux-procmail
-sec-policy/selinux-publicfile
-sec-policy/selinux-pyzor
-sec-policy/selinux-qmail
-sec-policy/selinux-razor
-sec-policy/selinux-samba
-sec-policy/selinux-screen
-sec-policy/selinux-snmpd
-sec-policy/selinux-snort
-sec-policy/selinux-spamassassin
-sec-policy/selinux-squid
-sec-policy/selinux-stunnel
-sec-policy/selinux-sudo
-sec-policy/selinux-tcpd
-sec-policy/selinux-tftpd
-sec-policy/selinux-ucspi-tcp
-sec-policy/selinux-wireshark
-
 # Mark Loeser <halcy0n@gentoo.org> (24 Apr 2010)
 # Masked for testing.  Only use this version of gcc if you know what you are
 # doing
diff --git a/profiles/selinux/parent b/profiles/selinux/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/selinux/parent
@@ -0,0 +1 @@
+../base