Version bump, security bug #354231.

Package-Manager: portage-2.2.0_alpha21/cvs/Linux x86_64

3 files changed, 118 insertions, 12 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 9a1532d039c3..51593f39fb32 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.48 2011/02/04 23:20:56 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.49 2011/02/10 00:23:41 caster Exp $
+
+*icedtea6-bin-1.9.6 (10 Feb 2011)
+
+  10 Feb 2011; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.9.6.ebuild:
+  Version bump, security bug #354231.
 
   04 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
   icedtea6-bin-1.9.5.ebuild:
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 0f1224eda337..7f6be4f820a0 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -1,31 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icedtea6-bin.env 947 RMD160 8f72b884c823f408755a3b06daea5af7705da488 SHA1 7473e4d987d5b0e9f1dbf48fbf4978e37d2f64b9 SHA256 b0f675b427f42d7fd1bbf1314523144a2bfc9f5ad44f89568adce120929f74e3
 DIST icedtea6-bin-core-1.9.4-amd64.tar.bz2 35871501 RMD160 67f930e55a21cca1b6fe26781e507fd167e39cc2 SHA1 3303d38f6d48a1c840b18cb2f2df15bb86a8b0de SHA256 462c2e3409de3518c4de91ba0870ef673c2732e1a7126da1cb6f189f5e7e0c60
 DIST icedtea6-bin-core-1.9.4-x86.tar.bz2 36971318 RMD160 a7ebac9e8c872cba491250a54d03c5b59151465b SHA1 1b133f22838f2860ac3af5bec01cdebb2880139f SHA256 527c18f9be83dd6ac10be2e47ad62031189e9fd0df9a5d83f18903d36c315286
 DIST icedtea6-bin-core-1.9.5-amd64.tar.bz2 35870913 RMD160 dbebbc0c36235b53d3155cef8f24f265de43b0eb SHA1 6fc0e919a6dd16a99da96ea6785d56fbd284a267 SHA256 06ca226dc42ec402a2681ceff4631289d5d87c55e9f3edd2dc157863bcf3eb53
 DIST icedtea6-bin-core-1.9.5-x86.tar.bz2 36972935 RMD160 72417b9fe4b1da3324795d078f65aada1e608a84 SHA1 46358714a314707d48686e4d136938d863fa6c4c SHA256 32eb74db8d5d2c4ebb000c8ce8e1eb4d51d8234bfb05451057baaf90a80b57ff
+DIST icedtea6-bin-core-1.9.6-amd64.tar.bz2 35869724 RMD160 9590cfb1857b10e54837fabf21451a2a99dee05b SHA1 c186b418b6ed7759586933cd4b9bd0dd36b48a25 SHA256 f4cc1bc59877de04bc38b899677a727bbf06a6e5b5f77438ae82106fdaaf8e98
+DIST icedtea6-bin-core-1.9.6-x86.tar.bz2 36975602 RMD160 e5a11501befead12ba9a55210455c26565eca1a3 SHA1 64108a893bb7d357e0bb3545ca665000930fcaeb SHA256 e2e9dd0c8529216112dab7d9b8b78ae41106cbd1035caf273f818a416876ef52
 DIST icedtea6-bin-doc-1.9.4.tar.bz2 11637465 RMD160 7da7ecf115cf793a241d28ae9757da8cd10a8d49 SHA1 3da0b1eacbc809ba1cec3619945293bd7fa27524 SHA256 72e5fdcb87a515d0b805a5ab08112c199b70f26e891583fba5107a9dc444f910
 DIST icedtea6-bin-doc-1.9.5.tar.bz2 11637671 RMD160 d7d4aab5d57982566be96fc41eeda46f2c652d5a SHA1 a74c447f650ab7d08c65230522a1171afdaf4d6b SHA256 1972f103863386eb73876cdb7da0f3484c2fcfc66230072efd761e8fe34a3b61
+DIST icedtea6-bin-doc-1.9.6.tar.bz2 11637705 RMD160 6f8c0d14f7de4947a59f930690fe90583a51d66c SHA1 6ebe3a1ef6014a301f059372188b97d8c5443b24 SHA256 f4e2eb9306c300230216908006c57f0277b068905e5c71a6553ffc0918491b0c
 DIST icedtea6-bin-examples-1.9.4-amd64.tar.bz2 2193025 RMD160 8e5e58078ff9c97536adf24dd4c0e75caab1cd63 SHA1 8a7c9b076aff55ce92322df0d625e32a9fe5c886 SHA256 0a2adffa6b184f02a8444c529075485b42f34abbfb83b1d26dde15a0570f0fb4
 DIST icedtea6-bin-examples-1.9.4-x86.tar.bz2 2162558 RMD160 abe5e138cab7a8f1b9644ac4a0f45f70d211ddb0 SHA1 ac7d18c79f1d909cd24feb0be76d287cefc73e63 SHA256 5a6fc871596b31a8408d003f128dc752132d025ce0fa383913faa0bdf96605a6
 DIST icedtea6-bin-examples-1.9.5-amd64.tar.bz2 2193100 RMD160 43843b7c22f84bfa034f63acc011178cad3f8abe SHA1 2b7593f516e3f73afd4e3207e7d72f9c94912cd7 SHA256 fcb0ad0998a1b9dcab649cdb9d00534fa3f23da4c200ae48efd95989569d31bc
 DIST icedtea6-bin-examples-1.9.5-x86.tar.bz2 2162958 RMD160 7c86d29e9bec826034f17dbaf03ca9b8c5d2d0b7 SHA1 acaa162c91ea97455acc8785c2ae5af299063574 SHA256 9a1b8726ddde45b46551aff39a71ca7caa0b417627b813a209b49ef0994b3104
+DIST icedtea6-bin-examples-1.9.6-amd64.tar.bz2 2192810 RMD160 c6b3d04d594397a05399cabc0054d908d00cda62 SHA1 996306a5d7f8821f11dbbf927ea4c0ac1f94bd5c SHA256 7031c607355a9b359477a8bfcc83347b957e4d77df975427e19939e53408eee1
+DIST icedtea6-bin-examples-1.9.6-x86.tar.bz2 2162859 RMD160 38f7e7e80a49daec663e919eba05b0276c6a2916 SHA1 e509afe29dc48282ac477fcbed16e75f99113d4b SHA256 9b554c80e9187f5b44c76f5eb00eb869ac322db42f1e6c6a4f47ec71deba4386
 DIST icedtea6-bin-nsplugin-1.9.4-amd64.tar.bz2 79225 RMD160 8f4c64221722f05fd8d15e5ed2625222c3e39bf9 SHA1 9b1696fdfe4fd452b582019e2944f242c37cccf0 SHA256 ff9b0974ca57bf629af7a398d90d315549aed60ab2cf54aa80d7363fb7d6ca64
 DIST icedtea6-bin-nsplugin-1.9.4-x86.tar.bz2 73101 RMD160 b4e843841b37f6c9c7c45397ac14fab7e71951a7 SHA1 bfbf2273a6cd5a591f374617a8988b12f3ac3f52 SHA256 fd85d9399b5fb6e0316b853dcf6fdac719e7b093b40efbf95f12f25e527ca789
 DIST icedtea6-bin-nsplugin-1.9.5-amd64.tar.bz2 79233 RMD160 58d6e3fd598305dd9e33cfb1c3437f53b463b0f9 SHA1 599ac04aa409fc6513bec0e3fa553d43a4505ac3 SHA256 611e1aea16edb6ab6b50dac8cbf7280b59cad5cb97e3dfc1c50a63c169b1aac7
 DIST icedtea6-bin-nsplugin-1.9.5-x86.tar.bz2 73095 RMD160 d4814730d3c08011f8b575b3c16356d2174b6d27 SHA1 bd9554ec36d13d5527d9b47c2cc8bc40f16d8ca7 SHA256 2ca14f62d6d0c8e3a1eb9df85afb88e4f2e1d16b2d4f25648a4f975b157bd167
+DIST icedtea6-bin-nsplugin-1.9.6-amd64.tar.bz2 79235 RMD160 8a37a082e3a0cb271eeaea20b453d8373b501272 SHA1 cbd3765ef04d4320e53b597330f33244e2383f71 SHA256 c757487333b5f6cc4827808cfb3eb157e72662fb7570fc16dfa850f75cafb296
+DIST icedtea6-bin-nsplugin-1.9.6-x86.tar.bz2 73117 RMD160 c06e8e8ee95d8aa9d564456fe6a030b4cf9cb7ca SHA1 5da0839e889d1a5c19e5c5f43b99beff0ea2ec0f SHA256 73798e5a491f13787961cb0511eb830d7384eeb7ed71380eb0dfa9db990e002f
 DIST icedtea6-bin-src-1.9.4.tar.bz2 26868737 RMD160 e21752e39892bb71d1ed7d34cd9f77c2d266a6e2 SHA1 c5439b14acf99c6bfbcef624ca9ee3aeeb21b0a4 SHA256 06b1abc1c77231a6c7a914d88791c0272eaa8eb006a6afd57c33223bce80d521
 DIST icedtea6-bin-src-1.9.5.tar.bz2 26869353 RMD160 8ce9210ec556b3886cc80dcb81db72dd0f1b56cc SHA1 d0befeab80c28c9aa4678f5f24ad23755fccd75d SHA256 d4023a181dfd688de28a1dbcaadee37e74ea6ed8927852a084035bc3cae7ebb7
+DIST icedtea6-bin-src-1.9.6.tar.bz2 26872291 RMD160 1bf7f052bbb0e92f9e29add8bc5eca1648146ea1 SHA1 393ec26ff7afc8f150ffeda5db811b7034e1272d SHA256 acf6bb0a1c4622e4e3165e00edc65046f305aa595ff80b826ce86a115dd0da93
 EBUILD icedtea6-bin-1.9.4.ebuild 2683 RMD160 f5090a341d54d7aa1ee68d3ed13d6be1dd48794c SHA1 d83a7693ffa592adeb601697d00c24a5cdf2ae2a SHA256 f03c1cd8a483a098065b0b832e8e89cefdd435d816efaeb0b3c7cd19be3b2806
 EBUILD icedtea6-bin-1.9.5.ebuild 2705 RMD160 dabcd22dd429e40dcbdd4003970693108a78b219 SHA1 a19b70e68c4d62ce9e31af4c19de85f0b9d4f0b5 SHA256 55534e5a75dd2df5a1aa62d037e05a0a70b4d005533656971b7f640fedefe857
-MISC ChangeLog 8100 RMD160 be45a3779c82c5fd478963431ca5b113c2a580da SHA1 1d982a9a117fdfe0c0cb91d67d6912c46ca79fd2 SHA256 8661b1476ee2e2dea346476401acd25f77b10d62aaab42c4bcee7118f91b02ea
+EBUILD icedtea6-bin-1.9.6.ebuild 2707 RMD160 0e53ddbd475b4b3fbc15250dfd87dfa3e6adf12c SHA1 8ee64401ec24d14d2d97e7901de096c16fc8919b SHA256 d9f43d2c0719f5020784b9127fa4d4188015cee0a12f58d75e3d64958d27f8d7
+MISC ChangeLog 8254 RMD160 6da053c6b650c9dd30eaf68de666601fa12f5dae SHA1 6ad4e788dbd6d70a4d14015befe35495d60a3944 SHA256 6f61c9e0e85d96723e002412594c1ea9b0304d052ba2d951975a92bf255590e5
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk1MieoACgkQNQqtfCuFneNEsgCdG++zFgQxREp3tdHIyAcYxlTA
-43UAn2w3v6Kar0+7MMRvC1s+PpoPpzoq
-=Fo1f
------END PGP SIGNATURE-----
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild
new file mode 100644
index 000000000000..d3ab16314eb3
--- /dev/null
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild,v 1.1 2011/02/10 00:23:41 caster Exp $
+
+EAPI="1"
+
+inherit java-vm-2
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+TARBALL_VERSION="${PVR}"
+SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="X alsa doc examples nsplugin source"
+RESTRICT="strip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
+
+RDEPEND=">=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=media-libs/giflib-4.1.6-r1
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=sys-libs/zlib-1.2.3-r1
+	alsa? ( >=media-libs/alsa-lib-1.0.20 )
+	X? (
+		>=media-libs/freetype-2.3.9:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXtst-1.1
+		>=x11-libs/libX11-1.3
+		x11-libs/libXt
+	)
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/pango-1.24.5
+	)"
+DEPEND=""
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${D}/${dest}"
+	dodir "${dest}" || die
+
+	local arch=${ARCH}
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
+	if use doc ; then
+		dohtml -r ../doc/html/* || die "Failed to install documentation"
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source ; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin ; then
+		use x86 && arch=i386
+		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin; then
+		elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}