Adding selinux-tftp as newer version for selinux-tftpd, naming now ok with upstream

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 2ec41317e643d832f8c20669b36b128fc0170576..0b1694a0bc347b5e149d613fc974d092cd022f53 100644 (file)
--- 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 644fa5d0fe69396488b89f6a17b89aabc4959e18..4c5e01a7969785e4435428b52c1158d9c28c3fcc 100644 (file)
--- 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 2bf501e93c9f7c82a4c9bc55c2788cb93f1dc858..11dfe151de9496b63557f62afca2c6920bcb3916 100644 (file)
--- 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