Bumping 1.5 package per GSLA# 200701-15 and CERT# TA07-022A. Just changed package name from .08

Package-Manager: portage-2.1.2-r1

6 files changed, 177 insertions, 18 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index f3b81cae8ed5..86d71e3416f6 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.14 2007/01/23 11:47:50 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.15 2007/01/26 00:54:15 wltjr Exp $
+
+*emul-linux-x86-java-1.5.0.10 (26 Jan 2007)
+
+  26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +emul-linux-x86-java-1.5.0.10.ebuild:
+  Bumping 1.5 package per GSLA# 200701-15 and CERT# TA07-022A. Just changed
+  package name from .08
 
   23 Jan 2007; Vlastimil Babka <caster@gentoo.org> files/construct.sh:
   Fix construct.sh to write into  instead of /tmp/ for bug #159547.
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 7461b68dcd44..cbf5759bedea 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -14,8 +14,9 @@ AUX javasettings_Linux_x86.xml 1601 RMD160 e87fe605d34fd6060f58f511deea5a935697b
 MD5 40fcbcc585ad443b5bf473228c8ef18d files/javasettings_Linux_x86.xml 1601
 RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml 1601
 SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/javasettings_Linux_x86.xml 1601
-DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
+DIST j2re-1.4.2-03-linux-i586.bin 8201180 RMD160 f221d66016cf4a1f462e0e1d35ed21e4dbd4042d SHA1 2a7ea8eeb99af799bb54f83762d97d3021b262ea SHA256 f560b8e7ffccb0e7338dc69d4fa6e1d4911b81727a07f4c8ab9e83b96145f8d9
 DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8
+DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa
 EBUILD emul-linux-x86-java-1.4.2.03-r1.ebuild 3098 RMD160 4cd5ee03d4bb9898da9a9f0e3fb6bf4e4f3be29c SHA1 81ae71ef019662a5667e88c445da5f7c3b681fb4 SHA256 44c0f286fb1bf112ed4f5c53d4f294dbbe34a8f0d53507a297d7c6f5665af59e
 MD5 3068277991ae1d4daef6dd14fd0d67d3 emul-linux-x86-java-1.4.2.03-r1.ebuild 3098
 RMD160 4cd5ee03d4bb9898da9a9f0e3fb6bf4e4f3be29c emul-linux-x86-java-1.4.2.03-r1.ebuild 3098
@@ -28,20 +29,27 @@ EBUILD emul-linux-x86-java-1.5.0.08.ebuild 4005 RMD160 92997aa71d4987ef748ca1bde
 MD5 dd62a084f8299d052d875476070455a5 emul-linux-x86-java-1.5.0.08.ebuild 4005
 RMD160 92997aa71d4987ef748ca1bde956e5896ddce6eb emul-linux-x86-java-1.5.0.08.ebuild 4005
 SHA256 372cad57538cda2c2d33bf8ae1c802483c9797a03dcfa6b33055dc00b889ce2b emul-linux-x86-java-1.5.0.08.ebuild 4005
-MISC ChangeLog 2876 RMD160 8faa951ec9df3f050ff499af0775a98c5d0c11b2 SHA1 2fbb8ce2ee3e9f30baf24cad67bcf7953aff8054 SHA256 f8154bb3648727ef0d511f5ede677e299839e01ec8ed35ad7a4ffeb961cf4860
-MD5 2848aae7f216fe30efd5ddb4d6688604 ChangeLog 2876
-RMD160 8faa951ec9df3f050ff499af0775a98c5d0c11b2 ChangeLog 2876
-SHA256 f8154bb3648727ef0d511f5ede677e299839e01ec8ed35ad7a4ffeb961cf4860 ChangeLog 2876
+EBUILD emul-linux-x86-java-1.5.0.10.ebuild 4004 RMD160 301c57306400a3572486f5d8a46fe4c61e2beaac SHA1 4ffbd0defdf2c617e9dec76e6a4be0c082cfdc1e SHA256 07b9ec77af6ad98d846c53e15ef54bba06e2f4ccee033858c8ce3b79f177a4fa
+MD5 aa8d502a01ad0853231691658368c272 emul-linux-x86-java-1.5.0.10.ebuild 4004
+RMD160 301c57306400a3572486f5d8a46fe4c61e2beaac emul-linux-x86-java-1.5.0.10.ebuild 4004
+SHA256 07b9ec77af6ad98d846c53e15ef54bba06e2f4ccee033858c8ce3b79f177a4fa emul-linux-x86-java-1.5.0.10.ebuild 4004
+MISC ChangeLog 3118 RMD160 58dea562fde85b0a45dd51c0290a5d1ce1780902 SHA1 c37f8aebda765dcb87074781c942f92305c28f89 SHA256 1f07109e66f28c3fb3531c83abfcb2c0d52c5f37116d3986f6f21c626a646a68
+MD5 75d6b4f583db44be711ac3c8db829d3d ChangeLog 3118
+RMD160 58dea562fde85b0a45dd51c0290a5d1ce1780902 ChangeLog 3118
+SHA256 1f07109e66f28c3fb3531c83abfcb2c0d52c5f37116d3986f6f21c626a646a68 ChangeLog 3118
 MISC metadata.xml 223 RMD160 5334a75802c04f73f2bbe2e5c133178728cc9bba SHA1 5f31c7deef3b32e6ed5126a4c40800419bc867f0 SHA256 90a4ae3bb1a82ba35e2971274b7c2437d3f717075382f02ece1b1c79421c1282
 MD5 ef1a1d0bbdb241725417e87002ec4d16 metadata.xml 223
 RMD160 5334a75802c04f73f2bbe2e5c133178728cc9bba metadata.xml 223
 SHA256 90a4ae3bb1a82ba35e2971274b7c2437d3f717075382f02ece1b1c79421c1282 metadata.xml 223
-MD5 132c52c1b863a8946fb168f79619e91d files/digest-emul-linux-x86-java-1.4.2.03-r1 271
-RMD160 3788f95de69c44708182938ec98e905da0b44922 files/digest-emul-linux-x86-java-1.4.2.03-r1 271
-SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/digest-emul-linux-x86-java-1.4.2.03-r1 271
-MD5 132c52c1b863a8946fb168f79619e91d files/digest-emul-linux-x86-java-1.4.2.03-r2 271
-RMD160 3788f95de69c44708182938ec98e905da0b44922 files/digest-emul-linux-x86-java-1.4.2.03-r2 271
-SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/digest-emul-linux-x86-java-1.4.2.03-r2 271
+MD5 2954adcf1a9351e23f585ea938fee9e0 files/digest-emul-linux-x86-java-1.4.2.03-r1 268
+RMD160 1ee9636f5e59f626c8642d9b41b58ba828c89163 files/digest-emul-linux-x86-java-1.4.2.03-r1 268
+SHA256 3b087d5d61be425fae8c482bb31243742c960b55055165b1789fe232d481b7d5 files/digest-emul-linux-x86-java-1.4.2.03-r1 268
+MD5 2954adcf1a9351e23f585ea938fee9e0 files/digest-emul-linux-x86-java-1.4.2.03-r2 268
+RMD160 1ee9636f5e59f626c8642d9b41b58ba828c89163 files/digest-emul-linux-x86-java-1.4.2.03-r2 268
+SHA256 3b087d5d61be425fae8c482bb31243742c960b55055165b1789fe232d481b7d5 files/digest-emul-linux-x86-java-1.4.2.03-r2 268
 MD5 f6d9b4f7871723b537a0d7c3ee6d776c files/digest-emul-linux-x86-java-1.5.0.08 280
 RMD160 b66681eb3d4866d9411362fa20d7cf55f8d93f27 files/digest-emul-linux-x86-java-1.5.0.08 280
 SHA256 3ee0c46629a8afb9fcbab31de25bd98ad094b95a0c4968637cebdf794be4d5f4 files/digest-emul-linux-x86-java-1.5.0.08 280
+MD5 4121668bffa114e96d47967ddf45c8ab files/digest-emul-linux-x86-java-1.5.0.10 280
+RMD160 4e4287a55e5706d8cf3cc76047ab07e4addb0673 files/digest-emul-linux-x86-java-1.5.0.10 280
+SHA256 07c9cbdd3dcd7b5cf04289e64f12cb8cbc36c67626cc4752b30a0ee18090dffe files/digest-emul-linux-x86-java-1.5.0.10 280
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild
new file mode 100644
index 000000000000..7b05140f6b0b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild,v 1.1 2007/01/26 00:54:15 wltjr Exp $
+
+inherit java-vm-2 eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+At="jdk-${MY_PVA}-dlj-linux-i586.bin"
+DESCRIPTION="32bit version Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="http://download.java.net/dlj/binaries/${At}"
+
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="nostrip"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	X? ( || ( ( x11-libs/libICE
+				x11-libs/libSM
+		 		x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp
+				x11-libs/libXext
+				x11-libs/libXi
+				x11-libs/libXp
+				x11-libs/libXt
+				x11-libs/libXtst
+			  )
+				virtual/x11
+			)
+		)"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+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"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so"
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+
+	${S}/bin/java -client -Xshare:dump
+}
+
+src_install() {
+	local dirs="bin lib man javaws plugin"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
+	done
+	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
+	dohtml Welcome.html
+	dodir /opt/${P}/share/
+
+	if use nsplugin; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+
+	# TODO Don't think we still needs these -nichoj
+	# 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
+
+	# FIXME figure out how to handle the control pannel conflict with
+	# sun-jdk-bin
+
+	# install control panel for Gnome/KDE
+#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+#		${T}/sun_java-${SLOT}.desktop
+
+#	domenu ${T}/sun_java-${SLOT}.desktop
+
+	set_java_env
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	# 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 java"
+
+		for paxkills in "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/$VM/jre/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 JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+}
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
index 6903ab4b3355..f32cc2ff29ce 100644
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
@@ -1,3 +1,3 @@
-MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431
-RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431
-SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431
+MD5 4ccb66bdd80da4e8d93886542cae532a j2re-1.4.2-03-linux-i586.bin 8201180
+RMD160 f221d66016cf4a1f462e0e1d35ed21e4dbd4042d j2re-1.4.2-03-linux-i586.bin 8201180
+SHA256 f560b8e7ffccb0e7338dc69d4fa6e1d4911b81727a07f4c8ab9e83b96145f8d9 j2re-1.4.2-03-linux-i586.bin 8201180
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2
index 6903ab4b3355..f32cc2ff29ce 100644
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2
@@ -1,3 +1,3 @@
-MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431
-RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431
-SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431
+MD5 4ccb66bdd80da4e8d93886542cae532a j2re-1.4.2-03-linux-i586.bin 8201180
+RMD160 f221d66016cf4a1f462e0e1d35ed21e4dbd4042d j2re-1.4.2-03-linux-i586.bin 8201180
+SHA256 f560b8e7ffccb0e7338dc69d4fa6e1d4911b81727a07f4c8ab9e83b96145f8d9 j2re-1.4.2-03-linux-i586.bin 8201180
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.10 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.10
new file mode 100644
index 000000000000..118fc7b34b4a
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.10
@@ -0,0 +1,3 @@
+MD5 baa5f71d72d1d4d7c38374d59bedfe7c jdk-1_5_0_10-dlj-linux-i586.bin 49553457
+RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 jdk-1_5_0_10-dlj-linux-i586.bin 49553457
+SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa jdk-1_5_0_10-dlj-linux-i586.bin 49553457