From: Vlastimil Babka Date: Tue, 30 Mar 2010 20:27:07 +0000 (+0000) Subject: Version bump, security bug #306579. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a68cc6574561a0a1963cc62f261ae6c74d1f51fc;p=gentoo.git Version bump, security bug #306579. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 3d5ac0d4a3a5..af1b1fc9c6e0 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.169 2010/03/30 17:48:53 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.170 2010/03/30 20:27:07 caster Exp $ + +*sun-jre-bin-1.6.0.19 (30 Mar 2010) + + 30 Mar 2010; Vlastimil Babka + +sun-jre-bin-1.6.0.19.ebuild: + Version bump, security bug #306579. 30 Mar 2010; Christian Faulhammer sun-jre-bin-1.6.0.18-r1.ebuild: diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 9e86ec86abdc..9bb8da756454 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc24071dba36878abf7a2da88bfc063eb3727da1 SHA256 47847c81ee85bd1b7dba6e91c2d7757c15a8930f4748dc926e00553bc89fcbd6 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 @@ -12,16 +9,12 @@ DIST jdk-6u17-dlj-linux-amd64.bin 81905547 RMD160 5ad629c427e14bbf13c0fc8470c574 DIST jdk-6u17-dlj-linux-i586.bin 81824577 RMD160 07ad522edd80e19e71152e37544128ddd600c42c SHA1 bca59cb275f37b492e69ceecbda75a573d94b553 SHA256 4ba74424271670cc65405d6ab9a5480cb299ce9fb19c800096ce012d7d662b2e DIST jdk-6u18-dlj-linux-amd64.bin 84826124 RMD160 b8ff139c22e4c2e454ed7b2c7df1e34c0113d5a3 SHA1 4c16d02ecb7b0f729e3888da67310f7ea2e9f668 SHA256 6ec4d76ca50deb67ecf2ec6e4116c657bc67a0986957e51d42fbc2761063cb17 DIST jdk-6u18-dlj-linux-i586.bin 84770500 RMD160 3c4f611e0593f6edb45f04399d9d049fae54359d SHA1 f7d0cefd581f523ac96ca99eb54ba4116fa29e0a SHA256 1097aa37004163878f61b3522fe7d13bdf7e1f10796fc43022011d4c5f4092bb +DIST jdk-6u19-dlj-linux-amd64.bin 84884457 RMD160 9d6a1e4a1c90bfcc82ebdac3a67ad46febd51343 SHA1 272a92b20929d00a3f332c7cca81aea596f0b0f3 SHA256 6b96586edfe17f8d41708fde9f332e2baeb4c15f8f54921235dc6f5ed35eabba +DIST jdk-6u19-dlj-linux-i586.bin 84828696 RMD160 7b0b23363fc0a807724cc290bd24560c99ac84de SHA1 8f3b750bd108a38fb3931e6bd5b0fcd6ab13951b SHA256 008d53b129909456699ac725e19e21c1a59b91737fc1724d0ff26278f73bf9b0 EBUILD sun-jre-bin-1.5.0.22.ebuild 3082 RMD160 b0ff3f603d5f01e33b7fa0622ea9acfb44340dc1 SHA1 d5c752b4600113544e2bcf6a4f3864b45b3b35d7 SHA256 3f3ce45ce2fa0deee1906c649cd60e0d7922cfa7ba4a851480f96de722c4ff7a EBUILD sun-jre-bin-1.6.0.17.ebuild 4192 RMD160 338134cb2a26ac58eabe9bd93d8bb0cd1ebf6175 SHA1 fa85c9788eeebf58cc7a7e17012d9f5480d77469 SHA256 c441f9f5528dd2f1e98c1cd9b3df0a685e5df5f47538989fed6a6509d54ae040 EBUILD sun-jre-bin-1.6.0.18-r1.ebuild 4663 RMD160 3a0016c7e87130385e363735711a5abf9373bbb2 SHA1 b98b004b0aecef22bfdd430413dd98ae33d62dd6 SHA256 953ee2f6b6b8264465e137c790071fa2fe5364f91d57e1afd714f7eb4f6bdf2d EBUILD sun-jre-bin-1.6.0.18.ebuild 4765 RMD160 6d9889e41f5fa631259a04c134c774fa1f744303 SHA1 b4094218afdad3d0fd336e8c6432d1e77bf741df SHA256 ce77ad188d6b441f86a24a0d3db5a8d6861e205c223d3d762d03f42edf06f622 -MISC ChangeLog 30378 RMD160 2397271831dde2619bd8bbc780049b9db2c0c6c2 SHA1 3163e56e5b89d579c45e9538ac928651620ff261 SHA256 eb20830dd77197c217cace27c916a2d209f0ffe3a2252f14447006c1195819db +EBUILD sun-jre-bin-1.6.0.19.ebuild 4662 RMD160 94885f169f67f762911bc1c052030c29e4c13158 SHA1 2a18b7ce83672ba664450a14ac455094698c559f SHA256 9a22d962a577ed249766a44b0b5ac9bc43b23ad2f831725e8527bfe180128b1a +MISC ChangeLog 30538 RMD160 46aea610558ea166f928163bec0818a800255ace SHA1 3b87a8c2f0fd0e1c2cdf6d6a9386b0800d0c8683 SHA256 35fb2df3904d9a785a995f955c3f2d9d07390614b4b2beb39e9d002a46b6ea0c MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuyOY8ACgkQNQqtfCuFneOf4ACfS0LtDrTHvhEWQKe8MrpQESLc -R2gAnj0xtXUJ9rY9CQiTvrPlW03mN8Xo -=sXKx ------END PGP SIGNATURE----- diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.19.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.19.ebuild new file mode 100644 index 000000000000..572e1776c9fa --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.19.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.19.ebuild,v 1.1 2010/03/30 20:27:07 caster Exp $ + +inherit versionator pax-utils eutils java-vm-2 + +UPDATE="$(get_version_component_range 4)" +UPDATE="${UPDATE#0}" +MY_PV="$(get_version_component_range 2)u${UPDATE}" + +SUFFIX=".bin" +X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}" +AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}" + +DESCRIPTION="Sun's Java SE Runtime Environment" +HOMEPAGE="http://java.sun.com/javase/6/" +URL_BASE="http://download.java.net/dlj/binaries" +SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) + amd64? ( ${URL_BASE}/${AMD64_AT} )" +SLOT="1.6" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="strip" +IUSE="X alsa jce nsplugin odbc" + +DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" +RDEPEND="${DEPEND} + sys-libs/glibc + x86? ( =virtual/libstdc++-3.3 ) + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXtst + amd64? ( x11-libs/libXt ) + x11-libs/libX11 + ) + odbc? ( dev-db/unixODBC )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so + opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so + opt/${P}/lib/i386/server/libjvm.so" + +src_unpack() { + mkdir bundled-jdk + cd bundled-jdk + sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" + + cd .. + bash "${FILESDIR}/construct-1.6.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.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 + if use x86; then + einfo "Creating the Class Data Sharing archives" + "${S}"/bin/java -client -Xshare:dump || die + "${S}"/bin/java -server -Xshare:dump || die + fi +} + +src_install() { + local dirs="bin lib man" + + # only X86 has the plugin and javaws + use x86 && dirs="${dirs} 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 jce; then + cd "${D}/opt/${P}/lib/security" + dodir /opt/${P}/lib/security/strong-jce + mv "${D}"/opt/${P}/lib/security/US_export_policy.jar \ + "${D}"/opt/${P}/lib/security/strong-jce || die + mv "${D}"/opt/${P}/lib/security/local_policy.jar \ + "${D}"/opt/${P}/lib/security/strong-jce || die + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/lib/security/ + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/lib/security/ + fi + + if use nsplugin; then + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + if use x86 ; then + install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji + else + install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so + fi + fi + + # install control panel for Gnome/KDE + if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then + sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \ + -e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \ + "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \ + "${T}/sun_jre-${SLOT}.desktop" || die + domenu "${T}/sun_jre-${SLOT}.desktop" || die + fi + + # bug #56444 + insinto /opt/${P}/lib/ + newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties + + set_java_env + java-vm_revdep-mask +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if use x86 && use nsplugin; then + elog + elog "Two variants of the nsplugin are available via eselect java-nsplugin:" + elog "Note that starting with ${PN}-1.6.0.18-r1 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 + fi + + if use amd64 && use nsplugin; then + elog + elog "The amd64 version ships the new 'plugin2' browser plugin which works" + elog "in Firefox 3+ and other recent browser versions." + elog "For more info see https://jdk6.dev.java.net/plugin2/" + elog + fi +}