Version bump, security bug #387637. Based on icedtea 1.10.4 and icedtea-web 1.1.3...

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

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index a6dac447c2bbedde80f34f8d30c374b09907a68b..cf8d85727541a78a65b49d362545fe2803887396 100644 (file)
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.71 2011/10/11 00:29:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.72 2011/10/22 22:45:34 caster Exp $
+
+*icedtea6-bin-1.10.4 (22 Oct 2011)
+
+  22 Oct 2011; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.10.4.ebuild:
+  Version bump, security bug #387637. Based on icedtea 1.10.4 and icedtea-web
+  1.1.3. Libpng-1.5 now required as it's stable.
 
   11 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -icedtea6-bin-1.10.3.ebuild, -icedtea6-bin-1.10.3-r1.ebuild:

diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 4f19d80c109a5ea1f65a9002b997eb26c764bde4..10f332c981c1756060a6724deaa617c92729d701 100644 (file)
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -1,28 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icedtea6-bin.env 1023 RMD160 6b5de5f11b11cecc72dc89077ec7795f322f030b SHA1 3392ee66d94e952ec63e682f5f1ad8cbb8b1d4a2 SHA256 729a1f5ee5c64c0270ae12acafd6a73dac0858edb5493868a98a2de4b606d0ff
 DIST icedtea6-bin-core-1.10.3-r1-amd64.tar.bz2 35172739 RMD160 bd5ca15b67ea1ec9341d2012791da028cf7c5a94 SHA1 df2d32707188fc4b6f0e4f421d060715e59fac18 SHA256 787671a9de31b71957bddb596441822d4d1df11d33be6e8e75668783301f4a8a
 DIST icedtea6-bin-core-1.10.3-r1-x86.tar.bz2 36138198 RMD160 cff53aa963466a4e39483d4978f41354dac61638 SHA1 760c1f1023edb89b5f02575dfeccffee782b0ff5 SHA256 fa8dd5fa4e059c32c0aa6bc4ac6b13832f17aa70ad51c1c0e0058f77c8da1a05
+DIST icedtea6-bin-core-1.10.4-amd64.tar.bz2 35182604 RMD160 b073884ce59c30303af3de7c05aa5324432c69d7 SHA1 9ad772cfaf755c1cf0d6261e10d2b48c016497b0 SHA256 3ab2d27f9ce6024854be87dd440da3a615f77f2afaac7fea5bf3a99f65c324f2
+DIST icedtea6-bin-core-1.10.4-x86.tar.bz2 36141759 RMD160 5d8eceeb6c68ed4bf349a5cfd168e2c6ff1fe83f SHA1 5fd628c6245f58357876336ab8c23a69ae3fe027 SHA256 0e11bdce0a3ec196d088a8e067a41d879f56c4fd75d4a24fa8d4b49d18a67a6f
 DIST icedtea6-bin-doc-1.10.3-r1.tar.bz2 11634986 RMD160 ccf6b8d2ca0c7e2f4757cd9d1c50f5778d76a7ac SHA1 61ad01441f2287a059523c158730e69195fc8a0f SHA256 296e339dd1571dbbcc28c2d785490586aa7f883cca81d113a22e0a9da4b5163e
+DIST icedtea6-bin-doc-1.10.4.tar.bz2 11635657 RMD160 9e5bf35f3a8205bb1c89a816ddb2eff05fc09141 SHA1 38b0740d015dd4a4ad1dcd348581710d7ec512a3 SHA256 43fe4bc069222fdda85fb03e0ad31f8c0d4a46fab22a64a4b09cecb22f73216f
 DIST icedtea6-bin-examples-1.10.3-r1-amd64.tar.bz2 2163240 RMD160 3ab92f6a60556e2fa1dc2d38f52c061aaad177bf SHA1 4f1ad0d818cc333b7d04225ace03fe72f8e27ebf SHA256 3dcb0ead0f03738aa47c4292ec1bfbaa16a79511a6e209732a0ea6ac18f30d97
 DIST icedtea6-bin-examples-1.10.3-r1-x86.tar.bz2 2132727 RMD160 4928889c5a788d9f10801564b3c87db6648de722 SHA1 bb5fd487233dc0f5115fcfc59f0e0dd0f6743b8a SHA256 f01a936c8dc5c6b9277d4dcfed8177d0d206d4e11241e9a663353b540d213441
+DIST icedtea6-bin-examples-1.10.4-amd64.tar.bz2 2163675 RMD160 96f03ac17528cb0053a821fb2deb87b0f154b954 SHA1 9841620b29ebf530f3b1ebdce6a540ced91a03be SHA256 801d807d03a874ec60c04c89b441604cf28a55186ae50ed29c41488ea24fb05f
+DIST icedtea6-bin-examples-1.10.4-x86.tar.bz2 2132874 RMD160 60dd79e57f70117d547b00b9baeb948a95e52793 SHA1 7870cccc74b544d412bd0053bc75ff78b38de043 SHA256 f7801df925be998ce11bb0f8340154f2113ccea6163e544133163a623a8ce6ec
 DIST icedtea6-bin-libpng15-1.10.3-r1-amd64.tar.bz2 18613 RMD160 7559ef8bcaaf85722f0228bdac45280e2f41a72e SHA1 b8f6ae994779fe67ac30d6e5347e9dc4a383419d SHA256 9934b24702a11864cfd5ff2531b00a9aa74bcc5cb3819d65253955ab1bd0e0bf
 DIST icedtea6-bin-libpng15-1.10.3-r1-x86.tar.bz2 17199 RMD160 9d1cd5e5285be002d9071cae08aca6150584d4b7 SHA1 b9c098527c596c7ec8b804b2270bff764421dde9 SHA256 d8e474e98601e30118564e7993e1d6fbabab28195f04ad74a0444d0cd0f0660f
 DIST icedtea6-bin-nsplugin-1.10.3-r2-amd64.tar.bz2 903575 RMD160 e2e6686f3bfdbc90dbee94d422d04221a6e58b01 SHA1 e1e3ff7d403167a2b6cb8546a937668270521193 SHA256 0c170c6c67e7fb00308b5e684a50e81c191a9c8ec1aaac9f555b6cc2b965d67a
 DIST icedtea6-bin-nsplugin-1.10.3-r2-x86.tar.bz2 897189 RMD160 0edb8c03e300101263f99519acd91b078be6d5ff SHA1 8c7b286cd6426ffe11394ec5bee1b108cace6138 SHA256 2b387031dbd6d073d52914aeb9feb1aaf51d09e45537f7863b154d820215c0fd
+DIST icedtea6-bin-nsplugin-1.10.4-amd64.tar.bz2 907288 RMD160 a97e343c99909ceedf6dcff6fa1429ff9e3ed4e5 SHA1 2f73c33a5b17ea03f1f37f4a2446bf8d4141fd0d SHA256 6d832600bcb5bacd37cbb94e948dfb94f3472fd90b92009184b56fb66300d8d1
+DIST icedtea6-bin-nsplugin-1.10.4-x86.tar.bz2 900912 RMD160 bd90075b7784463dcc1c2e37e740619e032402b0 SHA1 251ccd527c8b2ddd38f3c92320687eecfd4e09d1 SHA256 4cc4ece22041fd659bcb1e3364c376a45c16d0ddc97b141e93591e9c171feaf9
 DIST icedtea6-bin-src-1.10.3-r1.tar.bz2 40821581 RMD160 3419b80c28bc001fce7c6fac7363ba613be6f580 SHA1 54f2c9dff1313e488122cf2355bcca8b49a8093a SHA256 3f725f60ddf317b5c1c8b00900ed9e3ad01c67d0533f9bd364c9de9b9511d868
+DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38f93e225c37394 SHA1 54f3ad33bfc1e512165e8de7e954c77c22ff0714 SHA256 d85de113997f4b8978d3b9312dfcd88d50debbf673118615e5a72244b56e8eab
 EBUILD icedtea6-bin-1.10.3-r2.ebuild 3335 RMD160 5d19385ad15173d2433e6e3d05f55db80e5b231c SHA1 45943e269f3507e4bdcccf82d74e4137ee07f000 SHA256 08948cb6349fb7f31e8a156ac071db441f4401c7b4571dd78488e0184509c4b7
-MISC ChangeLog 11747 RMD160 a67bd0d58037093d11416f1e1224eae85fce6687 SHA1 1904ceae5b513b0153b9a2506897b067eff01741 SHA256 37853c82ad77d7d6b9949f43f54a315fa478c03261ae6f48cbad23332f4aef61
+EBUILD icedtea6-bin-1.10.4.ebuild 2782 RMD160 697650050e2ab6a0af580fef076e5eec7d65d089 SHA1 abb920e9ce8d371fc50dfb9b70bdd031d28a38db SHA256 e965d85693551e9e31d8bebdf035b8749d74680dd30852b2d86ab7e5a2203af6
+MISC ChangeLog 11988 RMD160 8f3190c9ef660616525e69996b4619e871d54a63 SHA1 b0a6452616449b78fa4e50bc5015b5125cdc035d SHA256 55ed1932d6007addec489abcc0b15b625c4b0275427976844cbb137d476bb59e
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJOk43/AAoJEEdUh39IaPFN3CgIAILHOTjt80MEAGzLb6W3FUdK
-1Lb+f3c99IgpYSoVS7lrOMTjMkVcR9O7EQkJdsD44k2uKg68qn09tlCJPBnOyGhc
-IJu4LzCEDtlgmhETQa2QGAfUgq+oqBdBNgKmI2yNd/AOuw2pHzQ8wPHFn1gBZKbv
-gu5w09hJ2oaUiT2WkTrZN+FtN5+VYyLMBecz9PEhtnlk6XuGT6lb4EHMV0gEfj8L
-KL/RqOvGPNtJ85QtkWADCTmbtVWPKlB4JTM2q1hbxoNpbctX0acXeMdE35eEEgfZ
-s40EIpHK1enuqGsXmP4i3DsajB5eJaFLKfc5E0WxITqds3Gk3EoNiXl29S9vBDY=
-=acNk
------END PGP SIGNATURE-----

diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.4.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.4.ebuild
new file mode 100644 (file)
index 0000000..cad4717
--- /dev/null
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.4.ebuild
@@ -0,0 +1,107 @@
+# 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.10.4.ebuild,v 1.1 2011/10/22 22:45:34 caster Exp $
+
+EAPI="3"
+
+inherit java-vm-2
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+TARBALL_VERSION="${PV}"
+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}/${P}"
+
+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.5
+       >=sys-libs/zlib-1.2.3-r1
+       "
+PDEPEND="
+       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
+               cd ..
+               cp -pPR icedtea6-web-bin "${D}/opt/"
+               install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
+               docinto icedtea-web
+               dodoc doc/icedtea-web/*
+       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
+}