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/sun-jdk: ChangeLog sun-jdk-1.6.0.35.ebuild
Date: Fri, 31 Aug 2012 10:40:10
Message-Id: 20120831103951.501CA20D71@flycatcher.gentoo.org
1 caster 12/08/31 10:39:51
2
3 Modified: ChangeLog
4 Added: sun-jdk-1.6.0.35.ebuild
5 Log:
6 Version bump, security bug #433094.
7
8 (Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.332 dev-java/sun-jdk/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.332&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.332&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.331&r2=1.332
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v
20 retrieving revision 1.331
21 retrieving revision 1.332
22 diff -u -r1.331 -r1.332
23 --- ChangeLog 23 Aug 2012 19:41:13 -0000 1.331
24 +++ ChangeLog 31 Aug 2012 10:39:51 -0000 1.332
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-java/sun-jdk
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.331 2012/08/23 19:41:13 caster Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.332 2012/08/31 10:39:51 caster Exp $
30 +
31 +*sun-jdk-1.6.0.35 (31 Aug 2012)
32 +
33 + 31 Aug 2012; Vlastimil Babka <caster@g.o> +sun-jdk-1.6.0.35.ebuild:
34 + Version bump, security bug #433094.
35
36 *sun-jdk-1.6.0.34 (23 Aug 2012)
37
38
39
40
41 1.1 dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild?rev=1.1&content-type=text/plain
45
46 Index: sun-jdk-1.6.0.35.ebuild
47 ===================================================================
48 # Copyright 1999-2012 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild,v 1.1 2012/08/31 10:39:51 caster Exp $
51
52 EAPI="4"
53
54 inherit java-vm-2 eutils prefix versionator
55
56 # This URIs need to be updated when bumping!
57 JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk6-downloads-1637591.html"
58
59 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
60 S_PV="$(replace_version_separator 3 '_')"
61
62 DEMOS_PV="6u34"
63 DEMOS_S_PV="1.6.0_34"
64
65 X86_AT="jdk-${MY_PV}-linux-i586.bin"
66 AMD64_AT="jdk-${MY_PV}-linux-x64.bin"
67 #IA64_AT="jdk-${MY_PV}-linux-ia64.bin"
68 SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh"
69 SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh"
70 SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh"
71 SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh"
72
73 X86_DEMOS="jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
74 AMD64_DEMOS="jdk-${DEMOS_PV}-linux-x64-demos.tar.gz"
75 #IA64_DEMOS="jdk-${DEMOS_PV}-linux-ia64-demos.tar.gz"
76 SOL_X86_DEMOS="jdk-${DEMOS_PV}-solaris-i586-demos.tar.Z"
77 SOL_AMD64_DEMOS="jdk-${DEMOS_PV}-solaris-x64-demos.tar.Z"
78 SOL_SPARC_DEMOS="jdk-${DEMOS_PV}-solaris-sparc-demos.tar.Z"
79 SOL_SPARCv9_DEMOS="jdk-${DEMOS_PV}-solaris-sparcv9-demos.tar.Z"
80
81 DESCRIPTION="Oracle's Java SE Development Kit"
82 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
83 SRC_URI="
84 x86? ( ${X86_AT}
85 examples? ( ${X86_DEMOS} ) )
86 amd64? ( ${AMD64_AT} )
87 x86-solaris? ( ${SOL_X86_AT}
88 examples? ( ${SOL_X86_DEMOS} ) )
89 x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT}
90 examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) )
91 sparc-solaris? ( ${SOL_SPARC_AT}
92 examples? ( ${SOL_SPARC_DEMOS} ) )
93 sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
94 examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )"
95 # examples? ( ${AMD64_DEMOS} ) )
96 # ia64? ( ${IA64_AT}
97 # examples? ( ${IA64_DEMOS} ) )
98
99 LICENSE="Oracle-BCLA-JavaSE"
100 SLOT="1.6"
101 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
102
103 IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source"
104
105 RESTRICT="fetch strip"
106
107 RDEPEND="
108 X? (
109 x11-libs/libX11
110 x11-libs/libXext
111 x11-libs/libXi
112 x11-libs/libXt
113 x11-libs/libXtst
114 )
115 alsa? ( media-libs/alsa-lib )
116 doc? ( dev-java/java-sdk-docs:1.6.0 )
117 jce? ( dev-java/sun-jce-bin:1.6 )
118 kernel_SunOS? ( app-arch/unzip )
119 !prefix? ( sys-libs/glibc )"
120 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
121 # marking. #427642
122 DEPEND="
123 pax_kernel? ( sys-apps/paxctl )"
124
125 S="${WORKDIR}/jdk${S_PV}"
126
127 _set_at() {
128 if use x86; then
129 AT=${X86_AT}
130 elif use amd64; then
131 AT=${AMD64_AT}
132 elif use ia64; then
133 AT=${IA64_AT}
134 elif use x86-solaris; then
135 AT=${SOL_X86_AT}
136 elif use x64-solaris; then
137 AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
138 elif use sparc-solaris; then
139 AT=${SOL_SPARC_AT}
140 elif use sparc64-solaris; then
141 AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
142 fi
143 }
144
145 _set_demos() {
146 if use x86; then
147 DEMOS=${X86_DEMOS}
148 elif use amd64; then
149 DEMOS=${AMD64_DEMOS}
150 elif use ia64; then
151 DEMOS=${IA64_DEMOS}
152 elif use x86-solaris; then
153 DEMOS=${SOL_X86_DEMOS}
154 elif use x64-solaris; then
155 DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
156 elif use sparc-solaris; then
157 DEMOS=${SOL_SPARC_AT}
158 elif use sparc64-solaris; then
159 DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
160 fi
161 }
162
163 pkg_nofetch() {
164 _set_at
165 _set_demos
166
167 einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
168 einfo "has become fetch restricted again. Alternatives are switching to"
169 einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
170 einfo ""
171 einfo "Please download ${AT} from:"
172 einfo "${JDK_URI}"
173 einfo "and move it to ${DISTDIR}"
174
175 if use examples && ! use amd64; then
176 einfo ""
177 einfo "Also download ${DEMOS} from:"
178 einfo "${JDK_URI}"
179 einfo "and move it to ${DISTDIR}"
180 fi
181 }
182
183 _sol_src_unpack() {
184 for i in ${AT}; do
185 [[ ${i} == "and" ]] && continue
186 rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
187 # don't die on unzip, it always "fails"
188 unzip "${DISTDIR}"/${i}
189 done
190 for f in $(find "${S}" -name "*.pack") ; do
191 "${S}"/bin/unpack200 ${f} ${f%.pack}.jar
192 rm ${f}
193 done
194 if use examples ; then
195 for i in ${DEMOS}; do
196 [[ ${i} == "and" ]] && continue
197 use examples && unpack ${i}
198 done
199 mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \
200 "${S}"/ || die
201 fi
202 }
203
204 src_unpack() {
205 [[ ${PV} != 1.6.0.35 ]] && die "Check if amd64 examples distfile is available again before bumping. Change SRC_URI and 'use examples' in src_{unpack,install},pkg_nofetch. Also check DEMOS_PV"
206 _set_at
207 _set_demos
208 if use kernel_SunOS; then
209 _sol_src_unpack
210 else
211 sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
212 use examples && ! use amd64 && unpack ${DEMOS}
213 fi
214 }
215
216 src_compile() {
217 # This needs to be done before CDS - #215225
218 java-vm_set-pax-markings "${S}"
219
220 # see bug #207282
221 einfo "Creating the Class Data Sharing archives"
222 if use x86; then
223 bin/java -client -Xshare:dump || die
224 fi
225 # limit heap size for large memory on x86 #405239
226 # this is a workaround and shouldn't be needed.
227 bin/java -server -Xmx64m -Xshare:dump || die
228 }
229
230 src_install() {
231 local dest="/opt/${P}"
232 local ddest="${ED}${dest}"
233
234 # We should not need the ancient plugin for Firefox 2 anymore, plus it has
235 # writable executable segments
236 if use x86; then
237 rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
238 {,jre/}lib/i386/libjavaplugin_nscp*.so
239 rm -vrf jre/plugin/i386
240 fi
241 # Without nsplugin flag, also remove the new plugin
242 local arch=${ARCH};
243 use x86 && arch=i386;
244 if ! use nsplugin; then
245 rm -vf {,jre/}lib/${arch}/libnpjp2.so \
246 {,jre/}lib/${arch}/libjavaplugin_jni.so
247 fi
248
249 dodir "${dest}"
250 cp -pPR bin include jre lib man "${ddest}" || die
251
252 if use derby; then
253 cp -pPR db "${ddest}" || die
254 fi
255
256 if use examples; then
257 if use amd64; then
258 ewarn "examples are not available in this version for amd64 due to upstream error (zero-byte distfile)"
259 else
260 cp -pPR "${WORKDIR}/${DEMOS_S_PV}"/{demo,sample} "${ddest}" || die
261 fi
262 fi
263
264 # Remove empty dirs we might have copied
265 find "${D}" -type d -empty -exec rmdir -v {} + || die
266
267 dodoc COPYRIGHT
268 dohtml README.html
269
270 if use jce; then
271 dodir "${dest}"/jre/lib/security/strong-jce
272 mv "${ddest}"/jre/lib/security/US_export_policy.jar \
273 "${ddest}"/jre/lib/security/strong-jce || die
274 mv "${ddest}"/jre/lib/security/local_policy.jar \
275 "${ddest}"/jre/lib/security/strong-jce || die
276 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
277 "${dest}"/jre/lib/security/US_export_policy.jar
278 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
279 "${dest}"/jre/lib/security/local_policy.jar
280 fi
281
282 if use nsplugin; then
283 install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
284 fi
285
286 if use source; then
287 cp src.zip "${ddest}" || die
288 fi
289
290 # Install desktop file for the Java Control Panel.
291 # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
292 # make_desktop_entry can't be used as ${P} would end up in filename.
293 newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
294 sun-jcontrol-${PN}-${SLOT}.png || die
295 sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)#" \
296 -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
297 -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
298 jre/lib/desktop/applications/sun_java.desktop > \
299 "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
300 domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
301
302 # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
303 rm "${ddest}"/jre/lib/fontconfig.* || die
304 cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
305 eprefixify "${T}"/fontconfig.properties
306 insinto "${dest}"/jre/lib/
307 doins "${T}"/fontconfig.properties
308
309 set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
310 java-vm_revdep-mask
311 java-vm_sandbox-predict /dev/random
312 }
313
314 QA_TEXTRELS_x86="
315 opt/${P}/jre/lib/i386/client/libjvm.so
316 opt/${P}/jre/lib/i386/motif21/libmawt.so
317 opt/${P}/jre/lib/i386/server/libjvm.so"
318 QA_FLAGS_IGNORED="
319 /opt/${P}/bin/appletviewer
320 /opt/${P}/bin/apt
321 /opt/${P}/bin/extcheck
322 /opt/${P}/bin/idlj
323 /opt/${P}/bin/jar
324 /opt/${P}/bin/jarsigner
325 /opt/${P}/bin/java
326 /opt/${P}/bin/javac
327 /opt/${P}/bin/javadoc
328 /opt/${P}/bin/javah
329 /opt/${P}/bin/javap
330 /opt/${P}/bin/javaws
331 /opt/${P}/bin/jconsole
332 /opt/${P}/bin/jdb
333 /opt/${P}/bin/jhat
334 /opt/${P}/bin/jinfo
335 /opt/${P}/bin/jmap
336 /opt/${P}/bin/jps
337 /opt/${P}/bin/jrunscript
338 /opt/${P}/bin/jsadebugd
339 /opt/${P}/bin/jstack
340 /opt/${P}/bin/jstat
341 /opt/${P}/bin/jstatd
342 /opt/${P}/bin/keytool
343 /opt/${P}/bin/native2ascii
344 /opt/${P}/bin/orbd
345 /opt/${P}/bin/pack200
346 /opt/${P}/bin/policytool
347 /opt/${P}/bin/rmic
348 /opt/${P}/bin/rmid
349 /opt/${P}/bin/rmiregistry
350 /opt/${P}/bin/schemagen
351 /opt/${P}/bin/serialver
352 /opt/${P}/bin/servertool
353 /opt/${P}/bin/tnameserv
354 /opt/${P}/bin/unpack200
355 /opt/${P}/bin/wsgen
356 /opt/${P}/bin/wsimport
357 /opt/${P}/bin/xjc
358 /opt/${P}/demo/jvmti/gctest/lib/libgctest.so
359 /opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
360 /opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
361 /opt/${P}/demo/jvmti/minst/lib/libminst.so
362 /opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
363 /opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
364 /opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
365 /opt/${P}/jre/bin/java
366 /opt/${P}/jre/bin/java_vm
367 /opt/${P}/jre/bin/javaws
368 /opt/${P}/jre/bin/keytool
369 /opt/${P}/jre/bin/orbd
370 /opt/${P}/jre/bin/pack200
371 /opt/${P}/jre/bin/policytool
372 /opt/${P}/jre/bin/rmid
373 /opt/${P}/jre/bin/rmiregistry
374 /opt/${P}/jre/bin/servertool
375 /opt/${P}/jre/bin/tnameserv
376 /opt/${P}/jre/bin/unpack200
377 /opt/${P}/jre/lib/jexec
378 /opt/${P}/lib/jexec
379 /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
380 /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
381 for java_system_arch in amd64 i386; do
382 QA_FLAGS_IGNORED+="
383 /opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
384 /opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
385 /opt/${P}/jre/lib/${java_system_arch}/libattach.so
386 /opt/${P}/jre/lib/${java_system_arch}/libawt.so
387 /opt/${P}/jre/lib/${java_system_arch}/libcmm.so
388 /opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
389 /opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
390 /opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
391 /opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
392 /opt/${P}/jre/lib/${java_system_arch}/libhprof.so
393 /opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
394 /opt/${P}/jre/lib/${java_system_arch}/libioser12.so
395 /opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
396 /opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
397 /opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
398 /opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
399 /opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
400 /opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
401 /opt/${P}/jre/lib/${java_system_arch}/libjava.so
402 /opt/${P}/jre/lib/${java_system_arch}/libjawt.so
403 /opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
404 /opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
405 /opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
406 /opt/${P}/jre/lib/${java_system_arch}/libjsig.so
407 /opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
408 /opt/${P}/jre/lib/${java_system_arch}/libjsound.so
409 /opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
410 /opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
411 /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
412 /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
413 /opt/${P}/jre/lib/${java_system_arch}/libnet.so
414 /opt/${P}/jre/lib/${java_system_arch}/libnio.so
415 /opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
416 /opt/${P}/jre/lib/${java_system_arch}/libnpt.so
417 /opt/${P}/jre/lib/${java_system_arch}/librmi.so
418 /opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
419 /opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
420 /opt/${P}/jre/lib/${java_system_arch}/libunpack.so
421 /opt/${P}/jre/lib/${java_system_arch}/libverify.so
422 /opt/${P}/jre/lib/${java_system_arch}/libzip.so
423 /opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
424 /opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
425 /opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
426 /opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
427 done
Report Message
Find on MARC Find on Google Groups