1 |
commit: 1689a7cb3c74dabde967e8b0e838967420f9c6aa |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 26 09:45:20 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 26 09:47:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1689a7cb |
7 |
|
8 |
dev-java/oracle-jre-bin: Remove vulnerable 1.8.0.121 wrt bug #616050 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
dev-java/oracle-jre-bin/Manifest | 2 - |
13 |
.../oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild | 251 --------------------- |
14 |
2 files changed, 253 deletions(-) |
15 |
|
16 |
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest |
17 |
index 4aafeaf9746..0989da6029f 100644 |
18 |
--- a/dev-java/oracle-jre-bin/Manifest |
19 |
+++ b/dev-java/oracle-jre-bin/Manifest |
20 |
@@ -1,5 +1,3 @@ |
21 |
DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc |
22 |
-DIST jre-8u121-linux-i586.tar.gz 76293286 SHA256 1b28662780c98b3233e8dacaa07c505a70c53463d3b00720baa59f955ab1e1bb SHA512 375003c2fec68deed36cf10a2e225044d6c85035d1d756110cb07ffa526d63bee7573b2db7568fb84c6dfdee101da82bedd7785548da812241e4e0234e99a5bb WHIRLPOOL 6f4665e448f59a4d1f432bfc974d9d626400b7932ec7f3f8edba29041354386d399306c685240194749d7a6d0364153143704768c4f205fb02ba44de3db92ba7 |
23 |
-DIST jre-8u121-linux-x64.tar.gz 73676107 SHA256 30bf5fbac0cfbc9201cac1d6973dbc96e5f55043ab315eda8c7aeb23df4f2644 SHA512 85ed3820b1461bf8c1b83259962f9e7c3f72d694f446d3e5852c416eeeb9905897a9a3b5eaded9a8d617c9c43848635b2ff7b520021b666fd87f39837e4ff54b WHIRLPOOL f2bdfe315dc9a7a15bd4e73dd774fd31c1c02bb3d5a24d2829cc51d9aed3b75993c9429e211ee4d204606cf6105015aac30c0e408e3558b24d6d3f4f229b9b7e |
24 |
DIST jre-8u131-linux-i586.tar.gz 78620957 SHA256 a773f2fe17061ef637ed2094b06313a99c0b45ba3d3cb7f8f1ebf18448495aeb SHA512 37508f39c62232953a479794073d8360f41182f2d3ea9fc4356442fb7b517466af944e00d10ed4b65cd12eff7e1de2d860b98bfb6c428bc0ee9e14bcf15b60c5 WHIRLPOOL 91f1e9caafbba0f700c43868409cd9eb5b94f4b9c00313b5df39d38168d127070cb9fc6ab22a76931a8c2504161444b4d43c860667064a41277e77181c4b16d1 |
25 |
DIST jre-8u131-linux-x64.tar.gz 75920010 SHA256 355e5cdb066d4cada1f9f16f358b6fa6280ff5caf7470cf0d5cdd43083408d35 SHA512 26e6515f8e8b4d1d72337e347810d57fcc99284c18260d9ebd67441c19b9f1f73a9570f58a103477f2642e880a79d6579a5e40d75d06e2f4a92a6d3e07ba59db WHIRLPOOL 9cccc44679ddf103c15d6d6797c97d40ccc3abc63f5b05f78c79650be92cfa5dec8c2c567c456556b6f2f6d9ec23fbfbdf2a936ff569ac1bf7e50ce74f57bcef |
26 |
|
27 |
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
28 |
deleted file mode 100644 |
29 |
index 0829cfb55ff..00000000000 |
30 |
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,251 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-inherit eutils java-vm-2 prefix versionator |
39 |
- |
40 |
-# This URIs need updating when bumping! |
41 |
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html" |
42 |
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" |
43 |
- |
44 |
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then |
45 |
- S_PV="$(get_version_component_range 1-3)" |
46 |
-else |
47 |
- MY_PV_EXT="u$(get_version_component_range 4)" |
48 |
- S_PV="$(get_version_component_range 1-4)" |
49 |
-fi |
50 |
- |
51 |
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" |
52 |
- |
53 |
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz" |
54 |
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz" |
55 |
- |
56 |
-JCE_DIR="UnlimitedJCEPolicyJDK8" |
57 |
-JCE_FILE="jce_policy-8.zip" |
58 |
- |
59 |
-DESCRIPTION="Oracle's Java SE Runtime Environment" |
60 |
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" |
61 |
-SRC_URI=" |
62 |
- amd64? ( ${AT_amd64} ) |
63 |
- x86? ( ${AT_x86} ) |
64 |
- jce? ( ${JCE_FILE} )" |
65 |
- |
66 |
-LICENSE="Oracle-BCLA-JavaSE" |
67 |
-SLOT="1.8" |
68 |
-KEYWORDS="amd64 x86" |
69 |
-IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux" |
70 |
- |
71 |
-RESTRICT="fetch preserve-libs strip" |
72 |
-QA_PREBUILT="*" |
73 |
- |
74 |
-# NOTES: |
75 |
-# |
76 |
-# * cups is dlopened. |
77 |
-# |
78 |
-# * libpng is also dlopened but only by libsplashscreen, which isn't |
79 |
-# important, so we can exclude that. |
80 |
-# |
81 |
-# * We still need to work out the exact AWT and JavaFX dependencies |
82 |
-# under MacOS. It doesn't appear to use many, if any, of the |
83 |
-# dependencies below. |
84 |
-# |
85 |
-RDEPEND="!x64-macos? ( |
86 |
- !headless-awt? ( |
87 |
- x11-libs/libX11 |
88 |
- x11-libs/libXext |
89 |
- x11-libs/libXi |
90 |
- x11-libs/libXrender |
91 |
- x11-libs/libXtst |
92 |
- ) |
93 |
- javafx? ( |
94 |
- dev-libs/glib:2 |
95 |
- dev-libs/libxml2:2 |
96 |
- dev-libs/libxslt |
97 |
- media-libs/freetype:2 |
98 |
- x11-libs/cairo |
99 |
- x11-libs/gtk+:2 |
100 |
- x11-libs/libX11 |
101 |
- x11-libs/libXtst |
102 |
- x11-libs/libXxf86vm |
103 |
- x11-libs/pango |
104 |
- virtual/opengl |
105 |
- ) |
106 |
- ) |
107 |
- alsa? ( media-libs/alsa-lib ) |
108 |
- cups? ( net-print/cups ) |
109 |
- fontconfig? ( media-libs/fontconfig:1.0 ) |
110 |
- !prefix? ( sys-libs/glibc:* ) |
111 |
- selinux? ( sec-policy/selinux-java )" |
112 |
- |
113 |
-DEPEND="app-arch/zip |
114 |
- jce? ( app-arch/unzip )" |
115 |
- |
116 |
-S="${WORKDIR}/jre" |
117 |
- |
118 |
-pkg_nofetch() { |
119 |
- local AT_ARCH="AT_${ARCH}" |
120 |
- local AT="${!AT_ARCH}" |
121 |
- |
122 |
- einfo "Please download '${AT}' from:" |
123 |
- einfo "'${JRE_URI}'" |
124 |
- einfo "and move it to '${DISTDIR}'" |
125 |
- |
126 |
- if use jce; then |
127 |
- einfo "Also download '${JCE_FILE}' from:" |
128 |
- einfo "'${JCE_URI}'" |
129 |
- einfo "and move it to '${DISTDIR}'" |
130 |
- fi |
131 |
- |
132 |
- einfo |
133 |
- einfo "If the above mentioned urls do not point to the correct version anymore," |
134 |
- einfo "please download the files from Oracle's java download archive:" |
135 |
- einfo |
136 |
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR" |
137 |
- einfo |
138 |
- |
139 |
-} |
140 |
- |
141 |
-src_unpack() { |
142 |
- default |
143 |
- |
144 |
- # Upstream is changing their versioning scheme every release around 1.8.0.*; |
145 |
- # to stop having to change it over and over again, just wildcard match and |
146 |
- # live a happy life instead of trying to get this new jre1.8.0_05 to work. |
147 |
- mv "${WORKDIR}"/jre* "${S}" || die |
148 |
-} |
149 |
- |
150 |
-src_prepare() { |
151 |
- if use jce ; then |
152 |
- mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die |
153 |
- fi |
154 |
- |
155 |
- default |
156 |
- |
157 |
- # Remove the hook that calls Oracle's evil usage tracker. Not just |
158 |
- # because it's evil but because it breaks the sandbox during builds |
159 |
- # and we can't find any other feasible way to disable it or make it |
160 |
- # write somewhere else. See bug #559936 for details. |
161 |
- zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- local dest="/opt/${P}" |
166 |
- local ddest="${ED}${dest#/}" |
167 |
- |
168 |
- # Create files used as storage for system preferences. |
169 |
- mkdir .systemPrefs || die |
170 |
- touch .systemPrefs/.system.lock || die |
171 |
- touch .systemPrefs/.systemRootModFile || die |
172 |
- |
173 |
- if ! use alsa ; then |
174 |
- rm -vf lib/*/libjsoundalsa.* || die |
175 |
- fi |
176 |
- |
177 |
- if ! use commercial; then |
178 |
- rm -vfr lib/jfr* || die |
179 |
- fi |
180 |
- |
181 |
- if use headless-awt ; then |
182 |
- rm -vf lib/*/lib*{[jx]awt,splashscreen}* \ |
183 |
- bin/{javaws,policytool} || die |
184 |
- fi |
185 |
- |
186 |
- if ! use javafx ; then |
187 |
- rm -vf lib/*/lib*{decora,fx,glass,prism}* \ |
188 |
- lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die |
189 |
- fi |
190 |
- |
191 |
- if ! use nsplugin ; then |
192 |
- rm -vf lib/*/libnpjp2.* || die |
193 |
- else |
194 |
- local nsplugin=$(echo lib/*/libnpjp2.*) |
195 |
- fi |
196 |
- |
197 |
- # Even though plugins linked against multiple ffmpeg versions are |
198 |
- # provided, they generally lag behind what Gentoo has available. |
199 |
- rm -vf lib/*/libavplugin* || die |
200 |
- |
201 |
- dodoc COPYRIGHT |
202 |
- dodir "${dest}" |
203 |
- cp -pPR bin lib man "${ddest}" || die |
204 |
- |
205 |
- if use jce ; then |
206 |
- dodir ${dest}/lib/security/strong-jce |
207 |
- mv "${ddest}"/lib/security/US_export_policy.jar \ |
208 |
- "${ddest}"/lib/security/strong-jce || die |
209 |
- mv "${ddest}"/lib/security/local_policy.jar \ |
210 |
- "${ddest}"/lib/security/strong-jce || die |
211 |
- dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ |
212 |
- "${dest}"/lib/security/US_export_policy.jar |
213 |
- dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ |
214 |
- "${dest}"/lib/security/local_policy.jar |
215 |
- fi |
216 |
- |
217 |
- if use nsplugin ; then |
218 |
- local nsplugin_link=${nsplugin##*/} |
219 |
- nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} |
220 |
- dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" |
221 |
- fi |
222 |
- |
223 |
- # Install desktop file for the Java Control Panel. |
224 |
- # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. |
225 |
- # make_desktop_entry can't be used as ${P} would end up in filename. |
226 |
- newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ |
227 |
- sun-jcontrol-${PN}-${SLOT}.png || die |
228 |
- sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ |
229 |
- -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ |
230 |
- -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ |
231 |
- -e "s#Application;##" \ |
232 |
- -e "/Encoding/d" \ |
233 |
- lib/desktop/applications/sun_java.desktop > \ |
234 |
- "${T}"/jcontrol-${PN}-${SLOT}.desktop || die |
235 |
- domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop |
236 |
- |
237 |
- # Prune all fontconfig files so libfontconfig will be used and only install |
238 |
- # a Gentoo specific one if fontconfig is disabled. |
239 |
- # http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html |
240 |
- rm "${ddest}"/lib/fontconfig.* || die |
241 |
- if ! use fontconfig ; then |
242 |
- cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die |
243 |
- eprefixify "${T}"/fontconfig.properties |
244 |
- insinto "${dest}"/lib/ |
245 |
- doins "${T}"/fontconfig.properties |
246 |
- fi |
247 |
- |
248 |
- # This needs to be done before CDS - #215225 |
249 |
- java-vm_set-pax-markings "${ddest}" |
250 |
- |
251 |
- # see bug #207282 |
252 |
- einfo "Creating the Class Data Sharing archives" |
253 |
- case ${ARCH} in |
254 |
- arm|ia64) |
255 |
- ${ddest}/bin/java -client -Xshare:dump || die |
256 |
- ;; |
257 |
- x86) |
258 |
- ${ddest}/bin/java -client -Xshare:dump || die |
259 |
- # limit heap size for large memory on x86 #467518 |
260 |
- # this is a workaround and shouldn't be needed. |
261 |
- ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die |
262 |
- ;; |
263 |
- *) |
264 |
- ${ddest}/bin/java -server -Xshare:dump || die |
265 |
- ;; |
266 |
- esac |
267 |
- |
268 |
- # Remove empty dirs we might have copied. |
269 |
- find "${D}" -type d -empty -exec rmdir -v {} + || die |
270 |
- |
271 |
- java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
272 |
- java-vm_revdep-mask |
273 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
274 |
-} |
275 |
- |
276 |
-pkg_postinst() { |
277 |
- java-vm-2_pkg_postinst |
278 |
- |
279 |
- if ! use headless-awt && ! use javafx; then |
280 |
- ewarn "You have disabled the javafx flag. Some modern desktop Java applications" |
281 |
- ewarn "require this and they may fail with a confusing error message." |
282 |
- fi |
283 |
-} |