Version bump, security bug #186277.

(Portage version: 2.1.3.5)

6 files changed, 24 insertions, 177 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 5ac1ebb6053d..21020f01d8ca 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.68 2007/08/12 14:35:33 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.69 2007/08/21 10:12:28 caster Exp $
+
+*ibm-jre-bin-1.5.0.5a (21 Aug 2007)
+
+  21 Aug 2007; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jre-bin-1.4.2.8.ebuild, -ibm-jre-bin-1.5.0.5.ebuild,
+  +ibm-jre-bin-1.5.0.5a.ebuild:
+  Version bump, security bug #186277.
 
   12 Aug 2007; Steve Dibb <beandog@gentoo.org> ibm-jre-bin-1.4.2.9.ebuild:
   amd64 stable, security bug 186277
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.8 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.8
deleted file mode 100644
index e28907c1cbac..000000000000
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 e319b2d369ee894acaad4bd03ed77b5f IBMJava2-JRE-1.4.2-8.0.ppc.tgz 48405855
-RMD160 4607807a697454d5f4b64d2ba76f5b5be54d8a70 IBMJava2-JRE-1.4.2-8.0.ppc.tgz 48405855
-SHA256 f49f4ff1467fc3ae9c3ecc6b41e1103b197815c472560868f1346f8e83e93aa4 IBMJava2-JRE-1.4.2-8.0.ppc.tgz 48405855
-MD5 2163169db3ff6d7a76deea65367a3ed3 IBMJava2-JRE-1.4.2-8.0.ppc64.tgz 46667976
-RMD160 8c181fff04f466dccf9eed8c9eb86e226edc73f3 IBMJava2-JRE-1.4.2-8.0.ppc64.tgz 46667976
-SHA256 047c1ff1f4a2b2660ecd03a8eb4ab80ed44b2c37a1eaf643275b4ba50d041630 IBMJava2-JRE-1.4.2-8.0.ppc64.tgz 46667976
-MD5 b2617c53f38e0bf56a6e42a481209bcc IBMJava2-JRE-1.4.2-8.0.tgz 39999141
-RMD160 6d91094bebeeef7c805f7109ef402ea6174e9719 IBMJava2-JRE-1.4.2-8.0.tgz 39999141
-SHA256 622d3a260870da554c15defd158e903b0616fdd1e09ceaaa2a59000748728447 IBMJava2-JRE-1.4.2-8.0.tgz 39999141
-MD5 2d8614dafce1d8552b2600dd2d6f26a3 IBMJava2-JRE-AMD64-1.4.2-8.0.x86_64.tgz 34894373
-RMD160 d055930419352c9f267a47096893760c36337bc4 IBMJava2-JRE-AMD64-1.4.2-8.0.x86_64.tgz 34894373
-SHA256 78d17767e3b72f031df0d32d84a2c4841cd029065ef81005cc4fa79518602485 IBMJava2-JRE-AMD64-1.4.2-8.0.x86_64.tgz 34894373
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5
deleted file mode 100644
index 3abe7ae350d3..000000000000
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 08078cfb1c1c70d6bd4cb742e4bf1909 ibm-java2-jre-5.0-5.0-linux-i386.tgz 43570026
-RMD160 375b409e32a6f015f32b8b4f767adab1c496fcda ibm-java2-jre-5.0-5.0-linux-i386.tgz 43570026
-SHA256 25e98cc5dc3a24b8570babccc0557d9818040a5f011055dc920a278a48a52052 ibm-java2-jre-5.0-5.0-linux-i386.tgz 43570026
-MD5 c0982dbcacd6cc65fe20c0f3f02766c0 ibm-java2-jre-5.0-5.0-linux-ppc.tgz 50066027
-RMD160 fd73c1707ce7b0929bd9bd3e717d96f1826c5a99 ibm-java2-jre-5.0-5.0-linux-ppc.tgz 50066027
-SHA256 3d362d3ce45f1394738072ab8921cc7b0664062f374a9ce22141a0868bf3d2cb ibm-java2-jre-5.0-5.0-linux-ppc.tgz 50066027
-MD5 16b722126f2462577a8295a3eddffcb1 ibm-java2-jre-5.0-5.0-linux-ppc64.tgz 49635119
-RMD160 b0fb3bbe23346a3958ec3a53c8916baf653d0cb8 ibm-java2-jre-5.0-5.0-linux-ppc64.tgz 49635119
-SHA256 3fe31d56429c07c197f0838ad349eb332be3f9441b5d9661355ca4138150c109 ibm-java2-jre-5.0-5.0-linux-ppc64.tgz 49635119
-MD5 f2b945d586949bcbc8c4fe31462ae025 ibm-java2-jre-5.0-5.0-linux-x86_64.tgz 45709062
-RMD160 d02791dda1c6d44e0fdea5a5c0f4935de236de40 ibm-java2-jre-5.0-5.0-linux-x86_64.tgz 45709062
-SHA256 5cfc5cbe54b8e679e92ca4582826d391173daa945eb8b5b993de7eedd087d7d7 ibm-java2-jre-5.0-5.0-linux-x86_64.tgz 45709062
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5a b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5a
new file mode 100644
index 000000000000..66e507eaad7e
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5a
@@ -0,0 +1,12 @@
+MD5 e745d755b7f18100ab6b97491016b1a6 ibm-java2-jre-5.0-5.1-linux-i386.tgz 43146484
+RMD160 d265291dfdc45076040a2eee35416bfd3a72a41c ibm-java2-jre-5.0-5.1-linux-i386.tgz 43146484
+SHA256 ccefe0711cf7ef170e03c050b51d65df191647f9b6b08c49c61021ca53660c3c ibm-java2-jre-5.0-5.1-linux-i386.tgz 43146484
+MD5 bfed0bf7242a9bf1fbbbd0d27cefffdf ibm-java2-jre-5.0-5.1-linux-ppc.tgz 49778743
+RMD160 3fae444a71b4fa791b9cb2c068f25b13ba1ac261 ibm-java2-jre-5.0-5.1-linux-ppc.tgz 49778743
+SHA256 face09a028df5bb3a46def327d785f159b7e39afaf13aec5b2bd7aec008d802b ibm-java2-jre-5.0-5.1-linux-ppc.tgz 49778743
+MD5 294a13b08736d20a476a60ea24762664 ibm-java2-jre-5.0-5.1-linux-ppc64.tgz 49615158
+RMD160 fb075e5b045acfa421a222f7726454d84187adcc ibm-java2-jre-5.0-5.1-linux-ppc64.tgz 49615158
+SHA256 a4dfba413275f43e12e62bd9a8e8c239b081782eb8fa2d93e74e217c77d3392d ibm-java2-jre-5.0-5.1-linux-ppc64.tgz 49615158
+MD5 8271c0c2a509761c0efbe4c8d5169111 ibm-java2-jre-5.0-5.1-linux-x86_64.tgz 45419369
+RMD160 6932ae186a32ff8a220c3b7ea3870a00958d831c ibm-java2-jre-5.0-5.1-linux-x86_64.tgz 45419369
+SHA256 22818d84e472f15cf8f8c15ebd49c0ae3f1dc0f1c98f85ca9a4f378218a16284 ibm-java2-jre-5.0-5.1-linux-x86_64.tgz 45419369
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.8.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.8.ebuild
deleted file mode 100644
index 6455631ae78a..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.8.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2007 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.4.2.8.ebuild,v 1.5 2007/07/22 20:52:55 philantrop Exp $
-
-inherit java-vm-2 eutils versionator
-
-JDK_RELEASE=$(get_version_component_range 1-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JRE_DIST_PREFIX="IBMJava2-JRE-${RPM_PV}"
-
-X86_JRE_DIST="${JRE_DIST_PREFIX}.tgz"
-# wonder why amd64 has this extra special AMD64 in its filename...
-AMD64_JRE_DIST="IBMJava2-JRE-AMD64-${RPM_PV}.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}/IBMJava2-142"
-	LINK_ARCH="ia32"
-elif use amd64; then
-	JRE_DIST=${AMD64_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-amd64-142"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JRE_DIST=${PPC_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-ppc-142"
-	LINK_ARCH="ip32"
-elif use ppc64; then
-	JRE_DIST=${PPC64_JRE_DIST}
-	S="${WORKDIR}/IBMJava2-ppc64-142"
-	LINK_ARCH="ip64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
-
-DESCRIPTION="IBM Java Runtime Environment"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-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.4"
-SLOT="1.4"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-IUSE="X alsa nsplugin"
-
-RDEPEND="
-	=virtual/libstdc++-3.3
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXtst
-		x11-libs/libXp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-	)
-	x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )"
-DEPEND=""
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
-	opt/${P}/bin/javaplugin.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/classic/libcore.so"
-QA_TEXTRELS_amd64="
-	opt/${P}/bin/libj9jit22.so
-	opt/${P}/bin/libjclscar_22.so
-"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JRE_DIST}"
-
-	einfo "Direct link:"
-	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. If it doesn't work, file a bug."
-}
-
-src_compile() { :; }
-
-src_install() {
-	# javaws is on x86 only
-	if use x86; then
-		# The javaws execution script is 777 why?
-		chmod 0755 ${S}/jre/javaws/javaws
-
-		# bug #147259
-		dosym ../javaws/javaws /opt/${P}/bin/javaws
-	fi
-
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR ${S}/jre/* ${D}opt/${P}/
-
-	if use x86 && use nsplugin; then
-		local plugin="libjavaplugin_oji.so"
-
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-
-		install_mozilla_plugin /opt/${P}/bin/${plugin}
-	elif use x86; then
-		rm ${D}/opt/${P}/bin/libjavaplugin*.so
-	fi
-
-	if ! use alsa; then
-		rm ${D}/opt/${P}/bin/libjsoundalsa.so \
-			|| eerror "${D}/opt/${P}/bin/libjsoundalsa.so not found"
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
-
-	set_java_env
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		ewarn
-		ewarn "You have not enabled the X useflag.  It is possible that"
-		ewarn "you do not have an X server installed.  Please note that"
-		ewarn "some parts of the IBM JRE require an X server to properly"
-		ewarn "function.  Be careful which Java libraries you attempt to"
-		ewarn "use with your installation."
-		ewarn
-	fi
-}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5a.ebuild
index d2245c952991..fe97f797896d 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5a.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2007 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.5.0.5.ebuild,v 1.3 2007/07/22 09:40:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5a.ebuild,v 1.1 2007/08/21 10:12:28 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
 JDK_RELEASE=$(get_version_component_range 2-3)
 SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}a"
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.1"
 
 JRE_DIST_PREFIX="ibm-java2-jre-${RPM_PV}-linux"
 
@@ -33,7 +34,7 @@ elif use ppc64; then
 	LINK_ARCH="ipseries64"
 fi
 
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.5"
 DESCRIPTION="IBM Java Runtime Environment ${SLOT}"