svn commit: r348006 - in head/java: openjdk6 openjdk6-jre openjdk6/files

[Jung-uk Kim]

Author: jkim
Date: Wed Mar 12 20:56:47 2014
New Revision: 348006
URL: http://svnweb.freebsd.org/changeset/ports/348006
QAT: https://qat.redports.org/buildarchive/r348006/

Log:
  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

Modified:
  head/java/openjdk6-jre/Makefile
  head/java/openjdk6/Makefile
  head/java/openjdk6/files/patch-set

Modified: head/java/openjdk6-jre/Makefile
==============================================================================
--- head/java/openjdk6-jre/Makefile	Wed Mar 12 20:54:18 2014	(r348005)
+++ head/java/openjdk6-jre/Makefile	Wed Mar 12 20:56:47 2014	(r348006)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 PKGNAMESUFFIX=	-jre
 

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Wed Mar 12 20:54:18 2014	(r348005)
+++ head/java/openjdk6/Makefile	Wed Mar 12 20:56:47 2014	(r348006)
@@ -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,} \

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Wed Mar 12 20:54:18 2014	(r348005)
+++ head/java/openjdk6/files/patch-set	Wed Mar 12 20:56:47 2014	(r348006)
@@ -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 @@