Restored stable 1.5.0.06 wrt bug #148738.

Package-Manager: portage-2.1.2_pre2

4 files changed, 233 insertions, 5 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 2144925da73a..2b5541e9edda 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.59 2006/09/23 01:28:27 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.60 2006/10/02 21:36:04 caster Exp $
+
+  02 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +sun-jre-bin-1.5.0.06.ebuild:
+  Restored stable 1.5.0.06 wrt bug #148738.
 
   23 Sep 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml,
   sun-jre-bin-1.4.2.10.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 86283c3181d0..e92987180985 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -22,6 +22,8 @@ DIST j2re-1_4_2_10-linux-i586.bin 14417572 RMD160 fab835b3469e4a38adfd24312ebc0a
 DIST j2re-1_4_2_12-linux-i586.bin 14339018 RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 SHA1 18631914aeff51fcd89d226dbe3396ea91d21408 SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f
 DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f
 DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8
+DIST jre-1_5_0_06-linux-amd64.bin 16403250 RMD160 4309c9805c9595587e385bcfe951c693609b8560 SHA256 3caff8426bb55fa6f3e40738a537b9351ef5f38c5a50b1f5ac6756b16f4bcfee
+DIST jre-1_5_0_06-linux-i586.bin 16769166 RMD160 b5f306da7d2569ab7698beaaa7dc2a662c04e876 SHA256 316a925f5a4f3edd5bf64c138c3585d979f15a1ffb517798e8ed8f3bde5024fc
 EBUILD sun-jre-bin-1.4.2.10.ebuild 5421 RMD160 66751c08562ca138101fbde7c5541c4482f43cbd SHA1 9f37e205036e2fc7860aba5bd0812b5b9c692892 SHA256 a5c9b674ceafd1294412571e402945bcd582758fae3cdf21d70f635a42aa1488
 MD5 315619dedd34da3aa917744723ecfdea sun-jre-bin-1.4.2.10.ebuild 5421
 RMD160 66751c08562ca138101fbde7c5541c4482f43cbd sun-jre-bin-1.4.2.10.ebuild 5421
@@ -30,14 +32,18 @@ EBUILD sun-jre-bin-1.4.2.12-r2.ebuild 4609 RMD160 8675299ab86c52019e310503b3e76a
 MD5 9462e9d5a0ab175e9d572763c8abc80f sun-jre-bin-1.4.2.12-r2.ebuild 4609
 RMD160 8675299ab86c52019e310503b3e76aa8c0a23e4c sun-jre-bin-1.4.2.12-r2.ebuild 4609
 SHA256 8537a89c2e4ac9f5afe5e2d4e6b652154215b041371807524a1246e5166e7cde sun-jre-bin-1.4.2.12-r2.ebuild 4609
+EBUILD sun-jre-bin-1.5.0.06.ebuild 5737 RMD160 4b2baad672655c6cda5d24c66dabc3faf06aa8a7 SHA1 56f101015aad817d45ae9345d10d338824ebb63b SHA256 2ac8f3533c97757a450bcdc3230c2afca194d4a539f7671ffcc9d9057e1b03bb
+MD5 2a31a6f1f88c7a91900363e4a92c21d1 sun-jre-bin-1.5.0.06.ebuild 5737
+RMD160 4b2baad672655c6cda5d24c66dabc3faf06aa8a7 sun-jre-bin-1.5.0.06.ebuild 5737
+SHA256 2ac8f3533c97757a450bcdc3230c2afca194d4a539f7671ffcc9d9057e1b03bb sun-jre-bin-1.5.0.06.ebuild 5737
 EBUILD sun-jre-bin-1.5.0.08-r1.ebuild 4603 RMD160 12710ef9f1aa33bed42efb1166c1b6367ca28d14 SHA1 55d996d3dc61b6d9219bcd532b59fc1e3dd5617b SHA256 268b4005dc0058b36fc0bb1b6f98cb99fdfc5092606e70b533777a6d766bfeaf
 MD5 42c5b1c255f291550b01915858584dd1 sun-jre-bin-1.5.0.08-r1.ebuild 4603
 RMD160 12710ef9f1aa33bed42efb1166c1b6367ca28d14 sun-jre-bin-1.5.0.08-r1.ebuild 4603
 SHA256 268b4005dc0058b36fc0bb1b6f98cb99fdfc5092606e70b533777a6d766bfeaf sun-jre-bin-1.5.0.08-r1.ebuild 4603
-MISC ChangeLog 11591 RMD160 636aa1fe078983fd6e06ae4b6bb262a63ac97a49 SHA1 76fad210145f8a3403660f7e5050f3b570b6002a SHA256 fcb4dac1b25844519fd73694fbb29a508d81ad10f298b2cbbab6ca0dc8c46dea
-MD5 f41f6df77ef2a925692903420acbadc3 ChangeLog 11591
-RMD160 636aa1fe078983fd6e06ae4b6bb262a63ac97a49 ChangeLog 11591
-SHA256 fcb4dac1b25844519fd73694fbb29a508d81ad10f298b2cbbab6ca0dc8c46dea ChangeLog 11591
+MISC ChangeLog 11719 RMD160 ab52ce0f145574a663a4980db6fc08bc2553f761 SHA1 0880ba97b4e800f7116c3ca13d97d2ed897adfa6 SHA256 20c267a4eb89e718e8beaec0e4200c9f2cd07a7db1ff9d82c4b674c6fa8fe421
+MD5 c8d93c846bf8a8fc79153c0271b11f03 ChangeLog 11719
+RMD160 ab52ce0f145574a663a4980db6fc08bc2553f761 ChangeLog 11719
+SHA256 20c267a4eb89e718e8beaec0e4200c9f2cd07a7db1ff9d82c4b674c6fa8fe421 ChangeLog 11719
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
 MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240
 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240
@@ -48,6 +54,9 @@ SHA256 441d20feed468696d5129d21bfedd9b408e0584b9d235fb2b145a76c825a001b files/di
 MD5 85b90dc2d065efaee3065eebe6814224 files/digest-sun-jre-bin-1.4.2.12-r2 271
 RMD160 9428423bb0e74bcacee9428aac0436b67438c429 files/digest-sun-jre-bin-1.4.2.12-r2 271
 SHA256 3e71d56840f86073ed25b7d52c9f1afb8bd0f1c13d04f20efd53803ef670cb76 files/digest-sun-jre-bin-1.4.2.12-r2 271
+MD5 575297db348a3e09371ab435ebddbea0 files/digest-sun-jre-bin-1.5.0.06 539
+RMD160 805a47eeb2ff25e53606c13cdd774db8a8b3b601 files/digest-sun-jre-bin-1.5.0.06 539
+SHA256 631931544e94f62bfa7526e9ac1a7c24ac3724f94f650989138b15867b780e8f files/digest-sun-jre-bin-1.5.0.06 539
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jre-bin-1.5.0.08-r1 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jre-bin-1.5.0.08-r1 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jre-bin-1.5.0.08-r1 563
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06
new file mode 100644
index 000000000000..1927b3ed0548
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06
@@ -0,0 +1,6 @@
+MD5 6a771c3c9e93021ab34a30bcf609c74b jre-1_5_0_06-linux-amd64.bin 16403250
+RMD160 4309c9805c9595587e385bcfe951c693609b8560 jre-1_5_0_06-linux-amd64.bin 16403250
+SHA256 3caff8426bb55fa6f3e40738a537b9351ef5f38c5a50b1f5ac6756b16f4bcfee jre-1_5_0_06-linux-amd64.bin 16403250
+MD5 e0a88dbec9bfe3195794bb652bfc6516 jre-1_5_0_06-linux-i586.bin 16769166
+RMD160 b5f306da7d2569ab7698beaaa7dc2a662c04e876 jre-1_5_0_06-linux-i586.bin 16769166
+SHA256 316a925f5a4f3edd5bf64c138c3585d979f15a1ffb517798e8ed8f3bde5024fc jre-1_5_0_06-linux-i586.bin 16769166
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild
new file mode 100644
index 000000000000..ce2b5bdfb5b1
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2006 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.5.0.06.ebuild,v 1.10 2006/10/02 21:36:04 caster Exp $
+
+inherit java eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+amd64file="jre-${MY_PVA}-linux-amd64.bin"
+x86file="jre-${MY_PVA}-linux-i586.bin"
+
+if use x86; then
+	At=${x86file}
+elif use amd64; then
+	At=${amd64file}
+fi
+
+S="${WORKDIR}/jre${MY_PVL}"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/"
+SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
+SLOT="1.5"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* amd64 x86"
+RESTRICT="fetch stricter"
+IUSE="X alsa browserplugin nsplugin mozilla"
+
+DEPEND="sys-apps/sed"
+
+RDEPEND="sys-libs/glibc
+		alsa? ( media-libs/alsa-lib )
+		X? ( || ( (
+					x11-libs/libX11
+					x11-libs/libXext
+					x11-libs/libXi
+					x11-libs/libXp
+					x11-libs/libXt
+					x11-libs/libXtst
+				)
+				virtual/x11
+			)
+		)"
+
+
+PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+
+pkg_nofetch() {
+	local archtext=""
+
+	if use x86; then
+		archtext="Linux"
+	elif use amd64; then
+		archtext="Linux AMD64"
+	fi
+
+	einfo "Please download ${At} from:"
+	einfo ${FETCH_SDK}
+	einfo "Select the ${archtext} self-extracting file"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+
+	#Search for the ELF Header
+	testExp=`echo -e "\105\114\106"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+
+	if [ -f ${S}/bin/unpack200 ]; then
+		UNPACK_CMD=${S}/bin/unpack200
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		for i in $PACKED_JARS; do
+			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+			if [ -f ${PACK_FILE} ]; then
+				echo "	unpacking: $i"
+				$UNPACK_CMD ${PACK_FILE} ${S}/$i
+				rm -f ${PACK_FILE}
+			fi
+		done
+		rm -f ${UNPACK_CMD}
+	else
+		die "unpack not found"
+	fi
+}
+
+src_install() {
+
+	if use amd64; then
+		local dirs="bin lib man"
+	else
+		local dirs="bin lib man plugin javaws"
+	fi
+
+
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
+	done
+
+	dodoc COPYRIGHT README
+	dohtml Welcome.html
+
+	if use nsplugin ||       # global useflag for netscape-compat plugins
+	   use browserplugin ||  # deprecated but honor for now
+	   use mozilla; then     # wrong but used to honor it
+		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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java-jre.desktop
+
+	domenu ${T}/sun_java-jre.desktop
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+pkg_postinst() {
+	# Create files used as storage for system preferences.
+	PREFS_LOCATION=/opt/${P}/
+	mkdir -p ${PREFS_LOCATION}/.systemPrefs
+	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
+		touch $PREFS_LOCATION/.systemPrefs/.system.lock
+		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
+	fi
+	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
+		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
+		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
+	fi
+
+	# Set as default VM if none exists
+	java_pkg_postinst
+
+	if ! use nsplugin && ( use browserplugin || use mozilla ); then
+		echo
+		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
+		ewarn "future jdk/jre ebuilds for plugin installation. Please"
+		ewarn "update your USE to include 'nsplugin'."
+	fi
+
+	# Show info about netscape
+	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
+		echo
+		einfo "If you want to install the plugin for Netscape 4.x, type"
+		einfo
+		einfo "   cd /usr/lib/nsbrowser/plugins/"
+		einfo "   ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
+	fi
+
+	# if chpax is on the target system, set the appropriate PaX flags
+	# this will not hurt the binary, it modifies only unused ELF bits
+	# but may confuse things like AV scanners and automatic tripwire
+	if has_version sys-apps/chpax
+	then
+		echo
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/$VM/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
+
+		einfo "you should have seen lots of chpax output above now"
+		ewarn "make sure the grsec ACL contains those entries also"
+		ewarn "because enabling it will override the chpax setting"
+		ewarn "on the physical files - help for PaX and grsecurity"
+		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
+	fi
+
+	if ! use X; then
+		local xwarn="virtual/x11 and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+}