summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-06-30 09:09:12 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-06-30 09:09:12 +0000
commita3043f008f893b21f96976ed2da6e58ab90a30e5 (patch)
treebc3cd08538a170845cfb1a09138056a8cbe70cae /java-virtuals
parentVersion bump (diff)
downloadgentoo-2-a3043f008f893b21f96976ed2da6e58ab90a30e5.tar.gz
gentoo-2-a3043f008f893b21f96976ed2da6e58ab90a30e5.tar.bz2
gentoo-2-a3043f008f893b21f96976ed2da6e58ab90a30e5.zip
Remove sun-jdk and sun-jre-bin from the virtuals, acked by Caster. For security bug #473830 reported by Agostino Sarubbo.
(Portage version: 2.1.12.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'java-virtuals')
-rw-r--r--java-virtuals/jdk-with-com-sun/ChangeLog12
-rw-r--r--java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild (renamed from java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild)11
2 files changed, 13 insertions, 10 deletions
diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index e5d149335bf3..f09e809bbcf7 100644
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for java-virtuals/jdk-with-com-sun
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.19 2012/10/04 17:36:29 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.20 2013/06/30 09:09:12 tomwij Exp $
+
+*jdk-with-com-sun-20111111-r1 (30 Jun 2013)
+
+ 30 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+ +jdk-with-com-sun-20111111-r1.ebuild, -jdk-with-com-sun-20111111.ebuild:
+ Remove sun-jdk and sun-jre-bin from the virtuals, acked by Caster. For
+ security bug #473830 reported by Agostino Sarubbo.
04 Oct 2012; Ralph Sennhauser <sera@gentoo.org>
jdk-with-com-sun-20111111.ebuild:
@@ -97,4 +104,3 @@
+jdk-with-com-sun-20080505.ebuild:
Rename sun-jdk virtual to jdk-with-com-sun to avoid having to specify
category with sun-jdk.
-
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild
index 755bfc0d3388..0e992cf92e1b 100644
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild,v 1.3 2012/10/04 17:36:29 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild,v 1.1 2013/06/30 09:09:12 tomwij Exp $
-EAPI=1
+EAPI="5"
inherit java-virtuals-2
@@ -21,9 +21,6 @@ RDEPEND="|| (
dev-java/icedtea:6
dev-java/icedtea-bin:7
dev-java/icedtea:7
- dev-java/sun-jdk:1.6
- dev-java/sun-jdk:1.5
- dev-java/sun-jdk:1.4
dev-java/oracle-jdk-bin:1.7
dev-java/diablo-jdk:1.6
dev-java/apple-jdk-bin:1.6
@@ -31,4 +28,4 @@ RDEPEND="|| (
dev-java/apple-jdk-bin:1.4
)"
-JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 oracle-jdk-bin-1.7 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"
+JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"