From ccb0765face18e6fc74b9b4d37faf70f94208348 Mon Sep 17 00:00:00 2001 From: Magnus Granberg Date: Thu, 16 May 2013 19:29:27 +0000 Subject: Fix bug 469254 and 470092 for hardened profile --- profiles/ChangeLog | 5 +- profiles/hardened/ChangeLog | 9 + .../hardened/linux/amd64/no-multilib/make.defaults | 6 +- .../hardened/linux/amd64/no-multilib/package.mask | 193 +++++++++++++++++++-- .../linux/amd64/no-multilib/package.use.force | 7 + .../linux/amd64/no-multilib/package.use.mask | 11 +- profiles/hardened/linux/amd64/no-multilib/parent | 6 - profiles/hardened/linux/amd64/no-multilib/use.mask | 19 +- 8 files changed, 229 insertions(+), 27 deletions(-) create mode 100644 profiles/hardened/ChangeLog create mode 100644 profiles/hardened/linux/amd64/no-multilib/package.use.force (limited to 'profiles') diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 812b4f391943..5a6d59d4d8c9 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7849 2013/05/16 16:01:42 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7850 2013/05/16 19:29:27 zorry 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! + 16 May 2013; Magnus Granberg hardened/ChangLog: + Add new ChangLog for hardened profile + 16 May 2013; Maxim Koltsov package.mask: Mask =media-video/mplayer2-2.0_p20130428.ebuild as it needs ffmpeg-9 diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog new file mode 100644 index 000000000000..5901c97372b7 --- /dev/null +++ b/profiles/hardened/ChangeLog @@ -0,0 +1,9 @@ +# ChangeLog for Gentoo/AMD64 profile directory +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.1 2013/05/16 19:29:27 zorry Exp $ + + 16 May 2013; Magnus Granberg linux/amd64/no-multilib/make.defaults, + linux/amd64/no-multilib/package.mask, linux/amd64/no-multilib/package.use.force, + linux/amd64/no-multilib/package.use.mask, linux/amd64/no-multilib/parent, + linux/amd64/no-multilib/use.mask, ChangeLog: + bug 470092 and 469254 qa on parent and missing arch/amd64/no-multilib(mirroring) diff --git a/profiles/hardened/linux/amd64/no-multilib/make.defaults b/profiles/hardened/linux/amd64/no-multilib/make.defaults index 6361e8534571..49d1166fd606 100644 --- a/profiles/hardened/linux/amd64/no-multilib/make.defaults +++ b/profiles/hardened/linux/amd64/no-multilib/make.defaults @@ -1,8 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v 1.2 2011/11/17 01:14:26 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v 1.3 2013/05/16 19:29:27 zorry Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" MULTILIB_ABIS="amd64" + +# Mirror profile/amd64/no-multilib/make.defaults +USE_EXPAND_HIDDEN="ABI_X86" + diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask index de1f34af75a6..bc5cde5031fd 100644 --- a/profiles/hardened/linux/amd64/no-multilib/package.mask +++ b/profiles/hardened/linux/amd64/no-multilib/package.mask @@ -1,23 +1,182 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.15 2013/03/21 22:14:33 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.16 2013/05/16 19:29:27 zorry Exp $ -# These are broken as reported by Halcy0n, Aug, 23, 2011 +# Mirror profile/amd64/no-multilib/package.mask +app-accessibility/mbrola +app-accessibility/perlbox-voice +app-arch/stuffit +app-benchmarks/cpuburn +=app-editors/emacs-18* +app-emulation/crossover-bin +app-emulation/crossover-office-bin +app-emulation/crossover-office-pro-bin +app-emulation/playonlinux +app-emulation/q4wine +app-emulation/virtualbox +app-emulation/virtualbox-extpack-oracle +app-emulation/virtualbox-guest-additions +app-emulation/vmware-player +>=app-i18n/atokx3-3.0.0 +app-office/ooextras +app-emulation/emul-linux-x86-baselibs +app-emulation/emul-linux-x86-compat +app-emulation/emul-linux-x86-cpplibs +app-emulation/emul-linux-x86-db +app-emulation/emul-linux-x86-gstplugins +app-emulation/emul-linux-x86-gtklibs +app-emulation/emul-linux-x86-gtkmmlibs +app-emulation/emul-linux-x86-jna +app-emulation/emul-linux-x86-medialibs +app-emulation/emul-linux-x86-motif +app-emulation/emul-linux-x86-opengl +app-emulation/emul-linux-x86-qtlibs +app-emulation/emul-linux-x86-sdl +app-emulation/emul-linux-x86-soundlibs +app-emulation/emul-linux-x86-xlibs +app-emulation/emul-linux-x86-java +app-emulation/winetricks +app-emulation/wine-doors +app-text/acroread +dev-embedded/libftd2xx +dev-embedded/openocd +>=dev-java/sun-j2me-bin-2.5.2.01 +dev-lang/dmd-bin +dev-lang/icc +dev-lang/idb +dev-lang/ifc +dev-perl/Archive-Rar +dev-python/skype4py +dev-util/android-sdk-update-manager +dev-util/biew +dev-util/dialogblocks +dev-util/helpblocks +games-action/cs2d +games-action/descent3 +games-action/descent3-demo +games-action/heretic2 +games-action/heretic2-demo +games-action/lugaru +games-action/lugaru-demo +games-action/mutantstorm-demo +games-action/phobiaii +games-action/rune games-action/shadowgrounds-bin games-action/shadowgrounds-survivor-bin - -# needs x86-compat +games-action/spacetripper-demo +games-arcade/aquaria +games-arcade/barbarian-bin +games-arcade/jardinains +games-arcade/gish-demo +games-emulation/caps +games-emulation/nestra +games-emulation/zinc +games-emulation/zsnes +games-fps/avp +games-fps/doom3-cdoom +games-fps/doom3-chextrek +games-fps/doom3-data +games-fps/doom3-demo +games-fps/doom3-ducttape +games-fps/doom3-eventhorizon +games-fps/doom3-hellcampaign +games-fps/doom3-inhell +games-fps/doom3-lms +games-fps/doom3-mitm +games-fps/doom3-phantasm +games-fps/doom3-roe +games-fps/doom3 +games-fps/enemy-territory-etpro +games-fps/enemy-territory-fortress +games-fps/enemy-territory-truecombat +games-fps/enemy-territory +games-fps/etqw-bin +games-fps/etqw-data +games-fps/etqw-demo +games-fps/glxquake-bin +games-fps/legends +games-fps/postal2 +games-fps/postal2mp-demo +games-fps/quake3-bin +games-fps/quake3-demo +games-fps/quake3-ra3 +games-fps/quake4-bin +games-fps/quake4-data +games-fps/quake4-demo +games-fps/rtcw +games-fps/rtcwmp-demo +games-fps/rtcwsp-demo +games-fps/sauerbraten +games-fps/serious-sam-tfe +games-fps/serious-sam-tse +games-fps/soldieroffortune +games-fps/soldieroffortune-demo +games-fps/unreal-tournament +games-fps/ut2003 +games-fps/ut2003-demo +games-fps/ut2004-demo +games-puzzle/drod-bin +games-puzzle/hoh-bin +games-roguelike/adom +games-rpg/eschalon-book-1-demo +games-rpg/nwmouse +games-rpg/nwmovies +games-rpg/nwn +games-rpg/nwn-cep +games-rpg/nwn-data +games-rpg/nwn-penultima +games-rpg/nwn-penultimarerolled +games-rpg/nwn-shadowlordsdreamcatcherdemon +games-rpg/rain-slick +games-rpg/sacred-gold +games-server/etqw-ded +games-server/nwn-ded +games-server/ut2003-ded +games-simulation/bcs-demo +games-strategy/coldwar +games-strategy/coldwar-demo +games-strategy/darwinia +games-strategy/darwinia-demo +games-strategy/defcon-demo +games-strategy/dominions2 +games-strategy/dominions2-demo +games-strategy/heroes3 +games-strategy/heroes3-demo +games-strategy/majesty-demo +games-strategy/savage-bin +games-strategy/smac +games-strategy/spaz +games-strategy/x2 +games-strategy/x2-demo +media-fonts/acroread-asianfonts +media-gfx/picasa +media-libs/realcodecs +media-libs/win32codecs media-sound/aucdtect -net-misc/teamviewer - -# 32bit only -dev-lang/rebol-bin -dev-lang/rebol -games-action/trine2 -games-action/swordandsworcery -games-action/beathazardultra -games-action/solar2 -games-arcade/dynamitejack -games-kids/crayon-physics -games-rpg/dungeon-defenders -games-rpg/bastion +media-sound/shoutcast-server-bin +media-sound/shoutcast-trans-bin +media-sound/skype-call-recorder +media-sound/ventrilo-server-bin +media-tv/huludesktop +media-tv/livestation +media-video/binkplayer +media-video/tsmuxer +net-im/skype +net-im/skypetab-ng +net-misc/icaclient +net-misc/ps3mediaserver +sci-biology/foldingathome +sci-electronics/eagle +sci-chemistry/cara-bin +sci-chemistry/cyana +sci-chemistry/icm +sci-chemistry/icm-browser +sci-chemistry/mars +sci-geosciences/googleearth +sci-libs/ipp +sys-apps/memtest86 +sys-apps/memtest86+ +sys-libs/lib-compat-loki + (24 Jun 2012) +# Force 64-bit parts of wine, bug #351436 +app-emulation/wine win64 diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.mask b/profiles/hardened/linux/amd64/no-multilib/package.use.mask index 35b4ede73c0c..87936b292c54 100644 --- a/profiles/hardened/linux/amd64/no-multilib/package.use.mask +++ b/profiles/hardened/linux/amd64/no-multilib/package.use.mask @@ -1,6 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.use.mask,v 1.1 2011/08/23 19:40:04 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.use.mask,v 1.2 2013/05/16 19:29:27 zorry Exp $ + +# Mirror profile/amd64/no-multilib/package.use.mask +# Alexandre Rostovtsev (24 Jun 2012) +# Disable 32-bit parts of wine, bug #351436 +app-emulation/wine mono win32 + +# Apr 28, 2008 Sébastien Fabbro +# ifc masked +sci-libs/acml ifc # Intel Integrated Primitive (sci-libs/ipp) support media-libs/opencv ipp diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent index 6d6c60c5667b..8305c3556463 100644 --- a/profiles/hardened/linux/amd64/no-multilib/parent +++ b/profiles/hardened/linux/amd64/no-multilib/parent @@ -1,8 +1,2 @@ .. -# Don't enable it. It will introduce -# phony profiles like: -# /usr/portage/profiles/arch/base -# /usr/portage/profiles/features/multilib -# /usr/portage/profiles/features/multilib/lib32 -# ../../../../arch/amd64/no-multilib ../../../../features/64bit-native diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask index 1aaf5cd5765c..5cd1ab9039ee 100644 --- a/profiles/hardened/linux/amd64/no-multilib/use.mask +++ b/profiles/hardened/linux/amd64/no-multilib/use.mask @@ -1,6 +1,23 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/use.mask,v 1.1 2012/02/10 21:52:56 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/use.mask,v 1.2 2013/05/16 19:29:27 zorry Exp $ + +# Mask the multilib flags back for non-multilib profile. +abi_x86_32 + +# Mirror profile/amd64/no-multilib/use.mask + +# 2007/08/29 Christoph Mende +# app-accessibility/mbrola is x86 only +mbrola + +# 2007/08/24 Michael Marineau +# Xen HVM support requires building 32-bit binaries. +hvm + +# 2009/05/11 Doug Goldstein +# Mask 32bit since this will always require emulation packages +32bit # Matt Turner