From 214fdeaa586b18715fa5dcae949c31655fd3c4dd Mon Sep 17 00:00:00 2001 From: Sven Vermeulen Date: Fri, 7 Oct 2011 18:47:48 +0000 Subject: [PATCH] Mask out selinux-mta due to conflict with base policy (bug #384851) --- profiles/features/selinux/package.mask | 7 +++++-- profiles/selinux/package.mask | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index b88e87c2eb80..5a7b0b67dd46 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.12 2011/08/28 21:00:34 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.13 2011/10/07 18:47:48 swift Exp $ # Zac Medico (09 Aug 2011) # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and @@ -146,7 +146,6 @@ -sec-policy/selinux-mozilla -sec-policy/selinux-mplayer -sec-policy/selinux-mrtg --sec-policy/selinux-mta -sec-policy/selinux-munin -sec-policy/selinux-mutt -sec-policy/selinux-mysql @@ -249,3 +248,7 @@ -sec-policy/selinux-xscreensaver -sec-policy/selinux-xserver -sec-policy/selinux-zabbix + +# Sven Vermeulen (07 Oct 2011) +# Mask out sec-policy/selinux-mta as it is offered by selinux-base-policy (bug #384851) +sec-policy/selinux-mta diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask index 425c40a890dc..26b7266e2451 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.68 2011/08/28 21:00:34 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.69 2011/10/07 18:47:48 swift Exp $ # Zac Medico (09 Aug 2011) # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and @@ -146,7 +146,6 @@ -sec-policy/selinux-mozilla -sec-policy/selinux-mplayer -sec-policy/selinux-mrtg --sec-policy/selinux-mta -sec-policy/selinux-munin -sec-policy/selinux-mutt -sec-policy/selinux-mysql @@ -249,3 +248,7 @@ -sec-policy/selinux-xscreensaver -sec-policy/selinux-xserver -sec-policy/selinux-zabbix + +# Sven Vermeulen (07 Oct 2011) +# Mask out sec-policy/selinux-mta as it is offered by selinux-base-policy (bug #384851) +sec-policy/selinux-mta -- 2.26.2