Java SE 6 Update 31

* Olson Data 2011l

* Bug Fixes

  This release contains fixes for security vulnerabilities. For more information,
  see Oracle Java SE Critical Patch Update Advisory.
  http://www.oracle.com/technetwork/topics/security/javacpufeb2012-366318.html

4 files changed, 43 insertions, 13 deletions

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 94baefe8bff..fff1958be86 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2011/10/20 12:28:09 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/02/17 08:16:14 obache Exp $
 
-DISTNAME=	jdk-6u29-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk6-6.0.29
+DISTNAME=	jdk-6u31-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk6-6.0.31
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jdk6-license
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-WRKSRC=		${WRKDIR}/jdk1.6.0_29
+WRKSRC=		${WRKDIR}/jdk1.6.0_31
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
diff --git a/lang/sun-jdk6/PLIST.linux-i386 b/lang/sun-jdk6/PLIST.linux-i386
index a7bba143a73..55f41b5d0f3 100644
--- a/lang/sun-jdk6/PLIST.linux-i386
+++ b/lang/sun-jdk6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.1 2011/08/16 22:13:23 abs Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.2 2012/02/17 08:16:14 obache Exp $
 bin/sun6-appletviewer
 bin/sun6-apt
 bin/sun6-extcheck
@@ -3557,9 +3557,12 @@ java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-compat.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-options.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-util-enumerations.xml_hidden
 java/sun-6/lib/visualvm/visualvm/core/com-sun-tools-visualvm-modules-startup.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_ja.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/all-wcprops
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-api-caching.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application-views.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application.jar
@@ -3582,6 +3585,7 @@ java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-sampler.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-threaddump.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-tools.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-uisupport.jar
+java/sun-6/lib/visualvm/visualvm/modules/entries
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_ja.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-application-views_ja.jar
@@ -3628,7 +3632,17 @@ java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core-windows_visualvm.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-profiler_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-api-caching.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application-views.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application.xml
diff --git a/lang/sun-jdk6/PLIST.linux-x86_64 b/lang/sun-jdk6/PLIST.linux-x86_64
index afed4df341a..3016d7137ae 100644
--- a/lang/sun-jdk6/PLIST.linux-x86_64
+++ b/lang/sun-jdk6/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.1 2011/08/16 22:13:23 abs Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.2 2012/02/17 08:16:14 obache Exp $
 bin/sun6-appletviewer
 bin/sun6-apt
 bin/sun6-extcheck
@@ -3556,9 +3556,12 @@ java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-compat.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-options.xml_hidden
 java/sun-6/lib/visualvm/visualvm/config/Modules/org-openide-util-enumerations.xml_hidden
 java/sun-6/lib/visualvm/visualvm/core/com-sun-tools-visualvm-modules-startup.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/core/locale/.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_ja.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/com-sun-tools-visualvm-modules-startup_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/core/locale/core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/all-wcprops
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-api-caching.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application-views.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-application.jar
@@ -3581,6 +3584,7 @@ java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-sampler.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-threaddump.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-tools.jar
 java/sun-6/lib/visualvm/visualvm/modules/com-sun-tools-visualvm-uisupport.jar
+java/sun-6/lib/visualvm/visualvm/modules/entries
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_ja.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-api-caching_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-application-views_ja.jar
@@ -3627,7 +3631,17 @@ java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport
 java/sun-6/lib/visualvm/visualvm/modules/locale/com-sun-tools-visualvm-uisupport_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core-windows_visualvm.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-core_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-.svn_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-profiler_visualvm.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-prop-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-props_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-text-base_zh_CN.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_ja.jar
+java/sun-6/lib/visualvm/visualvm/modules/locale/org-netbeans-modules-tmp_zh_CN.jar
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-api-caching.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application-views.xml
 java/sun-6/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-application.xml
@@ -3948,3 +3962,5 @@ java/sun-6/sample/webservices/EbayServer/src/ebay/server/Ebay.java
 java/sun-6/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java
 java/sun-6/sample/webservices/EbayServer/src/ebay/server/Main.java
 java/sun-6/src.zip
+@pkgdir java/sun-6/lib/visualvm/platform/docs
+@pkgdir java/sun-6/db/demo/programs/localcal/lib
diff --git a/lang/sun-jdk6/distinfo b/lang/sun-jdk6/distinfo
index 7ba9633a415..ae7fd32e55e 100644
--- a/lang/sun-jdk6/distinfo
+++ b/lang/sun-jdk6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2011/10/20 12:28:09 obache Exp $
+$NetBSD: distinfo,v 1.17 2012/02/17 08:16:14 obache Exp $
 
-SHA1 (jdk-6u29-linux-i586.bin) = a73580ed8ac42040f1bbcab62617719a31c6f487
-RMD160 (jdk-6u29-linux-i586.bin) = fca7a51bf14486a81a684c91152493e8af621647
-Size (jdk-6u29-linux-i586.bin) = 85146345 bytes
-SHA1 (jdk-6u29-linux-x64.bin) = 45286e11864285c0d9d5cafd0355dbe04d272951
-RMD160 (jdk-6u29-linux-x64.bin) = 7bb1433728c9d263bfe9d968595aac7d73e6c2f3
-Size (jdk-6u29-linux-x64.bin) = 85411605 bytes
+SHA1 (jdk-6u31-linux-i586.bin) = 8e404a292d85bddb1b39d63f4248094ca05ef0da
+RMD160 (jdk-6u31-linux-i586.bin) = a917f6233912b84e3c904220fcb0cf49399486d8
+Size (jdk-6u31-linux-i586.bin) = 85292206 bytes
+SHA1 (jdk-6u31-linux-x64.bin) = 51cc34977aef629897dda480558fc78b10166cae
+RMD160 (jdk-6u31-linux-x64.bin) = c96b98671572efcde96512649f62162d46489402
+Size (jdk-6u31-linux-x64.bin) = 85581913 bytes