Stop unmasking nsplugin of sun-jdk and sun-jre-bin 1.5 due to security #306579.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5684666fce66d9a47fdf1fc5ebbb2e66c423bef8..a9d8a3b4b28da8b424b868db687075b365c051e4 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4071 2010/03/31 14:46:57 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4072 2010/03/31 16:07:54 caster 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!
 
+  31 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  hardened/x86/package.use.mask, uclibc/x86/package.use.mask:
+  Stop unmasking nsplugin of sun-jdk and sun-jre-bin 1.5 due to security
+  #306579.
+
   31 Mar 2010; Theo Chatzimichos <tampakrap@gentoo.org> package.mask:
   Mask KOffice 2.1.2 until it is released
 

diff --git a/profiles/hardened/x86/package.use.mask b/profiles/hardened/x86/package.use.mask
index aa35bf5610dfd12e92989377b36eec122dadbc3c..fd65f3b75553d9b3e47a6fbea035a8f83ad3c6fd 100644 (file)
--- a/profiles/hardened/x86/package.use.mask
+++ b/profiles/hardened/x86/package.use.mask
@@ -1,6 +1,6 @@
 # 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.use.mask,v 1.11 2009/08/05 15:02:47 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.use.mask,v 1.12 2010/03/31 16:07:56 caster Exp $
 
 # 26 Mar 2009: Gordon Malm <gengor@gentoo.org>
 # This version fails if <gcc-4.2, subsequent versions do not
@@ -17,8 +17,8 @@ dev-java/eclipse-ecj gcj
 dev-libs/cyrus-sasl berkdb
 
 # bug #147908 - unmask these on x86 profiles
->=dev-java/sun-jdk-1.5 -nsplugin
->=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/sun-jdk-1.6 -nsplugin
+>=dev-java/sun-jre-bin-1.6 -nsplugin
 >=dev-java/ibm-jdk-bin-1.5 -nsplugin 
 >=dev-java/ibm-jre-bin-1.5 -nsplugin
 

diff --git a/profiles/uclibc/x86/package.use.mask b/profiles/uclibc/x86/package.use.mask
index aa9c18b5af90941aed3d9f27fa97d92030fa9fd1..f51f31059c2d9f0f62b85eb6af534d05bc89ab75 100644 (file)
--- a/profiles/uclibc/x86/package.use.mask
+++ b/profiles/uclibc/x86/package.use.mask
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/package.use.mask,v 1.3 2009/07/31 09:58:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/package.use.mask,v 1.4 2010/03/31 16:07:57 caster Exp $
 
 # This file requires >=portage-2.1.1
 
->=dev-java/sun-jdk-1.5 -nsplugin
->=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/sun-jdk-1.6 -nsplugin
+>=dev-java/sun-jre-bin-1.6 -nsplugin
 >=dev-java/ibm-jdk-bin-1.5 -nsplugin 
 >=dev-java/ibm-jre-bin-1.5 -nsplugin