diff options
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.mask | 3 | ||||
| -rw-r--r-- | profiles/selinux/package.mask | 3 | ||||
| -rw-r--r-- | profiles/selinux/v2refpolicy/package.mask | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 11b7cc8f3045..42349690a42d 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5292 2011/04/16 12:15:53 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5293 2011/04/16 13:19:54 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! + 16 Apr 2011; Anthony G. Basile <blueness@gentoo.org> base/package.mask, + selinux/package.mask, selinux/v2refpolicy/package.mask: + Added maskings and unmaskings for sec-policy/selinux-ldap. + 16 Apr 2011; Anthony G. Basile <blueness@gentoo.org> package.mask: sec-policy/selinux-hal: Masked for removal in 30 days. Bug #362847 diff --git a/profiles/base/package.mask b/profiles/base/package.mask index 09b07bc76aaf..1fe6677979f7 100644 --- a/profiles/base/package.mask +++ b/profiles/base/package.mask @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.15 2011/03/07 03:10:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.16 2011/04/16 13:19:55 blueness Exp $ # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011) # on behalf of QA team <qa@gentoo.org @@ -116,6 +116,7 @@ sec-policy/selinux-kerneloops sec-policy/selinux-kismet sec-policy/selinux-ksmtuned sec-policy/selinux-kudzu +sec-policy/selinux-ldap sec-policy/selinux-links sec-policy/selinux-lircd sec-policy/selinux-loadkeys diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask index 8c52a54dc7f9..37840ae0566f 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.55 2011/03/07 03:10:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.56 2011/04/16 13:19:55 blueness Exp $ # >=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 @@ -109,6 +109,7 @@ -sec-policy/selinux-kismet -sec-policy/selinux-ksmtuned -sec-policy/selinux-kudzu +-sec-policy/selinux-ldap -sec-policy/selinux-links -sec-policy/selinux-lircd -sec-policy/selinux-loadkeys diff --git a/profiles/selinux/v2refpolicy/package.mask b/profiles/selinux/v2refpolicy/package.mask index 3e8741c54943..016e59811c84 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.6 2011/03/07 03:10:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/v2refpolicy/package.mask,v 1.7 2011/04/16 13:19:55 blueness Exp $ # force version 2.YYYYMMDD policy over version YYYYMMDD policy >=sec-policy/selinux-acct-3 @@ -93,6 +93,7 @@ >=sec-policy/selinux-kismet-3 >=sec-policy/selinux-ksmtuned-3 >=sec-policy/selinux-kudzu-3 +>=sec-policy/selinux-ldap-3 >=sec-policy/selinux-links-3 >=sec-policy/selinux-lircd-3 >=sec-policy/selinux-loadkeys-3 |