diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2012-02-26 16:32:20 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2012-02-26 16:32:20 +0000 |
| commit | da51ea486e72bd6a2d0cab03eb10007dcfe39202 (patch) | |
| tree | 51ee8ecc5495213658bacf2492f136fa02624dd1 | |
| parent | Convert to eshopts_{push,pop}, bug 328871 by Spanky. (diff) | |
| download | historical-da51ea486e72bd6a2d0cab03eb10007dcfe39202.tar.gz historical-da51ea486e72bd6a2d0cab03eb10007dcfe39202.tar.bz2 historical-da51ea486e72bd6a2d0cab03eb10007dcfe39202.zip | |
Adding references to new selinux policy packages, mask for non-selinux systems
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.mask | 6 | ||||
| -rw-r--r-- | profiles/features/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/features/selinux/package.mask | 4 |
4 files changed, 15 insertions, 5 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index c239559d50c6..98e2745b0dd8 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.350 2012/02/25 20:57:16 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.351 2012/02/26 16:32:20 swift Exp $ + + 26 Feb 2012; <swift@gentoo.org> package.mask: + Mask out new selinux policy packages 25 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> package.use.mask: diff --git a/profiles/base/package.mask b/profiles/base/package.mask index e3682b4240fa..3bb81c3dfd9a 100644 --- a/profiles/base/package.mask +++ b/profiles/base/package.mask @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.36 2012/01/14 19:33:30 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.37 2012/02/26 16:32:20 swift Exp $ # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011) # on behalf of QA team <qa@gentoo.org @@ -44,6 +44,7 @@ sec-policy/selinux-automount sec-policy/selinux-avahi sec-policy/selinux-awstats sec-policy/selinux-bacula +sec-policy/selinux-base sec-policy/selinux-base-policy sec-policy/selinux-bind sec-policy/selinux-bitlbee @@ -238,6 +239,7 @@ sec-policy/selinux-ucspitcp sec-policy/selinux-ulogd sec-policy/selinux-uucp sec-policy/selinux-uml +sec-policy/selinux-unconfined sec-policy/selinux-uptime sec-policy/selinux-usbmuxd sec-policy/selinux-uwimap diff --git a/profiles/features/ChangeLog b/profiles/features/ChangeLog index 7b759e88c9d5..6ee4f0f47d95 100644 --- a/profiles/features/ChangeLog +++ b/profiles/features/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.32 2012/02/11 11:08:42 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.33 2012/02/26 16:32:20 swift Exp $ + + 26 Feb 2012; <swift@gentoo.org> selinux/package.mask: + Unmask masked new selinux policy packages 11 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> 64bit-native/package.mask: diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index a04b0ad9ef55..9424cdb538d0 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.23 2012/01/14 19:33:30 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.24 2012/02/26 16:32:20 swift Exp $ # Zac Medico <zmedico@gentoo.org> (09 Aug 2011) # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and @@ -51,6 +51,7 @@ -sec-policy/selinux-avahi -sec-policy/selinux-awstats -sec-policy/selinux-bacula +-sec-policy/selinux-base -sec-policy/selinux-base-policy -sec-policy/selinux-bind -sec-policy/selinux-bitlbee @@ -243,6 +244,7 @@ -sec-policy/selinux-ucspitcp -sec-policy/selinux-ulogd -sec-policy/selinux-uml +-sec-policy/selinux-unconfined -sec-policy/selinux-uptime -sec-policy/selinux-usbmuxd -sec-policy/selinux-uucp |