From cb33f0db796d92a2c854151f9a815bc63c46008e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 9 Aug 2011 04:29:56 +0000 Subject: [PATCH] Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and future versions of sys-apps/portage. --- profiles/arch/arm/package.mask | 9 ++++- profiles/arch/arm/packages | 7 ---- profiles/arch/ia64/package.mask | 10 +++++ profiles/arch/ia64/packages | 7 ---- profiles/arch/sh/package.mask | 10 +++++ profiles/arch/sh/packages | 7 ---- profiles/arch/x86/package.mask | 7 +++- profiles/arch/x86/packages | 14 ------- profiles/arch/x86/xbox/package.mask | 9 +++++ profiles/arch/x86/xbox/packages | 9 ----- profiles/features/gcc2/package.mask | 52 +++++++++++++++++++++++- profiles/features/gcc2/packages | 56 -------------------------- profiles/features/selinux/package.mask | 41 ++++++++++++++++++- profiles/features/selinux/packages | 29 +------------ profiles/hardened/amd64/package.mask | 8 +++- profiles/hardened/amd64/packages | 2 - profiles/hardened/ia64/package.mask | 8 +++- profiles/hardened/ia64/packages | 4 +- profiles/hardened/x86/package.mask | 8 +++- profiles/hardened/x86/packages | 4 +- profiles/releases/10.0/package.mask | 7 +++- profiles/releases/10.0/packages | 15 ------- profiles/releases/2008.0/package.mask | 7 +++- profiles/releases/2008.0/packages | 15 ------- profiles/selinux/package.mask | 42 ++++++++++++++++++- profiles/selinux/packages | 30 +------------- 26 files changed, 212 insertions(+), 205 deletions(-) delete mode 100644 profiles/arch/arm/packages create mode 100644 profiles/arch/ia64/package.mask delete mode 100644 profiles/arch/ia64/packages create mode 100644 profiles/arch/sh/package.mask delete mode 100644 profiles/arch/sh/packages delete mode 100644 profiles/arch/x86/packages create mode 100644 profiles/arch/x86/xbox/package.mask delete mode 100644 profiles/arch/x86/xbox/packages delete mode 100644 profiles/features/gcc2/packages delete mode 100644 profiles/releases/10.0/packages delete mode 100644 profiles/releases/2008.0/packages diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask index 5e0ce13fc57f..6b1771eff82e 100644 --- a/profiles/arch/arm/package.mask +++ b/profiles/arch/arm/package.mask @@ -1,6 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.22 2011/07/28 21:21:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.23 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. + (27 Jul 2011) # Mask KDE SC 4.7.0 per bug #376613 diff --git a/profiles/arch/arm/packages b/profiles/arch/arm/packages deleted file mode 100644 index 177ffcff1682..000000000000 --- a/profiles/arch/arm/packages +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2001-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/packages,v 1.1 2008/04/01 17:39:55 wolf31o2 Exp $ - ->=sys-devel/binutils-2.13.90.0.4 ->=sys-devel/gcc-3.2 ->=sys-libs/glibc-2.2.5 diff --git a/profiles/arch/ia64/package.mask b/profiles/arch/ia64/package.mask new file mode 100644 index 000000000000..9e94f6000320 --- /dev/null +++ b/profiles/arch/ia64/package.mask @@ -0,0 +1,10 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.mask,v 1.21 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +=sys-devel/binutils-2.13.90.0.4 ->=sys-devel/gcc-3.2 ->=sys-libs/glibc-2.2.5 diff --git a/profiles/arch/sh/package.mask b/profiles/arch/sh/package.mask new file mode 100644 index 000000000000..071580caa843 --- /dev/null +++ b/profiles/arch/sh/package.mask @@ -0,0 +1,10 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/package.mask,v 1.10 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +=sys-devel/binutils-2.13.90.0.4 ->=sys-devel/gcc-3.2 ->=sys-libs/glibc-2.2.5 diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask index f35667f3592a..cc71708b886d 100644 --- a/profiles/arch/x86/package.mask +++ b/profiles/arch/x86/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.18 2010/10/05 23:51:48 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.19 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. + (05 Dec 2006) # this version is badly broken on x86, see bug #153280 diff --git a/profiles/arch/x86/packages b/profiles/arch/x86/packages deleted file mode 100644 index b70fdd158222..000000000000 --- a/profiles/arch/x86/packages +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2001-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/packages,v 1.1 2008/04/01 17:40:04 wolf31o2 Exp $ - -# For instructions on how this file works (as an inclusion mask, primarily), -# please refer to ${PORTDIR}/profiles/base/packages - -# Use this file to lock down specific versions of packages ONLY TO THIS -# SPECIFIC ARCHITECTURE!! - -# You can also add files to the base system itself if you prefix them with a -# * - ->=sys-devel/binutils-2.13.90.0.4 diff --git a/profiles/arch/x86/xbox/package.mask b/profiles/arch/x86/xbox/package.mask new file mode 100644 index 000000000000..d9c3a7fb7515 --- /dev/null +++ b/profiles/arch/x86/xbox/package.mask @@ -0,0 +1,9 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/xbox/package.mask,v 1.1 2011/08/09 04:29:55 zmedico Exp $ + +# version specific stuff for xbox support +=app-misc/lirc-0.7.0_pre6 ->=x11-base/xorg-x11-4.3.0-r6 ->=media-sound/alsa-driver-1.0.5a ->=x11-base/xorg-6.8.0-r2 diff --git a/profiles/features/gcc2/package.mask b/profiles/features/gcc2/package.mask index 0fbb119ea2f8..fe55954145a9 100644 --- a/profiles/features/gcc2/package.mask +++ b/profiles/features/gcc2/package.mask @@ -1,6 +1,56 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/gcc2/package.mask,v 1.5 2010/04/08 13:55:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/gcc2/package.mask,v 1.6 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +sys-devel/gcc-2.95.3-r9999 +sys-libs/glibc-2.2.5-r9999 + +sci-mathematics/octave-2.0.9999 + +=sys-kernel/linux-headers-2.5 >=sys-devel/gcc-2.95.4 diff --git a/profiles/features/gcc2/packages b/profiles/features/gcc2/packages deleted file mode 100644 index e814633d7ff9..000000000000 --- a/profiles/features/gcc2/packages +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2001-2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/gcc2/packages,v 1.1 2008/04/01 17:41:08 wolf31o2 Exp $ - -# For instructions on how this file works (as an inclusion mask, primarily), -# please refer to ${PORTDIR}/profiles/base/packages - -# Use this file to lock down specific versions of packages ONLY TO THIS -# SPECIFIC PROFILE! - -# You can also add files to the base system itself if you prefix them with a -# * - -~sys-devel/gcc-2.95.3 -~sys-libs/glibc-2.2.5 - ->=sys-apps/texinfo-4.2-r1 - -#these ones have the new rc6 style init scripts ->=sys-libs/gpm-1.19.3-r5 ->=sys-apps/isapnptools-1.23-r6 - ->=sys-apps/xinetd-2.3.3-r6 ->=net-fs/samba-2.2.2-r6 ->=sys-process/at-3.1.8-r6 ->=app-admin/fcron-1.1.1-r6 ->=app-admin/metalog-0.6-r6 ->=app-admin/mon-0.38.20-r6 ->=app-admin/syslog-ng-1.4.12-r6 ->=net-www/apache-1.3.20-r6 ->=net-analyzer/net-snmp-5.1.1 ->=net-ftp/oftpd-0.3.6-r6 ->=net-ftp/proftpd-1.2.4-r6 ->=net-misc/dhcp-3.0_rc12-r6 ->=net-misc/bind-9.1.3-r6 ->=net-misc/netkit-timed-0.17-r6 ->=net-misc/pdnsd-1.1.6-r6 ->=mail-mta/exim-3.32-r6 ->=net-misc/fakeidentd-1.4-r6 ->=net-nds/openldap-1.2.12-r6 ->=net-nds/portmap-5b-r6 ->=media-sound/alsa-utils-0.5.10-r6 ->=net-print/LPRng-3.7.9-r6 ->=net-nds/ypbind-1.7-r6 ->=net-nds/ypserv-1.3.9-r6 ->=net-print/cups-1.1.10-r6 ->=sys-apps/apmd-3.0.1-r6 ->=net-misc/portsentry-1.1-r6 ->=sys-block/noflushd-2.4-r6 ->=app-text/dictd-1.5.5-r6 ->=net-fs/samba-winbind-20010329-r6 ->=net-www/wwwoffle-2.6d-r6 ->=net-www/squid-2.4.2s-r6 ->=net-dialup/ppp-2.4.1-r6 -=sci-mathematics/octave-2.0* - diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index 6ccd19ec70ce..43d0bedb3cae 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -1,4 +1,43 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.8 2011/08/07 11:07:08 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.9 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +############################################################################## +# Basic SELinux required versionings + +# Core Packages +=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 diff --git a/profiles/features/selinux/packages b/profiles/features/selinux/packages index 72b3ac7141ef..a566ba595039 100644 --- a/profiles/features/selinux/packages +++ b/profiles/features/selinux/packages @@ -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/features/selinux/packages,v 1.1 2011/05/17 10:46:49 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/packages,v 1.2 2011/08/09 04:29:55 zmedico Exp $ # This file extends the base packages file for the default profile that all # architectures will enjoy. Please note that default is what most architectures @@ -14,13 +14,6 @@ ############################################################################## # Basic SELinux required versionings -# Core Packages ->=sys-apps/portage-2.0.49-r15 ->=sys-apps/baselayout-1.8.6.12-r2 ->=sys-libs/glibc-2.3 ->=sys-libs/uclibc-0.9.26-r8 ->=sys-kernel/linux-headers-2.4.20 - # Base SELinux packages *sys-libs/libsepol *sys-libs/libselinux @@ -30,25 +23,5 @@ *sec-policy/selinux-base-policy # SELinux-aware packages ->=net-misc/openssh-3.7.1_p2 ->=sys-apps/coreutils-5.0.91 ->=sys-apps/findutils-4.1.20-r1 ->=sys-apps/shadow-4.0.3-r7 *>=sys-apps/util-linux-2.12 *>=sys-libs/pam-0.77 ->=sys-process/procps-3.1.15 ->=sys-process/psmisc-21.2-r4 - -# optional SELinux-aware programs: ->=app-admin/logrotate-3.6.5-r1 ->=gnome-base/gdm-2.4.4.7 ->=sys-process/fcron-2.9.4 ->=sys-fs/udev-055 ->=sys-process/vixie-cron-3.0.1-r2 - -# SELinux is integrated in 2.6 ->=sys-kernel/vanilla-sources-2.6.0 - -# Critical xattr fixes: ->=sys-boot/grub-0.94 ->=sys-boot/grub-static-0.94 diff --git a/profiles/hardened/amd64/package.mask b/profiles/hardened/amd64/package.mask index bcff19b5fc42..72152004344c 100644 --- a/profiles/hardened/amd64/package.mask +++ b/profiles/hardened/amd64/package.mask @@ -1,6 +1,12 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/package.mask,v 1.5 2009/07/31 11:00:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/package.mask,v 1.6 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. + # grub needs a multilib profile to compile on amd64 - use sys-boot/grub-static diff --git a/profiles/hardened/amd64/packages b/profiles/hardened/amd64/packages index 95abedbf47fc..8e349d27bd7d 100644 --- a/profiles/hardened/amd64/packages +++ b/profiles/hardened/amd64/packages @@ -1,6 +1,4 @@ *>=sys-devel/binutils-2.13.90.0.4 ->=x11-base/xorg-x11-6.8.0-r4 - *sys-devel/libtool *virtual/dev-manager diff --git a/profiles/hardened/ia64/package.mask b/profiles/hardened/ia64/package.mask index 6281fd1f20e6..d5ec283aa037 100644 --- a/profiles/hardened/ia64/package.mask +++ b/profiles/hardened/ia64/package.mask @@ -1,5 +1,11 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ia64/package.mask,v 1.2 2009/07/31 11:11:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ia64/package.mask,v 1.3 2011/08/09 04:29:55 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +=sys-devel/binutils-2.13.90.0.4 ->=x11-base/xorg-x11-6.8.0-r4 - *sys-devel/libtool *virtual/dev-manager diff --git a/profiles/hardened/x86/package.mask b/profiles/hardened/x86/package.mask index 5944c938ccff..fe23e2e42b12 100644 --- a/profiles/hardened/x86/package.mask +++ b/profiles/hardened/x86/package.mask @@ -1,6 +1,12 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.54 2009/09/11 17:48:07 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.mask,v 1.55 2011/08/09 04:29:56 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +=sys-devel/binutils-2.13.90.0.4 ->=x11-base/xorg-x11-6.8.0-r4 - *sys-devel/libtool *virtual/dev-manager diff --git a/profiles/releases/10.0/package.mask b/profiles/releases/10.0/package.mask index fc4a2957ac46..8c6d52a6156d 100644 --- a/profiles/releases/10.0/package.mask +++ b/profiles/releases/10.0/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/package.mask,v 1.1 2011/08/09 03:02:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/package.mask,v 1.2 2011/08/09 04:29:56 zmedico Exp $ +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +=sys-apps/baselayout-1.12.10-r5 ->=sys-apps/portage-2.1.6.8 diff --git a/profiles/releases/2008.0/package.mask b/profiles/releases/2008.0/package.mask index b23e6bf16cf3..d5074ca95782 100644 --- a/profiles/releases/2008.0/package.mask +++ b/profiles/releases/2008.0/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/package.mask,v 1.5 2011/08/09 03:02:23 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/releases/2008.0/package.mask,v 1.6 2011/08/09 04:29:56 zmedico Exp $ +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +=sys-apps/baselayout-1.12.10-r5 ->=sys-apps/portage-2.1.4.4 diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask index 50bb1ae0e94e..f10697fe38e2 100644 --- a/profiles/selinux/package.mask +++ b/profiles/selinux/package.mask @@ -1,4 +1,44 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.63 2011/08/07 11:07:08 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.64 2011/08/09 04:29:56 zmedico Exp $ + +# Zac Medico (09 Aug 2011) +# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and +# future versions of sys-apps/portage. +############################################################################## +# Basic SELinux required versionings + +# Core Packages +=sci-libs/acml-3.6 requires gcc-4.2. >=sci-libs/acml-3.6 diff --git a/profiles/selinux/packages b/profiles/selinux/packages index cf4bd62ab90a..e5338d3964d4 100644 --- a/profiles/selinux/packages +++ b/profiles/selinux/packages @@ -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/selinux/packages,v 1.25 2011/04/30 17:18:18 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/packages,v 1.26 2011/08/09 04:29:56 zmedico Exp $ # This file extends the base packages file for the default profile that all # architectures will enjoy. Please note that default is what most architectures @@ -14,13 +14,6 @@ ############################################################################## # Basic SELinux required versionings -# Core Packages ->=sys-apps/portage-2.0.49-r15 ->=sys-apps/baselayout-1.8.6.12-r2 ->=sys-libs/glibc-2.3 ->=sys-libs/uclibc-0.9.26-r8 ->=sys-kernel/linux-headers-2.4.20 - # Base SELinux packages *sys-libs/libsepol *sys-libs/libselinux @@ -30,26 +23,5 @@ *sec-policy/selinux-base-policy # SELinux-aware packages ->=net-misc/openssh-3.7.1_p2 ->=sys-apps/coreutils-5.0.91 ->=sys-apps/findutils-4.1.20-r1 ->=sys-apps/shadow-4.0.3-r7 *>=sys-apps/util-linux-2.12 *>=sys-libs/pam-0.77 ->=sys-process/procps-3.1.15 ->=sys-process/psmisc-21.2-r4 - -# optional SELinux-aware programs: ->=app-admin/logrotate-3.6.5-r1 ->=gnome-base/gdm-2.4.4.7 ->=sys-process/fcron-2.9.4 ->=sys-fs/udev-055 ->=sys-process/vixie-cron-3.0.1-r2 - -# SELinux is integrated in 2.6 ->=sys-kernel/vanilla-sources-2.6.0 ->=virtual/linux-sources-2.6 - -# Critical xattr fixes: ->=sys-boot/grub-0.94 ->=sys-boot/grub-static-0.94 -- 2.26.2