diff options
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/features/selinux/package.mask | 4 | ||||
| -rw-r--r-- | profiles/package.mask | 7 | ||||
| -rw-r--r-- | profiles/selinux/package.mask | 3 | ||||
| -rw-r--r-- | profiles/selinux/v2refpolicy/package.mask | 3 |
5 files changed, 14 insertions, 10 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 4524e37a58b7..e32746318b95 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5461 2011/06/18 19:53:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5462 2011/06/19 11:00:48 blueness 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! + 19 Jun 2011; Anthony G. Basile <blueness@gentoo.org> + features/selinux/package.mask, package.mask, selinux/package.mask, + selinux/v2refpolicy/package.mask: + Unmasked sec-policy/selinux-policykit, bug #371441 + 18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask: Mask cups-1.5, too new and still needs a lot of testing diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index b3997080121a..27fd574f3a41 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.2 2011/06/16 00:21:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.3 2011/06/19 11:00:49 blueness Exp $ # >=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 @@ -144,6 +144,7 @@ -sec-policy/selinux-pcmcia -sec-policy/selinux-perdition -sec-policy/selinux-podsleuth +-sec-policy/selinux-policykit -sec-policy/selinux-portmap -sec-policy/selinux-postfix -sec-policy/selinux-postgresql @@ -352,6 +353,7 @@ >=sec-policy/selinux-pcmcia-3 >=sec-policy/selinux-perdition-3 >=sec-policy/selinux-podsleuth-3 +>=sec-policy/selinux-policykit-3 >=sec-policy/selinux-portmap-3 >=sec-policy/selinux-postfix-3 >=sec-policy/selinux-postgresql-3 diff --git a/profiles/package.mask b/profiles/package.mask index 4a1306c487a3..85212f44be78 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12853 2011/06/18 19:53:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12854 2011/06/19 11:00:48 blueness 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 @@ -90,11 +90,6 @@ media-radio/gmfsk # experimental features and accept a more unstable release. >=www-client/chromium-14 -# Anthony G. Basile <blueness@gentoo.org> (15 Jun 2011) -# Masked for removal in 30 days. -# We don't have policykit in the tree anymore, bug #371441 -sec-policy/selinux-policykit - # Samuli Suominen <ssuominen@gentoo.org> (15 Jun 2011) # Retire gpixpod for bugs 221277 and 351307. Removal in 30 days. app-pda/gpixpod diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask index 539cf0ee4770..35ce6e403c81 100644 --- a/profiles/selinux/package.mask +++ b/profiles/selinux/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.58 2011/06/16 00:21:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.59 2011/06/19 11:00:49 blueness Exp $ # >=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 @@ -144,6 +144,7 @@ -sec-policy/selinux-pcmcia -sec-policy/selinux-perdition -sec-policy/selinux-podsleuth +-sec-policy/selinux-policykit -sec-policy/selinux-portmap -sec-policy/selinux-postfix -sec-policy/selinux-postgresql diff --git a/profiles/selinux/v2refpolicy/package.mask b/profiles/selinux/v2refpolicy/package.mask index a75b00aedbdd..9f767d1ea1cf 100644 --- a/profiles/selinux/v2refpolicy/package.mask +++ b/profiles/selinux/v2refpolicy/package.mask @@ -1,5 +1,5 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/v2refpolicy/package.mask,v 1.9 2011/06/16 00:21:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/v2refpolicy/package.mask,v 1.10 2011/06/19 11:00:49 blueness Exp $ # force version 2.YYYYMMDD policy over version YYYYMMDD policy >=sec-policy/selinux-acct-3 @@ -128,6 +128,7 @@ >=sec-policy/selinux-pcmcia-3 >=sec-policy/selinux-perdition-3 >=sec-policy/selinux-podsleuth-3 +>=sec-policy/selinux-policykit-3 >=sec-policy/selinux-portmap-3 >=sec-policy/selinux-postfix-3 >=sec-policy/selinux-postgresql-3 |