Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.3.1.ebuild
Date: Fri, 31 Aug 2012 14:28:40
Message-Id: 20120831142829.0FE1B20DA0@flycatcher.gentoo.org
1 caster 12/08/31 14:28:28
2
3 Modified: ChangeLog
4 Added: icedtea-7.2.3.1.ebuild
5 Log:
6 Version bump, security bug #433389.
7
8 (Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.79 dev-java/icedtea/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.79&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.79&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.78&r2=1.79
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
20 retrieving revision 1.78
21 retrieving revision 1.79
22 diff -u -r1.78 -r1.79
23 --- ChangeLog 27 Jun 2012 19:08:57 -0000 1.78
24 +++ ChangeLog 31 Aug 2012 14:28:28 -0000 1.79
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-java/icedtea
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.78 2012/06/27 19:08:57 sera Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.79 2012/08/31 14:28:28 caster Exp $
30 +
31 +*icedtea-7.2.3.1 (31 Aug 2012)
32 +
33 + 31 Aug 2012; Vlastimil Babka <caster@g.o> +icedtea-7.2.3.1.ebuild,
34 + +files/icedtea-7.2.3.1-pax_mark_rmic_java.patch:
35 + Version bump, security bug #433389.
36
37 27 Jun 2012; Ralph Sennhauser <sera@g.o> icedtea-7.2.2.1.ebuild,
38 +files/icedtea-7.2.2.1-warnings_are_errors.patch:
39
40
41
42 1.1 dev-java/icedtea/icedtea-7.2.3.1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: icedtea-7.2.3.1.ebuild
48 ===================================================================
49 # Copyright 1999-2012 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.1.ebuild,v 1.1 2012/08/31 14:28:28 caster Exp $
52 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
53
54 # *********************************************************
55 # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
56 # *********************************************************
57
58 EAPI="4"
59
60 inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
61
62 ICEDTEA_VER=$(get_version_component_range 2-)
63 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
64 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
65 OPENJDK_TARBALL="a3fa5d49d528.tar.gz"
66 CORBA_TARBALL="e9b200124386.tar.gz"
67 HOTSPOT_TARBALL="3e0087ab5e92.tar.gz"
68 JAXP_TARBALL="9bd1d8e8b802.tar.gz"
69 JAXWS_TARBALL="9a744f20cfc5.tar.gz"
70 JDK_TARBALL="507eee662587.tar.gz"
71 LANGTOOLS_TARBALL="0cf6181d44db.tar.gz"
72 CACAO_TARBALL="a567bcb7f589.tar.gz"
73 JAMVM_TARBALL="jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz"
74
75 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
76 HOMEPAGE="http://icedtea.classpath.org"
77 SRC_URI="
78 http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
79 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
80 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
81 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
82 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
83 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
84 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
85 http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
86 http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
87 http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
88
89 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"
90 SLOT="7"
91 KEYWORDS="~amd64 ~ia64 ~x86"
92
93 IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
94 +nss pax_kernel pulseaudio +source systemtap test +webstart"
95
96 # Ideally the following were optional at build time.
97 ALSA_COMMON_DEP="
98 >=media-libs/alsa-lib-1.0"
99 CUPS_COMMON_DEP="
100 >=net-print/cups-1.2.12"
101 X_COMMON_DEP="
102 >=dev-libs/atk-1.30.0
103 >=dev-libs/glib-2.26
104 media-libs/fontconfig
105 >=media-libs/freetype-2.3.5
106 >=x11-libs/cairo-1.8.8
107 x11-libs/gdk-pixbuf:2
108 >=x11-libs/gtk+-2.8:2
109 >=x11-libs/libX11-1.1.3
110 >=x11-libs/libXext-1.1.1
111 >=x11-libs/libXi-1.1.3
112 >=x11-libs/libXrender-0.9.4
113 >=x11-libs/libXtst-1.0.3
114 >=x11-libs/pango-1.24.5"
115 X_DEPEND="
116 >=x11-libs/libXau-1.0.3
117 >=x11-libs/libXdmcp-1.0.2
118 >=x11-libs/libXinerama-1.0.2
119 >=x11-libs/libXp-1.0.0
120 x11-proto/inputproto
121 >=x11-proto/xextproto-7.1.1
122 x11-proto/xineramaproto
123 x11-proto/xproto"
124
125 COMMON_DEP="
126 >=media-libs/giflib-4.1.6
127 media-libs/lcms:2
128 >=media-libs/libpng-1.2
129 >=sys-libs/zlib-1.2.3
130 virtual/jpeg
131 javascript? ( dev-java/rhino:1.6 )
132 nss? ( >=dev-libs/nss-3.12.5-r1 )
133 pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
134 systemtap? ( >=dev-util/systemtap-1 )"
135
136 # cups is needed for X. #390945 #390975
137 RDEPEND="${COMMON_DEP}
138 !dev-java/icedtea:0
139 X? (
140 ${CUPS_COMMON_DEP}
141 ${X_COMMON_DEP}
142 media-fonts/dejavu
143 cjk? (
144 media-fonts/arphicfonts
145 media-fonts/baekmuk-fonts
146 media-fonts/lklug
147 media-fonts/lohit-fonts
148 media-fonts/sazanami
149 )
150 )
151 alsa? ( ${ALSA_COMMON_DEP} )
152 cups? ( ${CUPS_COMMON_DEP} )"
153
154 # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
155 # ca-certificates, perl and openssl are used for the cacerts keystore generation
156 # xext headers have two variants depending on version - bug #288855
157 # autoconf - as long as we use eautoreconf, version restrictions for bug #294918
158 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
159 || (
160 >=dev-java/gcj-jdk-4.3
161 dev-java/icedtea-bin:7
162 dev-java/icedtea-bin:6
163 dev-java/icedtea:7
164 dev-java/icedtea:6
165 )
166 app-arch/cpio
167 app-arch/unzip
168 app-arch/zip
169 app-misc/ca-certificates
170 >=dev-java/ant-core-1.8.1
171 dev-java/ant-nodeps
172 dev-lang/perl
173 >=dev-libs/libxslt-1.1.26
174 dev-libs/openssl
175 virtual/pkgconfig
176 sys-apps/attr
177 sys-apps/lsb-release
178 ${X_DEPEND}
179 pax_kernel? ( sys-apps/paxctl )"
180
181 PDEPEND="webstart? ( dev-java/icedtea-web:7 )
182 nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
183
184 S="${WORKDIR}"/${ICEDTEA_PKG}
185
186 pkg_setup() {
187 JAVA_PKG_WANT_BUILD_VM="
188 icedtea-7 icedtea-bin-7 icedtea7
189 icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
190 gcj-jdk"
191 JAVA_PKG_WANT_SOURCE="1.5"
192 JAVA_PKG_WANT_TARGET="1.5"
193
194 java-vm-2_pkg_setup
195 java-pkg-2_pkg_setup
196 }
197
198 src_unpack() {
199 unpack ${ICEDTEA_PKG}.tar.gz
200 }
201
202 java_prepare() {
203 # For bootstrap builds as the sandbox control file might not yet exist.
204 addpredict /proc/self/coredump_filter
205
206 # icedtea doesn't like some locales. #330433 #389717
207 export LANG="C" LC_ALL="C"
208
209 epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
210 eautoreconf
211 }
212
213 bootstrap_impossible() {
214 # Fill this according to testing what works and what not
215 has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
216 }
217
218 src_configure() {
219 local config bootstrap
220 local vm=$(java-pkg_get-current-vm)
221
222 # Whether to bootstrap
223 bootstrap="disable"
224 if use jbootstrap; then
225 if bootstrap_impossible "${vm}"; then
226 einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
227 else
228 bootstrap="enable"
229 fi
230 fi
231
232 if has "${vm}" gcj-jdk; then
233 # gcj-jdk ensures ecj is present.
234 use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
235 bootstrap="enable"
236 local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
237 config="${config} --with-ecj-jar=${ecj_jar}"
238 fi
239
240 config="${config} --${bootstrap}-bootstrap"
241
242 # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
243 # Otherwise use JamVM as it's the only possibility right now
244 if ! has "${ARCH}" amd64 sparc x86; then
245 config="${config} --enable-jamvm"
246 fi
247
248 # OpenJDK-specific parallelism support. Bug #389791, #337827
249 # Implementation modified from waf-utils.eclass
250 # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
251 local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
252 config="${config} --with-parallel-jobs=${procs}";
253 einfo "Configuring using --with-parallel-jobs=${procs}"
254
255 if use javascript ; then
256 config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
257 else
258 config="${config} --without-rhino"
259 fi
260
261 unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
262
263 econf ${config} \
264 --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
265 --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
266 --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
267 --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
268 --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
269 --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
270 --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
271 --with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
272 --with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
273 --with-jdk-home="$(java-config -O)" \
274 --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
275 --disable-downloading --disable-Werror \
276 $(use_enable !debug optimizations) \
277 $(use_enable doc docs) \
278 $(use_enable nss) \
279 $(use_enable pulseaudio pulse-java) \
280 $(use_enable systemtap) \
281 $(use_with pax_kernel pax paxctl)
282 }
283
284 src_compile() {
285 # Would use GENTOO_VM otherwise.
286 export ANT_RESPECT_JAVA_HOME=TRUE
287
288 # Load the least that's needed to avoid possible classpath collisions.
289 export ANT_TASKS="ant-nodeps"
290
291 emake
292 }
293
294 src_test() {
295 # Use Xvfb for tests
296 unset DISPLAY
297
298 Xemake check
299 }
300
301 src_install() {
302 local dest="/usr/$(get_libdir)/icedtea${SLOT}"
303 local ddest="${ED}/${dest}"
304 dodir "${dest}"
305
306 dodoc README NEWS AUTHORS
307 dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
308 docompress -x /usr/share/doc/${PN}${SLOT}
309
310 cd openjdk.build/j2sdk-image || die
311
312 # Ensures HeadlessGraphicsEnvironment is used.
313 if ! use X; then
314 rm -r jre/lib/$(get_system_arch)/xawt || die
315 fi
316
317 # Don't hide classes
318 rm lib/ct.sym || die
319
320 #402507
321 mkdir jre/.systemPrefs || die
322 touch jre/.systemPrefs/.system.lock || die
323 touch jre/.systemPrefs/.systemRootModFile || die
324
325 # doins can't handle symlinks.
326 cp -vRP bin include jre lib man "${ddest}" || die
327
328 dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
329
330 if use doc; then
331 # java-pkg_dohtml needed for package-list #302654
332 java-pkg_dohtml -r ../docs/* || die
333 fi
334
335 if use examples; then
336 dodir "${dest}/share";
337 cp -vRP demo sample "${ddest}/share/" || die
338 fi
339
340 if use source; then
341 cp src.zip "${ddest}" || die
342 fi
343
344 # Fix the permissions.
345 find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
346
347 # Needs to be done before generating cacerts
348 java-vm_set-pax-markings "${ddest}"
349
350 # We need to generate keystore - bug #273306
351 einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
352 mkdir "${T}/certgen" && cd "${T}/certgen" || die
353 cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
354 for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
355 openssl x509 -text -in "${c}" >> all.crt || die
356 done
357 ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
358 cp -vRP cacerts "${ddest}/jre/lib/security/" || die
359 chmod 644 "${ddest}/jre/lib/security/cacerts" || die
360
361 # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
362 # install it anyway. Bug 390663
363 cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
364 eprefixify "${T}"/fontconfig.Gentoo.properties
365 insinto "${dest}"/jre/lib
366 doins "${T}"/fontconfig.Gentoo.properties
367
368 set_java_env "${FILESDIR}/icedtea.env"
369 if ! use X || ! use alsa || ! use cups; then
370 java-vm_revdep-mask "${dest}"
371 fi
372 java-vm_sandbox-predict /proc/self/coredump_filter
373 }
374
375 pkg_preinst() {
376 if has_version "<=dev-java/icedtea-7.2.0:7"; then
377 # portage would preserve the symlink otherwise, related to bug #384397
378 rm -f "${EROOT}/usr/lib/jvm/icedtea7"
379 elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
380 elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
381 elog "If you had icedtea7 as system VM, the change should be automatic, however"
382 elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
383 elog "and the same holds for any user VM settings. Sorry for the inconvenience."
384 fi
385 }
Report Message
Find on MARC Find on Google Groups