Pullup ticket 161 - Requested by Jan Schaumann

security fix for sun-jre14 and sun-jdk14

Module Name:	pkgsrc
Committed By:	tv
Date:		Tue Oct  5 22:09:23 UTC 2004

Modified Files:
	pkgsrc/lang/sun-jdk13: Makefile PLIST
	pkgsrc/lang/sun-jdk14: Makefile PLIST pkgsrc/lang/sun-jdk15: Makefile PLIST
	pkgsrc/lang/sun-jre13: Makefile PLIST
	pkgsrc/lang/sun-jre14: Makefile PLIST
	pkgsrc/lang/sun-jre15: Makefile PLIST

Log Message:
Expand the JAVA_WRAPPERS definitions for the sun-j{re,dk}* packages.
This adds many commonly used tools to $PREFIX/bin, such as keytool,
rmiregistry, rmic, idlj, etc.
---
Module Name:	pkgsrc
Committed By:	tv
Date:		Mon Oct 11 14:07:38 UTC 2004

Modified Files:
	pkgsrc/lang/blackdown-jdk13: Makefile PLIST
	pkgsrc/lang/jdk: Makefile PLIST
	pkgsrc/lang/sun-jdk13: Makefile PLIST
	pkgsrc/lang/sun-jdk14: Makefile PLIST
	pkgsrc/lang/win32-jdk: PLIST

Log Message:
Fix the "jre" symlink in the various Sun-based JDK packages; it was wrong
for quite some time after the ${PREFIX}/java migration.  Since pkgsrc now
has proper symlink handling in pkg_install, this can now be a simple
PLIST entry rather than an @exec/@unexec pair.
---
Committed By:   jschauma
Date:           Thu Oct 14 14:32:32 UTC 2004

Modified Files:
        pkgsrc/lang/sun-jdk14: Makefile distinfo
        pkgsrc/lang/sun-jre14: Makefile Makefile.common PLIST distinfo

Log Message:
Tell people to fetch the JCE file if necessary.
Update sun-j*4 to 14-2.6 (aka sun-jdk/jre version 1.4.2_06).
Bugs fixed since last according to
http://java.sun.com/j2se/1.4.2/ReleaseNotes.html:
- jResourceBundle holds ClassLoader references using SoftReference (not weak)
- enablev006: JVMPI_EVENT_ OBJECT_ALLOC request crashes Server VM
- Update cacerts with new VeriSign ca certs
- (so) Selector.select() throws CancelledKeyException
- Internal Error occurs during offet conversion of byte code in rewrite/relocate
- SEGV in MapLoops test
- REGRESSION 1.4: PropertyDescriptors do not find the most specific methods
- REGRESSION 1.5: Introspector.getBeanInfo throws NPE if a primitive type is passed
- CMS: vtest died with tiger b26
- JVM crashes during deoptimization phase
- CMS thread/SLT deadlock problem
- Unable to create Logger during JVM shutdown
- 64bit j2sdk1.4.2_01 and j2sdk1.4.2_03 dump core with oracle 64bit jdbc oci driver
- Cannot set different runtime parameters for different 1.4.2_x versions
- "java_g -version" dies on an assertion on RH9.0 and RHEL 3.0
- 1.4.2_05: 3 JCK tests failing with -Xcheck:jni flag on Linux
- RH Enterprise 3 and Suse Ent 8 server / desktop asian font properties needed
- Clent VM crash while compiling a large JSP generated method
- NullPointerException in reading an rtf-file into a javax.swing.text.rtf.RTFEdito
- RTFEditorKit wrongly parses rtf if fontname has unicode characters
- 1.4.2_04 Server VM - C2 crash in PhaseCFG::ScheduleLate on Solaris
- bf) Direct memory cannot be unreserved while reserving thread sleeps
- Hotspot compiler changes behaviour of program
- VM segv's running jvmti/jvmpi profiler
- J2SE 1.4.2 cannot display certain awt components in Asian characters in RH2.1 AS
- exception thows from jconsole when run any GUI which works fine with jdk1.4.x
- Can not eliminate implicit null checks for method invocations based on profile
- Regression 1.4.2_06b1 4937429 failing. cacerts in javaws and security dirs diffe
- /api/javax_swing/ SwingUtilities/descriptions.html fails for JCK14a, 1.4.2_06b1
- Regression:4683022 fails for 1.4.2_06-b01
- REGRESSION: ResourceBundle.getBundle(String, Locale) is broken in jdk 1.4.2_05

6 files changed, 38 insertions, 20 deletions

diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 75b57dacf1c..67aa9038c0b 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.19 2004/07/02 14:40:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2004/12/01 06:58:37 snj Exp $
 
-DISTNAME=	j2sdk-1_4_2_05-linux-i586
-PKGNAME=	sun-jdk14-2.5
+DISTNAME=	j2sdk-1_4_2_06-linux-i586
+PKGNAME=	sun-jdk14-2.6
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
 
 SHORT=		SDK
 
-DEPENDS=	sun-jre14>=2.5:../../lang/sun-jre14
+DEPENDS=	sun-jre14>=2.6:../../lang/sun-jre14
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.2_05
-JAVA_WRAPPERS=	appletviewer jar javac javadoc javah javap
+WRKSRC=		${WRKDIR}/j2sdk1.4.2_06
+JAVA_WRAPPERS=	appletviewer extcheck idlj jar jarsigner \
+		javac javadoc javah javap jdb rmic serialver
 
 # Remove parts that are in common with the JRE
 #
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index 2a9f322746d..775c8a8f202 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/07/02 14:40:21 jschauma Exp $
+$NetBSD: distinfo,v 1.11.2.1 2004/12/01 06:58:37 snj Exp $
 
-SHA1 (j2sdk-1_4_2_05-linux-i586.bin) = d7961739360721cc801382b71364acbb78babbd4
-Size (j2sdk-1_4_2_05-linux-i586.bin) = 36384457 bytes
+SHA1 (j2sdk-1_4_2_06-linux-i586.bin) = fa02d491e26700c14817585c1f970669c9e885c6
+Size (j2sdk-1_4_2_06-linux-i586.bin) = 36417364 bytes
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 0bfed793a7f..ed9cc4b2159 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.19 2004/07/06 11:32:49 abs Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2004/12/01 06:58:38 snj Exp $
 
 # Note: Regen distinfo with SUN_JRE14_USE_JCE=YES
 
-DISTNAME=	j2re-1_4_2_05-linux-i586
-PKGNAME=	sun-jre14-2.5
+DISTNAME=	j2re-1_4_2_06-linux-i586
+PKGNAME=	sun-jre14-2.6
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
 
 SHORT=		JRE
 
-WRKSRC=		${WRKDIR}/j2re1.4.2_05
+WRKSRC=		${WRKDIR}/j2re1.4.2_06
 USE_PKGINSTALL=	yes
-JAVA_WRAPPERS=	java
+JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
+		servertool tnameserv
 OWN_DIRS=	${JAVA_HOME}
 OWN_DIRS+=	${JAVA_HOME}/lib
 OWN_DIRS+=	${JAVA_HOME}/lib/applet
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 80276d3afa2..bcd0dac657a 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2004/07/06 11:32:49 abs Exp $
+# $NetBSD: Makefile.common,v 1.22.2.1 2004/12/01 06:58:38 snj Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -50,9 +50,15 @@ _FETCH_MESSAGE= 							\
 	${ECHO} ; \
 	${ECHO} " Click 'Download J2SE ${SHORT}', read and accept the"; \
 	${ECHO} " license, then choose 'Linux self-extracting file'."; 	\
-	${ECHO} ; 							\
+	${ECHO} -e ${END_MESSAGE};					\
 	${ECHO} "======================================================================"
 
+.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+END_MESSAGE="\n The file jce_policy-1_4_2.zip must be fetched into:\n"	\
+		"    ${DISTDIR}/jce_policy-1_4_2.zip\n\n"		\
+		"Under 'Other Downloads' / 'Java Cryptography Extension'\n" \
+		"click 'Download' and choose the .zip file.\n"
+.endif
 
 post-fetch:
 	@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then	\
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index 59fa0cffa35..131cd915fe2 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,5 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2004/07/06 11:32:49 abs Exp $
+@comment $NetBSD: PLIST,v 1.14.2.1 2004/12/01 06:58:38 snj Exp $
 bin/sun14-java
+bin/sun14-keytool
+bin/sun14-orbd
+bin/sun14-policytool
+bin/sun14-rmid
+bin/sun14-rmiregistry
+bin/sun14-servertool
+bin/sun14-tnameserv
 java/sun-1.4/.systemPrefs/.system.lock
 java/sun-1.4/.systemPrefs/.systemRootModFile
 java/sun-1.4/CHANGES
@@ -84,6 +91,7 @@ java/sun-1.4/lib/font.properties.zh_TW_UTF8.Sun
 java/sun-1.4/lib/font.properties.zh_TW_UTF8.Sun2003
 java/sun-1.4/lib/font.properties.Redhat6.1.default
 java/sun-1.4/lib/font.properties.ja.default
+java/sun-1.4/lib/font.properties.ja.Redhat3
 java/sun-1.4/lib/font.properties.ja.Redhat6.1.default
 java/sun-1.4/lib/font.properties.ja.Redhat6.2.default
 java/sun-1.4/lib/font.properties.Redhat8.0
@@ -92,9 +100,11 @@ java/sun-1.4/lib/font.properties.ja.Redhat7.2
 java/sun-1.4/lib/font.properties.ja.Redhat7.3
 java/sun-1.4/lib/font.properties.ja.Redhat8.0
 java/sun-1.4/lib/font.properties.ko.Redhat
+java/sun-1.4/lib/font.properties.ko.Redhat2.1
 java/sun-1.4/lib/font.properties.zh_CN.Redhat
 java/sun-1.4/lib/font.properties.zh_CN.Redhat2.1
 java/sun-1.4/lib/font.properties.zh_TW.Redhat
+java/sun-1.4/lib/font.properties.zh_TW.Redhat2.1
 java/sun-1.4/lib/font.properties.ja.Turbo.default
 java/sun-1.4/lib/font.properties.ja.Turbo6.0.default
 java/sun-1.4/lib/font.properties.zh.Turbo.default
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index 74d45aa0f57..573443bf00f 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2004/07/06 11:32:49 abs Exp $
+$NetBSD: distinfo,v 1.12.2.1 2004/12/01 06:58:38 snj Exp $
 
-SHA1 (j2re-1_4_2_05-linux-i586.bin) = 326a50523fbedb449596f2c502c2572d9b88114c
-Size (j2re-1_4_2_05-linux-i586.bin) = 14381383 bytes
+SHA1 (j2re-1_4_2_06-linux-i586.bin) = d86aca7f4c8e61ca9460f313ae853fad5d34c59c
+Size (j2re-1_4_2_06-linux-i586.bin) = 14396068 bytes
 SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee
 Size (jce_policy-1_4_2.zip) = 12195 bytes