summaryrefslogtreecommitdiff
path: root/java/openjdk6/files/patch-set
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2011-02-21 19:03:18 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2011-02-21 19:03:18 +0000
commitb6945850a459a079834122e03bd9fb7caf9b2175 (patch)
tree2957944a5ba397d1e132b8dd9849042d952349ac /java/openjdk6/files/patch-set
parent- Fix to RUN_DEPENDS, added dependencies rrdtool and GeoIP (diff)
Update IcedTea-Web to 1.0.1 and fix multiple security vulnerabilities.
CVE-2010-4469: Hotspot backward jsr heap corruption CVE-2010-4465: Swing timer-based security manager bypass CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N implementation CVE-2010-4448: DNS cache poisoning by untrusted applets CVE-2010-4450: Launcher incorrect processing of empty library path entries CVE-2010-4471: Java2D font-related system property leak CVE-2010-4470: JAXP untrusted component state manipulation CVE-2011-0706: Multiple signers privilege escalation Obtained from: icedtea.classpath.org Obtained from: jaxp.java.net
Diffstat (limited to '')
-rw-r--r--java/openjdk6/files/patch-set13
1 files changed, 7 insertions, 6 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index ac9ce2ef6394..cd0bbcf9183c 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -7173,13 +7173,14 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-01-20 18:51:22.000000000 -0500
-+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-02-01 17:47:12.000000000 -0500
-@@ -71,12 +71,25 @@
++++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-02-17 19:23:36.000000000 -0500
+@@ -71,12 +71,26 @@
# include <sys/procfs.h>
# endif
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
++#define __STDC_LIMIT_MACROS
#include <inttypes.h>
#include <signal.h>
+#ifndef __OpenBSD__
@@ -7202,7 +7203,7 @@
// 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
// When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
-@@ -112,7 +125,7 @@
+@@ -112,7 +126,7 @@
// pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
// sizeof(void*), so here we want something which is integer type, but has the
// same size as a pointer.
@@ -7211,7 +7212,7 @@
#ifdef _LP64
#define NULL_WORD 0L
#else
-@@ -124,7 +137,7 @@
+@@ -124,7 +138,7 @@
#define NULL_WORD NULL
#endif
@@ -7220,7 +7221,7 @@
// Compiler-specific primitive types
typedef unsigned short uint16_t;
#ifndef _UINT32_T
-@@ -144,7 +157,7 @@
+@@ -144,7 +158,7 @@
// prior definition of intptr_t, and add "&& !defined(XXX)" above.
#endif // _SYS_INT_TYPES_H
@@ -7229,7 +7230,7 @@
// Additional Java basic types
-@@ -236,7 +249,9 @@
+@@ -236,7 +250,9 @@
inline int g_isnan(float f) { return isnand(f); }
#endif
inline int g_isnan(double f) { return isnand(f); }