summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2008-10-03 03:44:47 +0000
committerChris PeBenito <pebenito@gentoo.org>2008-10-03 03:44:47 +0000
commit0a10b74be89c00773561f9445a4d3d7988808ddf (patch)
treea22e15860c55398a573d6127de56d2c1bbf7b17e /profiles
parentfix checkpolicy repoman complaints. (diff)
downloadgentoo-2-0a10b74be89c00773561f9445a4d3d7988808ddf.tar.gz
gentoo-2-0a10b74be89c00773561f9445a4d3d7988808ddf.tar.bz2
gentoo-2-0a10b74be89c00773561f9445a4d3d7988808ddf.zip
Mask dev-python/sepolgen on profiles that also mask libselinux.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog7
-rw-r--r--profiles/default-linux/mips/package.mask3
-rw-r--r--profiles/default/linux/package.mask3
-rw-r--r--profiles/hardened/ppc/package.mask3
4 files changed, 12 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c3cd45e95c35..56789538d851 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1918 2008/10/02 16:50:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1919 2008/10/03 03:44:45 pebenito 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!
+ 03 Oct 2008; Chris PeBenito <pebenito@gentoo.org>
+ default-linux/mips/package.mask, default/linux/package.mask,
+ hardened/ppc/package.mask:
+ Mask dev-python/sepolgen on profiles that also mask libselinux.
+
02 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> thirdpartymirrors:
Remove broken ftp.du.se mirror from kde mirrors list and add a couple
extra so they can share the load when Gentoo unmasks 4.1.2
diff --git a/profiles/default-linux/mips/package.mask b/profiles/default-linux/mips/package.mask
index 5225f42c67d9..731f1479658a 100644
--- a/profiles/default-linux/mips/package.mask
+++ b/profiles/default-linux/mips/package.mask
@@ -1,6 +1,6 @@
# Copyright 2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/package.mask,v 1.17 2008/05/16 02:47:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/package.mask,v 1.18 2008/10/03 03:44:46 pebenito Exp $
# Unmask =mozilla-thunderbird-1.5* until 2.0 is keyworded and stabilized
-=mail-client/mozilla-thunderbird-1.5*
@@ -35,6 +35,7 @@ sys-devel/gcc-mips64
>=sys-libs/libsemanage-1.6.17
>=sys-apps/policycoreutils-1.30.30
>=sys-apps/checkpolicy-1.30.12
+dev-python/sepolgen
sec-policy/selinux-acpi
>=sec-policy/selinux-apache-20060101
>=sec-policy/selinux-arpwatch-20060101
diff --git a/profiles/default/linux/package.mask b/profiles/default/linux/package.mask
index 6864dce47e9a..be5c93304507 100644
--- a/profiles/default/linux/package.mask
+++ b/profiles/default/linux/package.mask
@@ -1,6 +1,6 @@
# Copyright 2007-2008 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.mask,v 1.1 2008/04/01 17:40:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.mask,v 1.2 2008/10/03 03:44:46 pebenito Exp $
# Shouldn't be merging these SELinux packages on this profile
# but this keeps repoman happy since they require >=glibc-2.4
@@ -9,6 +9,7 @@
>=sys-libs/libsemanage-1.6.17
>=sys-apps/policycoreutils-1.30.30
>=sys-apps/checkpolicy-1.30.12
+dev-python/sepolgen
sec-policy/selinux-acpi
>=sec-policy/selinux-apache-20060101
>=sec-policy/selinux-arpwatch-20060101
diff --git a/profiles/hardened/ppc/package.mask b/profiles/hardened/ppc/package.mask
index f66cffeab521..f9f17c2009c2 100644
--- a/profiles/hardened/ppc/package.mask
+++ b/profiles/hardened/ppc/package.mask
@@ -1,6 +1,6 @@
# Copyright 2007 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/package.mask,v 1.15 2008/09/30 08:29:00 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/package.mask,v 1.16 2008/10/03 03:44:47 pebenito Exp $
# needs >=sys-devel/gcc-4.2
sys-libs/libfreevec
@@ -121,6 +121,7 @@ games-strategy/ufo-ai
>=sys-libs/libsemanage-1.6.17
>=sys-apps/policycoreutils-1.30.30
>=sys-apps/checkpolicy-1.30.12
+dev-python/sepolgen
sec-policy/selinux-acpi
>=sec-policy/selinux-apache-20060101
>=sec-policy/selinux-arpwatch-20060101