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-jre-bin/
Date: Sat, 18 Aug 2018 21:30:56
Message-Id: 1534627811.384d196024de436c1aae39431c010a6d112a95ce.chewi@gentoo
1 commit: 384d196024de436c1aae39431c010a6d112a95ce
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 18 21:30:11 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 18 21:30:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384d1960
7
8 dev-java/oracle-jre-bin: Drop vulnerable 1.8.0.172
9
10 Bug: https://bugs.gentoo.org/661456
11 Package-Manager: Portage-2.3.47, Repoman-2.3.10
12
13 dev-java/oracle-jre-bin/Manifest | 2 -
14 .../oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild | 220 ---------------------
15 2 files changed, 222 deletions(-)
16
17 diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
18 index 6f2ee8a2f50..d24d85db95c 100644
19 --- a/dev-java/oracle-jre-bin/Manifest
20 +++ b/dev-java/oracle-jre-bin/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST jre-8u172-linux-i586.tar.gz 84306480 BLAKE2B c5763bf5631a5ac246e5bbb6eaec98bac59ece15a9779c2861b474584bc86caafa333575d03fe875c3fcd3c47cbb506b905c274bf2b621f810846411b7619d5d SHA512 a4773fe39b69f22e6a646cd6b8ebdf189252e5b686f4000e43fc418ef133ac1b3e24374693c41eed5b3063849f33bbbf70a3ffe04c52ef9b1b8ac1b8d1d0dd22
23 -DIST jre-8u172-linux-x64.tar.gz 81182269 BLAKE2B f9c7afc534cc9e8c60458a58a768692ee95cb9401c238974daeb4ada5aa26b45f7a0de2b1785de77fb85ceaefc717b49cf08238f31032437bb620343cd468c30 SHA512 e113138946eb95fb2c9ea8bdc5ca4b8d0c3e9ae35baaf12a04c0f5a0c9af390f181d2e39fa1c71eb8c91d734a944c9239fdc10dcfc9b8a19829dad24dd35447f
24 DIST jre-8u181-linux-i586.tar.gz 84309787 BLAKE2B 3aa9f47698a35ca91bbc61d2f3ec43f5ee626b74fb913eb11be8e1478d8aad780b5ea672de4dcb6bd6c598058786d26d491d01a45d5f3cb5044d1f48db26c7d6 SHA512 86e4532248e383f6bca875bf039f4f852b79260b4d5affbbd5deb9cf2ea3e585ced9f1fe054526529dcc3dfbe031a829df078a7591dbc3cf3da7913703de7231
25 DIST jre-8u181-linux-x64.tar.gz 81191893 BLAKE2B c29d638b7dae9cc58d9de6e43f1af397cab04786045e4956d05cd8c3825af1f27e8a77b42a9d4b9d8ab7d15aa5b94349fd8c98ca37fadb271dc0bd868d513491 SHA512 dea7bc79210d23ddc58a7013bea8386169b9ab6c156995a2190dac298919c933641639173cf3426730b248004767449c5a62057d6736f897831d8c86b36c5bed
26 DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
27
28 diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
29 deleted file mode 100644
30 index ca2117f3c69..00000000000
31 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
32 +++ /dev/null
33 @@ -1,220 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit desktop gnome2-utils java-vm-2 prefix versionator
40 -
41 -KEYWORDS="-* amd64 x86"
42 -
43 -if [[ "$(get_version_component_range 4)" == 0 ]] ; then
44 - S_PV="$(get_version_component_range 1-3)"
45 -else
46 - MY_PV_EXT="u$(get_version_component_range 4)"
47 - S_PV="$(get_version_component_range 1-4)"
48 -fi
49 -
50 -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
51 -
52 -declare -A ARCH_FILES
53 -ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
54 -ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
55 -
56 -for keyword in ${KEYWORDS//-\*} ; do
57 - SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
58 -done
59 -
60 -DESCRIPTION="Oracle's Java SE Runtime Environment"
61 -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
62 -LICENSE="Oracle-BCLA-JavaSE"
63 -SLOT="1.8"
64 -IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
65 -RESTRICT="fetch preserve-libs strip"
66 -QA_PREBUILT="*"
67 -
68 -# NOTES:
69 -#
70 -# * cups is dlopened.
71 -#
72 -# * libpng is also dlopened but only by libsplashscreen, which isn't
73 -# important, so we can exclude that.
74 -#
75 -# * We still need to work out the exact AWT and JavaFX dependencies
76 -# under MacOS. It doesn't appear to use many, if any, of the
77 -# dependencies below.
78 -#
79 -RDEPEND="!x64-macos? (
80 - !headless-awt? (
81 - x11-libs/libX11
82 - x11-libs/libXext
83 - x11-libs/libXi
84 - x11-libs/libXrender
85 - x11-libs/libXtst
86 - )
87 - javafx? (
88 - dev-libs/glib:2
89 - dev-libs/libxml2:2
90 - dev-libs/libxslt
91 - media-libs/freetype:2
92 - x11-libs/cairo
93 - x11-libs/gtk+:2
94 - x11-libs/libX11
95 - x11-libs/libXtst
96 - x11-libs/libXxf86vm
97 - x11-libs/pango
98 - virtual/opengl
99 - )
100 - )
101 - alsa? ( media-libs/alsa-lib )
102 - cups? ( net-print/cups )
103 - fontconfig? ( media-libs/fontconfig:1.0 )
104 - !prefix? ( sys-libs/glibc:* )
105 - selinux? ( sec-policy/selinux-java )"
106 -
107 -DEPEND="app-arch/zip"
108 -
109 -S="${WORKDIR}/jre$(replace_version_separator 3 _ ${S_PV})"
110 -
111 -pkg_nofetch() {
112 - einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
113 - einfo "your distfiles directory:"
114 - einfo
115 - einfo " http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
116 - einfo
117 - einfo "If the above mentioned URL does not point to the correct version anymore,"
118 - einfo "please download the file from Oracle's Java download archive:"
119 - einfo
120 - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
121 - einfo
122 -}
123 -
124 -src_prepare() {
125 - default
126 -
127 - # Remove the hook that calls Oracle's evil usage tracker. Not just
128 - # because it's evil but because it breaks the sandbox during builds
129 - # and we can't find any other feasible way to disable it or make it
130 - # write somewhere else. See bug #559936 for details.
131 - zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
132 -}
133 -
134 -src_install() {
135 - local dest="/opt/${P}"
136 - local ddest="${ED}${dest#/}"
137 -
138 - # Create files used as storage for system preferences.
139 - mkdir .systemPrefs || die
140 - touch .systemPrefs/.system.lock || die
141 - touch .systemPrefs/.systemRootModFile || die
142 -
143 - if ! use alsa ; then
144 - rm -vf lib/*/libjsoundalsa.* || die
145 - fi
146 -
147 - if ! use commercial ; then
148 - rm -vfr lib/jfr* || die
149 - fi
150 -
151 - if use headless-awt ; then
152 - rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
153 - bin/{javaws,policytool} || die
154 - fi
155 -
156 - if ! use javafx ; then
157 - rm -vf lib/*/lib*{decora,fx,glass,prism}* \
158 - lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
159 - fi
160 -
161 - if ! use nsplugin ; then
162 - rm -vf lib/*/libnpjp2.* || die
163 - else
164 - local nsplugin=$(echo lib/*/libnpjp2.*)
165 - local nsplugin_link=${nsplugin##*/}
166 - nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
167 - dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
168 - fi
169 -
170 - # Even though plugins linked against multiple ffmpeg versions are
171 - # provided, they generally lag behind what Gentoo has available.
172 - rm -vf lib/*/libavplugin* || die
173 -
174 - # Prune all fontconfig files so that libfontconfig will be used.
175 - rm -v lib/fontconfig.* || die
176 -
177 - # Install desktop file for the Java Control Panel. Using
178 - # ${PN}-${SLOT} to prevent file collision with JDK and other slots.
179 - if [[ -d lib/desktop/icons ]] ; then
180 - local icon
181 - pushd lib/desktop/icons >/dev/null || die
182 - for icon in */*/apps/sun-jcontrol.png ; do
183 - insinto /usr/share/icons/"${icon%/*}"
184 - newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
185 - done
186 - popd >/dev/null || die
187 - make_desktop_entry \
188 - "${dest}"/bin/jcontrol \
189 - "Java Control Panel for Oracle JRE ${SLOT}" \
190 - sun-jcontrol-${PN}-${SLOT} \
191 - "Settings;Java;"
192 - fi
193 -
194 - dodoc COPYRIGHT
195 - dodir "${dest}"
196 - cp -pPR bin lib man "${ddest}" || die
197 -
198 - ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
199 - "${ddest}"/lib/security/ || die
200 -
201 - # Only install Gentoo-specific fontconfig if flag is disabled.
202 - # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
203 - if ! use fontconfig ; then
204 - insinto "${dest}"/lib/
205 - doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
206 - fi
207 -
208 - # Needs to be done before CDS, bug #215225.
209 - java-vm_set-pax-markings "${ddest}"
210 -
211 - # See bug #207282.
212 - einfo "Creating the Class Data Sharing archives"
213 - case ${ARCH} in
214 - arm|ia64)
215 - ${ddest}/bin/java -client -Xshare:dump || die
216 - ;;
217 - x86)
218 - ${ddest}/bin/java -client -Xshare:dump || die
219 - # limit heap size for large memory on x86 #467518
220 - # this is a workaround and shouldn't be needed.
221 - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
222 - ;;
223 - *)
224 - ${ddest}/bin/java -server -Xshare:dump || die
225 - ;;
226 - esac
227 -
228 - # Remove empty dirs we might have copied.
229 - find "${D}" -type d -empty -exec rmdir -v {} + || die
230 -
231 - java-vm_install-env "${FILESDIR}"/${PN}.env.sh
232 - java-vm_revdep-mask
233 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
234 -}
235 -
236 -pkg_preinst() {
237 - gnome2_icon_savelist
238 -}
239 -
240 -pkg_postinst() {
241 - gnome2_icon_cache_update
242 - java-vm-2_pkg_postinst
243 -
244 - if ! use headless-awt && ! use javafx ; then
245 - ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
246 - ewarn "require this and they may fail with a confusing error message."
247 - fi
248 -}
249 -
250 -pkg_postrm() {
251 - gnome2_icon_cache_update
252 - java-vm-2_pkg_postrm
253 -}