Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/
Date: Wed, 25 Apr 2018 20:43:28
Message-Id: 1524688932.eb62a19820abd5e4a1f761765ccac2627ca0197f.chewi@gentoo
1 commit: eb62a19820abd5e4a1f761765ccac2627ca0197f
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 25 20:42:12 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 25 20:42:12 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb62a198
7
8 dev-java/oracle-jdk-bin: Drop vulnerable 1.8.0.162-r1
9
10 Bug: https://bugs.gentoo.org/653560
11 Package-Manager: Portage-2.3.31, Repoman-2.3.9
12
13 dev-java/oracle-jdk-bin/Manifest | 14 -
14 .../oracle-jdk-bin-1.8.0.162-r1.ebuild | 301 ---------------------
15 2 files changed, 315 deletions(-)
16
17 diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
18 index 5efd9b3e0b9..b000a981e8e 100644
19 --- a/dev-java/oracle-jdk-bin/Manifest
20 +++ b/dev-java/oracle-jdk-bin/Manifest
21 @@ -1,17 +1,3 @@
22 -DIST jdk-8u162-linux-arm32-vfp-hflt-demos.tar.gz 10432598 BLAKE2B 49e8ac44c52b41851ccc96d41f77eddc92304e0ebb7b62da6bf393d73aadbd94e67d92b87bd13f7a2ccdedfbc0fc7c6ef7dd5cd2595860ee8d1776dad308e341 SHA512 00576347ec158f4f996db1aface6067b7df99a9e125bb2c22980b11ab84660cd2a3997d9519db3302fa31cbaaf98c01c5b3967b51daa5469926ca48037ef60e0
23 -DIST jdk-8u162-linux-arm32-vfp-hflt.tar.gz 81719419 BLAKE2B be6bd2ec7114e313e6abbd040aa9b29fe415cc15ce93b5c6fa350b0964faa7a1a3c0882c303596156065f9ea79a08bf8542757c5a8a16170d31f9cee5d7dd426 SHA512 86b835c388010f2bafd05114813ab84b4cd13334244891e9a65ae140fb65c9ad4436380043255fab36d44a91df9210ffe0858d89e48fc4efe2e460ae62928134
24 -DIST jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz 10434399 BLAKE2B 528476df75ec63acbe66dc58aad87e21633f34407e147352d048e76cc48c34afccf3d407229dd95ebd51bf2b5864d5b2626ddbd4a6b0d07142ce290fad58e786 SHA512 4ac7f4485c7290321221874fcac695cc47199e7ef76a0270a2d4b381bf42311a2d3dc0d325c1a50cbc0e79a82f9b876f5481a717425a7919d53e97b11d3f0a29
25 -DIST jdk-8u162-linux-arm64-vfp-hflt.tar.gz 78519170 BLAKE2B f8c083aba14ed5a7d70ab5c7eaaba7854a55c467608f38eec389489cbfae0a3abca3a2c9297a100eef7328c5e1d78f751dbbb11947a191fde94a428ca9e7737b SHA512 f713b174193abcf5a7cdbef2ff75a77c953f3369cdd9dd80a3633e9024c1386bed10d3889bb1ea0617ae5764fee7e70cf487c6a1a4c8c46dc92c2e27704b0d9d
26 -DIST jdk-8u162-linux-i586-demos.tar.gz 55100252 BLAKE2B 437dcb25306fedfda9fbda12533790d4df6b3be999ee5dafc2012e5277abc2736856f0ca028827420ff4b9aba920d8bc3f6933ead0e80e03c055e43fb7f1db71 SHA512 a867c08716874646e8073a1850f40d46f2d7b8bb1fa37ced7e95c11852ae169011fa8364055d07437cc1750974a984150eed8171b13d3bff03460cdea4b1567f
27 -DIST jdk-8u162-linux-i586.tar.gz 192733880 BLAKE2B e4e00ff4ca48c9de65ba7493fbd9f9ba04304d03dfb67f0130db977d2a3f244b22b6092115345e701ed60fa56e3cfc3787a6292ba29d46a082ff8205809793ad SHA512 f6b84e3fbfe741851e109908b394dd65e68e1214a049f47754dc88f4c223d217e597f7c6a6f34c94fb8fa9d78be59861475612289269b34789223519badb0a2f
28 -DIST jdk-8u162-linux-x64-demos.tar.gz 55164558 BLAKE2B a442bb0b9e75a61952ac8f588eef3d66f5bfe987cef982a621e12dc65e487cd49c95b9a92a5595d2d03337a07fb9d2cc4e0afbd0a041614a15a87751be525966 SHA512 a24668b4e2acb493e73ab4e0e1c8c2b60650675fe424c113514771e7ab6464bb40e839ff5b37c8e0019624160d7d3aacfc30c0049b851f34be816e13ea861db9
29 -DIST jdk-8u162-linux-x64.tar.gz 189815615 BLAKE2B ae4f9cac86aab3dfd528f9e8930bfecdb42fbeea8a6394c9589303766d47127083cff13567927125756c4ea174d7ee338da115266d01a3613380333022a65101 SHA512 55349e0400f2fa77144af1977b7487f38631a404b23411a294f3ab55c2190fd3db1447fe788490834a03c2093421e06ed3e2db8434f8c4f417f58763881402f6
30 -DIST jdk-8u162-macosx-x64.dmg 259123815 BLAKE2B 6c41876e7b9e54bbb7c14563f98825d6f41ea0cf30fbd914b4e75622f772c554a62d97b5e13f441de92428d945e985d3c32cbb285a85d5ae2ca15ff3883c97d9 SHA512 2c03129c5334ae7471a15722e70b872a3d8450d400b56333e42a663de71409b30161cd86764c8b9af7f0d49ef613ceac7d1507d821a84fb8544e53695ae6ea29
31 -DIST jdk-8u162-macosx-x86_64-demos.zip 55705634 BLAKE2B 088884279396ff53b69721ba8f3870a67b6d846c94d7a21e713e270f31a6366d5b1b00f371d334da264824c33ad33a1b146890888074e09af31060e8e3cac011 SHA512 939da23bc935a7c089dce9f7fcf87f4df8be911282a4a7fca6cb8b9325cdbc85632721ee596dc2f4014c81ab5d9e18a56369b46bf7ed2547dfac553a6962c1fd
32 -DIST jdk-8u162-solaris-sparcv9-demos.tar.gz 9799694 BLAKE2B e6812e0771cfde50ccb2623e645a114d668812656d4dc151a14f952a93f70dcbd7325c691637979eda95f2cc7892dd0e4ad75605eb72b2bdda4e1ea2bb2f9011 SHA512 b4d1a410b68b48eab66cab179274cf03f8dda1c49f155eb31bf6a91640f5ae4a9f750591d3d7327221c47d27e9fc6adc793414d1b63e404d5eb08cad2fac424b
33 -DIST jdk-8u162-solaris-sparcv9.tar.gz 104118900 BLAKE2B 8aa9e54e1cc189517caab4b799d2a0cb2ad8f5a5796058cb18bcdca0dd03b1dbfe927a88cb7bc257c79412a0a2594762e083e1979ee4fd21662f152c79b6b445 SHA512 10249be011c526ee707dfc1f293351d60892b64f1b9160b70583d94b17989e6705a69d6502b477a960b7826cadbb214e52aae3ce36aa4bcb3b6ddf8d06fb90eb
34 -DIST jdk-8u162-solaris-x64-demos.tar.gz 9752263 BLAKE2B 50e28f56df39b355587fc5894edb065eca115ef6f71c9afcef0c2640b9cd2dc8df9bb315a85219dbce96a59ab24304b429f0c756548b7a9fe26155f50916a11a SHA512 173c887650fa92f5c515fe5f7973c488301253344161ede7b1003a7fae0b5404c81fe450235c485846cb262ae82684500e249ac134f248889bea9ad05048cc1c
35 -DIST jdk-8u162-solaris-x64.tar.gz 101741152 BLAKE2B 9e01659aa83b11b20e47842b7ef5c23b3e376540023d92a1e2350083037d45872cb15138fcd37ad62ea05ed5d47a716b0c8dc792f415ecd18ada6ed9b075aea4 SHA512 9755a4b9af4b5aa7e904748e5d627ebffb2ff290748d28aac9b494b372815a6ca3ee219c140ed43698a341f495ccffe5f9cae3bea0ad94e1e14fefa84d287783
36 DIST jdk-8u172-linux-arm32-vfp-hflt-demos.tar.gz 10423820 BLAKE2B af3c7edab4e0bd3c785914292ac227138af25a948fa580ab466937f169806254bc12476dd1b4b320ce4997f52d41ab4851a7c82c47f33bbd3080cc49c1f8d091 SHA512 8b18204d5bfb8545db71e7b3f5f6fd6d67077116a32c6cf33cbe192a88c768a97082dbd62a436b2c75f45b3d5aac8974f8bf653dd3902121f4881193dff226cb
37 DIST jdk-8u172-linux-arm32-vfp-hflt.tar.gz 81781271 BLAKE2B cf69c1964126e6f79324ac5aaca552f6984925a5e2cd1dce8417a6c61792dba908e0cd92127405f8f10fafd2b7b6a33e76d5a4f766e72fe8bc928ffa9612c9e7 SHA512 451b1b4875775ee40c8b9260f1d6437d8f5d14ba12b578eb4bc855a04d061c5dc7a320b9ab962c8f26d9a73c8975122cd31c412b44654dd07e47de8a024f88fd
38 DIST jdk-8u172-linux-arm64-vfp-hflt-demos.tar.gz 10438462 BLAKE2B f72f2360b75d35443b5845669cb48d517591ad870253c6ae2a7fc341bcf12f86351125691f973f6cebb6a286d1f1763a93f38e238a00eb3562676cfcdff8b026 SHA512 91cfc64aed933c6760dd32b07609fe27edf13c7974e9ed6e5e9c3eddf47416ed97caec525a028ecdd8cf70d20d8fc2655c250befff9c37f38cba9e338d4c56d8
39
40 diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
41 deleted file mode 100644
42 index f71907bd1d4..00000000000
43 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
44 +++ /dev/null
45 @@ -1,301 +0,0 @@
46 -# Copyright 1999-2018 Gentoo Foundation
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=6
50 -
51 -inherit desktop gnome2-utils java-vm-2 prefix versionator
52 -
53 -KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
54 -
55 -if [[ "$(get_version_component_range 4)" == 0 ]] ; then
56 - S_PV="$(get_version_component_range 1-3)"
57 -else
58 - MY_PV_EXT="u$(get_version_component_range 4)"
59 - S_PV="$(get_version_component_range 1-4)"
60 -fi
61 -
62 -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
63 -
64 -declare -A ARCH_FILES
65 -ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
66 -ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
67 -ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
68 -ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
69 -ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
70 -ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
71 -ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
72 -
73 -for keyword in ${KEYWORDS//-\*} ; do
74 - case "${keyword#\~}" in
75 - *-linux) continue ;;
76 - x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
77 - *) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
78 - esac
79 -
80 - SRC_URI+="
81 - ${keyword#\~}? (
82 - ${ARCH_FILES[${keyword#\~}]}
83 - examples? ( ${demo} )
84 - )"
85 -done
86 -
87 -DESCRIPTION="Oracle's Java SE Development Kit"
88 -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
89 -LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
90 -SLOT="1.8"
91 -IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
92 -REQUIRED_USE="javafx? ( alsa fontconfig )"
93 -RESTRICT="fetch preserve-libs strip"
94 -QA_PREBUILT="*"
95 -
96 -# NOTES:
97 -#
98 -# * cups is dlopened.
99 -#
100 -# * libpng is also dlopened but only by libsplashscreen, which isn't
101 -# important, so we can exclude that.
102 -#
103 -# * We still need to work out the exact AWT and JavaFX dependencies
104 -# under MacOS. It doesn't appear to use many, if any, of the
105 -# dependencies below.
106 -#
107 -RDEPEND="!x64-macos? (
108 - !headless-awt? (
109 - x11-libs/libX11
110 - x11-libs/libXext
111 - x11-libs/libXi
112 - x11-libs/libXrender
113 - x11-libs/libXtst
114 - )
115 - javafx? (
116 - dev-libs/glib:2
117 - dev-libs/libxml2:2
118 - dev-libs/libxslt
119 - media-libs/freetype:2
120 - x11-libs/cairo
121 - x11-libs/gtk+:2
122 - x11-libs/libX11
123 - x11-libs/libXtst
124 - x11-libs/libXxf86vm
125 - x11-libs/pango
126 - virtual/opengl
127 - )
128 - )
129 - alsa? ( media-libs/alsa-lib )
130 - cups? ( net-print/cups )
131 - doc? ( dev-java/java-sdk-docs:${SLOT} )
132 - fontconfig? ( media-libs/fontconfig:1.0 )
133 - !prefix? ( sys-libs/glibc:* )
134 - selinux? ( sec-policy/selinux-java )"
135 -
136 -DEPEND="app-arch/zip
137 - examples? ( x64-macos? ( app-arch/unzip ) )"
138 -
139 -S="${WORKDIR}/jdk$(replace_version_separator 3 _ ${S_PV})"
140 -
141 -pkg_nofetch() {
142 - local a
143 - einfo "Please download these files and move them to your distfiles directory:"
144 - einfo
145 - for a in ${A} ; do
146 - [[ ! -f ${DISTDIR}/${a} ]] && einfo " ${a}"
147 - done
148 - einfo
149 - einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
150 - einfo
151 - einfo "If the above mentioned URL does not point to the correct version anymore,"
152 - einfo "please download the file from Oracle's Java download archive:"
153 - einfo
154 - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
155 - einfo
156 -}
157 -
158 -src_unpack() {
159 - if use x64-macos ; then
160 - mkdir -p "${T}"/dmgmount || die
161 - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
162 - -mountpoint "${T}"/dmgmount || die
163 - local jdkgen=$(get_version_component_range 2)
164 - local uver=$(get_version_component_range 4)
165 - ( cd "${T}" &&
166 - xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
167 - jdk${PV//.}.pkg/Payload ) || die
168 - zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
169 - hdiutil detach "${T}"/dmgmount || die
170 - mv Contents/Home "${S}" || die
171 - fi
172 -
173 - default
174 -}
175 -
176 -src_prepare() {
177 - default
178 -
179 - if [[ -n ${JAVA_PKG_STRICT} ]] ; then
180 - # Mark this binary early to run it now.
181 - pax-mark m ./bin/javap
182 -
183 - eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
184 - eqawarn
185 - eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
186 - fi
187 -
188 - # Remove the hook that calls Oracle's evil usage tracker. Not just
189 - # because it's evil but because it breaks the sandbox during builds
190 - # and we can't find any other feasible way to disable it or make it
191 - # write somewhere else. See bug #559936 for details.
192 - zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
193 -}
194 -
195 -src_install() {
196 - local dest="/opt/${P}"
197 - local ddest="${ED}${dest#/}"
198 -
199 - # Create files used as storage for system preferences.
200 - mkdir jre/.systemPrefs || die
201 - touch jre/.systemPrefs/.system.lock || die
202 - touch jre/.systemPrefs/.systemRootModFile || die
203 -
204 - if ! use alsa ; then
205 - rm -vf jre/lib/*/libjsoundalsa.* || die
206 - fi
207 -
208 - if ! use commercial ; then
209 - rm -vfr lib/missioncontrol jre/lib/jfr* || die
210 - fi
211 -
212 - if use headless-awt ; then
213 - rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
214 - {,jre/}bin/{javaws,policytool} \
215 - bin/appletviewer || die
216 - fi
217 -
218 - if ! use javafx ; then
219 - rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
220 - jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
221 - bin/*javafx* bin/javapackager || die
222 - fi
223 -
224 - if ! use nsplugin ; then
225 - rm -vf jre/lib/*/libnpjp2.* || die
226 - else
227 - local nsplugin=$(echo jre/lib/*/libnpjp2.*)
228 - local nsplugin_link=${nsplugin##*/}
229 - nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
230 - dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
231 - fi
232 -
233 - # Even though plugins linked against multiple ffmpeg versions are
234 - # provided, they generally lag behind what Gentoo has available.
235 - rm -vf jre/lib/*/libavplugin* || die
236 -
237 - # Prune all fontconfig files so that libfontconfig will be used.
238 - rm -v jre/lib/fontconfig.* || die
239 -
240 - # Packaged as dev-util/visualvm but some users prefer this version.
241 - use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
242 -
243 - # Install desktop file for the Java Control Panel. Using
244 - # ${PN}-${SLOT} to prevent file collision with JRE and other slots.
245 - if [[ -d jre/lib/desktop/icons ]] ; then
246 - local icon
247 - pushd jre/lib/desktop/icons >/dev/null || die
248 - for icon in */*/apps/sun-jcontrol.png ; do
249 - insinto /usr/share/icons/"${icon%/*}"
250 - newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
251 - done
252 - popd >/dev/null || die
253 - make_desktop_entry \
254 - "${dest}"/bin/jcontrol \
255 - "Java Control Panel for Oracle JDK ${SLOT}" \
256 - sun-jcontrol-${PN}-${SLOT} \
257 - "Settings;Java;"
258 - fi
259 -
260 - dodoc COPYRIGHT
261 - dodir "${dest}"
262 - cp -pPR bin include jre lib man "${ddest}" || die
263 -
264 - if use derby ; then
265 - cp -pPR db "${ddest}" || die
266 - fi
267 -
268 - if use examples && [[ ${A} = *-demos.* ]] ; then
269 - cp -pPR demo sample "${ddest}" || die
270 - fi
271 -
272 - ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
273 - "${ddest}"/jre/lib/security/ || die
274 -
275 - if use source ; then
276 - cp -v src.zip "${ddest}" || die
277 -
278 - if use javafx ; then
279 - cp -v javafx-src.zip "${ddest}" || die
280 - fi
281 - fi
282 -
283 - # Only install Gentoo-specific fontconfig if flag is disabled.
284 - # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
285 - if ! use fontconfig ; then
286 - insinto "${dest}"/jre/lib/
287 - doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
288 - fi
289 -
290 - # Needs to be done before CDS, bug #215225.
291 - java-vm_set-pax-markings "${ddest}"
292 -
293 - # See bug #207282.
294 - einfo "Creating the Class Data Sharing archives"
295 - case ${ARCH} in
296 - arm|ia64)
297 - ${ddest}/bin/java -client -Xshare:dump || die
298 - ;;
299 - x86)
300 - ${ddest}/bin/java -client -Xshare:dump || die
301 - # limit heap size for large memory on x86 #467518
302 - # this is a workaround and shouldn't be needed.
303 - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
304 - ;;
305 - *)
306 - ${ddest}/bin/java -server -Xshare:dump || die
307 - ;;
308 - esac
309 -
310 - # Remove empty dirs we might have copied.
311 - find "${D}" -type d -empty -exec rmdir -v {} + || die
312 -
313 - if use x64-macos ; then
314 - local lib
315 - for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
316 - ebegin "Fixing self-reference of ${lib}"
317 - install_name_tool \
318 - -id "${EPREFIX}${dest}"/jre/lib/${lib} \
319 - "${ddest}"/jre/lib/${lib} || die
320 - eend $?
321 - done
322 - fi
323 -
324 - java-vm_install-env "${FILESDIR}"/${PN}.env.sh
325 - java-vm_revdep-mask
326 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
327 -}
328 -
329 -pkg_preinst() {
330 - gnome2_icon_savelist
331 -}
332 -
333 -pkg_postinst() {
334 - gnome2_icon_cache_update
335 - java-vm-2_pkg_postinst
336 -
337 - if ! use headless-awt && ! use javafx ; then
338 - ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
339 - ewarn "require this and they may fail with a confusing error message."
340 - fi
341 -}
342 -
343 -pkg_postrm() {
344 - gnome2_icon_cache_update
345 - java-vm-2_pkg_postrm
346 -}