From 71dcc62dbed4b8637eb105f8c3ae8a531fad32c9 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 8 Jun 2011 15:53:11 +0000 Subject: Version bump, security bug #370559. Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64 --- app-emulation/emul-linux-x86-java/ChangeLog | 8 +- app-emulation/emul-linux-x86-java/Manifest | 14 +-- .../emul-linux-x86-java-1.6.0.26.ebuild | 112 +++++++++++++++++++++ 3 files changed, 122 insertions(+), 12 deletions(-) create mode 100644 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.ebuild (limited to 'app-emulation') diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 5b797ef80971..3826e7ab9afe 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.101 2011/05/21 04:28:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.102 2011/06/08 15:53:11 caster Exp $ + +*emul-linux-x86-java-1.6.0.26 (08 Jun 2011) + + 08 Jun 2011; Vlastimil Babka + +emul-linux-x86-java-1.6.0.26.ebuild: + Version bump, security bug #370559. 21 May 2011; Samuli Suominen emul-linux-x86-java-1.6.0.24.ebuild, emul-linux-x86-java-1.6.0.25.ebuild: diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index 98ef94f76703..bf28ef43c267 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: SHA256 - 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-6u24-dlj-linux-i586.bin 84988695 RMD160 82a4137288a3154a6b068caad5b47a38c1f44fce SHA1 d5b556e3b5333ec5fbe236482fa183c3635fe053 SHA256 372135d751d9daf5945cd21d5483e6bc85964aff4a9abdd90d8dff085b717b00 DIST jdk-6u25-dlj-linux-i586.bin 85125510 RMD160 fd7f31dbbcce6f85d104691d3caf9ccbbfa78b27 SHA1 69b10f03901a344d7f61aef0e2e7753c5abebb81 SHA256 83627292f371780007a8ff891506cb61a6cd5d1938032b114337cad80b2322ef +DIST jdk-6u26-dlj-linux-i586.bin 85214224 RMD160 dac0e73fe5cf6ea6cf9b6421f63205bc3856de50 SHA1 abd1e40bf9e51ee41c8a6863efe68e32d3c0b96e SHA256 54561b0b129c206cd6c29fe43968e8a8702fa437ed8df6debd8ffd1a2e536fae EBUILD emul-linux-x86-java-1.6.0.24.ebuild 3493 RMD160 3a7fe96899c3a310acc5fc9784deda2faa0f03ed SHA1 c943e90beae3df1e90911a65d05fd037904d52da SHA256 9ff99c224094728309effb1e775832dad599359f88aa9a7a49d2fbb06bb3307f EBUILD emul-linux-x86-java-1.6.0.25.ebuild 3494 RMD160 e0fb802e91a4ad64c80a1ae17d45f8e9b4fcc892 SHA1 35a86373d61c6e7aca4f82c77f37024ae7e295aa SHA256 98b64af6447a89fe8f181ac3012072a04fea1273c3650b64dde82beae3766e1f -MISC ChangeLog 20208 RMD160 5c8b022ee53a36c9d34e06b8a72556c4bf9623a5 SHA1 e4a46206715b6323de6ac9c01038136d545e1be1 SHA256 38f8124afc04ed161211d93c9977c73ea081694626500af35cfc5c92563d5c81 +EBUILD emul-linux-x86-java-1.6.0.26.ebuild 3491 RMD160 79d3a2bc58774e259a9586728f8dcf0d51e9b770 SHA1 8a5a3bde82609be3d77a73fe184b565cae977bba SHA256 ec102a521049a6af680bbc4c8f48ee131ef811b937c1e9101889cfed59fd06ff +MISC ChangeLog 20380 RMD160 bdb24bf8a38d3cdc21674ce454273641cdd405c4 SHA1 081273a1aeec73b53e73a8b8d93ba30b80e2a4d3 SHA256 edbfba7f99546bbb2421f46066e93fe5554c09bdbfdf621bf216c485b3dd6390 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iF4EAREIAAYFAk3XPwAACgkQXkR9YqOcLPGcTAEAiCFJMCz1nLUauGBSlTp6NChh -AjziOddmcFhR26IvxSIBAKMhfP5KpoPTTixBDoMIznJHFOA3aMNwsNCjsed8ohDR -=RUcW ------END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.ebuild new file mode 100644 index 000000000000..d74d4f0f436d --- /dev/null +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.26.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2011 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.26.ebuild,v 1.1 2011/06/08 15:53:11 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} net-print/cups or net-print/lprng to be installed." + ewarn "Be careful which Java libraries you attempt to use." +} -- cgit v1.2.3-65-gdbad