tomwij 14/05/30 11:20:17
Modified: jdk-1.7.0.ebuild jdk-1.5.0-r1.ebuild
jdk-1.8.0.ebuild jdk-1.6.0-r2.ebuild ChangeLog
Log:
Remove CVE-2012-1721 vulnerable IBM JDK binaries dependency, as well as
lastrited jrockit JDK binaries dependency; dropped KEYWORDS; EAPI 5; removed
empty variables.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key
6D34E57D)
Revision Changes Path
1.13 virtual/jdk/jdk-1.7.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild?rev=1.13&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild?rev=1.13&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild?r1=1.12&r2=1.13
Index: jdk-1.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jdk-1.7.0.ebuild 23 May 2014 23:49:25 -0000 1.12
+++ jdk-1.7.0.ebuild 30 May 2014 11:20:17 -0000 1.13
@@ -1,15 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.12
2014/05/23 23:49:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.13
2014/05/30 11:20:17 tomwij Exp $
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
+EAPI="5"
-LICENSE=""
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.7"
KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
RDEPEND="|| (
=dev-java/icedtea-bin-7*
@@ -17,4 +14,3 @@
=dev-java/oracle-jdk-bin-1.7.0*
=dev-java/soylatte-jdk-bin-7*
)"
-DEPEND=""
1.2 virtual/jdk/jdk-1.5.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild?r1=1.1&r2=1.2
Index: jdk-1.5.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jdk-1.5.0-r1.ebuild 29 Jun 2013 10:58:51 -0000 1.1
+++ jdk-1.5.0-r1.ebuild 30 May 2014 11:20:17 -0000 1.2
@@ -1,26 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.1
2013/06/29 10:58:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.2
2014/05/30 11:20:17 tomwij Exp $
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
+EAPI="5"
-LICENSE=""
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.5"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-freebsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
-# The keyword voodoo below is needed so that ppc(64) users will
-# get a masked license warning for ibm-jdk-bin
-# instead of (not useful) missing keyword warning for sun-jdk
-# see #287615
-# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
-# invent it in the first place!
RDEPEND="|| (
- =dev-java/ibm-jdk-bin-1.5.0*
- =dev-java/jrockit-jdk-bin-1.5.0*
=dev-java/apple-jdk-bin-1.5.0*
dev-java/gcj-jdk
)"
-DEPEND=""
1.2 virtual/jdk/jdk-1.8.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild?r1=1.1&r2=1.2
Index: jdk-1.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jdk-1.8.0.ebuild 28 Mar 2014 15:11:23 -0000 1.1
+++ jdk-1.8.0.ebuild 30 May 2014 11:20:17 -0000 1.2
@@ -1,20 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.1
2014/03/28 15:11:23 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.2
2014/05/30 11:20:17 tomwij Exp $
EAPI="5"
DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
SLOT="1.8"
-
# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin
# no longer provides them. Also temporarily dropped ~ia64.
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc64-solaris ~x64-solaris "
-IUSE=""
RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*"
-DEPEND=""
1.2 virtual/jdk/jdk-1.6.0-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild?r1=1.1&r2=1.2
Index: jdk-1.6.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jdk-1.6.0-r2.ebuild 29 Jun 2013 10:58:51 -0000 1.1
+++ jdk-1.6.0-r2.ebuild 30 May 2014 11:20:17 -0000 1.2
@@ -1,17 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.1
2013/06/29 10:58:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.2
2014/05/30 11:20:17 tomwij Exp $
EAPI="4"
DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
SLOT="1.6"
KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd
~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
# The keyword voodoo below is needed to work around confilcting masking types
# and for having arch specific preferences.
1.62 virtual/jdk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?rev=1.62&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?rev=1.62&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?r1=1.61&r2=1.62
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog 23 May 2014 23:49:25 -0000 1.61
+++ ChangeLog 30 May 2014 11:20:17 -0000 1.62
@@ -1,6 +1,12 @@
# ChangeLog for virtual/jdk
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.61 2014/05/23
23:49:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.62 2014/05/30
11:20:17 tomwij Exp $
+
+ 30 May 2014; Tom Wijsman <[email protected]> jdk-1.5.0-r1.ebuild,
+ jdk-1.6.0-r2.ebuild, jdk-1.7.0.ebuild, jdk-1.8.0.ebuild:
+ Remove CVE-2012-1721 vulnerable IBM JDK binaries dependency, as well as
+ lastrited jrockit JDK binaries dependency; dropped KEYWORDS; EAPI 5; removed
+ empty variables.
23 May 2014; Manuel Rüger <[email protected]> jdk-1.7.0.ebuild:
Add ~arm keyword.
