Update to Java 6.0 Update 5. Security update that fixes multiple recently

reported vulnerabilities.
* http://java.sun.com/javase/6/webnotes/ReleaseNotes.html#160_05

5 files changed, 26 insertions, 18 deletions

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 47095ecd894..22087bda44b 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2008/01/20 09:21:35 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/05 22:32:09 tnn Exp $
 
-DISTNAME=	jdk-6u4-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk6-6.0.4
+DISTNAME=	jdk-6u5-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk6-6.0.5
 MASTER_SITES=	# empty
 
-DOWNLOAD_NAME=	JDK 6u4
+DOWNLOAD_NAME=	JDK 6u5
 SHORT_NAME=	JDK
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-WRKSRC=		${WRKDIR}/jdk1.6.0_04
+WRKSRC=		${WRKDIR}/jdk1.6.0_05
 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 7e50d6b7188..e847fe993ef 100644
--- a/lang/sun-jdk6/distinfo
+++ b/lang/sun-jdk6/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/01/20 02:31:48 tnn Exp $
+$NetBSD: distinfo,v 1.4 2008/03/05 22:32:09 tnn Exp $
 
-SHA1 (jdk-6u4-linux-i586.bin) = 2c2211fccae1860642a280c4427a7b38662c8f22
-RMD160 (jdk-6u4-linux-i586.bin) = 35266d4e7eb2c14cb6905c6569e164e031c329a6
-Size (jdk-6u4-linux-i586.bin) = 70418455 bytes
+SHA1 (jdk-6u5-linux-i586.bin) = 0e5f6163bbd1ca388939345a1853c30d95e4a76d
+RMD160 (jdk-6u5-linux-i586.bin) = b965b2d715ae01b7e829e875b38892bada80cee2
+Size (jdk-6u5-linux-i586.bin) = 70504987 bytes
+SHA1 (jdk-6u5-linux-x64.bin) = dd1bcccc6aafd86022014beb53f4df0be51e3ee6
+RMD160 (jdk-6u5-linux-x64.bin) = 7fe84df0edf809d1e17ab93b5a1afb1050addac8
+Size (jdk-6u5-linux-x64.bin) = 63724381 bytes
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 50dae19a4d7..8f7d731903f 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2008/01/24 14:49:39 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/05 22:32:09 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	jre-6u4-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0.4
+DISTNAME=	jre-6u5-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.5
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u4
 SHORT_NAME=	JRE
 
-WRKSRC=		${WRKDIR}/jre1.6.0_04
+WRKSRC=		${WRKDIR}/jre1.6.0_05
 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 526d2fac029..e1065e33216 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.5 2008/01/20 09:21:35 tnn Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.6 2008/03/05 22:32:09 tnn Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -247,6 +247,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/servicetag/jdk_header.png
 java/sun-6/lib/sound.properties.default
 java/sun-6/lib/zi/Africa/Abidjan
 java/sun-6/lib/zi/Africa/Accra
@@ -739,6 +740,7 @@ java/sun-6/plugin/i386/ns7/libjavaplugin_oji.so
 @dirrm java/sun-6/lib/zi/America
 @dirrm java/sun-6/lib/zi/Africa
 @dirrm java/sun-6/lib/zi
+@dirrm java/sun-6/lib/servicetag
 @dirrm java/sun-6/lib/security
 @dirrm java/sun-6/lib/oblique-fonts
 @dirrm java/sun-6/lib/management
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index 4612eba2a1a..0fc9c6d9c3c 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.4 2008/01/20 09:21:35 tnn Exp $
+$NetBSD: distinfo,v 1.5 2008/03/05 22:32:09 tnn Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u4-linux-i586.bin) = d777dade892b4ecff1da871c3730b0fdecb8cc26
-RMD160 (jre-6u4-linux-i586.bin) = 1c403a3e3cdc2e3ae225d97798a23c8155cdebde
-Size (jre-6u4-linux-i586.bin) = 19661668 bytes
+SHA1 (jre-6u5-linux-i586.bin) = 12f469a4796ee1b33a801c2a020ea3fa322cde1e
+RMD160 (jre-6u5-linux-i586.bin) = 7c73f00d762e8f139ebe6ee41b388a6a8acf087b
+Size (jre-6u5-linux-i586.bin) = 19745768 bytes
+SHA1 (jre-6u5-linux-x64.bin) = 136ffb4c9048dc9a52e7e9b79b8e310909c8366d
+RMD160 (jre-6u5-linux-x64.bin) = 7734024c6ea70b801e87a31cc0816f654dfefae6
+Size (jre-6u5-linux-x64.bin) = 18349454 bytes