From b05d5bd2811612f100aaaafe00b2fe78e3b5d276 Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 9 Jun 2011 09:08:17 +0000 Subject: Update sun-{jre,jdk}6 to 6.0.26, aka 6u26. Java SE 6 Update 26 * Olson Data 2011g * Bug fixes This release contains fixes for security vulnerabilities. For more information, please see Oracle Java SE Critical Patch Update advisory: http://www.oracle.com/technetwork/topics/security/javacpujune2011-313339.html Java SE 6 Update 25 * Olson Data 2011b * Java Hotspot VM 20 * Performance Improvement to BigDecimal * Performance Improvement to java.util.logging.LogRecord * Bug Fixes --- lang/sun-jdk6/Makefile | 8 ++++---- lang/sun-jdk6/PLIST | 8 +------- lang/sun-jdk6/distinfo | 8 ++++---- lang/sun-jdk6/files/common | 3 ++- lang/sun-jre6/Makefile | 10 +++++----- lang/sun-jre6/PLIST.linux-i386 | 8 +++++++- lang/sun-jre6/distinfo | 8 ++++---- lang/sun-jre6/sfiles-i386.mk | 4 +++- 8 files changed, 30 insertions(+), 27 deletions(-) (limited to 'lang') diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile index d9c422a1c87..c1521d5a3b7 100644 --- a/lang/sun-jdk6/Makefile +++ b/lang/sun-jdk6/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.21 2011/02/21 07:48:19 obache Exp $ +# $NetBSD: Makefile,v 1.22 2011/06/09 09:08:17 obache Exp $ -DISTNAME= jdk-6u24-linux-${DIST_ARCH} -PKGNAME= sun-jdk6-6.0.24 +DISTNAME= jdk-6u26-linux-${DIST_ARCH} +PKGNAME= sun-jdk6-6.0.26 MASTER_SITES= # empty LICENSE= sun-jdk6-license DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6 -WRKSRC= ${WRKDIR}/jdk1.6.0_24 +WRKSRC= ${WRKDIR}/jdk1.6.0_26 JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ javac javadoc javah javap jdb rmic serialver diff --git a/lang/sun-jdk6/PLIST b/lang/sun-jdk6/PLIST index 15f09334092..0191c095a14 100644 --- a/lang/sun-jdk6/PLIST +++ b/lang/sun-jdk6/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2011/02/21 07:48:19 obache Exp $ +@comment $NetBSD: PLIST,v 1.12 2011/06/09 09:08:17 obache Exp $ bin/sun6-appletviewer bin/sun6-apt bin/sun6-extcheck @@ -13,8 +13,6 @@ bin/sun6-jdb bin/sun6-rmic bin/sun6-serialver java/sun-6/README.html -java/sun-6/README_ja.html -java/sun-6/README_zh_CN.html java/sun-6/bin/HtmlConverter java/sun-6/bin/appletviewer java/sun-6/bin/apt @@ -1872,8 +1870,6 @@ java/sun-6/demo/applets/WireFrame/models/hughes_500.obj java/sun-6/demo/applets/WireFrame/models/knoxS.obj java/sun-6/demo/jfc/CodePointIM/CodePointIM.jar java/sun-6/demo/jfc/CodePointIM/README.html -java/sun-6/demo/jfc/CodePointIM/README_ja.html -java/sun-6/demo/jfc/CodePointIM/README_zh_CN.html java/sun-6/demo/jfc/CodePointIM/src/CodePointIM.java java/sun-6/demo/jfc/CodePointIM/src/CodePointInputMethod.java java/sun-6/demo/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java @@ -2747,8 +2743,6 @@ java/sun-6/demo/plugin/applets/WireFrame/models/hughes_500.obj java/sun-6/demo/plugin/applets/WireFrame/models/knoxS.obj java/sun-6/demo/plugin/jfc/CodePointIM/CodePointIM.jar java/sun-6/demo/plugin/jfc/CodePointIM/README.html -java/sun-6/demo/plugin/jfc/CodePointIM/README_ja.html -java/sun-6/demo/plugin/jfc/CodePointIM/README_zh_CN.html java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointIM.java java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointInputMethod.java java/sun-6/demo/plugin/jfc/CodePointIM/src/CodePointInputMethodDescriptor.java diff --git a/lang/sun-jdk6/distinfo b/lang/sun-jdk6/distinfo index cb8df4c1a4f..24aada083be 100644 --- a/lang/sun-jdk6/distinfo +++ b/lang/sun-jdk6/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.12 2011/02/21 07:48:19 obache Exp $ +$NetBSD: distinfo,v 1.13 2011/06/09 09:08:17 obache Exp $ -SHA1 (jdk-6u24-linux-i586.bin) = 4aad5209feb08eb86304f92c7b13ba83836f6605 -RMD160 (jdk-6u24-linux-i586.bin) = ef3f5cada8598c179bdc22f0e7e54c1579330141 -Size (jdk-6u24-linux-i586.bin) = 84927175 bytes +SHA1 (jdk-6u26-linux-i586.bin) = 5f5c9c8489391b881ec324b455a98cabf832ca7a +RMD160 (jdk-6u26-linux-i586.bin) = 613bb466a85679517d7415bc70b15add2e1cc395 +Size (jdk-6u26-linux-i586.bin) = 85141056 bytes diff --git a/lang/sun-jdk6/files/common b/lang/sun-jdk6/files/common index 767b13b150b..9aeae75cca3 100644 --- a/lang/sun-jdk6/files/common +++ b/lang/sun-jdk6/files/common @@ -1,6 +1,7 @@ -# $NetBSD: common,v 1.2 2010/10/16 04:41:19 obache Exp $ +# $NetBSD: common,v 1.3 2011/06/09 09:08:17 obache Exp $ COPYRIGHT +LICENSE THIRDPARTYLICENSEREADME.txt bin/ControlPanel bin/java diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile index 5aaf02817a9..f03f589469b 100644 --- a/lang/sun-jre6/Makefile +++ b/lang/sun-jre6/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.28 2011/02/21 07:48:20 obache Exp $ +# $NetBSD: Makefile,v 1.29 2011/06/09 09:08:17 obache Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version -DISTNAME= jre-6u24-linux-${DIST_ARCH} -PKGNAME= sun-jre6-6.0.24 +DISTNAME= jre-6u26-linux-${DIST_ARCH} +PKGNAME= sun-jre6-6.0.26 MASTER_SITES= # empty LICENSE= sun-jre6-license -DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u24 +DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u26 USE_TOOLS+= pax -WRKSRC= ${WRKDIR}/jre1.6.0_24 +WRKSRC= ${WRKDIR}/jre1.6.0_26 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 89bdb1259f4..67ba59fb99f 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.21 2011/02/21 07:48:20 obache Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.22 2011/06/09 09:08:17 obache Exp $ bin/sun6-java bin/sun6-javaws bin/sun6-keytool @@ -11,6 +11,7 @@ bin/sun6-tnameserv java/sun-6/.systemPrefs/.system.lock java/sun-6/.systemPrefs/.systemRootModFile java/sun-6/COPYRIGHT +java/sun-6/LICENSE java/sun-6/README java/sun-6/THIRDPARTYLICENSEREADME.txt java/sun-6/Welcome.html @@ -122,6 +123,8 @@ java/sun-6/lib/fontconfig.RedHat.3.bfc.default java/sun-6/lib/fontconfig.RedHat.3.properties.src.default java/sun-6/lib/fontconfig.RedHat.4.bfc.default java/sun-6/lib/fontconfig.RedHat.4.properties.src.default +java/sun-6/lib/fontconfig.RedHat.6.0.bfc.default +java/sun-6/lib/fontconfig.RedHat.6.0.properties.src.default java/sun-6/lib/fontconfig.RedHat.bfc.default java/sun-6/lib/fontconfig.RedHat.properties.src.default java/sun-6/lib/fontconfig.SuSE.11.bfc.default @@ -396,6 +399,7 @@ java/sun-6/lib/zi/America/Matamoros java/sun-6/lib/zi/America/Mazatlan java/sun-6/lib/zi/America/Menominee java/sun-6/lib/zi/America/Merida +java/sun-6/lib/zi/America/Metlakatla java/sun-6/lib/zi/America/Mexico_City java/sun-6/lib/zi/America/Miquelon java/sun-6/lib/zi/America/Moncton @@ -408,6 +412,7 @@ java/sun-6/lib/zi/America/New_York java/sun-6/lib/zi/America/Nipigon java/sun-6/lib/zi/America/Nome java/sun-6/lib/zi/America/Noronha +java/sun-6/lib/zi/America/North_Dakota/Beulah java/sun-6/lib/zi/America/North_Dakota/Center java/sun-6/lib/zi/America/North_Dakota/New_Salem java/sun-6/lib/zi/America/Ojinaga @@ -431,6 +436,7 @@ java/sun-6/lib/zi/America/Santiago java/sun-6/lib/zi/America/Santo_Domingo java/sun-6/lib/zi/America/Sao_Paulo java/sun-6/lib/zi/America/Scoresbysund +java/sun-6/lib/zi/America/Sitka java/sun-6/lib/zi/America/St_Johns java/sun-6/lib/zi/America/St_Kitts java/sun-6/lib/zi/America/St_Lucia diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo index 43aa5d4c0d1..ffd9676cce2 100644 --- a/lang/sun-jre6/distinfo +++ b/lang/sun-jre6/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2011/02/21 07:48:20 obache Exp $ +$NetBSD: distinfo,v 1.16 2011/06/09 09:08:17 obache Exp $ SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae Size (jce_policy-6.zip) = 9101 bytes -SHA1 (jre-6u24-linux-i586.bin) = 4ea939acb29cb9e0e5e72ea47b9f193ccb647232 -RMD160 (jre-6u24-linux-i586.bin) = 4cc5e6d6da914c21cfbf6b9176fc56b05541895a -Size (jre-6u24-linux-i586.bin) = 21428830 bytes +SHA1 (jre-6u26-linux-i586.bin) = a6c3a29eb9b63a1993115ed319e960df195a1e9b +RMD160 (jre-6u26-linux-i586.bin) = 90d4b26cdc1c6d22bb304ab3cd6d8e01ddd55b30 +Size (jre-6u26-linux-i586.bin) = 21628961 bytes diff --git a/lang/sun-jre6/sfiles-i386.mk b/lang/sun-jre6/sfiles-i386.mk index 30cab8cf0c5..df67cfe4958 100644 --- a/lang/sun-jre6/sfiles-i386.mk +++ b/lang/sun-jre6/sfiles-i386.mk @@ -1,4 +1,4 @@ -# $NetBSD: sfiles-i386.mk,v 1.4 2011/02/21 07:48:20 obache Exp $ +# $NetBSD: sfiles-i386.mk,v 1.5 2011/06/09 09:08:17 obache Exp $ # # Created with "make makesfiles" # Do not edit this file manually! @@ -24,6 +24,8 @@ SFILES+= fontconfig.RedHat.3.bfc SFILES+= fontconfig.RedHat.3.properties.src SFILES+= fontconfig.RedHat.4.bfc SFILES+= fontconfig.RedHat.4.properties.src +SFILES+= fontconfig.RedHat.6.0.bfc +SFILES+= fontconfig.RedHat.6.0.properties.src SFILES+= fontconfig.RedHat.bfc SFILES+= fontconfig.RedHat.properties.src SFILES+= fontconfig.SuSE.11.bfc -- cgit v1.2.3