From e56469377f23aaafbdd173e8610e3b5637d2dd28 Mon Sep 17 00:00:00 2001
From: Sven Vermeulen <swift@gentoo.org>
Date: Tue, 15 Nov 2011 10:35:33 +0000
Subject: [PATCH] Adding selinux-tftp as newer version for selinux-tftpd,
 naming now ok with upstream

---
 profiles/base/package.mask             | 3 ++-
 profiles/features/selinux/package.mask | 3 ++-
 profiles/selinux/package.mask          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 2ec41317e643..0b1694a0bc34 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.27 2011/11/15 10:30:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.28 2011/11/15 10:35:33 swift Exp $
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011)
 #  on behalf of QA team <qa@gentoo.org
@@ -211,6 +211,7 @@ sec-policy/selinux-sxid
 sec-policy/selinux-sysstat
 sec-policy/selinux-tcpd
 sec-policy/selinux-telnet
+sec-policy/selinux-tftp
 sec-policy/selinux-tftpd
 sec-policy/selinux-tgtd
 sec-policy/selinux-thunderbird
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 644fa5d0fe69..4c5e01a79697 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.15 2011/11/15 10:30:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.16 2011/11/15 10:35:33 swift Exp $
 
 # Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
 # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
@@ -218,6 +218,7 @@
 -sec-policy/selinux-sysstat
 -sec-policy/selinux-tcpd
 -sec-policy/selinux-telnet
+-sec-policy/selinux-tftp
 -sec-policy/selinux-tftpd
 -sec-policy/selinux-tgtd
 -sec-policy/selinux-thunderbird
diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask
index 2bf501e93c9f..11dfe151de94 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.71 2011/11/15 10:30:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.72 2011/11/15 10:35:33 swift Exp $
 
 # Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
 # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
@@ -218,6 +218,7 @@
 -sec-policy/selinux-sysstat
 -sec-policy/selinux-tcpd
 -sec-policy/selinux-telnet
+-sec-policy/selinux-tftp
 -sec-policy/selinux-tftpd
 -sec-policy/selinux-tgtd
 -sec-policy/selinux-thunderbird
-- 
2.26.2