sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

. Update to 1.5.0_16 and patchset 9.

Browse source
This commit is contained in:
Greg Lewis 2009-03-09 20:18:28 +00:00
parent 3df9d4f00b
commit 739875a75c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=229787
16 changed files with 17 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
java/jdk15/Makefile
View file

@ -7,7 +7,6 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= # http://download.java.net/tiger/
@ -50,10 +49,10 @@ POLICYFILE= jce_policy-${JDK_VERSION:S/./_/g}.zip
TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
JDK_VERSION= 1.5.0
JDK_UPDATE_VERSION= 14
JDK_PATCHSET_VERSION= 8
JDK_BUILD_NUMBER= 03
JDK_BUILD_DATE= 05_oct_2007
JDK_UPDATE_VERSION= 16
JDK_PATCHSET_VERSION= 9
JDK_BUILD_NUMBER= 02
JDK_BUILD_DATE= 28_may_2008
LATEST_LINK= jdk15
TZUPDATE_VERSION= 1_3_11
@ -128,6 +127,8 @@ NO_CDROM= Redistribution of pre-compiled binaries is not permitted
MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
ALT_MOTIF_DIR="${LOCALBASE}" \
X11DIR="${LOCALBASE}" \
LOCALDIR="${LOCALBASE}" \
DEFAULT_LD_LIBRARY_PATH="/usr/lib:${LOCALBASE}/lib" \
SYS_CFLAGS="${CFLAGS}" \
LANG="C" \
@ -173,15 +174,14 @@ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/sun/cmm/Makefile \
../../j2se/make/sun/xawt/Makefile
X11_FILES= ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \
../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
../../j2se/src/solaris/native/sun/awt/fontpath.c
../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
# Check for JDK sources and patch file
.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
DISTFILE_INSTRUCTIONS=\n\
Due to licensing restrictions, certain files must be fetched manually.\n\n
.if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{
DISTFILE_INSTRUCTIONS += Please open http://download.java.net/tiger/archive/tiger_u14/\n\
DISTFILE_INSTRUCTIONS += Please open http://download.java.net/tiger/\n\
in a web browser. Download the\n
.if !exists(${DISTDIR}/${JRL_SRCFILE})#{
DISTFILE_INSTRUCTIONS += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE}

18
java/jdk15/distinfo
View file

@ -1,12 +1,12 @@
MD5 (jdk-1_5_0_14-fcs-src-b03-jrl-05_oct_2007.jar) = cfca1a632ba3ccde46a70c648042da1e
SHA256 (jdk-1_5_0_14-fcs-src-b03-jrl-05_oct_2007.jar) = 74e4ed81a3de4a86ef953d098102e79754f863357faec532b2a6dde7e5e9306e
SIZE (jdk-1_5_0_14-fcs-src-b03-jrl-05_oct_2007.jar) = 57791631
MD5 (jdk-1_5_0_14-fcs-bin-b03-jrl-05_oct_2007.jar) = c2707afea24993f0d67a4dafb2d2f5ca
SHA256 (jdk-1_5_0_14-fcs-bin-b03-jrl-05_oct_2007.jar) = f0858acb0b93469a9f75d76a262964c6e8e93945a1345bcfd1cc923a64adaafb
SIZE (jdk-1_5_0_14-fcs-bin-b03-jrl-05_oct_2007.jar) = 2211797
MD5 (bsd-jdk15-patches-8.tar.bz2) = 6df1cfd8b104de94f38534c7b1125995
SHA256 (bsd-jdk15-patches-8.tar.bz2) = 95a82cceb7ba55190ebe4b68cd3117a49ae7e13a1a14f659e14d88117a86725b
SIZE (bsd-jdk15-patches-8.tar.bz2) = 795972
MD5 (jdk-1_5_0_16-fcs-src-b02-jrl-28_may_2008.jar) = 126150cbefb01f28179b09745d0d4616
SHA256 (jdk-1_5_0_16-fcs-src-b02-jrl-28_may_2008.jar) = bef122a1b972b5a7a3866be5410f16e6c82333cffb9d804e9011fa0c3a5f1041
SIZE (jdk-1_5_0_16-fcs-src-b02-jrl-28_may_2008.jar) = 58024248
MD5 (jdk-1_5_0_16-fcs-bin-b02-jrl-28_may_2008.jar) = f14fe4b903411b91a0289748d3abf676
SHA256 (jdk-1_5_0_16-fcs-bin-b02-jrl-28_may_2008.jar) = cec915f68ba7b5ef9c61e1f86a29ce721d76c6be51f7d1dd12d8f302e444e6c9
SIZE (jdk-1_5_0_16-fcs-bin-b02-jrl-28_may_2008.jar) = 2211548
MD5 (bsd-jdk15-patches-9.tar.bz2) = 5be1e735390ea211aa35d5f51b463644
SHA256 (bsd-jdk15-patches-9.tar.bz2) = f197da850f02456c5ca4f7593401ee6afaf02fa1ddfacee61499e97be80dbd9f
SIZE (bsd-jdk15-patches-9.tar.bz2) = 802562
MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
SIZE (jce_policy-1_5_0.zip) = 8826

20
java/jdk15/files/patch-control::common::Defs-bsd.gmk
View file

@ -1,20 +0,0 @@
--- ../../control/make/common/Defs-bsd.gmk.orig 2008-03-02 03:42:25.000000000 +0900
+++ ../../control/make/common/Defs-bsd.gmk 2008-03-02 10:35:39.000000000 +0900
@@ -114,7 +114,7 @@
archExpr = case "`$(UNAME) -m`" in \
- i[3-9]86) \
+ i[3-9]86|pc98) \
$(ECHO) i586 \
;; \
ia64) \
@@ -204,7 +204,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/
else
-DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = ${LOCALBASE}/bin/
endif
# Allow the user to override the default value...
ifdef ALT_DEVTOOLS_PATH

13
java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:51 2006
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Sun Dec 10 21:44:53 2006
@@ -29,7 +29,7 @@
endif
# Default NSPR_PATH and allow override.
-NSPR_PATH = /usr/local
+NSPR_PATH = $(LOCALBASE)
ifdef ALT_NSPR_PATH
NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
endif

16
java/jdk15/files/patch-deploy::common::config.gmk
View file

@ -1,16 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/common/config.gmk.orig Sun Dec 10 21:40:24 2006
+++ ../../deploy/make/plugin/common/config.gmk Sun Dec 10 21:40:59 2006
@@ -44,9 +44,9 @@
ifeq ($(LINUX_OR_BSD), true)
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris
- OTHER_LDFLAGS = -L/usr/X11R6/lib
+ OTHER_LDFLAGS = -L$(LOCALBASE)/lib
ifeq ($(TRUE_PLATFORM), NetBSD)
- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib
+ OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
endif
endif

13
java/jdk15/files/patch-deploy::jvmnative::Makefile
View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/jvmnative/Makefile.orig Sun Dec 10 21:45:33 2006
+++ ../../deploy/make/plugin/jvmnative/Makefile Sun Dec 10 21:45:54 2006
@@ -16,7 +16,7 @@
ifeq ($(PLATFORM), bsd)
LDLIBS = -lm -lX11
-X11HDRDIR = /usr/X11R6/include
+X11HDRDIR = $(LOCALBASE)/include
else
X11HDRDIR =
ifeq ($(PLATFORM), linux)

15
java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk
View file

@ -1,15 +0,0 @@
$FreeBSD$
--- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Dec 10 18:30:50 2006
+++ ../../deploy/make/common/Defs-bsd.gmk Sun Dec 10 18:31:22 2006
@@ -13,8 +13,8 @@
JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX)
JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX)
PATH_SEP = /
-X11DIR = /usr/X11R6
-LOCALDIR = /usr/local
+X11DIR = $(LOCALBASE)
+LOCALDIR = $(LOCALBASE)
ifneq ($(TRUE_PLATFORM), NetBSD)
LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
else

15
java/jdk15/files/patch-deploy::ns7-adapter::Makefile
View file

@ -1,15 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig Sat Jan 20 12:52:46 2007
+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile Sat Jan 20 12:53:22 2007
@@ -66,8 +66,8 @@
COMMONDIR= $(PLUGIN_TOP)/src/plugin/solaris/common
ifeq ($(PLATFORM), bsd)
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7)
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
+X11HDRDIR = $(LOCALBASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
NSPRHDRDIR = $(NSPR_HEADERS_PATH)
else
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \

15
java/jdk15/files/patch-deploy::nscore::Makefile
View file

@ -1,15 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/nscore/unix/Makefile.orig Sun Dec 10 21:46:45 2006
+++ ../../deploy/make/plugin/nscore/unix/Makefile Sun Dec 10 21:47:26 2006
@@ -18,8 +18,8 @@
ifeq ($(PLATFORM), bsd)
LDLIBS = -lX11
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
+X11HDRDIR = $(LOCALBASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
else
X11HDRDIR =
ICONVHDRDIR =

29
java/jdk15/files/patch-j2se::awt::fontpath.c
View file

@ -1,29 +0,0 @@
$FreeBSD$
--- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Sun Dec 10 21:57:02 2006
+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Sun Dec 10 21:58:43 2006
@@ -98,18 +98,18 @@
* various flavors of Linux
*/
static char *fullLinuxFontPath[] = {
- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */
- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */
- "/usr/X11R6/lib/X11/fonts/tt",
- "/usr/X11R6/lib/X11/fonts/TTF",
- "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
+ "%%LOCALBASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */
+ "%%LOCALBASE%%/lib/X11/fonts/truetype", /* SuSE */
+ "%%LOCALBASE%%/lib/X11/fonts/tt",
+ "%%LOCALBASE%%/lib/X11/fonts/TTF",
+ "%%LOCALBASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
"/usr/share/fonts/ja/TrueType", /* RH 7.2+ */
"/usr/share/fonts/truetype",
"/usr/share/fonts/ko/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */
"/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */
- "/usr/X11R6/lib/X11/fonts/Type1",
+ "%%LOCALBASE%%/lib/X11/fonts/Type1",
"/usr/share/fonts/default/Type1", /* RH 9.0 */
NULL, /* terminates the list */
};

26
java/jdk15/files/patch-j2se::awt::mawt.gmk
View file

@ -1,26 +0,0 @@
$FreeBSD$
--- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Dec 10 21:49:45 2006
+++ ../../j2se/make/sun/awt/mawt.gmk Sun Dec 10 21:50:27 2006
@@ -132,9 +132,9 @@
ifeq ($(ARCH_DATA_MODEL), 64)
LIBXT = -lXt
else
- LIBXT = /usr/X11R6/lib/libXt.a
- LIBSM = /usr/X11R6/lib/libSM.a
- LIBICE = /usr/X11R6/lib/libICE.a
+ LIBXT = $(LOCALBASE)/lib/libXt.a
+ LIBSM = $(LOCALBASE)/lib/libSM.a
+ LIBICE = $(LOCALBASE)/lib/libICE.a
endif
endif
else
@@ -229,7 +229,7 @@
$(EVENT_MODEL)
ifeq ($(LINUX_OR_BSD), true)
- CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+ CPPFLAGS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/X11/extensions
endif
ifeq ($(PLATFORM), solaris)

22
java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
View file

@ -1,22 +0,0 @@
$FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Mar 4 21:27:49 2007
+++ ../../j2se/make/common/Defs-bsd.gmk Sun Mar 4 21:29:16 2007
@@ -180,7 +180,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/
else
-DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = $(LOCALBASE)/bin/
endif
# Allow the user to override the default value...
ifdef ALT_DEVTOOLS_PATH
@@ -432,7 +432,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = false
-override OPENWIN_HOME = /usr/X11R6
+override OPENWIN_HOME = $(LOCALBASE)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib
override OTHER_M4FLAGS = -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =

13
java/jdk15/files/patch-j2se::font::Makefile
View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../j2se/make/sun/font/Makefile.orig Sun Dec 10 21:51:17 2006
+++ ../../j2se/make/sun/font/Makefile Sun Dec 10 21:51:50 2006
@@ -125,7 +125,7 @@
# setup the list of libraries to link in...
ifeq ($(PLATFORM), bsd)
# XXXBSD: why here?
-OTHER_INCLUDES += -I/usr/X11R6/include
+OTHER_INCLUDES += -I$(LOCALBASE)/include
OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX)
else
ifeq ($(PLATFORM), linux)

15
java/jdk15/files/patch-j2se::instrument::Makefile
View file

@ -1,15 +0,0 @@
$FreeBSD$
--- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005
+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005
@@ -72,8 +72,8 @@
else
ifeq ($(PLATFORM), bsd)
ifneq ($(TRUE_PLATFORM), NetBSD)
- OTHER_INCLUDES += -I/usr/local/include
- OTHER_LDLIBS += -L/usr/local/lib -liconv
+ OTHER_INCLUDES += -I${LOCALBASE}/include
+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
endif
else
OTHER_LDLIBS = -lnsl -ldl

92
java/jdk15/files/patch-j2se::util::Calendar.java
View file

@ -1,92 +0,0 @@
$FreeBSD$
--- ../../j2se/src/share/classes/java/util/Calendar.java.orig Fri Oct 5 03:18:28 2007
+++ ../../j2se/src/share/classes/java/util/Calendar.java Sat Feb 28 09:34:02 2009
@@ -23,9 +23,14 @@ package java.util;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.OptionalDataException;
import java.io.Serializable;
+import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.PermissionCollection;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
import java.text.DateFormat;
import sun.text.resources.LocaleData;
import sun.util.BuddhistCalendar;
@@ -2396,6 +2401,18 @@ public abstract class Calendar implements Serializable
}
}
+ private static class CalendarAccessControlContext {
+ private static final AccessControlContext INSTANCE;
+ static {
+ RuntimePermission perm = new RuntimePermission("accessClassInPackage.sun.util.calendar");
+ PermissionCollection perms = perm.newPermissionCollection();
+ perms.add(perm);
+ INSTANCE = new AccessControlContext(new ProtectionDomain[] {
+ new ProtectionDomain(null, perms)
+ });
+ }
+ }
+
/**
* Reconstitutes this object from a stream (i.e., deserialize it).
*/
@@ -2425,17 +2442,30 @@ public abstract class Calendar implements Serializable
serialVersionOnStream = currentSerialVersion;
// If there's a ZoneInfo object, use it for zone.
+ ZoneInfo zi = null;
try {
- ZoneInfo zi = (ZoneInfo) AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Object run() throws Exception {
- return input.readObject();
- }
- });
- if (zi != null) {
- zone = zi;
- }
- } catch (Exception e) {
+ zi = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<ZoneInfo>() {
+ public ZoneInfo run() throws Exception {
+ return (ZoneInfo) input.readObject();
+ }
+ },
+ CalendarAccessControlContext.INSTANCE);
+ } catch (PrivilegedActionException pae) {
+ Exception e = pae.getException();
+ if (!(e instanceof OptionalDataException)) {
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException) e;
+ } else if (e instanceof IOException) {
+ throw (IOException) e;
+ } else if (e instanceof ClassNotFoundException) {
+ throw (ClassNotFoundException) e;
+ }
+ throw new RuntimeException(e);
+ }
+ }
+ if (zi != null) {
+ zone = zi;
}
// If the deserialized object has a SimpleTimeZone, try to
@@ -2444,9 +2474,9 @@ public abstract class Calendar implements Serializable
// implementation as much as possible.
if (zone instanceof SimpleTimeZone) {
String id = zone.getID();
- TimeZone zi = TimeZone.getTimeZone(id);
- if (zi != null && zi.hasSameRules(zone) && zi.getID().equals(id)) {
- zone = zi;
+ TimeZone tz = TimeZone.getTimeZone(id);
+ if (tz != null && tz.hasSameRules(zone) && tz.getID().equals(id)) {
+ zone = tz;
}
}
}

13
java/jdk15/files/patch-j2se::xawt::Makefile
View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../j2se/make/sun/xawt/Makefile.orig Sun Dec 10 21:52:27 2006
+++ ../../j2se/make/sun/xawt/Makefile Sun Dec 10 21:52:52 2006
@@ -117,7 +117,7 @@
endif
ifeq ($(PLATFORM), bsd)
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
+ CPPFLAGS += -I$(LOCALBASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
endif
ifeq ($(PLATFORM), solaris)