1 |
commit: 7ecd914505ef48c284cb9566a33e30c55aa08434 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 02:06:06 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 02:06:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ecd9145 |
7 |
|
8 |
dev-java/openjdk-bin: drop vulnerable |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjdk-bin/Manifest | 8 -- |
14 |
dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild | 111 --------------------- |
15 |
dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild | 92 ----------------- |
16 |
3 files changed, 211 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
19 |
index facc3b068f2..58d0618e809 100644 |
20 |
--- a/dev-java/openjdk-bin/Manifest |
21 |
+++ b/dev-java/openjdk-bin/Manifest |
22 |
@@ -1,16 +1,8 @@ |
23 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.8_10.tar.gz 190206674 BLAKE2B 1e5ac030b23cdcd16e9efb696bf4f22da1178234241c4951b36d19e9567c8e838e99311be0aafe336b92cd5cecd2a53bb4dcfdd40f7ad13a26abaf41dddc5cbc SHA512 e81cc6a0d3aa3afdf021b8a5c39fc821827eba3010c437d97ad219336749b15cbb057bc92b129b0899da104066003554065e5591a6fda622b9852db2ad895237 |
24 |
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz 190728488 BLAKE2B beda483e90e733932ca9cf9631ae3f97b7106fd3c80b4a70465f9d32d52bf2ba4f395fa5ad7b08a4998e5c72f3794e0189750a883422aaeaf42877750d7c4647 SHA512 a9fbd1336357bf7880e6eebaab9649ca2b5db5ea93bb184e9fa682d64f18bfa0addb87de5a04e13bc337536b2edce5189bba703c8eb3a524567073add6d29a95 |
25 |
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.8_10.tar.gz 182327847 BLAKE2B ad71bfd979f27ffd05abea804069402a7a47906cff70cbe68c29a8185d97043e4e28471d6444af757955c9be5d73d8d17f3f73120b8d2997dc5fb5b21f9045dc SHA512 32843b32d89125da14c8e77509e4dfb86b1aae55407edabb52a592a29ecb3ba17d300b91751f937189f370edfd57d60fa622cb9da2a9e190f35b219d0cd58774 |
26 |
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz 182835103 BLAKE2B 2b8849c5b9f490bf7700317525d3538ace19abcd73436a5c27251a282348345dba3c438c062ee60a2070f64c8c8e93a5d5d632a44f410775ed4fff1d691219f8 SHA512 707efc9d0660f0c06d4955e56761422b9da41b5afacfa337711c6a2500441f80fad1c65d8a4b0a1334ec6d5c6e55d464fc1cff1ade21e8cca42cffd0c161c1e2 |
27 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.8_10.tar.gz 176566452 BLAKE2B 584adc02d816cda72e5396d9e2a34768fe9c1ad3f6b37ad4b599ee45ee008389d7bec93ca983aec3e91995fa05548137f4ecb5c84b524333e0c7a35c5fc917ec SHA512 ab7768556488f0d13c3868e65ee22bedfaffc904d2b6af6d1c0ad48a382c2bc761dce99bd3a196e4ddd2a67f56019774a84edeab7db3e9e4650ef020f0d2e0a5 |
28 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890 |
29 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz 193398310 BLAKE2B 079f48381bf58edb7b9b75f4305df72184710c90101588fccce4edb0535b976b2f6332b66fdd8cf8b442eebbeee5a6044e0445519f9bbd8ed20b02f50e9fc203 SHA512 115b5627d6d1245f8393e3cd869bdb7accb42c35bc0e9030fb60701f61253ea8ce382edec75ded85ff5b0a0c8bbfbecdec81b16aef87fb6fc76c684628abf1e5 |
30 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727 |
31 |
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz 103150208 BLAKE2B 70880514e63402b740554cde3eba80106e2494d354751a620e54cde0376cebbf1ca5c2b10b0c340f59d9d1f390791c07ba39b13e72c938872e2a8b102b608f34 SHA512 37d9efe9c087dae9c180ee47e9f4f010e7726f4578edb5638d40ab4aea450912e3fa5e1d9254f6290779f43ffb5b0c6d1e3e9ac42c889b0c50072645deadbddb |
32 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4 |
33 |
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz 97641656 BLAKE2B 76d24e975c2ec173b6b4806d145f79d02828e12e2dd412b60a921648fba20920b3b69b03630ece8d5cefeaf408dad01573b15db7f4a7bbdd024806a7b01bd6ae SHA512 8f96d73038579d2873b84d19bfbcc7f481b031a91c35d86d35e127951b6c743a6a1d5230a61ebcacddf854b73c55b18cc53112b9a2759b283254bf93fd691459 |
34 |
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6 |
35 |
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz 100453105 BLAKE2B e57230d5f90821cb8f4c35baf0e5a9580164ad7df10ac67a528b959154317ea14b7bc0dd5c530a2b826ab6322611ddf2387617bc8dd1f444039b00a778a30025 SHA512 6de5694d0415e905848cc99ec6863e96640fca3ded4e851528c794dad82a0961e097f64f8338304d9325357729ae9ea5bc5d2eceecefebdad69a14bc7b50194a |
36 |
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3 |
37 |
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz 103157351 BLAKE2B efd8a4bcab5472c9775997713b09ab9e94ef4636564f07392263d6963850e07dc07569b2c066856846c16229f1641c169eecedcbb61533067af330262f07b927 SHA512 932fe2702aa3575bcb08d01e384fbd6a49768280931fdc1fb56314656343dc2f8e5b2650c8d72369d0294ac6024df0a142fd14cb0768f9aa7831aa986679e9ae |
38 |
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555 |
39 |
|
40 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild |
41 |
deleted file mode 100644 |
42 |
index 94b04394047..00000000000 |
43 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,111 +0,0 @@ |
46 |
-# Copyright 1999-2020 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=6 |
50 |
- |
51 |
-inherit java-vm-2 toolchain-funcs |
52 |
- |
53 |
-abi_uri() { |
54 |
- echo "${2-$1}? ( |
55 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
56 |
- )" |
57 |
-} |
58 |
- |
59 |
-MY_PV=${PV/_p/+} |
60 |
-SLOT=${MY_PV%%[.+]*} |
61 |
- |
62 |
-SRC_URI=" |
63 |
- $(abi_uri arm) |
64 |
- $(abi_uri aarch64 arm64) |
65 |
- $(abi_uri ppc64le ppc64) |
66 |
- $(abi_uri x64 amd64) |
67 |
-" |
68 |
- |
69 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
70 |
-HOMEPAGE="https://adoptopenjdk.net" |
71 |
-LICENSE="GPL-2-with-classpath-exception" |
72 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
73 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux source" |
74 |
- |
75 |
-RDEPEND=" |
76 |
- media-libs/fontconfig:1.0 |
77 |
- media-libs/freetype:2 |
78 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
79 |
- >=sys-libs/glibc-2.2.5:* |
80 |
- sys-libs/zlib |
81 |
- alsa? ( media-libs/alsa-lib ) |
82 |
- cups? ( net-print/cups ) |
83 |
- selinux? ( sec-policy/selinux-java ) |
84 |
- !headless-awt? ( |
85 |
- x11-libs/libX11 |
86 |
- x11-libs/libXext |
87 |
- x11-libs/libXi |
88 |
- x11-libs/libXrender |
89 |
- x11-libs/libXtst |
90 |
- )" |
91 |
- |
92 |
-RESTRICT="preserve-libs splitdebug" |
93 |
-QA_PREBUILT="*" |
94 |
- |
95 |
-S="${WORKDIR}/jdk-${MY_PV}" |
96 |
- |
97 |
-pkg_pretend() { |
98 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
99 |
- die "These binaries require a hardfloat system." |
100 |
- fi |
101 |
-} |
102 |
- |
103 |
-src_install() { |
104 |
- local dest="/opt/${P}" |
105 |
- local ddest="${ED%/}/${dest#/}" |
106 |
- |
107 |
- # Not sure why they bundle this as it's commonly available and they |
108 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
109 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
110 |
- rm -vf lib/libfreetype.so || die |
111 |
- |
112 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
113 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
114 |
- if ! use alsa ; then |
115 |
- rm -v lib/libjsound.* || die |
116 |
- fi |
117 |
- |
118 |
- if use headless-awt ; then |
119 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
120 |
- fi |
121 |
- |
122 |
- if ! use source ; then |
123 |
- rm -v lib/src.zip || die |
124 |
- fi |
125 |
- |
126 |
- rm -v lib/security/cacerts || die |
127 |
- dosym ../../../../etc/ssl/certs/java/cacerts \ |
128 |
- "${dest}"/lib/security/cacerts |
129 |
- |
130 |
- dodir "${dest}" |
131 |
- cp -pPR * "${ddest}" || die |
132 |
- |
133 |
- # provide stable symlink |
134 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
135 |
- |
136 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
137 |
- java-vm_set-pax-markings "${ddest}" |
138 |
- java-vm_revdep-mask |
139 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
140 |
-} |
141 |
- |
142 |
-pkg_postinst() { |
143 |
- java-vm-2_pkg_postinst |
144 |
- |
145 |
- if use gentoo-vm ; then |
146 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
147 |
- ewarn "recognised by the system. This will almost certainly break" |
148 |
- ewarn "many java ebuilds as they are not ready for openjdk-11" |
149 |
- else |
150 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
151 |
- ewarn "will not be recognised by the system. For example, simply calling" |
152 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
153 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
154 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
155 |
- fi |
156 |
-} |
157 |
|
158 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild |
159 |
deleted file mode 100644 |
160 |
index 04cf2523582..00000000000 |
161 |
--- a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild |
162 |
+++ /dev/null |
163 |
@@ -1,92 +0,0 @@ |
164 |
-# Copyright 1999-2020 Gentoo Authors |
165 |
-# Distributed under the terms of the GNU General Public License v2 |
166 |
- |
167 |
-EAPI=6 |
168 |
- |
169 |
-inherit eapi7-ver java-vm-2 |
170 |
- |
171 |
-abi_uri() { |
172 |
- echo "${2-$1}? ( |
173 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz |
174 |
- )" |
175 |
-} |
176 |
- |
177 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
178 |
-SLOT="$(ver_cut 1)" |
179 |
- |
180 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
181 |
-HOMEPAGE="https://adoptopenjdk.net" |
182 |
-SRC_URI=" |
183 |
- $(abi_uri aarch64 arm64) |
184 |
- $(abi_uri arm) |
185 |
- $(abi_uri ppc64le ppc64) |
186 |
- $(abi_uri x64 amd64) |
187 |
-" |
188 |
- |
189 |
-LICENSE="GPL-2-with-classpath-exception" |
190 |
-KEYWORDS="amd64 ~arm arm64 ppc64" |
191 |
- |
192 |
-IUSE="alsa cups examples headless-awt selinux source" |
193 |
- |
194 |
-RDEPEND=" |
195 |
- media-libs/fontconfig:1.0 |
196 |
- media-libs/freetype:2 |
197 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
198 |
- >=sys-libs/glibc-2.2.5:* |
199 |
- sys-libs/zlib |
200 |
- alsa? ( media-libs/alsa-lib ) |
201 |
- arm? ( dev-libs/libffi-compat:6 ) |
202 |
- cups? ( net-print/cups ) |
203 |
- selinux? ( sec-policy/selinux-java ) |
204 |
- !headless-awt? ( |
205 |
- x11-libs/libX11 |
206 |
- x11-libs/libXext |
207 |
- x11-libs/libXi |
208 |
- x11-libs/libXrender |
209 |
- x11-libs/libXtst |
210 |
- ) |
211 |
-" |
212 |
- |
213 |
-RESTRICT="preserve-libs strip" |
214 |
-QA_PREBUILT="*" |
215 |
- |
216 |
-S="${WORKDIR}/jdk${MY_PV}" |
217 |
- |
218 |
-src_install() { |
219 |
- local dest="/opt/${P}" |
220 |
- local ddest="${ED%/}/${dest#/}" |
221 |
- |
222 |
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die |
223 |
- |
224 |
- # this does not exist on arm64 hence -f |
225 |
- rm -fv jre/lib/*/libfreetype.so* || die |
226 |
- |
227 |
- if ! use alsa ; then |
228 |
- rm -v jre/lib/*/libjsoundalsa.so* || die |
229 |
- fi |
230 |
- |
231 |
- if ! use examples ; then |
232 |
- rm -vr sample || die |
233 |
- fi |
234 |
- |
235 |
- if use headless-awt ; then |
236 |
- rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ |
237 |
- {,jre/}bin/policytool bin/appletviewer || die |
238 |
- fi |
239 |
- |
240 |
- if ! use source ; then |
241 |
- rm -v src.zip || die |
242 |
- fi |
243 |
- |
244 |
- rm -v jre/lib/security/cacerts || die |
245 |
- dosym ../../../../../etc/ssl/certs/java/cacerts \ |
246 |
- "${dest}"/jre/lib/security/cacerts |
247 |
- |
248 |
- dodir "${dest}" |
249 |
- cp -pPR * "${ddest}" || die |
250 |
- |
251 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
252 |
- java-vm_set-pax-markings "${ddest}" |
253 |
- java-vm_revdep-mask |
254 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
255 |
-} |