1 |
chewi 15/06/28 22:58:52 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: icedtea-bin-6.1.13.7-r1.ebuild |
5 |
icedtea-bin-7.2.5.5-r1.ebuild |
6 |
Removed: icedtea-bin-7.2.5.3.ebuild |
7 |
icedtea-bin-6.1.13.5.ebuild |
8 |
Log: |
9 |
Remove vulnerable versions wrt bug #537940. Restore PAX marking |
10 |
because previous assertion that this is no longer required was |
11 |
wrong. The latest tarballs have legacy markings when they shouldn't |
12 |
but this shouldn't do any harm and they'll be removed next |
13 |
time. Closes bug #552100. |
14 |
|
15 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4) |
16 |
|
17 |
Revision Changes Path |
18 |
1.85 dev-java/icedtea-bin/ChangeLog |
19 |
|
20 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.85&view=markup |
21 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.85&content-type=text/plain |
22 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.84&r2=1.85 |
23 |
|
24 |
Index: ChangeLog |
25 |
=================================================================== |
26 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v |
27 |
retrieving revision 1.84 |
28 |
retrieving revision 1.85 |
29 |
diff -u -r1.84 -r1.85 |
30 |
--- ChangeLog 24 Jun 2015 10:55:27 -0000 1.84 |
31 |
+++ ChangeLog 28 Jun 2015 22:58:52 -0000 1.85 |
32 |
@@ -1,6 +1,18 @@ |
33 |
# ChangeLog for dev-java/icedtea-bin |
34 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
35 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.84 2015/06/24 10:55:27 ago Exp $ |
36 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.85 2015/06/28 22:58:52 chewi Exp $ |
37 |
+ |
38 |
+*icedtea-bin-6.1.13.7-r1 (28 Jun 2015) |
39 |
+*icedtea-bin-7.2.5.5-r1 (28 Jun 2015) |
40 |
+ |
41 |
+ 28 Jun 2015; James Le Cuirot <chewi@g.o> |
42 |
+ +icedtea-bin-6.1.13.7-r1.ebuild, +icedtea-bin-7.2.5.5-r1.ebuild, |
43 |
+ -files/fontconfig.Gentoo.properties.src, -icedtea-bin-6.1.13.5.ebuild, |
44 |
+ -icedtea-bin-7.2.5.3.ebuild: |
45 |
+ Remove vulnerable versions wrt bug #537940. Restore PAX marking because |
46 |
+ previous assertion that this is no longer required was wrong. The latest |
47 |
+ tarballs have legacy markings when they shouldn't but this shouldn't do any |
48 |
+ harm and they'll be removed next time. Closes bug #552100. |
49 |
|
50 |
24 Jun 2015; Agostino Sarubbo <ago@g.o> icedtea-bin-6.1.13.7.ebuild, |
51 |
icedtea-bin-7.2.5.5.ebuild: |
52 |
|
53 |
|
54 |
|
55 |
1.1 dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild |
56 |
|
57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild?rev=1.1&view=markup |
58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild?rev=1.1&content-type=text/plain |
59 |
|
60 |
Index: icedtea-bin-6.1.13.7-r1.ebuild |
61 |
=================================================================== |
62 |
# Copyright 1999-2015 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild,v 1.1 2015/06/28 22:58:52 chewi Exp $ |
65 |
|
66 |
EAPI="5" |
67 |
|
68 |
inherit java-vm-2 prefix versionator |
69 |
|
70 |
dist="http://dev.gentoo.org/~chewi/distfiles" |
71 |
TARBALL_VERSION="${PV}" |
72 |
|
73 |
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" |
74 |
HOMEPAGE="http://icedtea.classpath.org" |
75 |
SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz ) |
76 |
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )" |
77 |
|
78 |
for arch in amd64 ppc x86; do |
79 |
SRC_URI+=" |
80 |
${arch}? ( |
81 |
${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz |
82 |
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz ) |
83 |
)" |
84 |
done |
85 |
|
86 |
LICENSE="GPL-2-with-linking-exception" |
87 |
SLOT="6" |
88 |
KEYWORDS="-* ~amd64 ~ppc ~x86" |
89 |
|
90 |
IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart" |
91 |
REQUIRED_USE="nsplugin? ( X )" |
92 |
RESTRICT="strip" |
93 |
|
94 |
# 423161 |
95 |
QA_PREBUILT="opt/.*" |
96 |
|
97 |
ALSA_COMMON_DEP=" |
98 |
>=media-libs/alsa-lib-1.0" |
99 |
CUPS_COMMON_DEP=" |
100 |
>=net-print/cups-2.0" |
101 |
X_COMMON_DEP=" |
102 |
>=media-libs/freetype-2.5:2 |
103 |
>=x11-libs/gtk+-2.24:2 |
104 |
>=x11-libs/libX11-1.6 |
105 |
>=x11-libs/libXext-1.3 |
106 |
>=x11-libs/libXi-1.7 |
107 |
>=x11-libs/libXrender-0.9.4 |
108 |
>=x11-libs/libXtst-1.2" |
109 |
|
110 |
COMMON_DEP=" |
111 |
>=media-libs/giflib-4.1.6-r1 |
112 |
>=media-libs/lcms-2.6:2 |
113 |
media-libs/libpng:0/16 |
114 |
>=sys-devel/gcc-4.8.4 |
115 |
>=sys-libs/glibc-2.20 |
116 |
>=sys-libs/zlib-1.2.3-r1 |
117 |
virtual/jpeg:62" |
118 |
|
119 |
RDEPEND="${COMMON_DEP} |
120 |
X? ( |
121 |
${X_COMMON_DEP} |
122 |
media-fonts/dejavu |
123 |
cjk? ( |
124 |
media-fonts/arphicfonts |
125 |
media-fonts/baekmuk-fonts |
126 |
media-fonts/lklug |
127 |
media-fonts/lohit-fonts |
128 |
media-fonts/sazanami |
129 |
) |
130 |
) |
131 |
alsa? ( ${ALSA_COMMON_DEP} ) |
132 |
cups? ( ${CUPS_COMMON_DEP} ) |
133 |
selinux? ( sec-policy/selinux-java )" |
134 |
|
135 |
PDEPEND="webstart? ( dev-java/icedtea-web:0 ) |
136 |
nsplugin? ( dev-java/icedtea-web:0[nsplugin] )" |
137 |
|
138 |
src_prepare() { |
139 |
# Ensures HeadlessGraphicsEnvironment is used. |
140 |
if ! use X; then |
141 |
rm -r jre/lib/$(get_system_arch)/xawt || die |
142 |
fi |
143 |
|
144 |
# Reprefixify because prefix may be different. |
145 |
sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die |
146 |
eprefixify jre/lib/fontconfig.Gentoo.properties |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
local dest="/opt/${P}" |
151 |
local ddest="${ED}${dest#/}" |
152 |
dodir "${dest}" |
153 |
|
154 |
# doins doesn't preserve executable bits. |
155 |
cp -pRP bin include jre lib man "${ddest}" || die |
156 |
|
157 |
dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} |
158 |
use doc && dodoc -r doc/html |
159 |
|
160 |
if use examples; then |
161 |
cp -pRP demo sample "${ddest}" || die |
162 |
fi |
163 |
|
164 |
if use source; then |
165 |
cp src.zip "${ddest}" || die |
166 |
fi |
167 |
|
168 |
if use webstart || use nsplugin; then |
169 |
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings" |
170 |
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings" |
171 |
fi |
172 |
if use webstart; then |
173 |
dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws" |
174 |
dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws" |
175 |
fi |
176 |
|
177 |
# Both icedtea itself and the icedtea ebuild set PAX markings but we |
178 |
# disable them for the icedtea-bin build because the line below will |
179 |
# respect end-user settings when icedtea-bin is actually installed. |
180 |
java-vm_set-pax-markings "${ddest}" |
181 |
|
182 |
set_java_env |
183 |
java-vm_revdep-mask "${dest}" |
184 |
java-vm_sandbox-predict /proc/self/coredump_filter |
185 |
} |
186 |
|
187 |
pkg_preinst() { |
188 |
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then |
189 |
# portage would preserve the symlink otherwise, related to bug #384397 |
190 |
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin" |
191 |
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*" |
192 |
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4" |
193 |
elog "If you had icedtea6-bin as system VM, the change should be automatic, however" |
194 |
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" |
195 |
elog "and the same holds for any user VM settings. Sorry for the inconvenience." |
196 |
fi |
197 |
} |
198 |
|
199 |
pkg_postinst() { |
200 |
if use nsplugin; then |
201 |
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then |
202 |
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package" |
203 |
elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below" |
204 |
elog "The switch should complete properly during the subsequent installation of icedtea-web" |
205 |
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'" |
206 |
fi |
207 |
fi |
208 |
|
209 |
# Set as default VM if none exists |
210 |
java-vm-2_pkg_postinst |
211 |
} |
212 |
|
213 |
|
214 |
|
215 |
1.1 dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild |
216 |
|
217 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild?rev=1.1&view=markup |
218 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild?rev=1.1&content-type=text/plain |
219 |
|
220 |
Index: icedtea-bin-7.2.5.5-r1.ebuild |
221 |
=================================================================== |
222 |
# Copyright 1999-2015 Gentoo Foundation |
223 |
# Distributed under the terms of the GNU General Public License v2 |
224 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild,v 1.1 2015/06/28 22:58:52 chewi Exp $ |
225 |
|
226 |
EAPI="5" |
227 |
|
228 |
inherit java-vm-2 multilib prefix toolchain-funcs versionator |
229 |
|
230 |
dist="http://dev.gentoo.org/~chewi/distfiles" |
231 |
TARBALL_VERSION="${PV}" |
232 |
|
233 |
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" |
234 |
HOMEPAGE="http://icedtea.classpath.org" |
235 |
SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz ) |
236 |
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )" |
237 |
|
238 |
for arch in amd64 arm ppc x86; do |
239 |
SRC_URI+=" |
240 |
${arch}? ( |
241 |
${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz |
242 |
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz ) |
243 |
)" |
244 |
done |
245 |
|
246 |
LICENSE="GPL-2-with-linking-exception" |
247 |
SLOT="7" |
248 |
KEYWORDS="-* ~amd64 ~arm ~ppc ~x86" |
249 |
|
250 |
IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart" |
251 |
REQUIRED_USE="nsplugin? ( X )" |
252 |
RESTRICT="strip" |
253 |
|
254 |
# 423161 |
255 |
QA_PREBUILT="opt/.*" |
256 |
|
257 |
ALSA_COMMON_DEP=" |
258 |
>=media-libs/alsa-lib-1.0" |
259 |
CUPS_COMMON_DEP=" |
260 |
>=net-print/cups-2.0" |
261 |
X_COMMON_DEP=" |
262 |
>=dev-libs/atk-2.12 |
263 |
>=dev-libs/glib-2.40:2 |
264 |
>=media-libs/fontconfig-2.11:1.0 |
265 |
>=media-libs/freetype-2.5.3:2 |
266 |
>=x11-libs/cairo-1.12 |
267 |
x11-libs/gdk-pixbuf:2 |
268 |
>=x11-libs/gtk+-2.24:2 |
269 |
>=x11-libs/libX11-1.6 |
270 |
>=x11-libs/libXext-1.3 |
271 |
>=x11-libs/libXi-1.7 |
272 |
>=x11-libs/libXrender-0.9.4 |
273 |
>=x11-libs/libXtst-1.2 |
274 |
>=x11-libs/pango-1.36" |
275 |
|
276 |
COMMON_DEP=" |
277 |
>=media-libs/giflib-4.1.6-r1 |
278 |
>=media-libs/lcms-2.6:2 |
279 |
media-libs/libpng:0/16 |
280 |
>=sys-devel/gcc-4.8.4 |
281 |
>=sys-libs/glibc-2.20 |
282 |
>=sys-libs/zlib-1.2.3-r1 |
283 |
virtual/jpeg:62" |
284 |
|
285 |
# cups is needed for X. #390945 #390975 |
286 |
# gsettings-desktop-schemas is needed for native proxy support. #431972 |
287 |
RDEPEND="${COMMON_DEP} |
288 |
X? ( |
289 |
${CUPS_COMMON_DEP} |
290 |
${X_COMMON_DEP} |
291 |
media-fonts/dejavu |
292 |
cjk? ( |
293 |
media-fonts/arphicfonts |
294 |
media-fonts/baekmuk-fonts |
295 |
media-fonts/lklug |
296 |
media-fonts/lohit-fonts |
297 |
media-fonts/sazanami |
298 |
) |
299 |
) |
300 |
alsa? ( ${ALSA_COMMON_DEP} ) |
301 |
cups? ( ${CUPS_COMMON_DEP} ) |
302 |
selinux? ( sec-policy/selinux-java ) |
303 |
>=gnome-base/gsettings-desktop-schemas-3.12.2" |
304 |
|
305 |
DEPEND="!arm? ( dev-util/patchelf )" |
306 |
|
307 |
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) |
308 |
nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) |
309 |
pulseaudio? ( dev-java/icedtea-sound )" |
310 |
|
311 |
pkg_pretend() { |
312 |
if [[ "$(tc-is-softfloat)" != "no" ]]; then |
313 |
die "These binaries require a hardfloat system." |
314 |
fi |
315 |
} |
316 |
|
317 |
src_prepare() { |
318 |
# Ensures HeadlessGraphicsEnvironment is used. |
319 |
if ! use X; then |
320 |
rm -r jre/lib/$(get_system_arch)/xawt || die |
321 |
fi |
322 |
|
323 |
# Reprefixify because prefix may be different. |
324 |
sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die |
325 |
eprefixify jre/lib/fontconfig.Gentoo.properties |
326 |
|
327 |
# Fix the RPATHs, except on arm. |
328 |
# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3 |
329 |
# https://github.com/NixOS/patchelf/issues/8 |
330 |
if use arm; then |
331 |
ewarn "The RPATHs on these binaries are normally modified to avoid" |
332 |
ewarn "conflicts with an icedtea installation built from source. This" |
333 |
ewarn "is currently not possible on ARM so please refrain from" |
334 |
ewarn "installing dev-java/icedtea on the same system." |
335 |
else |
336 |
local old="/usr/$(get_libdir)/icedtea${SLOT}" |
337 |
local new="${EPREFIX}/opt/${P}" |
338 |
local elf rpath |
339 |
|
340 |
for elf in $(find -type f -executable ! -name "*.cgi" || die); do |
341 |
rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}") |
342 |
|
343 |
if [[ -n "${rpath}" ]]; then |
344 |
patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}" |
345 |
fi |
346 |
done |
347 |
fi |
348 |
} |
349 |
|
350 |
src_install() { |
351 |
local dest="/opt/${P}" |
352 |
local ddest="${ED}${dest#/}" |
353 |
dodir "${dest}" |
354 |
|
355 |
# doins doesn't preserve executable bits. |
356 |
cp -pRP bin include jre lib man "${ddest}" || die |
357 |
|
358 |
dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} |
359 |
use doc && dodoc -r doc/html |
360 |
|
361 |
if use examples; then |
362 |
cp -pRP demo sample "${ddest}" || die |
363 |
fi |
364 |
|
365 |
if use source; then |
366 |
cp src.zip "${ddest}" || die |
367 |
fi |
368 |
|
369 |
if use webstart || use nsplugin; then |
370 |
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings" |
371 |
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings" |
372 |
fi |
373 |
if use webstart; then |
374 |
dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws" |
375 |
dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws" |
376 |
fi |
377 |
|
378 |
# Both icedtea itself and the icedtea ebuild set PAX markings but we |
379 |
# disable them for the icedtea-bin build because the line below will |
380 |
# respect end-user settings when icedtea-bin is actually installed. |
381 |
java-vm_set-pax-markings "${ddest}" |
382 |
|
383 |
set_java_env |
384 |
java-vm_revdep-mask "${dest}" |
385 |
java-vm_sandbox-predict /proc/self/coredump_filter |
386 |
} |
387 |
|
388 |
pkg_postinst() { |
389 |
if use nsplugin; then |
390 |
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then |
391 |
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package" |
392 |
elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below" |
393 |
elog "The switch should complete properly during the subsequent installation of icedtea-web" |
394 |
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'" |
395 |
fi |
396 |
fi |
397 |
|
398 |
# Set as default VM if none exists |
399 |
java-vm-2_pkg_postinst |
400 |
} |