summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-08-06 15:35:55 +0000
committerVlastimil Babka <caster@gentoo.org>2009-08-06 15:35:55 +0000
commitfef08131bfd553d2cbec05c6c6fc02acd01937eb (patch)
tree861dc4f271fb733587e984eb90f8accfebba5c39 /dev-java
parentFix building with GLIBC 2.10+ wrt #272362. (diff)
downloadhistorical-fef08131bfd553d2cbec05c6c6fc02acd01937eb.tar.gz
historical-fef08131bfd553d2cbec05c6c6fc02acd01937eb.tar.bz2
historical-fef08131bfd553d2cbec05c6c6fc02acd01937eb.zip
Version bump - security bug #280409.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/sun-jdk/ChangeLog9
-rw-r--r--dev-java/sun-jdk/Manifest21
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.5.0.20.ebuild (renamed from dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild)4
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.6.0.15.ebuild161
4 files changed, 178 insertions, 17 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index c60fb2022c87..1c9eda50dcb4 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/sun-jdk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.263 2009/08/02 13:10:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.264 2009/08/06 15:35:55 caster Exp $
+
+*sun-jdk-1.6.0.15 (06 Aug 2009)
+*sun-jdk-1.5.0.20 (06 Aug 2009)
+
+ 06 Aug 2009; Vlastimil Babka <caster@gentoo.org> -sun-jdk-1.5.0.18.ebuild,
+ +sun-jdk-1.5.0.20.ebuild, +sun-jdk-1.6.0.15.ebuild:
+ Version bump - security bug #280409.
02 Aug 2009; Markus Meier <maekke@gentoo.org> sun-jdk-1.5.0.19.ebuild:
amd64 stable, bug #278314
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 81912b2b7035..05fb73760eef 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,31 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8cee6524044fc3bc1bde9c9ec02c420c52ec5499 SHA256 b57d36c5a24829add66fb92a8dd4d496e14ea792218c3515dab9573a55cfad49
AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
DIST j2sdk-1_4_2_19-linux-i586.bin 36387084 RMD160 4d2167bac874d7bce757563d88a9e124b3cb2ca7 SHA1 7c66d03bb6762e549b0644262d08075eb972ac53 SHA256 ce2a2be4ce97313626dd3dc093a7c594fa0f1ffb51e2e12dd341a8091b2c3369
DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
-DIST jdk-5.0u18-dlj-linux-amd64.bin 44094223 RMD160 538225ac69fd4541c2d08fab70c99e8ad3867ef4 SHA1 756be76937bd70c6d0ce520566844aa428d3149e SHA256 40a8f7b5f8e5f515a0a736645635376479eb89351eee594ded341e80a64ee701
-DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
DIST jdk-5.0u19-dlj-linux-amd64.bin 44155115 RMD160 b759a873af5170c189a54c1c872ae2f7b1fde8c8 SHA1 801caa43e5fde123cd49403e4970eaeddcf26ba2 SHA256 f936820ee7d9dbe886588a1cc1d890661aeb81a6e2b1b51d107ca351d543b2d8
DIST jdk-5.0u19-dlj-linux-i586.bin 49754865 RMD160 85531baed424aa400aa75598a8a9d09e22281e03 SHA1 8510b2b2d1c16e2fb3988fe4f94424d19bf179ec SHA256 7e5cd192c7058b6b9b34f34df315451439175ee55a1c8be80428c188345b86dc
+DIST jdk-5.0u20-dlj-linux-amd64.bin 44167773 RMD160 273963fb6330423442822b2b7c6b7cd164223bb1 SHA1 c1af8cf606f5d5a7eb22717159692e0922d6eee7 SHA256 92132d06a2bbec548ed8e35b32764e2a9bdf127a2e57c9eb4f5af18434627618
+DIST jdk-5.0u20-dlj-linux-i586.bin 49764253 RMD160 22148cb268decb1237e2d74764726ca7c5de3387 SHA1 128aa89d06c3f39bee7866882ff2b4d4d33bfaa4 SHA256 10b1beea2e8d2733255095ba6fe55065e66e9fc2e0116f240eea2ce680195206
DIST jdk-6u13-dlj-linux-amd64.bin 80287589 RMD160 8e2994657a732e8e45b166dcaf0b16422ae4fb25 SHA1 70b412a12037e3a9033503a566585d08418f029c SHA256 799ae9ce5ed2cede1e75aa1861e0e835c06135a54767546e5b12d6be4d2814d5
DIST jdk-6u13-dlj-linux-i586.bin 80161911 RMD160 8167ed89d38722577547d4f46f5fa06cf07fedf3 SHA1 ef9177f519ad03669921876fd711c1c02f306abf SHA256 a07d48549bb48becf7a1185b2ce908797a9dcfcc834ff111e8b6d9ad19ce60d7
DIST jdk-6u14-dlj-linux-amd64.bin 81881391 RMD160 40986758e23369d870c766e9f7b65860b421390d SHA1 3ffc80f7a194bc29792dbdfc9b7c395bf82cf346 SHA256 a2593daa7bee2789085d62389b6a37e988281c901c84af0916ef1bc5e5220f8e
DIST jdk-6u14-dlj-linux-i586.bin 81803297 RMD160 db35274bd08422f97f454dbcadb79abdc9e4ab13 SHA1 ce7fcdeb9275820b98a54ecf7a44ed30557b8233 SHA256 08ff9c6a89da117f7e6eabcc21da36900fab56a4fb9b4e8ff5cb3c267b4ec0a0
+DIST jdk-6u15-dlj-linux-amd64.bin 81895994 RMD160 12976068c37998bf91e5ecd87179ac4ed697d2ce SHA1 77323aab8b59b5cf84ea09cb43e0e4a0c05e1f1a SHA256 14133ea4bd8f1dfd5ce92d1d622f719539b58ceb6eac5c094939cf216075a317
+DIST jdk-6u15-dlj-linux-i586.bin 81819735 RMD160 593d067c222bd05d640b24fd9cba20915a795de2 SHA1 d09eea7fb48cd662abafbf490b0cb8340936095a SHA256 d0e14d777d2f49da7d98fc27790c766d4d47d19a973c0855b2b9250ab4fdd815
EBUILD sun-jdk-1.4.2.19.ebuild 5213 RMD160 530b79d8148058cf2914021795f834e7209d080e SHA1 2b9401bc92289ea853318af38c85eb35c8b9d06e SHA256 96d94c6b234835dbb429a9ee1f63d43ef4f82b7db70f4ec225af857de9d7b0d3
-EBUILD sun-jdk-1.5.0.18.ebuild 4158 RMD160 4497b25778d5da72a5c68a6bc962ec02e16ad261 SHA1 c6ba9278938181fce1a9d5c0596f3151a4b14058 SHA256 5562ee96b9156d29f1b1669bd727577acd5e1a359f27703b7590d4385804edc8
EBUILD sun-jdk-1.5.0.19.ebuild 4158 RMD160 12510a30cb738eda6220a9480895316d458d2414 SHA1 1627f0660de5245f1d29e308f9fa0afda3337299 SHA256 fec932ee75d46237635db31ed837a60c34419d7be5063db19897db20de7a2c88
+EBUILD sun-jdk-1.5.0.20.ebuild 4160 RMD160 7d82a44b343b92b13fe9485860830a3de646b23a SHA1 ab6339eef86d86955c4f06d458510353ef40b6ba SHA256 f18de397aea8d748a3b62e04784b18d3f0137e632ec826aa8efcbb81836cc2ea
EBUILD sun-jdk-1.6.0.13.ebuild 5059 RMD160 a085ba418acb1f984c3fa3efe1674aabeb59a739 SHA1 a89032ee807c9dce3f5044abee1e45029654c940 SHA256 afaec3f222f8d7a9e48ccbb7e0e873445aeef646d566a24371fbb0936e7e2ab4
EBUILD sun-jdk-1.6.0.14.ebuild 5098 RMD160 d0535f5e6ff2834ab5b784f28564a861c04b8a13 SHA1 ed5ff4d4de5624522bc3ec89f6638d512713df6a SHA256 bd8de15d204a0b711eb68f993aeb371c74cca67359aed0a5454cb7f0844f4150
-MISC ChangeLog 49590 RMD160 4e9b7e8a745d46fc652de143e917c10519975dbf SHA1 dbc55d0bddb7c36f52af4389bb5f792503623d76 SHA256 cb86841ffa649572a4305232d68b715d89584ad10009b6a1bd34bce8d34ec0d9
+EBUILD sun-jdk-1.6.0.15.ebuild 5100 RMD160 98cc6e0996ab93a21624b8e84991eb300d5dd641 SHA1 987888b576961814ff9c6b571fa57fd3a801e46a SHA256 cd3f60dcc6b595f45d5e608c75d5dade29e020ef85d2eae932451d7ffd7d557b
+MISC ChangeLog 49826 RMD160 4d598c8eb255e7e5673d6d35fe964f90cf91a18c SHA1 a9b52559253d1229f71340d08e07bf20d06a7d7c SHA256 def73f2258f8c7106823ae636b2e6f93c430430166087ab8d0664be75536d982
MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp1kIQACgkQkKaRLQcq0GKPPwCdHxh05ofAzL1/cm1iP89d5/+W
-B9YAnRjGMOAlNBHqcUznFCAYaByLkRdD
-=BJNd
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.20.ebuild
index 78eb4358287d..c017e0740b89 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.18.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.5.0.18.ebuild,v 1.4 2009/05/29 20:30:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.20.ebuild,v 1.1 2009/08/06 15:35:55 caster Exp $
inherit versionator java-vm-2 eutils pax-utils
@@ -17,7 +17,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
SLOT="1.5"
LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
RESTRICT="strip"
IUSE="X alsa doc examples jce nsplugin odbc"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.15.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.15.ebuild
new file mode 100644
index 000000000000..a718668bd67c
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.15.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2009 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.15.ebuild,v 1.1 2009/08/06 15:35:55 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="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/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+ install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2
+ 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 "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
+ ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
+ elog "For more info see https://jdk6.dev.java.net/plugin2/"
+ elog
+ fi
+
+ if use amd64 && use nsplugin; then
+ elog
+ elog "This version finally brings a browser plugin for amd64"
+ elog "It is the so-called Next-Generation Plug-In (plugin2)"
+ elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
+ ewarn "Note that it works only in Firefox 3 or newer browsers!"
+ elog "For more info see https://jdk6.dev.java.net/plugin2/"
+ elog
+ fi
+
+ elog "Please reinstall eclipse-sdk if you have it installed and want"
+ elog "workaround for bug #215150."
+}