diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-03-12 20:56:47 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-03-12 20:56:47 +0000 |
| commit | f0fd5a1e4a61f64d859daa56c19a576287173b30 (patch) | |
| tree | 42294fd90966c4f97530cef91e938a6285a05640 /java | |
| parent | Add forgotten description. (diff) | |
Add an upstream patch to fix yet another fallout from HotSpot 23 merge.
https://java.net/jira/browse/OPENJDK6-29
http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/04e4c3ec6516
Notes
Notes:
svn path=/head/; revision=348006
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6-jre/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk6/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-set | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile index 051f4402754c..c7c90243e91e 100644 --- a/java/openjdk6-jre/Makefile +++ b/java/openjdk6-jre/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel PKGNAMESUFFIX= -jre diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index e96a33c3c685..8c1ccdb81066 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -3,7 +3,7 @@ PORTNAME= openjdk6 PORTVERSION= b30 -PORTREVISION?= 2 +PORTREVISION?= 3 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index ecc0e8d1560d..086bf4060ee5 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -5601,6 +5601,17 @@ /* There can't be more than 64K labels because of the limit * on per-method byte code length. */ +--- jdk/src/share/native/common/jdk_util.c ++++ jdk/src/share/native/common/jdk_util.c +@@ -76,7 +76,7 @@ + } + + +- memset(info, 0, sizeof(info_size)); ++ memset(info, 0, info_size); + info->jdk_version = ((jdk_major_version & 0xFF) << 24) | + ((jdk_minor_version & 0xFF) << 16) | + ((jdk_micro_version & 0xFF) << 8) | --- jdk/src/share/native/java/io/io_util.h +++ jdk/src/share/native/java/io/io_util.h @@ -29,7 +29,15 @@ |