[gentoo-commits] gentoo-x86 commit in dev-java/icedtea/files: icedtea-old.env 6.1.9.5-sparc.patch icedtea.env 6.1.9.3-sparc.patch

[gentoo-commits] gentoo-x86 commit in dev-java/icedtea/files: icedtea-old.env 6.1.9.5-sparc.patch icedtea.env 6.1.9.3-sparc.patch

[Vlastimil Babka (caster)]

caster      11/02/02 00:06:07

  Modified:             icedtea.env
  Added:                icedtea-old.env 6.1.9.5-sparc.patch
  Removed:              6.1.9.3-sparc.patch
  Log:
  Version bump, security bug #353418. Use get_libdir to set proper lib dir in the env file.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-java/icedtea/files/icedtea.env

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea.env?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea.env?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea.env?r1=1.1&r2=1.2

Index: icedtea.env
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icedtea.env	4 Mar 2010 23:21:01 -0000	1.1
+++ icedtea.env	2 Feb 2011 00:06:07 -0000	1.2
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.1 2010/03/04 23:21:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.2 2011/02/02 00:06:07 caster Exp $
 
 VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
-JAVA_HOME=/usr/lib/icedtea@SLOT@
-JDK_HOME=/usr/lib/icedtea@SLOT@
+JAVA_HOME=/usr/@LIBDIR@/icedtea@SLOT@
+JDK_HOME=/usr/@LIBDIR@/icedtea@SLOT@
 JAVAC=${JAVA_HOME}/bin/javac
 PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="/usr/lib/icedtea@SLOT@/man"
+MANPATH="/usr/@LIBDIR@/icedtea@SLOT@/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.@SLOT@"
 # Taken from sun.boot.class.path property



1.1                  dev-java/icedtea/files/icedtea-old.env

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea-old.env?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea-old.env?rev=1.1&content-type=text/plain

Index: icedtea-old.env
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea-old.env,v 1.1 2011/02/02 00:06:07 caster Exp $

VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
JAVA_HOME=/usr/lib/icedtea@SLOT@
JDK_HOME=/usr/lib/icedtea@SLOT@
JAVAC=${JAVA_HOME}/bin/javac
PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
MANPATH="/usr/lib/icedtea@SLOT@/man"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.@SLOT@"
# Taken from sun.boot.class.path property
BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
GENERATION="2"
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"



1.1                  dev-java/icedtea/files/6.1.9.5-sparc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/6.1.9.5-sparc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/6.1.9.5-sparc.patch?rev=1.1&content-type=text/plain

Index: 6.1.9.5-sparc.patch
===================================================================
diff -Nru icedtea6-1.9.5.orig/Makefile.am icedtea6-1.9.5/Makefile.am
--- icedtea6-1.9.5.orig/Makefile.am	2011-01-18 15:15:22.228649098 +0000
+++ icedtea6-1.9.5/Makefile.am	2011-01-26 11:41:09.648533950 +0000
@@ -326,7 +326,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.5.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.5/patches/g344659-sparc_fscanf_fix.patch
--- icedtea6-1.9.5.orig/patches/g344659-sparc_fscanf_fix.patch	1970-01-01 01:00:00.000000000 +0100
+++ icedtea6-1.9.5/patches/g344659-sparc_fscanf_fix.patch	2011-01-26 11:40:50.136332933 +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;
+       }