Update sun-{jre,jdk}6 to 6.0.33.

* Olson Data 2012c
* 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/javacpujun2012-1515912.html

6 files changed, 27 insertions, 25 deletions

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 046a9a7378c..df472bf29c1 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2012/05/11 13:04:17 abs Exp $
+# $NetBSD: Makefile,v 1.30 2012/06/14 01:05:36 obache Exp $
 
-DISTNAME=	jdk-6u32-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk6-6.0.32
+DISTNAME=	jdk-6u33-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk6-6.0.33
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jdk6-license
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-WRKSRC=		${WRKDIR}/jdk1.6.0_32
+WRKSRC=		${WRKDIR}/jdk1.6.0_33
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
diff --git a/lang/sun-jdk6/distinfo b/lang/sun-jdk6/distinfo
index b58f149cebe..f65b516652c 100644
--- a/lang/sun-jdk6/distinfo
+++ b/lang/sun-jdk6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2012/05/11 13:04:17 abs Exp $
+$NetBSD: distinfo,v 1.19 2012/06/14 01:05:37 obache Exp $
 
-SHA1 (jdk-6u32-linux-i586.bin) = 558ba711622df8964e321f45b76a398840721c2b
-RMD160 (jdk-6u32-linux-i586.bin) = c0b39543c0b4d526dc314a7fe7fbb652572f610f
-Size (jdk-6u32-linux-i586.bin) = 71746385 bytes
-SHA1 (jdk-6u32-linux-x64.bin) = bf60e6bf9271966403cbdfe0ca81627515fd7cdc
-RMD160 (jdk-6u32-linux-x64.bin) = cf142dbafcb1a25bde84973b631a28bb134a5421
-Size (jdk-6u32-linux-x64.bin) = 72033964 bytes
+SHA1 (jdk-6u33-linux-i586.bin) = a525dd379f577d34628b89beb3ba7c1c935c9f94
+RMD160 (jdk-6u33-linux-i586.bin) = d52ca094683408acc6f62ee1770ce07ed9cfe7d4
+Size (jdk-6u33-linux-i586.bin) = 71748499 bytes
+SHA1 (jdk-6u33-linux-x64.bin) = eee126305d836533894be41cc5eb1eca7cdf5831
+RMD160 (jdk-6u33-linux-x64.bin) = 58fe852835e11743b1c2389c741deead87401cf8
+Size (jdk-6u33-linux-x64.bin) = 72029591 bytes
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 922cdd17a70..894e9afae1d 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.37 2012/05/11 13:02:37 abs Exp $
+# $NetBSD: Makefile,v 1.38 2012/06/14 01:05:37 obache Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 
-DISTNAME=	jre-6u32-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0.32
+DISTNAME=	jre-6u33-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.33
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jre6-license
 
-DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u32
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u33
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.6.0_32
+WRKSRC=		${WRKDIR}/jre1.6.0_33
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index 790dc1a5164..cb1dd2a6651 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.24 2012/04/27 04:27:16 sbd Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.25 2012/06/14 01:05:37 obache Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -359,6 +359,7 @@ java/sun-6/lib/zi/America/Cayman
 java/sun-6/lib/zi/America/Chicago
 java/sun-6/lib/zi/America/Chihuahua
 java/sun-6/lib/zi/America/Costa_Rica
+java/sun-6/lib/zi/America/Creston
 java/sun-6/lib/zi/America/Cuiaba
 java/sun-6/lib/zi/America/Curacao
 java/sun-6/lib/zi/America/Danmarkshavn
diff --git a/lang/sun-jre6/PLIST.linux-x86_64 b/lang/sun-jre6/PLIST.linux-x86_64
index 1691ccc410f..de23e18f9d3 100644
--- a/lang/sun-jre6/PLIST.linux-x86_64
+++ b/lang/sun-jre6/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.6 2012/04/27 04:27:16 sbd Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.7 2012/06/14 01:05:37 obache Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -354,6 +354,7 @@ java/sun-6/lib/zi/America/Cayman
 java/sun-6/lib/zi/America/Chicago
 java/sun-6/lib/zi/America/Chihuahua
 java/sun-6/lib/zi/America/Costa_Rica
+java/sun-6/lib/zi/America/Creston
 java/sun-6/lib/zi/America/Cuiaba
 java/sun-6/lib/zi/America/Curacao
 java/sun-6/lib/zi/America/Danmarkshavn
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index c904ebbc2c4..f4de8f769d5 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.21 2012/05/11 13:02:37 abs Exp $
+$NetBSD: distinfo,v 1.22 2012/06/14 01:05:37 obache Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u32-linux-i586.bin) = d5206bb9d1d657a17a09ff59ea061664cd0c5a0c
-RMD160 (jre-6u32-linux-i586.bin) = 0cdb922b5eede22ef36a4f4e1ebb33fc24963a8f
-Size (jre-6u32-linux-i586.bin) = 21694324 bytes
-SHA1 (jre-6u32-linux-x64.bin) = a52c2b5fc2f5b17a5f225172d222141993d66c48
-RMD160 (jre-6u32-linux-x64.bin) = dcf9ba6df757b56debd21d40b5c6efacc277e80a
-Size (jre-6u32-linux-x64.bin) = 21305045 bytes
+SHA1 (jre-6u33-linux-i586.bin) = 0eb29f15703fdcb567d64e15ed41a31a5a6ab66f
+RMD160 (jre-6u33-linux-i586.bin) = c395a2a780a3714673e4acd4a835e1ece1abd9bb
+Size (jre-6u33-linux-i586.bin) = 21693745 bytes
+SHA1 (jre-6u33-linux-x64.bin) = 2cf25614681fa5b3ee4c06612fb5ce91de6edb74
+RMD160 (jre-6u33-linux-x64.bin) = fc73909219502f216acff53e0d41e35e0039617b
+Size (jre-6u33-linux-x64.bin) = 21301090 bytes