1 |
caster 10/07/30 11:10:04 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: icedtea-6.1.8.1.ebuild |
5 |
Removed: icedtea-6.1.7.3.ebuild icedtea-6.1.7.2-r1.ebuild |
6 |
Log: |
7 |
Security version bump, bug #330205. Remove the older 1.7.x. |
8 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 dev-java/icedtea/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/metadata.xml,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- metadata.xml 4 Mar 2010 23:20:59 -0000 1.1 |
24 |
+++ metadata.xml 30 Jul 2010 11:10:04 -0000 1.2 |
25 |
@@ -17,7 +17,6 @@ |
26 |
<flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag> |
27 |
<flag name="hs16">Use the new version of HotSpot (16).</flag> |
28 |
<flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag> |
29 |
- <flag name="npplugin">Enable the new alpha-quality plugin which works with Firefox 3.6+ and Chromium.</flag> |
30 |
<flag name="nss">Enable NSS security provider support.</flag> |
31 |
<!-- <flag name="shark">Enable Shark JIT support</flag> --> |
32 |
<flag name="systemtap">Enable SystemTap probes in HotSpot.</flag> |
33 |
|
34 |
|
35 |
|
36 |
1.8 dev-java/icedtea/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.8&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.8&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.7&r2=1.8 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v |
45 |
retrieving revision 1.7 |
46 |
retrieving revision 1.8 |
47 |
diff -u -r1.7 -r1.8 |
48 |
--- ChangeLog 3 May 2010 12:32:51 -0000 1.7 |
49 |
+++ ChangeLog 30 Jul 2010 11:10:04 -0000 1.8 |
50 |
@@ -1,6 +1,13 @@ |
51 |
# ChangeLog for dev-java/icedtea |
52 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.7 2010/05/03 12:32:51 caster Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.8 2010/07/30 11:10:04 caster Exp $ |
55 |
+ |
56 |
+*icedtea-6.1.8.1 (30 Jul 2010) |
57 |
+ |
58 |
+ 30 Jul 2010; Vlastimil Babka <caster@g.o> -files/1.7.2-free.patch, |
59 |
+ -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild, |
60 |
+ -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml: |
61 |
+ Security version bump, bug #330205. Remove the older 1.7.x. |
62 |
|
63 |
*icedtea-6.1.7.3 (03 May 2010) |
64 |
|
65 |
|
66 |
|
67 |
|
68 |
1.1 dev-java/icedtea/icedtea-6.1.8.1.ebuild |
69 |
|
70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.1.ebuild?rev=1.1&view=markup |
71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.1.ebuild?rev=1.1&content-type=text/plain |
72 |
|
73 |
Index: icedtea-6.1.8.1.ebuild |
74 |
=================================================================== |
75 |
# Copyright 1999-2010 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.1.ebuild,v 1.1 2010/07/30 11:10:04 caster Exp $ |
78 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
79 |
|
80 |
# ********************************************************* |
81 |
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * |
82 |
# ********************************************************* |
83 |
|
84 |
EAPI="2" |
85 |
|
86 |
inherit pax-utils java-pkg-2 java-vm-2 |
87 |
|
88 |
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" |
89 |
SLOT="6" |
90 |
KEYWORDS="~amd64 ~x86" |
91 |
|
92 |
DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies" |
93 |
ICEDTEA_VER="1.8.1" |
94 |
ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER} |
95 |
OPENJDK_BUILD="18" |
96 |
OPENJDK_DATE="16_feb_2010" |
97 |
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" |
98 |
HOTSPOT_TARBALL="62926c7f67a3.tar.gz" |
99 |
JAXP_TARBALL="jdk6-jaxp-2009_10_13.zip" |
100 |
JAXWS_TARBALL="jdk6-jaxws-2009_10_27.zip" |
101 |
JAF_TARBALL="jdk6-jaf-2009_10_27.zip" |
102 |
CACAO_TARBALL="cacao-0.99.4.tar.gz" |
103 |
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz |
104 |
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} |
105 |
http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL} |
106 |
https://jaxp.dev.java.net/files/documents/913/147329/${JAXP_TARBALL} |
107 |
http://kenai.com/projects/jdk6-drops/downloads/download/${JAXWS_TARBALL} |
108 |
http://kenai.com/projects/jdk6-drops/downloads/download/${JAF_TARBALL} |
109 |
cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )" |
110 |
HOMEPAGE="http://icedtea.classpath.org" |
111 |
S=${WORKDIR}/${ICEDTEA_PKG} |
112 |
|
113 |
# Missing options: |
114 |
# shark - still experimental, requires llvm which is not yet packaged |
115 |
# visualvm - requries netbeans which would cause major bootstrap issues |
116 |
IUSE="cacao debug doc examples +hs16 javascript nio2 nsplugin +nss pulseaudio systemtap +xrender zero" |
117 |
|
118 |
# JTReg doesn't pass at present |
119 |
RESTRICT="test" |
120 |
|
121 |
RDEPEND=">=net-print/cups-1.2.12 |
122 |
>=x11-libs/libX11-1.1.3 |
123 |
>=media-libs/freetype-2.3.5 |
124 |
>=media-libs/alsa-lib-1.0 |
125 |
>=x11-libs/gtk+-2.8 |
126 |
>=x11-libs/libXinerama-1.0.2 |
127 |
>=x11-libs/libXp-1.0.0 |
128 |
>=x11-libs/libXi-1.1.3 |
129 |
>=x11-libs/libXau-1.0.3 |
130 |
>=x11-libs/libXdmcp-1.0.2 |
131 |
>=x11-libs/libXtst-1.0.3 |
132 |
>=media-libs/jpeg-6b |
133 |
>=media-libs/libpng-1.2 |
134 |
>=media-libs/giflib-4.1.6 |
135 |
>=sys-libs/zlib-1.2.3 |
136 |
x11-proto/inputproto |
137 |
x11-proto/xineramaproto |
138 |
nsplugin? ( >=net-libs/xulrunner-1.9.1 ) |
139 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) |
140 |
javascript? ( dev-java/rhino:1.6 ) |
141 |
zero? ( virtual/libffi ) |
142 |
xrender? ( >=x11-libs/libXrender-0.9.4 ) |
143 |
systemtap? ( >=dev-util/systemtap-1 ) |
144 |
!dev-java/icedtea6 |
145 |
nss? ( >=dev-libs/nss-3.12.5-r1 )" |
146 |
|
147 |
# Additional dependencies for building: |
148 |
# zip: extract OpenJDK tarball, and needed by configure |
149 |
# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly) |
150 |
# ant, ecj, jdk: required to build Java code |
151 |
# Only ant-core-1.7.1-r2 and later contain a version of Ant that |
152 |
# properly respects environment variables, if the build |
153 |
# sets some environment variables. |
154 |
# ca-certificates, perl and openssl are used for the cacerts keystore generation |
155 |
# xext headers have two variants depending on version - bug #288855 |
156 |
DEPEND="${RDEPEND} |
157 |
|| ( |
158 |
( >=dev-java/gcj-jdk-4.3 =app-admin/eselect-ecj-0.5-r1 ) |
159 |
( >=dev-java/cacao-0.99.2 =app-admin/eselect-ecj-0.5-r1 ) |
160 |
dev-java/icedtea6-bin |
161 |
dev-java/icedtea:${SLOT} |
162 |
) |
163 |
app-arch/zip |
164 |
>=dev-java/xalan-2.7.0:0 |
165 |
>=dev-java/xerces-2.9.1:2 |
166 |
>=dev-java/ant-core-1.7.1-r2 |
167 |
dev-java/ant-nodeps |
168 |
app-misc/ca-certificates |
169 |
dev-lang/perl |
170 |
dev-libs/openssl |
171 |
|| ( |
172 |
( |
173 |
>=x11-libs/libXext-1.1.1 |
174 |
>=x11-proto/xextproto-7.1.1 |
175 |
x11-proto/xproto |
176 |
) |
177 |
<x11-libs/libXext-1.1.1 |
178 |
) |
179 |
sys-apps/lsb-release" |
180 |
|
181 |
# a bit of hack so the VM switching is triggered without causing dependency troubles |
182 |
JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5" |
183 |
JAVA_PKG_WANT_SOURCE="1.5" |
184 |
JAVA_PKG_WANT_TARGET="1.5" |
185 |
|
186 |
pkg_setup() { |
187 |
# Shark support disabled for now - still experimental and needs sys-devel/llvm |
188 |
# if use shark ; then |
189 |
# if ( ! use x86 && ! use sparc && ! use ppc ) ; then |
190 |
# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild" |
191 |
# errror "without the shark USE flag turned on." |
192 |
# die "Rebuild without the shark USE flag on." |
193 |
# fi |
194 |
# if ( ! use zero ) ; then |
195 |
# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port."; |
196 |
# die "Rebuild without the shark USE flag on or with the zero USE flag turned on." |
197 |
# fi |
198 |
# fi |
199 |
|
200 |
# quite a hack since java-config does not provide a way for a package |
201 |
# to limit supported VM's for building and their preferred order |
202 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
203 |
einfo "Honoring user-set JAVA_PKG_FORCE_VM" |
204 |
elif has_version "dev-java/icedtea:${SLOT}"; then |
205 |
JAVA_PKG_FORCE_VM="icedtea6" |
206 |
elif has_version dev-java/icedtea6; then |
207 |
JAVA_PKG_FORCE_VM="icedtea6" |
208 |
elif has_version dev-java/icedtea6-bin; then |
209 |
JAVA_PKG_FORCE_VM="icedtea6-bin" |
210 |
elif has_version dev-java/gcj-jdk; then |
211 |
JAVA_PKG_FORCE_VM="gcj-jdk" |
212 |
elif has_version dev-java/cacao; then |
213 |
JAVA_PKG_FORCE_VM="cacao" |
214 |
else |
215 |
JAVA_PKG_FORCE_VM="" |
216 |
# don't die just yet if merging a binpkg - bug #258423 |
217 |
DIE_IF_NOT_BINPKG=true |
218 |
fi |
219 |
|
220 |
# if the previous failed, don't even run java eclasses pkg_setup |
221 |
# as it might also die when no VM is present |
222 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
223 |
einfo "Forced vm ${JAVA_PKG_FORCE_VM}" |
224 |
java-vm-2_pkg_setup |
225 |
java-pkg-2_pkg_setup |
226 |
fi |
227 |
|
228 |
VMHANDLE="icedtea${SLOT}" |
229 |
} |
230 |
|
231 |
src_unpack() { |
232 |
if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then |
233 |
die "Unable to find a supported VM for building" |
234 |
fi |
235 |
unpack ${ICEDTEA_PKG}.tar.gz |
236 |
} |
237 |
|
238 |
unset_vars() { |
239 |
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS |
240 |
} |
241 |
|
242 |
src_configure() { |
243 |
local config procs rhino_jar |
244 |
local vm=$(java-pkg_get-current-vm) |
245 |
local vmhome="/usr/lib/jvm/${vm}" |
246 |
|
247 |
# IcedTea6 can't be built using IcedTea7; its class files are too new |
248 |
if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then |
249 |
# If we are upgrading icedtea, then we don't need to bootstrap. |
250 |
config="${config} --with-openjdk=$(java-config -O)" |
251 |
elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then |
252 |
# For other 1.5 JDKs e.g. GCJ, CACAO. |
253 |
config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \ |
254 |
config="${config} --with-gcj-home=${vmhome}" |
255 |
else |
256 |
eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}." |
257 |
die "Install a GNU Classpath JDK (gcj-jdk, cacao)" |
258 |
fi |
259 |
|
260 |
# OpenJDK-specific parallelism support. |
261 |
procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/') |
262 |
if [[ -n ${procs} ]] ; then |
263 |
config="${config} --with-parallel-jobs=${procs}"; |
264 |
einfo "Configuring using --with-parallel-jobs=${procs}" |
265 |
fi |
266 |
|
267 |
if use_zero ; then |
268 |
config="${config} --enable-zero" |
269 |
else |
270 |
config="${config} --disable-zero" |
271 |
fi |
272 |
|
273 |
if use javascript ; then |
274 |
rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar); |
275 |
fi |
276 |
|
277 |
if use hs16 ; then |
278 |
config="${config} --with-hotspot-build=hs16" |
279 |
fi |
280 |
|
281 |
unset_vars |
282 |
|
283 |
econf ${config} \ |
284 |
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ |
285 |
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ |
286 |
--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \ |
287 |
--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \ |
288 |
--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \ |
289 |
--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \ |
290 |
--with-java="${vmhome}/bin/java" \ |
291 |
--with-javac="${vmhome}/bin/javac" \ |
292 |
--with-javah="${vmhome}/bin/javah" \ |
293 |
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ |
294 |
$(use_enable !debug optimizations) \ |
295 |
$(use_enable doc docs) \ |
296 |
$(use_enable nsplugin plugin) \ |
297 |
$(use_with javascript rhino ${rhino_jar}) \ |
298 |
$(use_enable cacao) \ |
299 |
$(use_enable pulseaudio pulse-java) \ |
300 |
$(use_enable xrender) \ |
301 |
$(use_enable systemtap) \ |
302 |
$(use_enable nio2) \ |
303 |
$(use_enable nss) \ |
304 |
|| die "configure failed" |
305 |
} |
306 |
|
307 |
src_compile() { |
308 |
# Newer versions of Gentoo's ant add |
309 |
# an environment variable so it works properly... |
310 |
export ANT_RESPECT_JAVA_HOME=TRUE |
311 |
# ant -diagnostics in Ant 1.8.0 fails without these |
312 |
# otherwise we try to load the least that's needed to avoid possible classpath collisions |
313 |
export ANT_TASKS="xerces-2 xalan ant-nodeps" |
314 |
|
315 |
# Paludis does not respect unset from src_configure |
316 |
unset_vars |
317 |
emake -j 1 || die "make failed" |
318 |
} |
319 |
|
320 |
src_install() { |
321 |
local dest="/usr/$(get_libdir)/icedtea${SLOT}" |
322 |
local ddest="${D}/${dest}" |
323 |
dodir "${dest}" || die |
324 |
|
325 |
local arch=${ARCH} |
326 |
use x86 && arch=i586 |
327 |
|
328 |
dodoc README NEWS AUTHORS THANKYOU || die |
329 |
|
330 |
cd "${S}/openjdk/build/linux-${arch}/j2sdk-image" || die |
331 |
|
332 |
if use doc ; then |
333 |
# java-pkg_dohtml needed for package-list #302654 |
334 |
java-pkg_dohtml -r ../docs/* || die "Failed to install documentation" |
335 |
fi |
336 |
|
337 |
# doins can't handle symlinks. |
338 |
cp -vRP bin include jre lib man "${ddest}" || die "failed to copy" |
339 |
|
340 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
341 |
# the heap by the JIT compiler. |
342 |
pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*) |
343 |
|
344 |
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die |
345 |
|
346 |
if use examples; then |
347 |
dodir "${dest}/share"; |
348 |
cp -vRP demo sample "${ddest}/share/" || die |
349 |
fi |
350 |
|
351 |
cp src.zip "${ddest}" || die |
352 |
|
353 |
# Fix the permissions. |
354 |
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die |
355 |
|
356 |
if use nsplugin; then |
357 |
use x86 && arch=i386; |
358 |
install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"; |
359 |
fi |
360 |
|
361 |
# We need to generate keystore - bug #273306 |
362 |
einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/" |
363 |
mkdir "${T}/certgen" && cd "${T}/certgen" || die |
364 |
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die |
365 |
for c in /usr/share/ca-certificates/*/*.crt; do |
366 |
openssl x509 -text -in "${c}" >> all.crt || die |
367 |
done |
368 |
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die |
369 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
370 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
371 |
|
372 |
sed -e "s/@SLOT@/${SLOT}/g" \ |
373 |
-e "s/@PV@/${ICEDTEA_VER}/g" \ |
374 |
< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env" |
375 |
set_java_env "${T}/icedtea.env" |
376 |
} |
377 |
|
378 |
use_zero() { |
379 |
use zero || ( ! use amd64 && ! use x86 && ! use sparc ) |
380 |
} |
381 |
|
382 |
pkg_postinst() { |
383 |
# Set as default VM if none exists |
384 |
java-vm-2_pkg_postinst |
385 |
|
386 |
if use nsplugin; then |
387 |
elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" |
388 |
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" |
389 |
elog "such as Firefox 3.5+, Chromium and perhaps some others too." |
390 |
fi |
391 |
} |