From fc4cbb55861e225203c394285ed166869905191b Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 9 Feb 2011 22:34:42 +0000 Subject: Version bump, security bug #354231. (Portage version: 2.2.0_alpha21/cvs/Linux x86_64) --- dev-java/icedtea/ChangeLog | 8 +- dev-java/icedtea/files/6.1.9.6-sparc.patch | 29 +++ dev-java/icedtea/icedtea-6.1.9.6.ebuild | 327 +++++++++++++++++++++++++++++ 3 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 dev-java/icedtea/files/6.1.9.6-sparc.patch create mode 100644 dev-java/icedtea/icedtea-6.1.9.6.ebuild diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index ff7ef0994ce2..84c1da998bb2 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,12 @@ # 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.22 2011/02/02 00:06:07 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.23 2011/02/09 22:34:41 caster Exp $ + +*icedtea-6.1.9.6 (09 Feb 2011) + + 09 Feb 2011; Vlastimil Babka +files/6.1.9.6-sparc.patch, + +icedtea-6.1.9.6.ebuild: + Version bump, security bug #354231. *icedtea-6.1.9.5 (02 Feb 2011) diff --git a/dev-java/icedtea/files/6.1.9.6-sparc.patch b/dev-java/icedtea/files/6.1.9.6-sparc.patch new file mode 100644 index 000000000000..ea41ad005ab1 --- /dev/null +++ b/dev-java/icedtea/files/6.1.9.6-sparc.patch @@ -0,0 +1,29 @@ +diff -Nru icedtea6-1.9.6.orig/Makefile.am icedtea6-1.9.6/Makefile.am +--- icedtea6-1.9.6.orig/Makefile.am 2011-02-09 10:48:29.464832314 +0000 ++++ icedtea6-1.9.6/Makefile.am 2011-02-09 13:01:39.430490143 +0000 +@@ -327,7 +327,8 @@ + patches/openjdk/6795356-proxylazyvalue-leak.patch \ + patches/openjdk/6687968-pngimagereader_mem_leak.patch \ + patches/openjdk/6541476-png-iTXt-chunk.patch \ +- patches/openjdk/6782079-png_metadata_oom.patch ++ patches/openjdk/6782079-png_metadata_oom.patch \ ++ patches/g344659-sparc_fscanf_fix.patch + + if WITH_ALT_HSBUILD + ICEDTEA_PATCHES += \ +diff -Nru icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch +--- icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100 ++++ icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch 2011-02-09 13:01:39.430490143 +0000 +@@ -0,0 +1,12 @@ ++diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp ++--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-06-21 22:12:15.000000000 +0100 +++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-29 20:15:36.179541001 +0000 ++@@ -35,7 +35,7 @@ ++ } ++ ++ while (!feof(fp)) { ++- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) { +++ if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) { ++ if (strstr(cpu, "Niagara") != NULL) { ++ rv = true; ++ } diff --git a/dev-java/icedtea/icedtea-6.1.9.6.ebuild b/dev-java/icedtea/icedtea-6.1.9.6.ebuild new file mode 100644 index 000000000000..e3eb681ca3db --- /dev/null +++ b/dev-java/icedtea/icedtea-6.1.9.6.ebuild @@ -0,0 +1,327 @@ +# 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.9.6.ebuild,v 1.1 2011/02/09 22:34:42 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 autotools 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="20" +OPENJDK_DATE="21_jun_2010" +OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" +JAXP_TARBALL="jdk6-jaxp-b20.zip" +JAXWS_TARBALL="jdk6-jaxws-b20.zip" +JAF_TARBALL="jdk6-jaf-b20.zip" +HOTSPOT_TARBALL="13edc857b967.tar.gz" +CACAO_TARBALL="e321b101a9ee.tar.bz2" +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} + http://hg.openjdk.java.net/hsx/hsx19/master/archive/${HOTSPOT_TARBALL} + cacao? ( http://mips.complang.tuwien.ac.at/hg/cacao/archive/${CACAO_TARBALL} )" +HOMEPAGE="http://icedtea.classpath.org" +S=${WORKDIR}/${ICEDTEA_PKG} + +# Missing options: +# shark - needs adding +IUSE="cacao debug doc examples +hs19 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 + >=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 + nsplugin? ( >=net-libs/xulrunner-1.9.1 ) + 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 + ) + > 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 + + if use nsplugin; then + elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" + elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" + elog "such as Firefox 3.5+, Chromium and perhaps some others too." + fi +} -- cgit v1.2.3-65-gdbad