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