| 1 |
tomwij 14/05/30 11:20:17 |
| 2 |
|
| 3 |
Modified: jdk-1.7.0.ebuild jdk-1.5.0-r1.ebuild |
| 4 |
jdk-1.8.0.ebuild jdk-1.6.0-r2.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Remove CVE-2012-1721 vulnerable IBM JDK binaries dependency, as well as lastrited jrockit JDK binaries dependency; dropped KEYWORDS; EAPI 5; removed empty variables. |
| 7 |
|
| 8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.13 virtual/jdk/jdk-1.7.0.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild?rev=1.13&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild?rev=1.13&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild?r1=1.12&r2=1.13 |
| 16 |
|
| 17 |
Index: jdk-1.7.0.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v |
| 20 |
retrieving revision 1.12 |
| 21 |
retrieving revision 1.13 |
| 22 |
diff -u -r1.12 -r1.13 |
| 23 |
--- jdk-1.7.0.ebuild 23 May 2014 23:49:25 -0000 1.12 |
| 24 |
+++ jdk-1.7.0.ebuild 30 May 2014 11:20:17 -0000 1.13 |
| 25 |
@@ -1,15 +1,12 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.12 2014/05/23 23:49:25 mrueg Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.13 2014/05/30 11:20:17 tomwij Exp $ |
| 30 |
|
| 31 |
-DESCRIPTION="Virtual for Java Development Kit (JDK)" |
| 32 |
-HOMEPAGE="" |
| 33 |
-SRC_URI="" |
| 34 |
+EAPI="5" |
| 35 |
|
| 36 |
-LICENSE="" |
| 37 |
+DESCRIPTION="Virtual for Java Development Kit (JDK)" |
| 38 |
SLOT="1.7" |
| 39 |
KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 40 |
-IUSE="" |
| 41 |
|
| 42 |
RDEPEND="|| ( |
| 43 |
=dev-java/icedtea-bin-7* |
| 44 |
@@ -17,4 +14,3 @@ |
| 45 |
=dev-java/oracle-jdk-bin-1.7.0* |
| 46 |
=dev-java/soylatte-jdk-bin-7* |
| 47 |
)" |
| 48 |
-DEPEND="" |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.2 virtual/jdk/jdk-1.5.0-r1.ebuild |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild?rev=1.2&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild?rev=1.2&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild?r1=1.1&r2=1.2 |
| 57 |
|
| 58 |
Index: jdk-1.5.0-r1.ebuild |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v |
| 61 |
retrieving revision 1.1 |
| 62 |
retrieving revision 1.2 |
| 63 |
diff -u -r1.1 -r1.2 |
| 64 |
--- jdk-1.5.0-r1.ebuild 29 Jun 2013 10:58:51 -0000 1.1 |
| 65 |
+++ jdk-1.5.0-r1.ebuild 30 May 2014 11:20:17 -0000 1.2 |
| 66 |
@@ -1,26 +1,14 @@ |
| 67 |
-# Copyright 1999-2013 Gentoo Foundation |
| 68 |
+# Copyright 1999-2014 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.1 2013/06/29 10:58:51 tomwij Exp $ |
| 71 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $ |
| 72 |
|
| 73 |
-DESCRIPTION="Virtual for Java Development Kit (JDK)" |
| 74 |
-HOMEPAGE="" |
| 75 |
-SRC_URI="" |
| 76 |
+EAPI="5" |
| 77 |
|
| 78 |
-LICENSE="" |
| 79 |
+DESCRIPTION="Virtual for Java Development Kit (JDK)" |
| 80 |
SLOT="1.5" |
| 81 |
-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" |
| 82 |
-IUSE="" |
| 83 |
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 84 |
|
| 85 |
-# The keyword voodoo below is needed so that ppc(64) users will |
| 86 |
-# get a masked license warning for ibm-jdk-bin |
| 87 |
-# instead of (not useful) missing keyword warning for sun-jdk |
| 88 |
-# see #287615 |
| 89 |
-# note that this "voodoo" is pretty annoying for Prefix, and that we didn't |
| 90 |
-# invent it in the first place! |
| 91 |
RDEPEND="|| ( |
| 92 |
- =dev-java/ibm-jdk-bin-1.5.0* |
| 93 |
- =dev-java/jrockit-jdk-bin-1.5.0* |
| 94 |
=dev-java/apple-jdk-bin-1.5.0* |
| 95 |
dev-java/gcj-jdk |
| 96 |
)" |
| 97 |
-DEPEND="" |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.2 virtual/jdk/jdk-1.8.0.ebuild |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild?rev=1.2&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild?rev=1.2&content-type=text/plain |
| 105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild?r1=1.1&r2=1.2 |
| 106 |
|
| 107 |
Index: jdk-1.8.0.ebuild |
| 108 |
=================================================================== |
| 109 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v |
| 110 |
retrieving revision 1.1 |
| 111 |
retrieving revision 1.2 |
| 112 |
diff -u -r1.1 -r1.2 |
| 113 |
--- jdk-1.8.0.ebuild 28 Mar 2014 15:11:23 -0000 1.1 |
| 114 |
+++ jdk-1.8.0.ebuild 30 May 2014 11:20:17 -0000 1.2 |
| 115 |
@@ -1,20 +1,13 @@ |
| 116 |
# Copyright 1999-2014 Gentoo Foundation |
| 117 |
# Distributed under the terms of the GNU General Public License v2 |
| 118 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.1 2014/03/28 15:11:23 tomwij Exp $ |
| 119 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $ |
| 120 |
|
| 121 |
EAPI="5" |
| 122 |
|
| 123 |
DESCRIPTION="Virtual for Java Development Kit (JDK)" |
| 124 |
-HOMEPAGE="" |
| 125 |
-SRC_URI="" |
| 126 |
- |
| 127 |
-LICENSE="" |
| 128 |
SLOT="1.8" |
| 129 |
- |
| 130 |
# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin |
| 131 |
# no longer provides them. Also temporarily dropped ~ia64. |
| 132 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris " |
| 133 |
-IUSE="" |
| 134 |
|
| 135 |
RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*" |
| 136 |
-DEPEND="" |
| 137 |
|
| 138 |
|
| 139 |
|
| 140 |
1.2 virtual/jdk/jdk-1.6.0-r2.ebuild |
| 141 |
|
| 142 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild?rev=1.2&view=markup |
| 143 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild?rev=1.2&content-type=text/plain |
| 144 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild?r1=1.1&r2=1.2 |
| 145 |
|
| 146 |
Index: jdk-1.6.0-r2.ebuild |
| 147 |
=================================================================== |
| 148 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v |
| 149 |
retrieving revision 1.1 |
| 150 |
retrieving revision 1.2 |
| 151 |
diff -u -r1.1 -r1.2 |
| 152 |
--- jdk-1.6.0-r2.ebuild 29 Jun 2013 10:58:51 -0000 1.1 |
| 153 |
+++ jdk-1.6.0-r2.ebuild 30 May 2014 11:20:17 -0000 1.2 |
| 154 |
@@ -1,17 +1,12 @@ |
| 155 |
-# Copyright 1999-2013 Gentoo Foundation |
| 156 |
+# Copyright 1999-2014 Gentoo Foundation |
| 157 |
# Distributed under the terms of the GNU General Public License v2 |
| 158 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.1 2013/06/29 10:58:51 tomwij Exp $ |
| 159 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $ |
| 160 |
|
| 161 |
EAPI="4" |
| 162 |
|
| 163 |
DESCRIPTION="Virtual for Java Development Kit (JDK)" |
| 164 |
-HOMEPAGE="" |
| 165 |
-SRC_URI="" |
| 166 |
- |
| 167 |
-LICENSE="" |
| 168 |
SLOT="1.6" |
| 169 |
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" |
| 170 |
-IUSE="" |
| 171 |
|
| 172 |
# The keyword voodoo below is needed to work around confilcting masking types |
| 173 |
# and for having arch specific preferences. |
| 174 |
|
| 175 |
|
| 176 |
|
| 177 |
1.62 virtual/jdk/ChangeLog |
| 178 |
|
| 179 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?rev=1.62&view=markup |
| 180 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?rev=1.62&content-type=text/plain |
| 181 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?r1=1.61&r2=1.62 |
| 182 |
|
| 183 |
Index: ChangeLog |
| 184 |
=================================================================== |
| 185 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v |
| 186 |
retrieving revision 1.61 |
| 187 |
retrieving revision 1.62 |
| 188 |
diff -u -r1.61 -r1.62 |
| 189 |
--- ChangeLog 23 May 2014 23:49:25 -0000 1.61 |
| 190 |
+++ ChangeLog 30 May 2014 11:20:17 -0000 1.62 |
| 191 |
@@ -1,6 +1,12 @@ |
| 192 |
# ChangeLog for virtual/jdk |
| 193 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 194 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.61 2014/05/23 23:49:25 mrueg Exp $ |
| 195 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.62 2014/05/30 11:20:17 tomwij Exp $ |
| 196 |
+ |
| 197 |
+ 30 May 2014; Tom Wijsman <TomWij@g.o> jdk-1.5.0-r1.ebuild, |
| 198 |
+ jdk-1.6.0-r2.ebuild, jdk-1.7.0.ebuild, jdk-1.8.0.ebuild: |
| 199 |
+ Remove CVE-2012-1721 vulnerable IBM JDK binaries dependency, as well as |
| 200 |
+ lastrited jrockit JDK binaries dependency; dropped KEYWORDS; EAPI 5; removed |
| 201 |
+ empty variables. |
| 202 |
|
| 203 |
23 May 2014; Manuel Rüger <mrueg@g.o> jdk-1.7.0.ebuild: |
| 204 |
Add ~arm keyword. |
Archives