From d388f286aec0956eb3c7aafe01b9a81dd7ebbc7c Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 4 Jul 2013 12:25:31 +0000 Subject: Update sun-{jre,jdk} to 7.0.25, aka Oracle Java SE 7u25. while here, convert Solaris support to use pkgsrc emulator framework, or it is hard to maintain this package. This release includes important security fixes (CVE-2013-1571) . Oracle strongly recommends that all Java SE 7 users upgrade to this release. XXX: I cannot test on Solaris, but want to update for security fix. XXX: If this change broke Solaris support, please fix, or report it. --- lang/sun-jre7/Makefile | 12 ++++++------ lang/sun-jre7/Makefile.common | 16 ++++++---------- lang/sun-jre7/PLIST.linux-i386 | 4 +++- lang/sun-jre7/PLIST.linux-x86_64 | 4 +++- lang/sun-jre7/PLIST.solaris-i386 | 4 +++- lang/sun-jre7/PLIST.solaris-x86_64 | 4 +++- lang/sun-jre7/distinfo | 26 +++++++++++++------------- 7 files changed, 37 insertions(+), 33 deletions(-) (limited to 'lang/sun-jre7') diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile index 597dd354f29..8ac0ca6ac7f 100644 --- a/lang/sun-jre7/Makefile +++ b/lang/sun-jre7/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.14 2013/04/20 01:10:19 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2013/07/04 12:25:31 obache Exp $ # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version # Note: This needs to be kept in sync with the sun-jdk7 package # Note: If you make makesum, make sure that you include both archs in distinfo -DISTNAME= jre-7u21-${DIST_OS}-${DIST_ARCH} -PKGNAME= sun-jre7-7.0.21 +DISTNAME= jre-7u25-${DIST_OS}-${DIST_ARCH} +PKGNAME= sun-jre7-7.0.25 MASTER_SITES= # empty LICENSE= oracle-binary-code-license -DOWNLOAD_NAME= Java Runtime Environment (JRE) 7u21 +DOWNLOAD_NAME= Java Runtime Environment (JRE) 7u25 USE_TOOLS+= pax -WRKSRC= ${WRKDIR}/jre1.7.0_21 +WRKSRC= ${WRKDIR}/jre1.7.0_25 JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \ servertool tnameserv REQD_DIRS= ${JAVA_HOME} @@ -34,7 +34,7 @@ SFILES_MK=sfiles-${DIST_OS}-${EMUL_ARCH}.mk # The 64-bit Solaris downloads for some inexplicable reason only contain # the additional 64-bit files, and you need the main 32-bit file too. -.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64" +.if ${EMUL_OPSYS} == "solaris" && ${EMUL_ARCH} == "x86_64" DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/} .endif diff --git a/lang/sun-jre7/Makefile.common b/lang/sun-jre7/Makefile.common index 64a4395e2a8..6792ce8986a 100644 --- a/lang/sun-jre7/Makefile.common +++ b/lang/sun-jre7/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2013/03/06 16:21:13 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.3 2013/07/04 12:25:31 obache Exp $ # used by lang/sun-jre7/Makefile # used by lang/sun-jdk7/Makefile @@ -7,8 +7,8 @@ COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.oracle.com/technetwork/java/index.html -DOWNLOAD= http://www.oracle.com/technetwork/java/javase/downloads/index.html -ARCHIVE= http://www.oracle.com/technetwork/java/archive-139210.html +DOWNLOAD= http://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html +ARCHIVE= http://www.oracle.com/technetwork/java/javase/archive-139210.html RESTRICTED= Redistribution of repackaged binaries not permitted NO_SRC_ON_CDROM=${RESTRICTED} @@ -16,16 +16,14 @@ NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -EMUL_PLATFORMS= linux-i386 linux-x86_64 +EMUL_PLATFORMS= linux-i386 linux-x86_64 solaris-i386 solaris-x86_64 USE_TOOLS+= pax .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" +.if ${EMUL_OPSYS} == "solaris" DIST_OS= solaris -EMUL_ARCH= ${MACHINE_ARCH} # XXX: re-use EMUL_ARCH as it is simpler -EMUL_PLATFORMS= # empty, uses native binaries .else DIST_OS= linux EMUL_MODULES.linux= compat locale x11 @@ -74,11 +72,9 @@ FETCH_MESSAGE+= " ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}" FETCH_MESSAGE+= " from:" FETCH_MESSAGE+= " ${DOWNLOAD}" FETCH_MESSAGE+= " or ${ARCHIVE}" -.if ${DIST_OS} == "linux" FETCH_MESSAGE+= "" FETCH_MESSAGE+= " Click Download for '${DOWNLOAD_NAME}', read and accept the" -FETCH_MESSAGE+= " license, then choose 'Linux tar.gz file'." -.endif +FETCH_MESSAGE+= " license, then choose '${EMUL_OPSYS} tar.gz file'." do-install: ${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME} diff --git a/lang/sun-jre7/PLIST.linux-i386 b/lang/sun-jre7/PLIST.linux-i386 index 80234c06cd7..35e1964f764 100644 --- a/lang/sun-jre7/PLIST.linux-i386 +++ b/lang/sun-jre7/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.1 2012/12/11 14:47:17 ryoon Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.2 2013/07/04 12:25:31 obache Exp $ bin/sun7-java bin/sun7-javaws bin/sun7-keytool @@ -510,6 +510,7 @@ java/sun-7/lib/zi/Asia/Kamchatka java/sun-7/lib/zi/Asia/Karachi java/sun-7/lib/zi/Asia/Kashgar java/sun-7/lib/zi/Asia/Kathmandu +java/sun-7/lib/zi/Asia/Khandyga java/sun-7/lib/zi/Asia/Kolkata java/sun-7/lib/zi/Asia/Krasnoyarsk java/sun-7/lib/zi/Asia/Kuala_Lumpur @@ -548,6 +549,7 @@ java/sun-7/lib/zi/Asia/Thimphu java/sun-7/lib/zi/Asia/Tokyo java/sun-7/lib/zi/Asia/Ulaanbaatar java/sun-7/lib/zi/Asia/Urumqi +java/sun-7/lib/zi/Asia/Ust-Nera java/sun-7/lib/zi/Asia/Vientiane java/sun-7/lib/zi/Asia/Vladivostok java/sun-7/lib/zi/Asia/Yakutsk diff --git a/lang/sun-jre7/PLIST.linux-x86_64 b/lang/sun-jre7/PLIST.linux-x86_64 index 68d34e79e07..ef408a9c973 100644 --- a/lang/sun-jre7/PLIST.linux-x86_64 +++ b/lang/sun-jre7/PLIST.linux-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-x86_64,v 1.1 2012/12/11 14:47:17 ryoon Exp $ +@comment $NetBSD: PLIST.linux-x86_64,v 1.2 2013/07/04 12:25:31 obache Exp $ bin/sun7-java bin/sun7-javaws bin/sun7-keytool @@ -504,6 +504,7 @@ java/sun-7/lib/zi/Asia/Kamchatka java/sun-7/lib/zi/Asia/Karachi java/sun-7/lib/zi/Asia/Kashgar java/sun-7/lib/zi/Asia/Kathmandu +java/sun-7/lib/zi/Asia/Khandyga java/sun-7/lib/zi/Asia/Kolkata java/sun-7/lib/zi/Asia/Krasnoyarsk java/sun-7/lib/zi/Asia/Kuala_Lumpur @@ -542,6 +543,7 @@ java/sun-7/lib/zi/Asia/Thimphu java/sun-7/lib/zi/Asia/Tokyo java/sun-7/lib/zi/Asia/Ulaanbaatar java/sun-7/lib/zi/Asia/Urumqi +java/sun-7/lib/zi/Asia/Ust-Nera java/sun-7/lib/zi/Asia/Vientiane java/sun-7/lib/zi/Asia/Vladivostok java/sun-7/lib/zi/Asia/Yakutsk diff --git a/lang/sun-jre7/PLIST.solaris-i386 b/lang/sun-jre7/PLIST.solaris-i386 index e74a54235bc..8068c92b599 100644 --- a/lang/sun-jre7/PLIST.solaris-i386 +++ b/lang/sun-jre7/PLIST.solaris-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.solaris-i386,v 1.1 2013/03/06 16:21:13 jperkin Exp $ +@comment $NetBSD: PLIST.solaris-i386,v 1.2 2013/07/04 12:25:31 obache Exp $ bin/sun7-java bin/sun7-javaws bin/sun7-keytool @@ -492,6 +492,7 @@ java/sun-7/lib/zi/Asia/Kamchatka java/sun-7/lib/zi/Asia/Karachi java/sun-7/lib/zi/Asia/Kashgar java/sun-7/lib/zi/Asia/Kathmandu +java/sun-7/lib/zi/Asia/Khandyga java/sun-7/lib/zi/Asia/Kolkata java/sun-7/lib/zi/Asia/Krasnoyarsk java/sun-7/lib/zi/Asia/Kuala_Lumpur @@ -530,6 +531,7 @@ java/sun-7/lib/zi/Asia/Thimphu java/sun-7/lib/zi/Asia/Tokyo java/sun-7/lib/zi/Asia/Ulaanbaatar java/sun-7/lib/zi/Asia/Urumqi +java/sun-7/lib/zi/Asia/Ust-Nera java/sun-7/lib/zi/Asia/Vientiane java/sun-7/lib/zi/Asia/Vladivostok java/sun-7/lib/zi/Asia/Yakutsk diff --git a/lang/sun-jre7/PLIST.solaris-x86_64 b/lang/sun-jre7/PLIST.solaris-x86_64 index 9558b16d676..cfe2e3480a6 100644 --- a/lang/sun-jre7/PLIST.solaris-x86_64 +++ b/lang/sun-jre7/PLIST.solaris-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.solaris-x86_64,v 1.1 2013/03/06 16:21:13 jperkin Exp $ +@comment $NetBSD: PLIST.solaris-x86_64,v 1.2 2013/07/04 12:25:31 obache Exp $ bin/sun7-java bin/sun7-javaws bin/sun7-keytool @@ -546,6 +546,7 @@ java/sun-7/lib/zi/Asia/Kamchatka java/sun-7/lib/zi/Asia/Karachi java/sun-7/lib/zi/Asia/Kashgar java/sun-7/lib/zi/Asia/Kathmandu +java/sun-7/lib/zi/Asia/Khandyga java/sun-7/lib/zi/Asia/Kolkata java/sun-7/lib/zi/Asia/Krasnoyarsk java/sun-7/lib/zi/Asia/Kuala_Lumpur @@ -584,6 +585,7 @@ java/sun-7/lib/zi/Asia/Thimphu java/sun-7/lib/zi/Asia/Tokyo java/sun-7/lib/zi/Asia/Ulaanbaatar java/sun-7/lib/zi/Asia/Urumqi +java/sun-7/lib/zi/Asia/Ust-Nera java/sun-7/lib/zi/Asia/Vientiane java/sun-7/lib/zi/Asia/Vladivostok java/sun-7/lib/zi/Asia/Yakutsk diff --git a/lang/sun-jre7/distinfo b/lang/sun-jre7/distinfo index b84930f3bf1..6d9abeda715 100644 --- a/lang/sun-jre7/distinfo +++ b/lang/sun-jre7/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.11 2013/04/20 01:10:19 ryoon Exp $ +$NetBSD: distinfo,v 1.12 2013/07/04 12:25:31 obache Exp $ SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f Size (UnlimitedJCEPolicyJDK7.zip) = 7426 bytes -SHA1 (jre-7u21-linux-i586.tar.gz) = b5277744dc56e33db2507acd02f22e4f555d2246 -RMD160 (jre-7u21-linux-i586.tar.gz) = 0bc1c78a545bbb54ebbe1ae3f351d6fda6442005 -Size (jre-7u21-linux-i586.tar.gz) = 48233160 bytes -SHA1 (jre-7u21-linux-x64.tar.gz) = 76c4acd98d916aee370dc6aa8c094280606f92c5 -RMD160 (jre-7u21-linux-x64.tar.gz) = 0d6e8f137139eea8eb4c37398beb272b61a78e24 -Size (jre-7u21-linux-x64.tar.gz) = 46934987 bytes -SHA1 (jre-7u21-solaris-i586.tar.gz) = c4c7d909cd4da09e01c5d464744b3f90c9ec7135 -RMD160 (jre-7u21-solaris-i586.tar.gz) = a6c3cc2f6c646206d2814d174826253156754c40 -Size (jre-7u21-solaris-i586.tar.gz) = 47771041 bytes -SHA1 (jre-7u21-solaris-x64.tar.gz) = 343cc7c9d7af31b5d75da9621b4295d6ce211e21 -RMD160 (jre-7u21-solaris-x64.tar.gz) = 22ebee71a29e46df525f2c0c82eb9e331013bc7b -Size (jre-7u21-solaris-x64.tar.gz) = 15580629 bytes +SHA1 (jre-7u25-linux-i586.tar.gz) = a052a45b4ae664906d67ac2693b75d3ff2e4c5ed +RMD160 (jre-7u25-linux-i586.tar.gz) = c76fc667ef629b3f81163797b045a6df90130d76 +Size (jre-7u25-linux-i586.tar.gz) = 48273509 bytes +SHA1 (jre-7u25-linux-x64.tar.gz) = fb4c38af805bda3923092b332bdb520d07d94aa5 +RMD160 (jre-7u25-linux-x64.tar.gz) = 2eaaeeb86c29c4fd62feed385affc340820ff2cb +Size (jre-7u25-linux-x64.tar.gz) = 46962005 bytes +SHA1 (jre-7u25-solaris-i586.tar.gz) = ba7b5d772cf254a98991b74dbe7fd77693436323 +RMD160 (jre-7u25-solaris-i586.tar.gz) = f870b3e1fc1b5708665430c82ebf729b0ea9fee5 +Size (jre-7u25-solaris-i586.tar.gz) = 47922091 bytes +SHA1 (jre-7u25-solaris-x64.tar.gz) = a77a45c990b4d215e625edecc991e7a07c1bac15 +RMD160 (jre-7u25-solaris-x64.tar.gz) = 1d419480ad48f99caabd372fda2f32e9c336dcf0 +Size (jre-7u25-solaris-x64.tar.gz) = 15654306 bytes -- cgit v1.2.3