Update to 1.4.2 Update 17. Security update that fixes multiple recently

reported vulnerabilities.
* http://java.sun.com/j2se/1.4.2/ReleaseNotes.html#142_17

5 files changed, 18 insertions, 18 deletions

diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 0e44be7668b..86f20bfd23f 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2008/01/21 01:39:01 tnn Exp $
+# $NetBSD: Makefile,v 1.39 2008/03/05 21:50:22 tnn Exp $
 
-DISTNAME=	j2sdk-1_4_2_16-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk14-2.16
+DISTNAME=	j2sdk-1_4_2_17-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk14-2.17
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
@@ -10,7 +10,7 @@ SHORT=		SDK
 
 DEPENDS+=	sun-jre14>=2.9:../../lang/sun-jre14
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.2_16
+WRKSRC=		${WRKDIR}/j2sdk1.4.2_17
 JAVA_WRAPPERS+=	appletviewer extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index bc6c53f85fc..e480a923d7f 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2008/01/21 01:39:01 tnn Exp $
+$NetBSD: distinfo,v 1.21 2008/03/05 21:50:22 tnn Exp $
 
-SHA1 (j2sdk-1_4_2_16-linux-i586.bin) = d26cbf796b04f67d9d613049b799d2a168f48f98
-RMD160 (j2sdk-1_4_2_16-linux-i586.bin) = 01652579112db12b431940da39bbd4a6ea4748f0
-Size (j2sdk-1_4_2_16-linux-i586.bin) = 36397216 bytes
+SHA1 (j2sdk-1_4_2_17-linux-i586.bin) = 79311406936549dfe4906650d11862c8cc9a8574
+RMD160 (j2sdk-1_4_2_17-linux-i586.bin) = 8b79b4e0f356c0f263a6345a40a9a52d6165961f
+Size (j2sdk-1_4_2_17-linux-i586.bin) = 36376686 bytes
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 9bec991eded..dce8f7f67ff 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.46 2008/01/21 01:39:01 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2008/03/05 21:50:22 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	j2re-1_4_2_16-linux-${DIST_ARCH}
-PKGNAME=	sun-jre14-2.16
+DISTNAME=	j2re-1_4_2_17-linux-${DIST_ARCH}
+PKGNAME=	sun-jre14-2.17
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
 
 SHORT=		JRE
 
-WRKSRC=		${WRKDIR}/j2re1.4.2_16
+WRKSRC=		${WRKDIR}/j2re1.4.2_17
 JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index ee9bae82414..f8d203600d5 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/01/21 10:34:20 tnn Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/03/05 21:50:22 tnn Exp $
 bin/sun14-java
 bin/sun14-keytool
 bin/sun14-orbd
@@ -29,7 +29,6 @@ java/sun-1.4/bin/rmid
 java/sun-1.4/bin/rmiregistry
 java/sun-1.4/bin/servertool
 java/sun-1.4/bin/tnameserv
-java/sun-1.4/javaws/cacerts
 java/sun-1.4/javaws/javalogo52x88.gif
 java/sun-1.4/javaws/javaws
 java/sun-1.4/javaws/javaws-l10n.jar
@@ -310,6 +309,7 @@ java/sun-1.4/lib/zi/America/Indiana/Indianapolis
 java/sun-1.4/lib/zi/America/Indiana/Knox
 java/sun-1.4/lib/zi/America/Indiana/Marengo
 java/sun-1.4/lib/zi/America/Indiana/Petersburg
+java/sun-1.4/lib/zi/America/Indiana/Tell_City
 java/sun-1.4/lib/zi/America/Indiana/Vevay
 java/sun-1.4/lib/zi/America/Indiana/Vincennes
 java/sun-1.4/lib/zi/America/Indiana/Winamac
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index 9909dd2a262..ebcac0ccbfe 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2008/01/21 01:39:02 tnn Exp $
+$NetBSD: distinfo,v 1.25 2008/03/05 21:50:22 tnn Exp $
 
-SHA1 (j2re-1_4_2_16-linux-i586.bin) = 7abc5f9354bc00109766f8f6302e39c4da938bcb
-RMD160 (j2re-1_4_2_16-linux-i586.bin) = 46885501b413a73a08f50695c335e11291389376
-Size (j2re-1_4_2_16-linux-i586.bin) = 14388621 bytes
+SHA1 (j2re-1_4_2_17-linux-i586.bin) = a4282ea13048c76274222476abfb0954d42c35b8
+RMD160 (j2re-1_4_2_17-linux-i586.bin) = 62de02a90f67d8965cebc563636d688f6745b7ca
+Size (j2re-1_4_2_17-linux-i586.bin) = 14376647 bytes
 SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee
 RMD160 (jce_policy-1_4_2.zip) = 323340fa8a96f315a35b0ebc918731e6fe56c370
 Size (jce_policy-1_4_2.zip) = 12195 bytes