Update sun-{jre,jdk}6 to 6.0.20, aka 1.6.0_20.

Changes in 1.6.0_20 (6u20)
* OlsonData 2010b
* A Java Network Launch Protocol (JNLP) file without a codebase parameter, such
  as the following, will no longer work with the Java SE 6 update 20 release.
      <jnlp spec="0.2 1.0" href="draw.jnlp">
  This means that developers must specify the codebase parameter in a JNLP file.
  See the following example:
      <jnlp spec="0.2 1.0"
            codebase="http://java.sun.com/javase/technologies/desktop/javawebstart/apps/"
            href="draw.jnlp">
* This release contains fixes for security vulnerabilities.
  For more information, please see Oracle Security Alert for CVE-2010-0886

Changes in 1.6.0_19 (6u19)
* OlsonData 2010b
* Root Certificates
* Ensuring Application and Applet Security when Mixing Signed and Unsigned Code
* Interim Fix for the Transport Layer Security (TLS) Man-in-the-Middle Attack
* Bug Fixes

Changes in 1.6.0_18 (6u18)
* OlsonData 2009s
* VisualVM 1.2
* Java DB 10.5.3.0
* Performance Improvements
* Deployment Updates
* JSR-173 StAX 1.2 API Upgrade
* Bug Fixes

3 files changed, 18 insertions, 11 deletions

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 7a436b3c2a0..d22c1276f0d 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.24 2009/11/22 19:27:21 abs Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/06 09:51:49 obache Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 
-DISTNAME=	jre-6u17-linux-${DIST_ARCH}
-#PKGREVISION=    1
-PKGNAME=	sun-jre6-6.0.17
+DISTNAME=	jre-6u20-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.20
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jre6-license
 
-DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u17
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u20
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.6.0_17
+WRKSRC=		${WRKDIR}/jre1.6.0_20
 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 a1d72015ae8..0e927442552 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.17 2009/08/22 22:39:57 abs Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.18 2010/06/06 09:51:49 obache Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -129,6 +129,8 @@ java/sun-6/lib/fontconfig.Sun.bfc.default
 java/sun-6/lib/fontconfig.Sun.properties.src.default
 java/sun-6/lib/fontconfig.Turbo.bfc.default
 java/sun-6/lib/fontconfig.Turbo.properties.src.default
+java/sun-6/lib/fontconfig.Ubuntu.bfc
+java/sun-6/lib/fontconfig.Ubuntu.properties.src
 java/sun-6/lib/fontconfig.bfc.default
 java/sun-6/lib/fontconfig.properties.src.default
 java/sun-6/lib/fonts/LucidaBrightDemiBold.ttf
@@ -141,6 +143,7 @@ java/sun-6/lib/fonts/LucidaTypewriterBold.ttf
 java/sun-6/lib/fonts/LucidaTypewriterRegular.ttf
 java/sun-6/lib/fonts/fonts.dir
 java/sun-6/lib/i386/client/Xusage.txt
+java/sun-6/lib/i386/client/classes.jsa
 java/sun-6/lib/i386/client/libjsig.so
 java/sun-6/lib/i386/client/libjvm.so
 java/sun-6/lib/i386/headless/libmawt.so
@@ -250,6 +253,7 @@ java/sun-6/lib/security/java.policy
 java/sun-6/lib/security/java.security.default
 java/sun-6/lib/security/javaws.policy
 java/sun-6/lib/security/local_policy.jar
+java/sun-6/lib/security/trusted.libraries
 java/sun-6/lib/servicetag/jdk_header.png
 java/sun-6/lib/sound.properties.default
 java/sun-6/lib/zi/Africa/Abidjan
@@ -385,6 +389,7 @@ java/sun-6/lib/zi/America/Maceio
 java/sun-6/lib/zi/America/Managua
 java/sun-6/lib/zi/America/Manaus
 java/sun-6/lib/zi/America/Martinique
+java/sun-6/lib/zi/America/Matamoros
 java/sun-6/lib/zi/America/Mazatlan
 java/sun-6/lib/zi/America/Menominee
 java/sun-6/lib/zi/America/Merida
@@ -402,6 +407,7 @@ java/sun-6/lib/zi/America/Nome
 java/sun-6/lib/zi/America/Noronha
 java/sun-6/lib/zi/America/North_Dakota/Center
 java/sun-6/lib/zi/America/North_Dakota/New_Salem
+java/sun-6/lib/zi/America/Ojinaga
 java/sun-6/lib/zi/America/Panama
 java/sun-6/lib/zi/America/Pangnirtung
 java/sun-6/lib/zi/America/Paramaribo
@@ -416,6 +422,7 @@ java/sun-6/lib/zi/America/Recife
 java/sun-6/lib/zi/America/Regina
 java/sun-6/lib/zi/America/Resolute
 java/sun-6/lib/zi/America/Rio_Branco
+java/sun-6/lib/zi/America/Santa_Isabel
 java/sun-6/lib/zi/America/Santarem
 java/sun-6/lib/zi/America/Santiago
 java/sun-6/lib/zi/America/Santo_Domingo
@@ -494,6 +501,7 @@ java/sun-6/lib/zi/Asia/Makassar
 java/sun-6/lib/zi/Asia/Manila
 java/sun-6/lib/zi/Asia/Muscat
 java/sun-6/lib/zi/Asia/Nicosia
+java/sun-6/lib/zi/Asia/Novokuznetsk
 java/sun-6/lib/zi/Asia/Novosibirsk
 java/sun-6/lib/zi/Asia/Omsk
 java/sun-6/lib/zi/Asia/Oral
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index df64eb105ea..03c42dcd813 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2009/11/22 19:27:21 abs Exp $
+$NetBSD: distinfo,v 1.13 2010/06/06 09:51:49 obache Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u17-linux-i586.bin) = 4653d635c22b5b7e9faaa8fb94ade0846579de12
-RMD160 (jre-6u17-linux-i586.bin) = 3b5e7b6c36b9d2ad185ce443ffecb94284c0f0b3
-Size (jre-6u17-linux-i586.bin) = 20864591 bytes
+SHA1 (jre-6u20-linux-i586.bin) = dc650aeebbf0fb046061b42423d20ca3bc7f293e
+RMD160 (jre-6u20-linux-i586.bin) = 040e551eaba2b9570d5a7f5aa5d0465815e99c6e
+Size (jre-6u20-linux-i586.bin) = 21079390 bytes