From 4f9e865ec2c60270a77114d34f9e1bcba5285cec Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 18 Oct 2009 19:58:46 +0000 Subject: Version bump, security bug #287490. (Portage version: 2.2_rc46/cvs/Linux x86_64) --- dev-java/ibm-jre-bin/ChangeLog | 8 +- dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild | 181 ------------------------ dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.6.ebuild | 181 ++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 182 deletions(-) delete mode 100644 dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild create mode 100644 dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.6.ebuild (limited to 'dev-java') diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog index a2dc7020465a..88ff20548f58 100644 --- a/dev-java/ibm-jre-bin/ChangeLog +++ b/dev-java/ibm-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/ibm-jre-bin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.135 2009/10/15 15:12:02 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.136 2009/10/18 19:58:46 caster Exp $ + +*ibm-jre-bin-1.6.0.6 (18 Oct 2009) + + 18 Oct 2009; Vlastimil Babka + -ibm-jre-bin-1.6.0.4.ebuild, +ibm-jre-bin-1.6.0.6.ebuild: + Version bump, security bug #287490. 15 Oct 2009; Mounir Lamouri ibm-jre-bin-1.5.0.10.ebuild: diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild deleted file mode 100644 index 2ee618ee1369..000000000000 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.4.ebuild,v 1.3 2009/05/29 20:39:13 caster Exp $ - -inherit java-vm-2 versionator eutils - -JDK_RELEASE=$(get_version_component_range 2-3) -SERVICE_RELEASE=$(get_version_component_range 4) -SERVICE_RELEASE_LINK="${SERVICE_RELEASE}" -TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" - -JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux" - -X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz" -AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz" -PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz" -PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz" - -if use x86; then - JRE_DIST=${X86_JRE_DIST} - S="${WORKDIR}/ibm-java-i386-60" - LINK_ARCH="intel" -elif use amd64; then - JRE_DIST=${AMD64_JRE_DIST} - S="${WORKDIR}/ibm-java-x86_64-60" - LINK_ARCH="amd64" -elif use ppc; then - JRE_DIST=${PPC_JRE_DIST} - S="${WORKDIR}/ibm-java-ppc-60" - LINK_ARCH="ipseries32" -elif use ppc64; then - JRE_DIST=${PPC64_JRE_DIST} - S="${WORKDIR}/ibm-java-ppc64-60" - LINK_ARCH="ipseries64" -fi - -DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK" - -SLOT="1.6" -DESCRIPTION="IBM Java SE Runtime Environment" -HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" -DOWNLOADPAGE="${HOMEPAGE}linux/download.html" -# bug #125178 -ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" - -SRC_URI="x86? ( ${X86_JRE_DIST} ) - amd64? ( ${AMD64_JRE_DIST} ) - ppc? ( ${PPC_JRE_DIST} ) - ppc64? ( ${PPC64_JRE_DIST} )" -LICENSE="IBM-J1.6" -KEYWORDS="-* ~amd64 ppc ppc64 ~x86" -RESTRICT="fetch" -IUSE="X alsa nsplugin odbc" - -RDEPEND=" - X? ( - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXp - x11-libs/libXtst - x11-libs/libX11 - amd64? ( x11-libs/libXt ) - ) - alsa? ( media-libs/alsa-lib ) - odbc? ( dev-db/unixODBC )" -DEPEND="" - -QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so -opt/${P}/lib/i386/libj9vm24.so -opt/${P}/lib/i386/libjclscar_24.so -opt/${P}/lib/i386/motif21/libmawt.so -opt/${P}/lib/i386/libj9thr24.so -opt/${P}/lib/i386/libj9jit24.so -opt/${P}/lib/i386/libj9dbg24.so -opt/${P}/lib/i386/libj9gc24.so" - -QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so -opt/${P}/lib/i386/j9vm/libjvm.so -opt/${P}/lib/i386/libj9jvmti24.so -opt/${P}/lib/i386/libj9hookable24.so -opt/${P}/lib/i386/libj9vm24.so -opt/${P}/lib/i386/libjclscar_24.so -opt/${P}/lib/i386/libj9thr24.so -opt/${P}/lib/i386/libj9dmp24.so -opt/${P}/lib/i386/libj9prt24.so -opt/${P}/lib/i386/libj9jit24.so -opt/${P}/lib/i386/libiverel24.so -opt/${P}/lib/i386/libj9trc24.so -opt/${P}/lib/i386/libj9dbg24.so -opt/${P}/lib/i386/libj9shr24.so -opt/${P}/lib/i386/libj9gc24.so -opt/${P}/lib/i386/libj9bcv24.so -opt/${P}/lib/i386/classic/libjvm.so" - -QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so -opt/${P}/lib/amd64/default/libj9jvmti24.so -opt/${P}/lib/amd64/default/libj9hookable24.so -opt/${P}/lib/amd64/default/libj9vm24.so -opt/${P}/lib/amd64/default/libjclscar_24.so -opt/${P}/lib/amd64/default/libj9jpi24.so -opt/${P}/lib/amd64/default/libj9thr24.so -opt/${P}/lib/amd64/default/libj9dmp24.so -opt/${P}/lib/amd64/default/libj9prt24.so -opt/${P}/lib/amd64/default/libj9jit24.so -opt/${P}/lib/amd64/default/libiverel24.so -opt/${P}/lib/amd64/default/libj9trc24.so -opt/${P}/lib/amd64/default/libj9dbg24.so -opt/${P}/lib/amd64/default/libj9shr24.so -opt/${P}/lib/amd64/default/libj9gc24.so -opt/${P}/lib/amd64/default/libj9bcv24.so -opt/${P}/lib/amd64/compressedrefs/libjvm.so -opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so -opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so -opt/${P}/lib/amd64/compressedrefs/libj9vm24.so -opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so -opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so -opt/${P}/lib/amd64/compressedrefs/libj9thr24.so -opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so -opt/${P}/lib/amd64/compressedrefs/libj9prt24.so -opt/${P}/lib/amd64/compressedrefs/libj9jit24.so -opt/${P}/lib/amd64/compressedrefs/libiverel24.so -opt/${P}/lib/amd64/compressedrefs/libj9trc24.so -opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so -opt/${P}/lib/amd64/compressedrefs/libj9shr24.so -opt/${P}/lib/amd64/compressedrefs/libj9gc24.so -opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so" - -pkg_nofetch() { - einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" - einfo "Please visit: ${DOWNLOADPAGE}" - - einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:" - einfo "${JRE_DIST}" - - einfo "You can use direct link to your arch download page:" - einfo "${DIRECT_DOWNLOAD}" - einfo "Place the file(s) in: ${DISTDIR}" - einfo "Then restart emerge: 'emerge --resume'" - - einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}" - einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" - einfo "isn't updated, but the files should still available through the" - einfo "direct link to arch download page. If it doesn't work, file a bug." -} - -src_compile() { :; } - -src_install() { - # Copy all the files to the designated directory - dodir /opt/${P} - cp -pR "${S}"/jre/* "${D}/opt/${P}/" - - if use x86 || use ppc; then - if use nsplugin; then - local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so" - install_mozilla_plugin "${plugin}" - fi - fi - - local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop" - if [[ -f "${desktop_in}" ]]; then - local desktop_out="${T}/ibm_jre-${SLOT}.desktop" - # install control panel for Gnome/KDE - # The jdk also installs these so make sure that they do not have the same - # Name - sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ - "${desktop_in}" > \ - "${desktop_out}" || die - - domenu "${desktop_out}" || die - fi - - dohtml -a html,htm,HTML -r docs || die - dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die - - set_java_env - java-vm_revdep-mask -} diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.6.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.6.ebuild new file mode 100644 index 000000000000..ce7699343e6a --- /dev/null +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.6.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.6.ebuild,v 1.1 2009/10/18 19:58:46 caster Exp $ + +inherit java-vm-2 versionator eutils + +JDK_RELEASE=$(get_version_component_range 2-3) +SERVICE_RELEASE=$(get_version_component_range 4) +SERVICE_RELEASE_LINK="${SERVICE_RELEASE}" +TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" + +JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux" + +X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz" +AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz" +PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz" +PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz" + +if use x86; then + JRE_DIST=${X86_JRE_DIST} + S="${WORKDIR}/ibm-java-i386-60" + LINK_ARCH="intel" +elif use amd64; then + JRE_DIST=${AMD64_JRE_DIST} + S="${WORKDIR}/ibm-java-x86_64-60" + LINK_ARCH="amd64" +elif use ppc; then + JRE_DIST=${PPC_JRE_DIST} + S="${WORKDIR}/ibm-java-ppc-60" + LINK_ARCH="ipseries32" +elif use ppc64; then + JRE_DIST=${PPC64_JRE_DIST} + S="${WORKDIR}/ibm-java-ppc64-60" + LINK_ARCH="ipseries64" +fi + +DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK" + +SLOT="1.6" +DESCRIPTION="IBM Java SE Runtime Environment" +HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" +DOWNLOADPAGE="${HOMEPAGE}linux/download.html" +# bug #125178 +ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" + +SRC_URI="x86? ( ${X86_JRE_DIST} ) + amd64? ( ${AMD64_JRE_DIST} ) + ppc? ( ${PPC_JRE_DIST} ) + ppc64? ( ${PPC64_JRE_DIST} )" +LICENSE="IBM-J1.6" +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" +RESTRICT="fetch" +IUSE="X alsa nsplugin odbc" + +RDEPEND=" + X? ( + x11-libs/libXext + x11-libs/libXft + x11-libs/libXi + x11-libs/libXp + x11-libs/libXtst + x11-libs/libX11 + amd64? ( x11-libs/libXt ) + ) + alsa? ( media-libs/alsa-lib ) + odbc? ( dev-db/unixODBC )" +DEPEND="" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so +opt/${P}/lib/i386/libj9vm24.so +opt/${P}/lib/i386/libjclscar_24.so +opt/${P}/lib/i386/motif21/libmawt.so +opt/${P}/lib/i386/libj9thr24.so +opt/${P}/lib/i386/libj9jit24.so +opt/${P}/lib/i386/libj9dbg24.so +opt/${P}/lib/i386/libj9gc24.so" + +QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so +opt/${P}/lib/i386/j9vm/libjvm.so +opt/${P}/lib/i386/libj9jvmti24.so +opt/${P}/lib/i386/libj9hookable24.so +opt/${P}/lib/i386/libj9vm24.so +opt/${P}/lib/i386/libjclscar_24.so +opt/${P}/lib/i386/libj9thr24.so +opt/${P}/lib/i386/libj9dmp24.so +opt/${P}/lib/i386/libj9prt24.so +opt/${P}/lib/i386/libj9jit24.so +opt/${P}/lib/i386/libiverel24.so +opt/${P}/lib/i386/libj9trc24.so +opt/${P}/lib/i386/libj9dbg24.so +opt/${P}/lib/i386/libj9shr24.so +opt/${P}/lib/i386/libj9gc24.so +opt/${P}/lib/i386/libj9bcv24.so +opt/${P}/lib/i386/classic/libjvm.so" + +QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so +opt/${P}/lib/amd64/default/libj9jvmti24.so +opt/${P}/lib/amd64/default/libj9hookable24.so +opt/${P}/lib/amd64/default/libj9vm24.so +opt/${P}/lib/amd64/default/libjclscar_24.so +opt/${P}/lib/amd64/default/libj9jpi24.so +opt/${P}/lib/amd64/default/libj9thr24.so +opt/${P}/lib/amd64/default/libj9dmp24.so +opt/${P}/lib/amd64/default/libj9prt24.so +opt/${P}/lib/amd64/default/libj9jit24.so +opt/${P}/lib/amd64/default/libiverel24.so +opt/${P}/lib/amd64/default/libj9trc24.so +opt/${P}/lib/amd64/default/libj9dbg24.so +opt/${P}/lib/amd64/default/libj9shr24.so +opt/${P}/lib/amd64/default/libj9gc24.so +opt/${P}/lib/amd64/default/libj9bcv24.so +opt/${P}/lib/amd64/compressedrefs/libjvm.so +opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so +opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so +opt/${P}/lib/amd64/compressedrefs/libj9vm24.so +opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so +opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so +opt/${P}/lib/amd64/compressedrefs/libj9thr24.so +opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so +opt/${P}/lib/amd64/compressedrefs/libj9prt24.so +opt/${P}/lib/amd64/compressedrefs/libj9jit24.so +opt/${P}/lib/amd64/compressedrefs/libiverel24.so +opt/${P}/lib/amd64/compressedrefs/libj9trc24.so +opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so +opt/${P}/lib/amd64/compressedrefs/libj9shr24.so +opt/${P}/lib/amd64/compressedrefs/libj9gc24.so +opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so" + +pkg_nofetch() { + elog "Due to license restrictions, we cannot redistribute or fetch the distfiles" + elog "Please visit: ${DOWNLOADPAGE}" + + elog "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:" + elog "${JRE_DIST}" + + elog "You can use direct link to your arch download page:" + elog "${DIRECT_DOWNLOAD}" + elog "Place the file(s) in: ${DISTDIR}" + elog "Then restart emerge: 'emerge --resume'" + + elog "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}" + elog "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" + elog "isn't updated, but the files should still available through the" + elog "direct link to arch download page. If it doesn't work, file a bug." +} + +src_compile() { :; } + +src_install() { + # Copy all the files to the designated directory + dodir /opt/${P} + cp -pR "${S}"/jre/* "${D}/opt/${P}/" + + if use x86 || use ppc; then + if use nsplugin; then + local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so" + install_mozilla_plugin "${plugin}" + fi + fi + + local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop" + if [[ -f "${desktop_in}" ]]; then + local desktop_out="${T}/ibm_jre-${SLOT}.desktop" + # install control panel for Gnome/KDE + # The jdk also installs these so make sure that they do not have the same + # Name + sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ + "${desktop_in}" > \ + "${desktop_out}" || die + + domenu "${desktop_out}" || die + fi + + dohtml -a html,htm,HTML -r docs || die + dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die + + set_java_env + java-vm_revdep-mask +} -- cgit v1.2.3-65-gdbad