Version bump, security bug #314531.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index b95e271e2a9f042b1d961c851d88b1bc5c4962cb..d3abe467d5b89747b78143091fb47e16e6989b52 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.283 2010/04/15 22:09:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.284 2010/04/16 09:34:27 caster Exp $
+
+*sun-jdk-1.6.0.20 (16 Apr 2010)
+
+  16 Apr 2010; Vlastimil Babka <caster@gentoo.org> +sun-jdk-1.6.0.20.ebuild:
+  Version bump, security bug #314531.
 
   15 Apr 2010; Vlastimil Babka <caster@gentoo.org> -sun-jdk-1.6.0.17.ebuild,
   -sun-jdk-1.6.0.18.ebuild, -sun-jdk-1.6.0.18-r1.ebuild:

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index d4c5e95c26a228643f8e9887ff87fe355d1a35cb..5d4d6a5d7fca5357a053ec1d0d42afa9e196d69b 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -5,7 +5,10 @@ DIST jdk-5.0u22-dlj-linux-amd64.bin 44213188 RMD160 00cecc02b5a02b00732954f5dab6
 DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 RMD160 f015e1502b357cccd45695a5c4bc41ba113d3a30 SHA1 611e56dd3dc0e25b286c374c60b56b5e76569fb2 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46
 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
+DIST jdk-6u20-dlj-linux-amd64.bin 84885416 RMD160 4a62ba9ea54128fe227afd3ff1678286d41616df SHA1 3612cd55715cee3c02894818f9edbd08d71bdea1 SHA256 1e482a05a3741f215613fed15e5d6644520614533b2393ec807674cc2e2d8a88
+DIST jdk-6u20-dlj-linux-i586.bin 84828910 RMD160 6f015c434363e8ac89cdf435c3c71634dea01d8a SHA1 b9866ab9923ba88d95fe3629ece3a6dbbbad1300 SHA256 dbfc1338fd18b59b66701de87ee8d553b8a7fce348966ee8a50728d08e474dbe
 EBUILD sun-jdk-1.5.0.22-r1.ebuild 4188 RMD160 1ea9e630494ec8d58ad8f2fa4aec4612c9adcec6 SHA1 08927124f3fc4c135db56e4bd3868755b5a743f8 SHA256 31c586d5703d1496de96043d9498afb22ef8c837a6a3605c8caf535fc19f9be0
 EBUILD sun-jdk-1.6.0.19.ebuild 5146 RMD160 3c344b122a1e621342a380dc0bca5d9615f5d14d SHA1 1e2aa1066a8aedb909849f0e4374331e0f48a4bd SHA256 06796b2c284ed1cda2a95289b9da6870b4529951ba71c815cab3c0dfc8578d98
-MISC ChangeLog 53009 RMD160 2455e2e7a279362342e33ffa335c59d8896bf408 SHA1 f82c9b7214f30e4d67eb07a5d8aa54c10ba935b7 SHA256 ec204d8bbd992d92cb229a2599ca269b2f85053a7b722efafe285b94a2e104e9
+EBUILD sun-jdk-1.6.0.20.ebuild 5148 RMD160 6f0f50a3f24191d126df4c1d2abb5010aec89e3a SHA1 a643d1990406a9fe53443664f309b5e832c656a4 SHA256 869686e5c4d781d40138749d7bbd4544f2b1d4f654468abc9fdd301d80815acd
+MISC ChangeLog 53158 RMD160 3d657c8872e030c3c945e5d6cca9ba6bea8824ee SHA1 9c4928cb86f811b438d8196f5bb24abcd0a6fda9 SHA256 bcf9a14c069302d6d2df90560554915def7b5e6adc26c3ead65e7b511ae22ee4
 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c

diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild
new file mode 100644 (file)
index 0000000..da99fb0
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild,v 1.1 2010/04/16 09:34:27 caster Exp $
+
+inherit versionator java-vm-2 eutils pax-utils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's Java SE Development Kit"
+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 derby doc examples jce nsplugin odbc"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
+       opt/${P}/jre/lib/i386/libdeploy.so
+       opt/${P}/jre/lib/i386/client/libjvm.so
+       opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_DT_HASH="opt/${P}/.*"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
+RDEPEND="${DEPEND}
+       doc? ( =dev-java/java-sdk-docs-1.6.0* )
+       sys-libs/glibc
+       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"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
+
+src_unpack() {
+       sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+}
+
+src_compile() {
+       # Set PaX markings on all JDK/JRE executables to allow code-generation on
+       # the heap by the JIT compiler. This needs to be done before CDS - #215225
+       pax-mark m $(list-paxables "${S}"{,/jre}/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 include jre lib man"
+
+       use derby && dirs="${dirs} db"
+
+       dodir /opt/${P}
+
+       cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
+       dodoc COPYRIGHT || die
+       dohtml README.html || die
+
+       cp -pP src.zip "${D}/opt/${P}/" || die
+
+       if use examples; then
+               cp -pPR demo sample "${D}/opt/${P}/" || die
+       fi
+
+       if use jce; then
+               cd "${D}/opt/${P}/jre/lib/security"
+               dodir /opt/${P}/jre/lib/security/strong-jce
+               mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+                       "${D}"/opt/${P}/jre/lib/security/strong-jce || die
+               mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
+                       "${D}"/opt/${P}/jre/lib/security/strong-jce || die
+               dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+               dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/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}/jre/lib/i386/libnpjp2.so
+                       install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji
+               else
+                       install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so
+               fi
+       fi
+
+       # create dir for system preferences
+       dodir /opt/${P}/jre/.systemPrefs
+       # Create files used as storage for system preferences.
+       touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+       chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+       touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+       chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+       if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+               # install control panel for Gnome/KDE
+               # The jre also installs these so make sure that they do not have the same
+               # Name
+               sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
+                       -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
+                       -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+                       "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+                       "${T}"/sun_jdk-${SLOT}.desktop
+
+               domenu "${T}"/sun_jdk-${SLOT}.desktop
+       fi
+
+       # bug #56444
+       insinto /opt/${P}/jre/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
+}