From f1bceb5f5859dc08b060b12341d7c9e613594bf9 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 29 Nov 2006 21:47:49 +0000 Subject: [PATCH] mask checkpolicy to fix #155919. --- profiles/default-linux/alpha/no-nptl/package.mask | 1 + profiles/default-linux/mips/package.mask | 3 ++- profiles/default-linux/sparc/sparc64/2006.1/package.mask | 3 ++- profiles/default-linux/x86/no-nptl/package.mask | 1 + profiles/hardened/package.mask | 3 ++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/profiles/default-linux/alpha/no-nptl/package.mask b/profiles/default-linux/alpha/no-nptl/package.mask index 41beaaeb3521..cd65bcf102bd 100644 --- a/profiles/default-linux/alpha/no-nptl/package.mask +++ b/profiles/default-linux/alpha/no-nptl/package.mask @@ -11,6 +11,7 @@ >=sys-libs/libselinux-1.30.29 >=sys-libs/libsemanage-1.6.17 >=sys-apps/policycoreutils-1.30.30 +>=sys-apps/checkpolicy-1.30.12 sec-policy/selinux-acpi >=sec-policy/selinux-apache-20060101 >=sec-policy/selinux-arpwatch-20060101 diff --git a/profiles/default-linux/mips/package.mask b/profiles/default-linux/mips/package.mask index 1964362d172c..445be086ac34 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.8 2006/11/22 05:46:22 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/package.mask,v 1.9 2006/11/29 21:47:49 pebenito Exp $ # Mask gcc-4.x and >=mips-sources-2.6.17 (unmasked in 2006.1/* Profiles) >=sys-devel/gcc-4.0 @@ -23,6 +23,7 @@ sys-devel/gcc-mips64 >=sys-libs/libselinux-1.30.29 >=sys-libs/libsemanage-1.6.17 >=sys-apps/policycoreutils-1.30.30 +>=sys-apps/checkpolicy-1.30.12 sec-policy/selinux-acpi >=sec-policy/selinux-apache-20060101 >=sec-policy/selinux-arpwatch-20060101 diff --git a/profiles/default-linux/sparc/sparc64/2006.1/package.mask b/profiles/default-linux/sparc/sparc64/2006.1/package.mask index a4f8b136a3ee..10ec32732232 100644 --- a/profiles/default-linux/sparc/sparc64/2006.1/package.mask +++ b/profiles/default-linux/sparc/sparc64/2006.1/package.mask @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.1/package.mask,v 1.7 2006/11/22 05:46:22 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.1/package.mask,v 1.8 2006/11/29 21:47:49 pebenito Exp $ # Jason Wever # gradm requires 64 bit support, which doesn't exist in this profile @@ -21,6 +21,7 @@ >=sys-libs/libselinux-1.30.29 >=sys-libs/libsemanage-1.6.17 >=sys-apps/policycoreutils-1.30.30 +>=sys-apps/checkpolicy-1.30.12 sec-policy/selinux-acpi >=sec-policy/selinux-apache-20060101 >=sec-policy/selinux-arpwatch-20060101 diff --git a/profiles/default-linux/x86/no-nptl/package.mask b/profiles/default-linux/x86/no-nptl/package.mask index 32ee4c688088..8c31cfc95274 100644 --- a/profiles/default-linux/x86/no-nptl/package.mask +++ b/profiles/default-linux/x86/no-nptl/package.mask @@ -15,6 +15,7 @@ sys-apps/inputd >=sys-libs/libselinux-1.30.29 >=sys-libs/libsemanage-1.6.17 >=sys-apps/policycoreutils-1.30.30 +>=sys-apps/checkpolicy-1.30.12 sec-policy/selinux-acpi >=sec-policy/selinux-apache-20060101 >=sec-policy/selinux-arpwatch-20060101 diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask index 6257e6fcbf07..e3367d1a1946 100644 --- a/profiles/hardened/package.mask +++ b/profiles/hardened/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/hardened/package.mask,v 1.14 2006/11/22 05:46:22 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.15 2006/11/29 21:47:49 pebenito Exp $ # This file is additional masking for the hardened profile @@ -37,6 +37,7 @@ media-video/nvidia-settings >=sys-libs/libselinux-1.30.29 >=sys-libs/libsemanage-1.6.17 >=sys-apps/policycoreutils-1.30.30 +>=sys-apps/checkpolicy-1.30.12 sec-policy/selinux-acpi >=sec-policy/selinux-apache-20060101 >=sec-policy/selinux-arpwatch-20060101 -- 2.26.2