diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-07-06 00:43:39 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-07-06 00:43:39 +0000 |
| commit | 61d8715fa7ea8f8e2f27499580532a6fd639e840 (patch) | |
| tree | 6f27d71a33e92a1420aaf161578f2b8619b50ebe /profiles/hardened | |
| parent | Whitespace. (diff) | |
| download | gentoo-2-61d8715fa7ea8f8e2f27499580532a6fd639e840.tar.gz gentoo-2-61d8715fa7ea8f8e2f27499580532a6fd639e840.tar.bz2 gentoo-2-61d8715fa7ea8f8e2f27499580532a6fd639e840.zip | |
More syncing up old hardened profiles with newer hardened/linux profiles
Diffstat (limited to 'profiles/hardened')
| -rw-r--r-- | profiles/hardened/amd64/package.use.mask | 12 | ||||
| -rw-r--r-- | profiles/hardened/make.defaults | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/profiles/hardened/amd64/package.use.mask b/profiles/hardened/amd64/package.use.mask index 0648a7576d09..0930b81f4fd4 100644 --- a/profiles/hardened/amd64/package.use.mask +++ b/profiles/hardened/amd64/package.use.mask @@ -36,6 +36,18 @@ media-tv/zapping vdr # See bug #238487 for references net-im/kadu amarok2 +# Following is taken from arch/amd64/package.use.mask + +# Vlastimil Babka <caster@gentoo.org> (12 Dec 2008) +# finally a 64bit java plugin +>=dev-java/sun-jdk-1.6.0.12_beta2 -nsplugin +# but not on 1.7 yet +=dev-java/sun-jdk-1.7* + +# Serkan Kaba <serkan@gentoo.org> (5 Feb 2009) +# finally a 64bit java plugin +>=dev-java/sun-jre-bin-1.6.0.12 -nsplugin + # Following is x86-32-only SIMD, etc. (some taken from arch/amd64/package.use.mask) diff --git a/profiles/hardened/make.defaults b/profiles/hardened/make.defaults index 5cdd1fda55e4..5b783cc251e6 100644 --- a/profiles/hardened/make.defaults +++ b/profiles/hardened/make.defaults @@ -1,7 +1,7 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.17 2008/11/01 19:10:17 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.18 2009/07/06 00:43:38 gengor Exp $ STAGE1_USE="hardened pic" -USE="xorg urandom" +USE="sysfs urandom xorg" INPUT_DEVICES="mouse keyboard evdev" |