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