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: sun-jdk-1.6.0.17.ebuild ChangeLog sun-jdk-1.5.0.22.ebuild
Date: Wed, 04 Nov 2009 11:16:05
Message-Id: E1N5dqM-0000FU-Hi@stork.gentoo.org
1 caster 09/11/04 11:16:02
2
3 Modified: ChangeLog
4 Added: sun-jdk-1.6.0.17.ebuild sun-jdk-1.5.0.22.ebuild
5 Log:
6 Version bump, security bug #291817
7 (Portage version: 2.2_rc48/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.270 dev-java/sun-jdk/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.270&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.270&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.269&r2=1.270
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v
19 retrieving revision 1.269
20 retrieving revision 1.270
21 diff -u -r1.269 -r1.270
22 --- ChangeLog 29 Sep 2009 15:51:45 -0000 1.269
23 +++ ChangeLog 4 Nov 2009 11:16:02 -0000 1.270
24 @@ -1,6 +1,13 @@
25 # ChangeLog for dev-java/sun-jdk
26 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.269 2009/09/29 15:51:45 caster Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.270 2009/11/04 11:16:02 caster Exp $
29 +
30 +*sun-jdk-1.6.0.17 (04 Nov 2009)
31 +*sun-jdk-1.5.0.22 (04 Nov 2009)
32 +
33 + 04 Nov 2009; Vlastimil Babka <caster@g.o> +sun-jdk-1.5.0.22.ebuild,
34 + +sun-jdk-1.6.0.17.ebuild:
35 + Version bump, security bug #291817
36
37 *sun-jdk-1.5.0.21 (29 Sep 2009)
38
39
40
41
42 1.1 dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild?rev=1.1&content-type=text/plain
46
47 Index: sun-jdk-1.6.0.17.ebuild
48 ===================================================================
49 # Copyright 1999-2009 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.17.ebuild,v 1.1 2009/11/04 11:16:02 caster Exp $
52
53 inherit versionator java-vm-2 eutils pax-utils
54
55 UPDATE="$(get_version_component_range 4)"
56 UPDATE="${UPDATE#0}"
57 MY_PV="$(get_version_component_range 2)u${UPDATE}"
58 X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
59 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
60
61 DESCRIPTION="Sun's Java SE Development Kit"
62 HOMEPAGE="http://java.sun.com/javase/6/"
63 URL_BASE="http://download.java.net/dlj/binaries"
64 SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
65 amd64? ( ${URL_BASE}/${AMD64_AT} )"
66 SLOT="1.6"
67 LICENSE="dlj-1.1"
68 KEYWORDS="~amd64 ~x86"
69 RESTRICT="strip"
70 IUSE="X alsa derby doc examples jce nsplugin odbc"
71
72 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
73 opt/${P}/jre/lib/i386/libdeploy.so
74 opt/${P}/jre/lib/i386/client/libjvm.so
75 opt/${P}/jre/lib/i386/server/libjvm.so"
76 QA_DT_HASH="opt/${P}/.*"
77
78 DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
79 RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
80 sys-libs/glibc
81 alsa? ( media-libs/alsa-lib )
82 X? (
83 x11-libs/libXext
84 x11-libs/libXi
85 x11-libs/libXp
86 x11-libs/libXtst
87 amd64? ( x11-libs/libXt )
88 x11-libs/libX11
89 )
90 odbc? ( dev-db/unixODBC )"
91
92 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
93
94 S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
95
96 src_unpack() {
97 sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
98 }
99
100 src_compile() {
101 # Set PaX markings on all JDK/JRE executables to allow code-generation on
102 # the heap by the JIT compiler. This needs to be done before CDS - #215225
103 pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
104
105 # see bug #207282
106 if use x86; then
107 einfo "Creating the Class Data Sharing archives"
108 "${S}"/bin/java -client -Xshare:dump || die
109 "${S}"/bin/java -server -Xshare:dump || die
110 fi
111 }
112
113 src_install() {
114 local dirs="bin include jre lib man"
115
116 use derby && dirs="${dirs} db"
117
118 dodir /opt/${P}
119
120 cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
121 dodoc COPYRIGHT || die
122 dohtml README.html || die
123
124 cp -pP src.zip "${D}/opt/${P}/" || die
125
126 if use examples; then
127 cp -pPR demo sample "${D}/opt/${P}/" || die
128 fi
129
130 if use jce; then
131 cd "${D}/opt/${P}/jre/lib/security"
132 dodir /opt/${P}/jre/lib/security/strong-jce
133 mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
134 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
135 mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
136 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
137 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
138 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
139 fi
140
141 if use nsplugin; then
142 local plugin_dir="ns7-gcc29"
143 if has_version '>=sys-devel/gcc-3' ; then
144 plugin_dir="ns7"
145 fi
146
147 if use x86 ; then
148 install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
149 install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2
150 else
151 install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so
152 fi
153 fi
154
155 # create dir for system preferences
156 dodir /opt/${P}/jre/.systemPrefs
157 # Create files used as storage for system preferences.
158 touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
159 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
160 touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
161 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
162
163 if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
164 # install control panel for Gnome/KDE
165 # The jre also installs these so make sure that they do not have the same
166 # Name
167 sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
168 -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
169 -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
170 "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
171 "${T}"/sun_jdk-${SLOT}.desktop
172
173 domenu "${T}"/sun_jdk-${SLOT}.desktop
174 fi
175
176 # bug #56444
177 insinto /opt/${P}/jre/lib/
178 newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
179
180 set_java_env
181 java-vm_revdep-mask
182 }
183
184 pkg_postinst() {
185 # Set as default VM if none exists
186 java-vm-2_pkg_postinst
187
188 if use x86 && use nsplugin; then
189 elog
190 elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
191 elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
192 ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
193 elog "For more info see https://jdk6.dev.java.net/plugin2/"
194 elog
195 fi
196
197 if use amd64 && use nsplugin; then
198 elog
199 elog "This version finally brings a browser plugin for amd64"
200 elog "It is the so-called Next-Generation Plug-In (plugin2)"
201 elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
202 ewarn "Note that it works only in Firefox 3 or newer browsers!"
203 elog "For more info see https://jdk6.dev.java.net/plugin2/"
204 elog
205 fi
206
207 elog "Please reinstall eclipse-sdk if you have it installed and want"
208 elog "workaround for bug #215150."
209 }
210
211
212
213 1.1 dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild
214
215 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild?rev=1.1&view=markup
216 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild?rev=1.1&content-type=text/plain
217
218 Index: sun-jdk-1.5.0.22.ebuild
219 ===================================================================
220 # Copyright 1999-2009 Gentoo Foundation
221 # Distributed under the terms of the GNU General Public License v2
222 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.22.ebuild,v 1.1 2009/11/04 11:16:02 caster Exp $
223
224 inherit versionator java-vm-2 eutils pax-utils
225
226 UPDATE="$(get_version_component_range 4)"
227 UPDATE="${UPDATE#0}"
228 MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
229
230 X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
231 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
232
233 DESCRIPTION="Sun's Java SE Development Kit"
234 HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
235 SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
236 amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
237 SLOT="1.5"
238 LICENSE="dlj-1.1"
239 KEYWORDS="~amd64 ~x86"
240 RESTRICT="strip"
241 IUSE="X alsa doc examples jce nsplugin odbc"
242
243 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
244 QA_DT_HASH="opt/${P}/.*"
245
246 DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
247 RDEPEND="sys-libs/glibc
248 alsa? ( media-libs/alsa-lib )
249 doc? ( =dev-java/java-sdk-docs-1.5.0* )
250 X? (
251 x11-libs/libXext
252 x11-libs/libXi
253 x11-libs/libXp
254 x11-libs/libXtst
255 x11-libs/libXt
256 x11-libs/libX11
257 )
258 odbc? ( dev-db/unixODBC )"
259
260 S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
261
262 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
263
264 src_unpack() {
265 sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
266 }
267
268 src_compile() {
269 # Set PaX markings on all JDK/JRE executables to allow code-generation on
270 # the heap by the JIT compiler. This needs to be done before CDS - #215225
271 pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
272
273 # see bug #207282
274 if use x86; then
275 einfo "Creating the Class Data Sharing archives"
276 "${S}"/bin/java -client -Xshare:dump || die
277 fi
278 }
279
280 src_install() {
281 local dirs="bin include jre lib man"
282
283 dodir /opt/${P}
284
285 cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
286 dodoc COPYRIGHT README.html || die
287 dohtml README.html || die
288
289 cp -pP src.zip "${D}/opt/${P}/" || die
290
291 if use examples; then
292 cp -pPR demo "${D}/opt/${P}/" || die
293 cp -pPR sample "${D}/opt/${P}/" || die
294 fi
295
296 if use jce; then
297 cd "${D}"/opt/${P}/jre/lib/security || die
298 dodir /opt/${P}/jre/lib/security/strong-jce
299 mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
300 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
301 mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
302 "${D}"/opt/${P}/jre/lib/security/strong-jce || die
303 local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
304 dosym ${jcedir}/US_export_policy.jar \
305 /opt/${P}/jre/lib/security/ || die
306 dosym ${jcedir}/local_policy.jar \
307 /opt/${P}/jre/lib/security/ || die
308 fi
309
310 if use nsplugin; then
311 local plugin_dir="ns7-gcc29"
312 if has_version '>=sys-devel/gcc-3' ; then
313 plugin_dir="ns7"
314 fi
315
316 if use x86 ; then
317 install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
318 else
319 eerror "No plugin available for amd64 arch"
320 fi
321 fi
322
323 # create dir for system preferences
324 dodir /opt/${P}/jre/.systemPrefs
325 # Create files used as storage for system preferences.
326 touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
327 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
328 touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
329 chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
330
331 # install control panel for Gnome/KDE
332 if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
333 sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
334 -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
335 "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
336 "${T}"/sun_java-${SLOT}.desktop \
337 || die "Failed to sed .desktop file"
338
339 domenu "${T}"/sun_java-${SLOT}.desktop
340 fi
341
342 # bug #56444
343 insinto /opt/${P}/jre/lib/
344 newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
345
346 set_java_env
347 java-vm_revdep-mask
348 }
349
350 pkg_postinst() {
351 # Set as default VM if none exists
352 java-vm-2_pkg_postinst
353
354 elog "The epoll-based implementation of SelectorProvider is not selected by"
355 elog "default."
356 elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
357 elog ""
358 }
Report Message
Find on MARC Find on Google Groups