From: Vlastimil Babka <caster@gentoo.org>
Date: Fri, 21 Oct 2011 22:40:29 +0000 (+0000)
Subject: Version bump, security bug #387637.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=744493cb73553d6739bc62eda5da26842beb0d86;p=gentoo.git

Version bump, security bug #387637.

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

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index d3f460ac55f6..9c00befabac9 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.32 2011/09/09 09:24:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.33 2011/10/21 22:40:29 caster Exp $
+
+*icedtea-6.1.10.4 (21 Oct 2011)
+
+  21 Oct 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4.ebuild:
+  Version bump, security bug #387637.
 
   09 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.2.ebuild,
   icedtea-6.1.10.3.ebuild:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 70d8142471b0..16540e73c475 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -6,6 +6,7 @@ DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST icedtea6-1.10.2.tar.gz 6474110 RMD160 d7d27f12fbc034dac1e5907882e3fc52f7389dbe SHA1 17e2ad42a61751557aeefad4c361cbfd1f343b85 SHA256 488af9a6ddebc38344aabdb62798d403ccc477be1076118788f0b146aa3db5ba
 DIST icedtea6-1.10.3.tar.gz 6490891 RMD160 64cf6297d1931f8f9b6415ddabbe161e0d425e4e SHA1 98d40b17cfa6f1eff5c341005f9613ef11aa0a07 SHA256 c29827bf4b5ceed41799e680395fa475b67f5bbc94de7bc323030feb4f2be5db
+DIST icedtea6-1.10.4.tar.gz 6821129 RMD160 4de37c2086ddcebd2e48004aaa6035870394265c SHA1 b38818a80f2635e21457c6230031e5f7493e6acd SHA256 15491d7f2f81436aaf87f964d923b95b4bda8f6689198b4999961070b6c68851
 DIST jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz 288269 RMD160 9f0dafecf766ae27ad19ed1b6d12fdd59104fbd3 SHA1 b5e304b60f274d0ed59c7888e2340a2f043df4f5 SHA256 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
@@ -13,5 +14,6 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 EBUILD icedtea-6.1.10.2.ebuild 10752 RMD160 4ef55339dbefa16afe66c457d3321291b4a867e2 SHA1 37bdf0c1459bdabee7c5a43dc2289d60df40ec7c SHA256 c2de97f3d118644f028207362865b5cb86a934f00d2fa3075c5baef0a4db8558
 EBUILD icedtea-6.1.10.3.ebuild 10655 RMD160 cf34bf9341717ce9bdabef5057653daf6ac58fba SHA1 c308244aff56f27e8c42e1e90b582a6f32cb9674 SHA256 a73b0e93373ec979c5826c140f32e86ae2fc1d61c40fd822edcf5d924266a91e
-MISC ChangeLog 6550 RMD160 4278f16ed66a7e7df140001ff4dd69926911c870 SHA1 9ac55bc0a1b54a4cbdc5f320d91201cc9aac990e SHA256 191711a6a59572fb236826bf0a336afbcf29bd94f750344e58dcfbf8a39f2a73
+EBUILD icedtea-6.1.10.4.ebuild 10655 RMD160 24f831e245015c28f3b1dd7fe33bab6e911bf92e SHA1 0a08b255fac661cdb7811fc866b04628e6e605a8 SHA256 c922a4c38628ac4fc4eab2908f9b24a7ab851fa64d4c7c65515f91adb26d3bdf
+MISC ChangeLog 6699 RMD160 d03453af70e9fde856a5707542010096ffa73c61 SHA1 79752ce86e67b3b351a94e156694e1077d295be4 SHA256 69db68ce5a177b000ed3f083adf7795ea8d433b8bfebe1f553c0b071272e34fb
 MISC metadata.xml 1631 RMD160 72e61e27b431b353472ca7c0469dc1adaab14971 SHA1 6010b4cfbf447ec6bfce758b42283f3e4d3ffb21 SHA256 dec15c576e0651a896199d0282487de83b2413779097ca4845cde4e85c0a92aa
diff --git a/dev-java/icedtea/icedtea-6.1.10.4.ebuild b/dev-java/icedtea/icedtea-6.1.10.4.ebuild
new file mode 100644
index 000000000000..f2901c79b5aa
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.10.4.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4.ebuild,v 1.1 2011/10/21 22:40:29 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="2"
+
+inherit pax-utils java-pkg-2 java-vm-2 versionator
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
+ICEDTEA_VER="$(get_version_component_range 2-4)"
+ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
+OPENJDK_BUILD="22"
+OPENJDK_DATE="28_feb_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_01.zip"
+JAXWS_TARBALL="jdk6-jaxws-b20.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
+CACAO_TARBALL="c7bf150bfa46.tar.gz"
+JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz"
+SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+		 hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
+		 cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
+		 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
+HOMEPAGE="http://icedtea.classpath.org"
+S=${WORKDIR}/${ICEDTEA_PKG}
+
+# Missing options:
+# shark - needs adding
+IUSE="cacao debug doc examples +hs20 jamvm javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender zero"
+
+# JTReg doesn't pass at present
+RESTRICT="test"
+
+RDEPEND=">=net-print/cups-1.2.12
+	 >=x11-libs/libX11-1.1.3
+	 >=media-libs/freetype-2.3.5
+	 >=media-libs/alsa-lib-1.0
+	 >=x11-libs/gtk+-2.8:2
+	 >=x11-libs/libXinerama-1.0.2
+	 >=x11-libs/libXp-1.0.0
+	 >=x11-libs/libXi-1.1.3
+	 >=x11-libs/libXau-1.0.3
+	 >=x11-libs/libXdmcp-1.0.2
+	 >=x11-libs/libXtst-1.0.3
+	 virtual/jpeg
+	 >=media-libs/libpng-1.2
+	 >=media-libs/giflib-4.1.6
+	 >=sys-libs/zlib-1.2.3
+	 x11-proto/inputproto
+	 x11-proto/xineramaproto
+	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	 javascript? ( dev-java/rhino:1.6 )
+	 zero? ( virtual/libffi )
+	 xrender? ( >=x11-libs/libXrender-0.9.4 )
+	 systemtap? ( >=dev-util/systemtap-1 )
+	 !dev-java/icedtea6
+	 nss? ( >=dev-libs/nss-3.12.5-r1 )"
+
+# Additional dependencies for building:
+#   zip: extract OpenJDK tarball, and needed by configure
+#   xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
+#   ant, ecj, jdk: required to build Java code
+# Only ant-core-1.7.1-r2 and later contain a version of Ant that
+# properly respects environment variables, if the build
+# sets some environment variables.
+#   ca-certificates, perl and openssl are used for the cacerts keystore generation
+#   xext headers have two variants depending on version - bug #288855
+DEPEND="${RDEPEND}
+	|| (
+		( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 )
+		( >=dev-java/cacao-0.99.2 >=app-admin/eselect-ecj-0.5-r1 )
+		dev-java/icedtea6-bin
+		dev-java/icedtea:${SLOT}
+	)
+	app-arch/zip
+	>=dev-java/xalan-2.7.0:0
+	>=dev-java/xerces-2.9.1:2
+	>=dev-java/ant-core-1.7.1-r2
+	dev-java/ant-nodeps
+	app-misc/ca-certificates
+	dev-lang/perl
+	dev-libs/openssl
+	|| (
+		(
+			>=x11-libs/libXext-1.1.1
+			>=x11-proto/xextproto-7.1.1
+			x11-proto/xproto
+		)
+		<x11-libs/libXext-1.1.1
+	)
+	sys-apps/lsb-release"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+# Shark support disabled for now - still experimental and needs sys-devel/llvm
+#	if use shark ; then
+#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
+#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
+#		errror "without the shark USE flag turned on."
+#		die "Rebuild without the shark USE flag on."
+#	  fi
+#	  if ( ! use zero ) ; then
+#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
+#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
+#	  fi
+#	fi
+
+	if use nsplugin && ! use webstart ; then
+		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
+	fi
+
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version "dev-java/icedtea:${SLOT}"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version dev-java/icedtea6; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version dev-java/icedtea6-bin; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	elif has_version dev-java/cacao; then
+		JAVA_PKG_FORCE_VM="cacao"
+	else
+		JAVA_PKG_FORCE_VM=""
+		# don't die just yet if merging a binpkg - bug #258423
+		DIE_IF_NOT_BINPKG=true
+	fi
+
+	# if the previous failed, don't even run java eclasses pkg_setup
+	# as it might also die when no VM is present
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+		java-vm-2_pkg_setup
+		java-pkg-2_pkg_setup
+	fi
+
+	VMHANDLE="icedtea${SLOT}"
+}
+
+src_unpack() {
+	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
+		die "Unable to find a supported VM for building"
+	fi
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_configure() {
+	local config procs rhino_jar
+	local vm=$(java-pkg_get-current-vm)
+	# the VM symlinks are installed specifically to /usr/lib (not get_libdir), bug 380853
+	local vmhome="/usr/lib/jvm/${vm}"
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
+		# If we are upgrading icedtea, then we don't need to bootstrap.
+		config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
+	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
+		# For other 1.5 JDKs e.g. GCJ, CACAO.
+		config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
+		config="${config} --with-jdk-home=${vmhome}"
+	else
+		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
+		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+	fi
+
+	# OpenJDK-specific parallelism support.
+	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
+	if [[ -n ${procs} ]] ; then
+		config="${config} --with-parallel-jobs=${procs}";
+		einfo "Configuring using --with-parallel-jobs=${procs}"
+	fi
+
+	if use_zero ; then
+		config="${config} --enable-zero"
+	else
+		config="${config} --disable-zero"
+	fi
+
+	if use javascript ; then
+		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
+	fi
+
+	if use hs20 ; then
+		config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
+	fi
+
+	if use cacao ; then
+		config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
+	fi
+
+	if use jamvm ; then
+		config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
+	fi
+
+	unset_vars
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_with javascript rhino ${rhino_jar}) \
+		$(use_enable cacao) \
+		$(use_enable jamvm) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable xrender) \
+		$(use_enable systemtap) \
+		$(use_enable nio2) \
+		$(use_enable nss) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	# Newer versions of Gentoo's ant add
+	# an environment variable so it works properly...
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	# ant -diagnostics in Ant 1.8.0 fails without these
+	# otherwise we try to load the least that's needed to avoid possible classpath collisions
+	export ANT_TASKS="xerces-2 xalan ant-nodeps"
+
+	# Paludis does not respect unset from src_configure
+	unset_vars
+	emake || die "make failed"
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${D}/${dest}"
+	dodir "${dest}" || die
+
+	dodoc README NEWS AUTHORS THANKYOU || die
+	dosym "/usr/share/doc/${PF}" "/usr/share/doc/${PN}${SLOT}"
+
+	cd "${S}/openjdk.build/j2sdk-image" || die
+
+	if use doc ; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
+	fi
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	cp src.zip "${ddest}" || die
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in /usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	sed -e "s#@SLOT@#${SLOT}#g" \
+		-e "s#@PV@#${ICEDTEA_VER}#g" \
+		-e "s#@LIBDIR@#$(get_libdir)#g" \
+		< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
+	set_java_env "${T}/icedtea.env"
+}
+
+use_zero() {
+	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}