diff options
| -rw-r--r-- | app-emulation/emul-linux-x86-java/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-java/Manifest | 14 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.22.ebuild | 112 |
3 files changed, 122 insertions, 12 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 7e5592e4c64a..827598618fab 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.90 2010/10/11 14:46:44 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.91 2010/10/12 21:24:03 caster Exp $ + +*emul-linux-x86-java-1.6.0.22 (12 Oct 2010) + + 12 Oct 2010; Vlastimil Babka <caster@gentoo.org> + +emul-linux-x86-java-1.6.0.22.ebuild: + Version bump, security bug #340421. 11 Oct 2010; Markos Chandras <hwoarang@gentoo.org> emul-linux-x86-java-1.6.0.21.ebuild: diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index 9ccbdafd4079..4d2d64520a4d 100644 --- a/app-emulation/emul-linux-x86-java/Manifest +++ b/app-emulation/emul-linux-x86-java/Manifest @@ -1,18 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df DIST jdk-6u20-dlj-linux-i586.bin 84828910 RMD160 6f015c434363e8ac89cdf435c3c71634dea01d8a SHA1 b9866ab9923ba88d95fe3629ece3a6dbbbad1300 SHA256 dbfc1338fd18b59b66701de87ee8d553b8a7fce348966ee8a50728d08e474dbe DIST jdk-6u21-dlj-linux-i586.bin 83916252 RMD160 8901ce27934a7038cd025913bcba6e44b62bfd88 SHA1 7ed1d64dca5f1b3bdf2031b08c56f79a51b16929 SHA256 64d171d38781077b014e49ac2ebe90b6e9de152f033c8a592b3f9661ff57914a +DIST jdk-6u22-dlj-linux-i586.bin 83823265 RMD160 ea0d48585397f3f6b9a1aa09cd04ecff86cde2ad SHA1 a7b0a8f47aa5a35a48271f8013418c72b1bf1cac SHA256 3af78858159460ff4f9f828b77640e710f4a8b260167db396c6d0664b4eb0f5b EBUILD emul-linux-x86-java-1.6.0.20.ebuild 3468 RMD160 5b9fd29caa5d9d79f197c3a203202f5d216cf68c SHA1 43d76c393d50ea01d6063469ed7e98924a8a1e5b SHA256 04ceebf65d74e27de82bc0eb03eefa50c4a0702c58139117435e79417e3287b5 EBUILD emul-linux-x86-java-1.6.0.21.ebuild 3470 RMD160 706f56948f35d24c7457ed85a610b6ebe26ac375 SHA1 5188e1841226d63ca5991542577fe4b6386b04db SHA256 4d7ddace42643f8b194751205e266b65bee3d031b3d0e75fd615237d4f6d7c40 -MISC ChangeLog 18506 RMD160 f44d9c9bda636a22fbc4c2e94eeeb0894a92adb1 SHA1 bcd52f2dd508163b63378de42cbcfa33b733bf97 SHA256 a7e365c8acfdf5eb10614465b03cce4ac1f2ee184954fc8588dea4e12ffe2f6f +EBUILD emul-linux-x86-java-1.6.0.22.ebuild 3469 RMD160 dead20e04fb097759ae00a8ab088c94c4af545e2 SHA1 84f744fce550a1fb3f75b9674b45a6df4ebabb09 SHA256 9ced6a2239f074ec54eea1e13383849ee614c0f317f2eba73ba65e7522a599e2 +MISC ChangeLog 18679 RMD160 470469718e323dd6aee051ae7783006b53fbcff5 SHA1 0dec7562fd6ff8ff92a5ff720596ceb25526554f SHA256 cd7d99dc0f15360f3a34da8c5de8973d5c2e0b752785eeb7bf165b73167c3be9 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkyzIrwACgkQ9/cejkQaxBDM7wCfQgXToBRAB9p5oaZTy3NrTwxg -Q6IAnjPngnzCny0AQOUO/8iDiUQ1jeQ2 -=YGuk ------END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.22.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.22.ebuild new file mode 100644 index 000000000000..43075a1304c4 --- /dev/null +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.22.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.22.ebuild,v 1.1 2010/10/12 21:24:03 caster Exp $ + +inherit versionator pax-utils java-vm-2 eutils + +UPDATE="$(get_version_component_range 4)" +UPDATE="${UPDATE#0}" +MY_PV="$(get_version_component_range 2)u${UPDATE}" + +At="jdk-${MY_PV}-dlj-linux-i586.bin" +DESCRIPTION="Sun's Java SE Runtime Environment (32bit)" +HOMEPAGE="http://java.sun.com/javase/6/" +#SRC_URI="http://download.java.net/dlj/binaries/${At}" +SRC_URI="http://dlc.sun.com/dlj/binaries/${At}" + +SLOT="1.6" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64" +RESTRICT="strip" +IUSE="X alsa nsplugin" + +JAVA_VM_NO_GENERATION1=true + +RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs ) + X? ( app-emulation/emul-linux-x86-xlibs )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so + opt/${P}/lib/i386/client/libjvm.so + opt/${P}/lib/i386/server/libjvm.so" +QA_DT_HASH="opt/${P}/.*" + +src_unpack() { + mkdir bundled-jdk + cd bundled-jdk + sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack" + + cd .. + bash "${FILESDIR}"/construct-${SLOT}.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed" +} + +src_compile() { + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. This has to be done before CDS - #215225 + pax-mark m $(list-paxables "${S}"/bin/*) + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + "${S}"/bin/java -client -Xshare:dump || die + "${S}"/bin/java -server -Xshare:dump || die +} + +src_install() { + local dirs="bin lib man javaws plugin" + dodir /opt/${P} + + cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy" + + dodoc README THIRDPARTYLICENSEREADME.txt || die + dohtml Welcome.html || die + dodir /opt/${P}/share/ + + if use nsplugin; then + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji + fi + + # FIXME figure out how to handle the control pannel conflict with + # sun-jdk-bin + + # install control panel for Gnome/KDE +# sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ +# -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ +# ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ +# ${T}/sun_java-${SLOT}.desktop + +# domenu ${T}/sun_java-${SLOT}.desktop + + set_java_env + java-vm_revdep-mask +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + elog + elog "Two variants of the nsplugin are available via eselect java-nsplugin." + elog "Note that starting with ${PN}-1.6.0.19 their naming and the default changed," + elog "users with the old plugin set are switched to the new default automatically." + elog "The default ${VMHANDLE} is the new 'plugin2' which works in Firefox 3 (xulrunner-1.9)" + elog "and newer, the ${VMHANDLE}-old_oji is the old plugin using the OJI API" + elog "that was removed in Firefox 3.6 (xulrunner-1.9.2)." + elog "For more info see https://jdk6.dev.java.net/plugin2/" + elog + + if ! use X; then + local xwarn="X11 libraries and/or" + fi + + echo + ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." + ewarn "Be careful which Java libraries you attempt to use." +} |