Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Wed, 02 Feb 2011 00:06:18
Message-Id: 20110202000607.575CA20054@flycatcher.gentoo.org
1 caster 11/02/02 00:06:07
2
3 Modified: icedtea.env
4 Added: icedtea-old.env 6.1.9.5-sparc.patch
5 Removed: 6.1.9.3-sparc.patch
6 Log:
7 Version bump, security bug #353418. Use get_libdir to set proper lib dir in the env file.
8
9 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.2 dev-java/icedtea/files/icedtea.env
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea.env?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea.env?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea.env?r1=1.1&r2=1.2
17
18 Index: icedtea.env
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- icedtea.env 4 Mar 2010 23:21:01 -0000 1.1
25 +++ icedtea.env 2 Feb 2011 00:06:07 -0000 1.2
26 @@ -1,15 +1,15 @@
27 -# Copyright 1999-2007 Gentoo Foundation
28 +# Copyright 1999-2011 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.1 2010/03/04 23:21:01 caster Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.2 2011/02/02 00:06:07 caster Exp $
32
33 VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
34 -JAVA_HOME=/usr/lib/icedtea@SLOT@
35 -JDK_HOME=/usr/lib/icedtea@SLOT@
36 +JAVA_HOME=/usr/@LIBDIR@/icedtea@SLOT@
37 +JDK_HOME=/usr/@LIBDIR@/icedtea@SLOT@
38 JAVAC=${JAVA_HOME}/bin/javac
39 PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
40 ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
41 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/"
42 -MANPATH="/usr/lib/icedtea@SLOT@/man"
43 +MANPATH="/usr/@LIBDIR@/icedtea@SLOT@/man"
44 PROVIDES_TYPE="JDK JRE"
45 PROVIDES_VERSION="1.@SLOT@"
46 # Taken from sun.boot.class.path property
47
48
49
50 1.1 dev-java/icedtea/files/icedtea-old.env
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea-old.env?rev=1.1&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea-old.env?rev=1.1&content-type=text/plain
54
55 Index: icedtea-old.env
56 ===================================================================
57 # Copyright 1999-2011 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea-old.env,v 1.1 2011/02/02 00:06:07 caster Exp $
60
61 VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
62 JAVA_HOME=/usr/lib/icedtea@SLOT@
63 JDK_HOME=/usr/lib/icedtea@SLOT@
64 JAVAC=${JAVA_HOME}/bin/javac
65 PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
66 ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
67 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/"
68 MANPATH="/usr/lib/icedtea@SLOT@/man"
69 PROVIDES_TYPE="JDK JRE"
70 PROVIDES_VERSION="1.@SLOT@"
71 # Taken from sun.boot.class.path property
72 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"
73 GENERATION="2"
74 ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
75
76
77
78 1.1 dev-java/icedtea/files/6.1.9.5-sparc.patch
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/6.1.9.5-sparc.patch?rev=1.1&view=markup
81 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
82
83 Index: 6.1.9.5-sparc.patch
84 ===================================================================
85 diff -Nru icedtea6-1.9.5.orig/Makefile.am icedtea6-1.9.5/Makefile.am
86 --- icedtea6-1.9.5.orig/Makefile.am 2011-01-18 15:15:22.228649098 +0000
87 +++ icedtea6-1.9.5/Makefile.am 2011-01-26 11:41:09.648533950 +0000
88 @@ -326,7 +326,8 @@
89 patches/openjdk/6795356-proxylazyvalue-leak.patch \
90 patches/openjdk/6687968-pngimagereader_mem_leak.patch \
91 patches/openjdk/6541476-png-iTXt-chunk.patch \
92 - patches/openjdk/6782079-png_metadata_oom.patch
93 + patches/openjdk/6782079-png_metadata_oom.patch \
94 + patches/g344659-sparc_fscanf_fix.patch
95
96 if WITH_ALT_HSBUILD
97 ICEDTEA_PATCHES += \
98 diff -Nru icedtea6-1.9.5.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.5/patches/g344659-sparc_fscanf_fix.patch
99 --- icedtea6-1.9.5.orig/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100
100 +++ icedtea6-1.9.5/patches/g344659-sparc_fscanf_fix.patch 2011-01-26 11:40:50.136332933 +0000
101 @@ -0,0 +1,12 @@
102 +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
103 +--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-06-21 22:12:15.000000000 +0100
104 ++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-29 20:15:36.179541001 +0000
105 +@@ -35,7 +35,7 @@
106 + }
107 +
108 + while (!feof(fp)) {
109 +- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
110 ++ if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) {
111 + if (strstr(cpu, "Niagara") != NULL) {
112 + rv = true;
113 + }
Report Message
Find on MARC Find on Google Groups