Version bump, security bug #501472.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4E61DE84

3 files changed, 120 insertions, 11 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 6cf24100d41e..fba14cfe1515 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea-web
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.38 2013/12/30 17:23:46 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.39 2014/06/01 20:53:52 caster Exp $
+
+*icedtea-web-1.4.2 (01 Jun 2014)
+
+  01 Jun 2014; Vlastimil Babka <caster@gentoo.org> +icedtea-web-1.4.2.ebuild:
+  Version bump, security bug #501472.
 
   30 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -icedtea-web-1.3.1-r7.ebuild,
   -icedtea-web-1.3.1.ebuild, metadata.xml:
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index ea82e5c63118..150ac12299a1 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0001-Fix-parallel-install.-BGO-440906.patch 744 SHA256 deb003bdad87e1ad00c4754fc2c42f27b6c093d80bbe227e6bc180daa85f6ab7 SHA512 33ce175b26e00585db663130d47d993d4193c3ed44e77098676d9b1128dc9329fa74c60775430444957faf57ffb45310f84fb6bf2f586b37f82e7a05c6e9143c WHIRLPOOL 1993fc4577f6b68f198dd70b97b7e372331004273ed90837b1507e24655f148994ac69050c371697d5ecc4651a597d20bafcb42bddeb22cb6d87e762dec029a3
 AUX 0002-Respect-LDFLAGS.patch 352 SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 SHA512 83e431505808e5e8b553d17b74590eaf232f69ccc7d0c9c3753af6995105a08b4cf8cc844295edb977e5a6456c5fe3b53ba0fa565607c99cc82ac025169dd16f WHIRLPOOL ef0f6ccdd1f879940351dbe0ece62c2f1ecc333df06328f7d12e07885579255f973689545e32ec7db679cc1ec516860f2b7acb52070dc4714c2a3b78b9eeae87
@@ -7,19 +7,17 @@ AUX README.gentoo 837 SHA256 621b0029be026356bb84c86d6062203eb90279bb95ae2516f27
 AUX icedtea-web-1.3.2-openjdk-build-25.patch 2366 SHA256 4c5b93ea81e3527c946853490d752903d8bd2cf285941aa5c37975980f392ce6 SHA512 52aaeea5790589388bb94edb00c9181c406a3cd6899454b75cc0d9582188dc1cf48be3b3a6eb29bb762db2c2213ca5606ff4fd2bcfd0db0f162dee1308cb391b WHIRLPOOL 92cb50828a5040d204d7f613b7178d155853f7401730190d1e849a287e27489143eed94ef835b46da6865078151b3478a61fa6bed2cdf129836ea90398f15493
 DIST icedtea-web-1.3.2.tar.gz 1038957 SHA256 bd25d9a9565271b716e54a19ffe8e34ab339666f72c99da743155320b9ac27f0 SHA512 5bf09819c7ce855c5c05b27589afbef14a209174d9de2e7ad6d1a7c7ee90e98efe5498718becca046c9aca8525d5fea9636819ccc4b9b18f38f15103d66bcd16 WHIRLPOOL 43bb9f1532305c61c456d2f7a81f93f73e4f560bafdeada5d731627fd6c8d2435718d2571e47fa05e8420d306627f7396f59f6dd10961a88df03491032a37817
 DIST icedtea-web-1.4.1.tar.gz 1376133 SHA256 09100207396a09784e04f2ad40d65212930c1d43839e7fa63b9dffaf8567d77b SHA512 aee04dfd3f5cfdf1b956c500922c62f5b37134be4c17562e42f4368bf1a160954a57e78e5f0ce06e2af21237511c5b8d04c490db12ab11d743b5064523b76e6b WHIRLPOOL e47893f67efcda6b948ac28c443a4c2a51cf92e687ac3ca765fc87ed20e5231dd6d96b751044ac87d85ae1d03fdf608931e2e693ca026b921970a3d804eb89c6
+DIST icedtea-web-1.4.2.tar.gz 1393866 SHA256 d48de5fdbf0eb8983b857ebc5368f3392916b4a3e93e1c2bee6d3ad95924dc2d SHA512 473f0eb1c28aba383911861f65064786bee547dc05e7e06135a442296cc62878c59149c6dfaa4d09f372ce4d4a3b764e0953c7e9318faebc90fe678dc3fe00d7 WHIRLPOOL 735aa38e469a4d406cf5fe9f9b02cefe2d849b7393611ad2d1a64d71044d8ed2610336c57f018082e4170be121716e6890cc8548b4ff649068de472a7776c23b
 EBUILD icedtea-web-1.3.2-r7.ebuild 3203 SHA256 d67cef1dd513f226eca7b11ae70c81d1bfb7ad162647349b1e723fa7a29f1757 SHA512 3f2c7a4acbeeda0aeb080affbd1c21db89acfd3184ffe076027ee8cd1a8b6ab3e0a8f950dcec1177b6324469836380aecf70f035a9a34841b99363b89804ace7 WHIRLPOOL 79f3e1e890574569db53ac1d7e3a5de27af3da3cf00af1635a2acdb8c8aef4a8b285d7c6a543c7c5d09b64ffc72e03ca490b5864719b82af123138a118474a84
 EBUILD icedtea-web-1.3.2.ebuild 3217 SHA256 6fccee8ebd946fc2cb66de0008e0785698afad5af5858ffc39e1cd6dbaa98719 SHA512 e30865ed5c61dad1691e5949b6d7772e195b6ada216931ab5d6f0434441a1b4d3c26b76eebce44223691b2400abfa5665e329229b11d4deb7bb726834e7bdfef WHIRLPOOL 8fe02f31c88b0b49664f6e510915b02a315c22c5232e0d366cc549013322642698e922345f720920c44b640160b1416f1316e3391d4826f3a2c90a5c0a82372c
 EBUILD icedtea-web-1.4.1.ebuild 2822 SHA256 d78585f1633129e30423c3e05948742e9ebded4c47b7b683ca603b04975ad346 SHA512 ba54fb8ed114d77f72d2e631c504947e948e0661f42ca4584f15f6de136d51bd88f46b2d4776112ec6a23121b504047f4039905bf1ad5070ee5b36d45554788d WHIRLPOOL 2cae8e65feca3ee0e6fa93898534dd2ea14042632486565648d94cdeab81e9579d93c78a26ba041304ff09185820d51e65c91fad04575267a946952ae7a82aa7
-MISC ChangeLog 8301 SHA256 d3212ab4935d7307be115cf67fd91ebc930544cc670d6848e3d34aabbff90e91 SHA512 0757fe4a9f1ccd1db7d48c995891d8d99b866cae7996b878f128b23310a57198420d1136b01a5e293899e9a2487559ed32718c0ea2c4d1f9e44e24caf47ad224 WHIRLPOOL 76e32f0cdd6b8d1a4d3fbdc1192fd0568b34eec99f9c9f544ffa6556aca20df047d7e8ca7fce82e79ab6c404ef32d52c4356c18fa53a6f2bf7f00f2513205194
+EBUILD icedtea-web-1.4.2.ebuild 2822 SHA256 abe5c1846d95e971f5d8dbb2d5bb20164e1e06964f8826f0a4b5f06f2f2e1828 SHA512 f43bda56c7dc4415d9c5414ca1a76e0fdf7433291bae99ad9bde60d96878b45f6cff44d4632b4357e30bdb4f8ca6dd57af0efa8c71f38e4b5f50779282f5fc0e WHIRLPOOL 9c359736377ae38bab59f7085b5237dd552f5d7a62fea74c346283ec2ad9c10fa3fb729c879ac267e72bf2e6d2e4fbcc37a178d7cfe8d12c4b36af589b25ee45
+MISC ChangeLog 8452 SHA256 1c2dc4179935680f2c5b5235e86beda4fe02bd8b5f169d396fbc8041345aef68 SHA512 18b6b5722864d8318225fbdcc0b742a188a372b8c65fe13289b6af5c0ee74b11a5faa042e13ab2c7ea803991a729f005ed681735f5430bbba8b40cc32b52010e WHIRLPOOL fd1cd155ede4c325520795f014d28fa65bee24701e51086f17059d2c02f537b4e3ad8e250c4322acc1a92c846209d5aa19c91669e632e144022db6f11dc16e70
 MISC metadata.xml 602 SHA256 075988888499fde2040ccf1c555886e1f0099d09092040581006050ad8d2b58c SHA512 7d6da92f77c0d07abd0eb63bfba536786fde518c8d97f04a5701cccfe9c55dfb211d9cad3eb8b3c718b83ed6cfb017cce7bd1cc62d557dc051c62a38a81ac572 WHIRLPOOL ad270f91bfbaa488fe35cfa9b15ae68abd05106b6ac338d16c1f20552a131a0f38873117e87553bf959a34bde8dbfbb375e570e9f2f71f1d28f28f0dc4bbad9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSwawNAAoJEJWyH81tNOV9TrUH/A6BxO44Z2Tr0PvkbeoFaEs1
-I4xUCZUHCgH0wRzlCk38XZikKMbruEpdtwdOh7C4MP8NOFXKHB0DQESS0hV2GhML
-aYLq380XcCU2gnGVkvYraTkyI7qN+JKlHuN/mM7h+97XMGnH2hKOEWz0IWlHa2BY
-jLAQ/QfE04ARnlttmXcVOlZYrL+ROoAtkbsdpbgZwKtSKalGE/xMTj3ybxYMlKrU
-rx3RtaIqSrT2Y+KoZuNqMQKPuZ3Gjj/NvthMf2dQyJlAlBo8HB5g4nuHEql+w3RR
-4cBBlIOOoe/9nLNcTQ/EU0uyZahCHvJRgQws05vzw+vjhTJskTAJtjAEsGPpbhM=
-=+hCk
+iEYEAREKAAYFAlOLkucACgkQtbrAj05h3oSsvgCeIMHs1WhnyvzILDsEahqf6DNZ
+ULIAoI2wNRIKAgwZmLCnnNAxwIhRdJ49
+=CvQn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild
new file mode 100644
index 000000000000..20bb3764b1c3
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild,v 1.1 2014/06/01 20:53:52 caster Exp $
+# Build written by Andrew John Hughes (ahughes@redhat.com)
+
+EAPI="5"
+
+inherit autotools eutils readme.gentoo java-pkg-2 java-vm-2
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc +icedtea7 javascript +nsplugin test"
+
+COMMON_DEP="
+	icedtea7? ( || (
+		dev-java/icedtea:7 dev-java/icedtea-bin:7
+	) )
+	!icedtea7? ( || (
+		dev-java/icedtea:7 dev-java/icedtea-bin:7
+		dev-java/icedtea:6 dev-java/icedtea-bin:6
+	) )
+	app-admin/eselect-java
+	nsplugin? (
+		>=dev-libs/glib-2.16
+	)"
+RDEPEND="${COMMON_DEP}"
+# Need system junit 4.8+. Bug #389795
+DEPEND="${COMMON_DEP}
+	virtual/pkgconfig
+	javascript? ( dev-java/rhino:1.6 )
+	nsplugin? ( net-misc/npapi-sdk )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7"
+	if ! use icedtea7; then
+		JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
+	fi
+	JAVA_PKG_WANT_SOURCE="1.6"
+	JAVA_PKG_WANT_TARGET="1.6"
+
+	java-pkg-2_pkg_setup
+	java-vm-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Fix-parallel-install.-BGO-440906.patch
+	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch # bug #356645
+	eautoreconf
+}
+
+src_configure() {
+	local config=(
+		# javaws is managed by eselect java-vm and symlinked to by icedtea so
+		# move it out of the way and symlink itweb-settings back to bin
+		--bindir="${EPREFIX}"/usr/libexec/${PN}
+		--with-jdk-home="${JAVA_HOME}"
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
+		$(use_with javascript rhino)
+	)
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	econf "${config[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	if use nsplugin; then
+		install_mozilla_plugin "/usr/$(get_libdir)/IcedTeaPlugin.so"
+	fi
+
+	mkdir -p "${ED}"/usr/bin || die
+	dosym /usr/libexec/${PN}/itweb-settings /usr/bin/itweb-settings || die
+
+	# Should we patch system default lookup instead?
+	mkdir -p "${ED}"/etc/.java/deployment/ || die
+	echo "deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm" \
+		> "${ED}"/etc/.java/deployment/deployment.properties || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	VMHANDLE="icedtea-web@${GENTOO_VM}" java-vm_check-nsplugin
+	java_mozilla_clean_
+	readme.gentoo_print_elog
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it
+	# doesn't make sense here.
+	:;
+}