From e81c3ac03b225524ceb917e0c18887e161af0fa3 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Sat, 27 Nov 2004 16:29:06 +0000
Subject: Pullup ticket 148 - requested by Jan Schaumann security fix for
 sun-jdk13 and sun-jre13

        Module Name:	pkgsrc
        Committed By:	jschauma
        Date:		Tue Nov 23 16:56:33 UTC 2004

        Modified Files:
        	pkgsrc/lang/sun-jdk13: Makefile distinfo
        	pkgsrc/lang/sun-jre13: Makefile distinfo

        Log Message:
        Update to version 1.3.1_13.
        Addresses security issue
          http://sunsolve.sun.com/search/document.do?assetkey=1-26-57591-1

        Changes since _12 according to
          http://java.sun.com/j2se/1.3/ReleaseNotes.html

        Can't display localized exception messages of the native method
        correctly java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
---
 lang/sun-jdk13/Makefile | 10 +++++-----
 lang/sun-jdk13/distinfo |  6 +++---
 lang/sun-jre13/Makefile |  8 ++++----
 lang/sun-jre13/distinfo |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index d260d0d4330..85078e3318d 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.29 2004/06/08 14:52:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.29.4.1 2004/11/27 16:29:06 salo Exp $
 
-DISTNAME=	j2sdk-1_3_1_12-linux-i586
-PKGNAME=	sun-jdk13-1.0.12
+DISTNAME=	j2sdk-1_3_1_13-linux-i586
+PKGNAME=	sun-jdk13-1.0.13
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
 
 SHORT=		JDK
 
-DEPENDS=	sun-jre13>=1.0.12:../../lang/sun-jre13
+DEPENDS=	sun-jre13>=1.0.13:../../lang/sun-jre13
 
 JAVA_CLASSPATH=	${JAVA_HOME}/src.jar
 JAVA_WRAPPERS=	appletviewer jar javac javadoc javah javap
-WRKSRC=		${WRKDIR}/jdk1.3.1_12
+WRKSRC=		${WRKDIR}/jdk1.3.1_13
 
 # Remove parts that are in common with the JRE.
 #
diff --git a/lang/sun-jdk13/distinfo b/lang/sun-jdk13/distinfo
index 0526b449215..16d18885804 100644
--- a/lang/sun-jdk13/distinfo
+++ b/lang/sun-jdk13/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2004/06/08 14:52:38 jschauma Exp $
+$NetBSD: distinfo,v 1.13.4.1 2004/11/27 16:29:06 salo Exp $
 
-SHA1 (j2sdk-1_3_1_12-linux-i586.bin) = 4d22994582798be4b698abf72489f0fcbb867a4e
-Size (j2sdk-1_3_1_12-linux-i586.bin) = 26645804 bytes
+SHA1 (j2sdk-1_3_1_13-linux-i586.bin) = e672313ebe1e78620ce171649103b2a7cc8a5dbb
+Size (j2sdk-1_3_1_13-linux-i586.bin) = 26653147 bytes
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index f1d471d102e..94f3e175333 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2004/06/08 14:52:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.35.4.1 2004/11/27 16:29:07 salo Exp $
 
-DISTNAME=	j2re-1_3_1_12-linux-i586
-PKGNAME=	sun-jre13-1.0.12
+DISTNAME=	j2re-1_3_1_13-linux-i586
+PKGNAME=	sun-jre13-1.0.13
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
@@ -9,7 +9,7 @@ COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 SHORT=		JRE
 
 JAVA_WRAPPERS=	java
-WRKSRC=		${WRKDIR}/jre1.3.1_12
+WRKSRC=		${WRKDIR}/jre1.3.1_13
 USE_PKGINSTALL=	yes
 OWN_DIRS=	${JAVA_HOME}
 OWN_DIRS+=	${JAVA_HOME}/lib
diff --git a/lang/sun-jre13/distinfo b/lang/sun-jre13/distinfo
index ac74068f45e..5191b1da8e6 100644
--- a/lang/sun-jre13/distinfo
+++ b/lang/sun-jre13/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2004/06/08 14:52:38 jschauma Exp $
+$NetBSD: distinfo,v 1.11.4.1 2004/11/27 16:29:07 salo Exp $
 
-SHA1 (j2re-1_3_1_12-linux-i586.bin) = 6143a9deeabbe360bdeaa01dc65cd8f6910a7d38
-Size (j2re-1_3_1_12-linux-i586.bin) = 15462648 bytes
+SHA1 (j2re-1_3_1_13-linux-i586.bin) = c7e118e4ccbc87d12eaa485dd6ce206f0b373385
+Size (j2re-1_3_1_13-linux-i586.bin) = 15470536 bytes
 SHA1 (patch-aa) = d77d939b5c38ca8c8f9b387632e40441015c47cf
 SHA1 (patch-ab) = 1a1664d2be48d7a4f8fc05876b7aa5f225c65b16
-- 
cgit v1.2.3