1 |
commit: 97e55f96f87bbdf4e6bb32fe415de38bdbd0400a |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 02:06:37 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 02:06:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e55f96 |
7 |
|
8 |
dev-java/openjdk-jre-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-jre-bin/Manifest | 2 - |
14 |
.../openjdk-jre-bin-11.0.8_p10-r1.ebuild | 97 ---------------------- |
15 |
.../openjdk-jre-bin-8.265_p01.ebuild | 80 ------------------ |
16 |
3 files changed, 179 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest |
19 |
index 9b50b644b82..372a3c00dc4 100644 |
20 |
--- a/dev-java/openjdk-jre-bin/Manifest |
21 |
+++ b/dev-java/openjdk-jre-bin/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0 |
24 |
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz 43086814 BLAKE2B 20785b5edb3fbfae99c7cdc76fba964a7a00eb148e68125138281c0995d6a82cfe9924c7f653dd188ab97da41135004546ec822bfa845f599135c8a9ec5e9336 SHA512 b0c53febc2628b91763cd5304cce782adaa71ff466c4dd9d056c7f1ac18e8f1f4ad2fc355882b2990fbd71e7792134697bcd1204eb9e03c12cf3b287ac33c3f0 |
25 |
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095 |
26 |
DIST OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz 42139854 BLAKE2B 52e7a594aab1a70d351daf9dc42598b4952894a9a72ed996e261e347eece4337fe95c5f63850a0dde2d8862045d22ef41832a6af51df5113b81713bab20c797e SHA512 2fd45a9b967e96309c79724fea047d7c35f31da8e0290bd5cdafeea47b83941b9269129d0d557ee488526c0667ba581dee860381fc344374971e1005105db376 |
27 |
|
28 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index a6aade59d9e..00000000000 |
31 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,97 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit java-vm-2 |
40 |
- |
41 |
-abi_uri() { |
42 |
- echo "${2-$1}? ( |
43 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
44 |
- )" |
45 |
-} |
46 |
- |
47 |
-MY_PV=${PV/_p/+} |
48 |
-SLOT=${MY_PV%%[.+]*} |
49 |
- |
50 |
-SRC_URI=" |
51 |
- $(abi_uri x64 amd64) |
52 |
-" |
53 |
- |
54 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
55 |
-HOMEPAGE="https://adoptopenjdk.net" |
56 |
-LICENSE="GPL-2-with-classpath-exception" |
57 |
-KEYWORDS="~amd64" |
58 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux" |
59 |
- |
60 |
-RDEPEND=" |
61 |
- media-libs/fontconfig:1.0 |
62 |
- media-libs/freetype:2 |
63 |
- >net-libs/libnet-1.1 |
64 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
65 |
- >=sys-libs/glibc-2.2.5:* |
66 |
- sys-libs/zlib |
67 |
- alsa? ( media-libs/alsa-lib ) |
68 |
- cups? ( net-print/cups ) |
69 |
- selinux? ( sec-policy/selinux-java ) |
70 |
- !headless-awt? ( |
71 |
- x11-libs/libX11 |
72 |
- x11-libs/libXext |
73 |
- x11-libs/libXi |
74 |
- x11-libs/libXrender |
75 |
- x11-libs/libXtst |
76 |
- )" |
77 |
- |
78 |
-RESTRICT="preserve-libs splitdebug" |
79 |
-QA_PREBUILT="*" |
80 |
- |
81 |
-S="${WORKDIR}/jdk-${MY_PV}-jre" |
82 |
- |
83 |
-src_install() { |
84 |
- local dest="/opt/${P}" |
85 |
- local ddest="${ED%/}/${dest#/}" |
86 |
- |
87 |
- # Not sure why they bundle this as it's commonly available and they |
88 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
89 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
90 |
- rm -vf lib/libfreetype.so || die |
91 |
- |
92 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
93 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
94 |
- if ! use alsa ; then |
95 |
- rm -v lib/libjsound.* || die |
96 |
- fi |
97 |
- |
98 |
- if use headless-awt ; then |
99 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
100 |
- fi |
101 |
- |
102 |
- rm -v lib/security/cacerts || die |
103 |
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
104 |
- |
105 |
- dodir "${dest}" |
106 |
- cp -pPR * "${ddest}" || die |
107 |
- |
108 |
- # provide stable symlink |
109 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
110 |
- |
111 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
112 |
- java-vm_set-pax-markings "${ddest}" |
113 |
- java-vm_revdep-mask |
114 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
115 |
-} |
116 |
- |
117 |
-pkg_postinst() { |
118 |
- java-vm-2_pkg_postinst |
119 |
- |
120 |
- if use gentoo-vm ; then |
121 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" |
122 |
- ewarn "recognised by the system. This will almost certainly break things." |
123 |
- else |
124 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" |
125 |
- ewarn "will not be recognised by the system. For example, simply calling" |
126 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
127 |
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its" |
128 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
129 |
- fi |
130 |
-} |
131 |
|
132 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild |
133 |
deleted file mode 100644 |
134 |
index 16aae21f0a4..00000000000 |
135 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,80 +0,0 @@ |
138 |
-# Copyright 1999-2020 Gentoo Authors |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
- |
141 |
-EAPI=6 |
142 |
- |
143 |
-inherit eapi7-ver java-vm-2 |
144 |
- |
145 |
-abi_uri() { |
146 |
- echo "${2-$1}? ( |
147 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz |
148 |
- )" |
149 |
-} |
150 |
- |
151 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
152 |
-SLOT="$(ver_cut 1)" |
153 |
- |
154 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
155 |
-HOMEPAGE="https://adoptopenjdk.net" |
156 |
-SRC_URI=" |
157 |
- $(abi_uri x64 amd64) |
158 |
-" |
159 |
- |
160 |
-LICENSE="GPL-2-with-classpath-exception" |
161 |
-KEYWORDS="amd64" |
162 |
- |
163 |
-IUSE="alsa cups headless-awt selinux" |
164 |
- |
165 |
-RDEPEND=" |
166 |
- media-libs/fontconfig:1.0 |
167 |
- media-libs/freetype:2 |
168 |
- >net-libs/libnet-1.1 |
169 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
170 |
- >=sys-libs/glibc-2.2.5:* |
171 |
- sys-libs/zlib |
172 |
- alsa? ( media-libs/alsa-lib ) |
173 |
- cups? ( net-print/cups ) |
174 |
- selinux? ( sec-policy/selinux-java ) |
175 |
- !headless-awt? ( |
176 |
- x11-libs/libX11 |
177 |
- x11-libs/libXext |
178 |
- x11-libs/libXi |
179 |
- x11-libs/libXrender |
180 |
- x11-libs/libXtst |
181 |
- )" |
182 |
- |
183 |
-RESTRICT="preserve-libs splitdebug" |
184 |
-QA_PREBUILT="*" |
185 |
- |
186 |
-S="${WORKDIR}/jdk${MY_PV}-jre" |
187 |
- |
188 |
-src_install() { |
189 |
- local dest="/opt/${P}" |
190 |
- local ddest="${ED%/}/${dest#/}" |
191 |
- |
192 |
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die |
193 |
- |
194 |
- # this does not exist on arm64 hence -f |
195 |
- rm -fv lib/*/libfreetype.so* || die |
196 |
- |
197 |
- if ! use alsa ; then |
198 |
- rm -v lib/*/libjsoundalsa.so* || die |
199 |
- fi |
200 |
- |
201 |
- if use headless-awt ; then |
202 |
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \ |
203 |
- bin/policytool || die |
204 |
- fi |
205 |
- |
206 |
- rm -v lib/security/cacerts || die |
207 |
- dosym ../../../../../etc/ssl/certs/java/cacerts \ |
208 |
- "${dest}"/lib/security/cacerts |
209 |
- |
210 |
- dodir "${dest}" |
211 |
- cp -pPR * "${ddest}" || die |
212 |
- |
213 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
214 |
- java-vm_set-pax-markings "${ddest}" |
215 |
- java-vm_revdep-mask |
216 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
217 |
-} |