Pullup ticket #3914 - requested by obache

lang/sun-jdk6: security update
lang/sun-jre6: security update

Revisions pulled up:
- lang/sun-jdk6/Makefile                                        1.31
- lang/sun-jdk6/distinfo                                        1.20
- lang/sun-jre6/Makefile                                        1.39
- lang/sun-jre6/distinfo                                        1.23

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Fri Aug 31 11:34:01 UTC 2012

   Modified Files:
   	pkgsrc/lang/sun-jdk6: Makefile distinfo
   	pkgsrc/lang/sun-jre6: Makefile distinfo

   Log Message:
   Update sun-{jdk,jre}6 to 6.0.35.

   Java(TM) SE Development Kit 6, Update 35 (JDK 6u35)

   The full version string for this update release is 1.6.0_35-b10 (where "b" means
   "build") and the version number is 6u35.
   JDK Demos and Samples remain the same as in JDK 6u34

   The vulnerabilities addressed by this security release do not affect the demos
   and samples code. Therefore there is no need to update Demos and Samples as long
   as the JDK itself is updated to 6u35.

   Olson Data 2012c

   JDK 6u35 contains Olson time zone data version 2012c. For more information,
   refer to Timezone Data Versions in the JRE

   Bug Fixes

   This release contains a security-in-depth fix. For more information, see Oracle
   Security Alert for CVE-2012-4681.

   Java(TM) SE Development Kit 6, Update 34 (JDK 6u34)

   The full version string for this update release is 1.6.0_34-b04 (where "b" means
   "build") and the version number is 6u34.

   Olson Data 2012c

   JDK 6u34 contains Olson time zone data version 2012c. For more information,
   refer to Timezone Data Versions in the JRE Software.

   Bug Fixes
   Notable Bug Fixes in JDK 6u34
   Bug Id	Category	Sub_Category		Description
   7162955	hotspot		attach			Attach api on Solaris, too many
   						open files
   7100757	hotspot		compiler2		The BitSet.nextSetBit() produces
   						incorrect result in 32bit VM on
   						Sparc
   7108221	hotspot		compiler2		Backport to jdk6 Hotspot defaults
   						for AMD Bulldozer processor
   7167142	hotspot		runtime_arguments	Issue warning when finding a
   						.hotspotrc or .hotspot_compiler
   						file that isn't used
   6941923	hotspot		runtime_logging		RFE: Handling large log files
   						produced by long running Java
   						Applications
   7059899	hotspot		runtime_system		Stack overflows in Java code cause
   						64-bit JVMs to exit due to SIGSEGV
   7145587	hotspot		runtime_system		Stack overflows in Java code cause
   						64-bit JVMs to exit due to
   						SIGSEGV (solaris sparc)
   7177216	java		char_encodings		native2ascii changes file
   						permissions of input file
   7027300	java		classes_2d		Unsynchronized HashMap access
   						causes endless loop
   7183251	java		classes_2d		Netbeans editor renders text
   						wrong on JDK 7u6 build 17
   6707273	java		classes_awt		TrayIcon does not support 8-bit
   						alpha channel in Windows XP
   7145980	java		classes_awt		Dispose method of window.java
   						takes long
   6521014	java		classes_net		IOException thrown when Socket
   						tries to bind to an local IPv6
   						address on SuSE Linux
   6543428	java		classes_net		BindException when binding to a
   						link-local address on Windows
   6886436	java		classes_net		Lightwight HTTP Container
   						(com.sun.* package) is unstable
   7118373	java		classes_nio		(se) Potential leak file descriptor
   						when deregistrating at around
   						the same time as an async close
   7093090	java		classes_security	Reduce synchronization in
   						java.security.Policy.getPolicyNoCheck
   7152564	java		classes_security	Improve CodeSource.matchLocation
   						(CodeSource) performance
   7165725	java		classes_swing		JAVA6 HTML PARSER CANNOT PARSE
   						MULTIPLE SCRIPT TAGS IN A LINE
   						CORRECTLY
   7071826	java		classes_util		UUID.randomUUID() race condition
   7144488	java		classes_util		(coll) Infinite recursion for
   						some equals tests in Collections
   7133138	java		classes_util_i18n	Improve io performance around
   						timezone lookups
   7149608	java		classes_util_i18n	(tz): Default TZ detection fails
   						on linux when symbolic links to
   						non default location used.
   7167359	java		classes_util_i18n	(tz) SEGV on solaris if TZ
   						variable not set
   7141852	java		compiler		1.6 v30 no longer compiles
   						particular interface inheritance
   						hierarchy
   7158412	java		install			JRE installer does not delete
   						its installation files from the
   						user's Application Data folder
   7148584	java		jar			Jar tools fails to generate
   						manifest correctly when boundary
   						condition hit
   7175845	java		jar			"jar uf" changes file permissions
   						unexpectedly
   7070619	java		localization		locale issue for keytool with
   						pt_BR
   7168110	java		serviceability		Misleading jstack error message
   7063183	java_deployment	general			AIOB exception in the
   						RemoveCommentReader
   7063790	java_deployment	general			SunAutoProxyHandlerTest hangs
   7119269	java_deployment	general			Tune URLUtils
   7173533	java_deployment	general			Discoverer 10g olap is slower
   						when using java 1.6 than with 1.5
   7175548	java_deployment	security		Regression: Fix 7110690 breaks
   						crossdomain functionality for
   						applets running on 6u33-b03 (FCS/GA)
   6670362	jgss		krb5plugin		HTTP/SPNEGO should work across
   						realms
   7067974	jgss		krb5plugin		multiple ETYPE-INFO-ENTRY with
   						same etype and different salt
   7155051	jndi		dns			DNS provider may return incorrect
   						results
   7157903	jsse		runtime			JSSE client sockets are very slow
   7166570	jsse		runtime			JSSE certificate validation has
   						started to fail for certificate
   						chains

4 files changed, 23 insertions, 23 deletions

diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index df472bf29c1..22b8a8fbd6d 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.30 2012/06/14 01:05:36 obache Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2012/08/31 15:40:40 tron Exp $
 
-DISTNAME=	jdk-6u33-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk6-6.0.33
+DISTNAME=	jdk-6u35-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk6-6.0.35
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jdk6-license
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
-WRKSRC=		${WRKDIR}/jdk1.6.0_33
+WRKSRC=		${WRKDIR}/jdk1.6.0_35
 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 f65b516652c..a4175eca376 100644
--- a/lang/sun-jdk6/distinfo
+++ b/lang/sun-jdk6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2012/06/14 01:05:37 obache Exp $
+$NetBSD: distinfo,v 1.19.2.1 2012/08/31 15:40:40 tron Exp $
 
-SHA1 (jdk-6u33-linux-i586.bin) = a525dd379f577d34628b89beb3ba7c1c935c9f94
-RMD160 (jdk-6u33-linux-i586.bin) = d52ca094683408acc6f62ee1770ce07ed9cfe7d4
-Size (jdk-6u33-linux-i586.bin) = 71748499 bytes
-SHA1 (jdk-6u33-linux-x64.bin) = eee126305d836533894be41cc5eb1eca7cdf5831
-RMD160 (jdk-6u33-linux-x64.bin) = 58fe852835e11743b1c2389c741deead87401cf8
-Size (jdk-6u33-linux-x64.bin) = 72029591 bytes
+SHA1 (jdk-6u35-linux-i586.bin) = 95b412dd2b04eba26620d7300b65b4f28598e989
+RMD160 (jdk-6u35-linux-i586.bin) = e836f8403229e33ca927799ec795a03436cfe3ba
+Size (jdk-6u35-linux-i586.bin) = 71758261 bytes
+SHA1 (jdk-6u35-linux-x64.bin) = eb6d296520549f76757263843bb648feecc90afa
+RMD160 (jdk-6u35-linux-x64.bin) = 38b0498bfcd34ac8bef5901cac0c2053615722e1
+Size (jdk-6u35-linux-x64.bin) = 72039455 bytes
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 894e9afae1d..878ee8000c5 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.38 2012/06/14 01:05:37 obache Exp $
+# $NetBSD: Makefile,v 1.38.2.1 2012/08/31 15:40:40 tron Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 
-DISTNAME=	jre-6u33-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0.33
+DISTNAME=	jre-6u35-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.35
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jre6-license
 
-DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u33
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u35
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.6.0_33
+WRKSRC=		${WRKDIR}/jre1.6.0_35
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index f4de8f769d5..32d4a8aa6b0 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2012/06/14 01:05:37 obache Exp $
+$NetBSD: distinfo,v 1.22.2.1 2012/08/31 15:40:40 tron Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u33-linux-i586.bin) = 0eb29f15703fdcb567d64e15ed41a31a5a6ab66f
-RMD160 (jre-6u33-linux-i586.bin) = c395a2a780a3714673e4acd4a835e1ece1abd9bb
-Size (jre-6u33-linux-i586.bin) = 21693745 bytes
-SHA1 (jre-6u33-linux-x64.bin) = 2cf25614681fa5b3ee4c06612fb5ce91de6edb74
-RMD160 (jre-6u33-linux-x64.bin) = fc73909219502f216acff53e0d41e35e0039617b
-Size (jre-6u33-linux-x64.bin) = 21301090 bytes
+SHA1 (jre-6u35-linux-i586.bin) = 82b4dc3f53f4974902c430a50657de4a1851f85f
+RMD160 (jre-6u35-linux-i586.bin) = 9d0e95772219ed3c8c73c5ce1bee18293ce6cb93
+Size (jre-6u35-linux-i586.bin) = 21697122 bytes
+SHA1 (jre-6u35-linux-x64.bin) = 8c7b23fc6bb8ee41e417d5b067bbebe8b898f234
+RMD160 (jre-6u35-linux-x64.bin) = 2f7c7751804935d0a9e93a425818ee14080412c2
+Size (jre-6u35-linux-x64.bin) = 21301595 bytes