. Update to patchset 8.

7 files changed, 17 insertions, 196 deletions

diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 08b2090d1abb..1203fc6bde45 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -44,7 +44,7 @@ SUB_LIST+=	JRE_HOME=${PREFIX}/jdk${JDK_VERSION}/jre \
 WRKSRC=		${WRKDIR}/control/make
 
 JDK_VERSION=	1.4.2
-JDK_PATCHSET_VERSION=	7
+JDK_PATCHSET_VERSION=	8
 LATEST_LINK=	jdk14
 
 SUN_LINUX_JDK_VERSION=  1.4.2
diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo
index da9b8f8976e5..71f4046f5c30 100644
--- a/java/jdk14/distinfo
+++ b/java/jdk14/distinfo
@@ -4,6 +4,6 @@ SIZE (j2sdk-1_4_2-src-scsl.zip) = 49269919
 MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
 SHA256 (j2sdk-1_4_2-bin-scsl.zip) = 033a7babe989176890760cffa03d6c1dd595d93d47637032c4314bf6a96008d0
 SIZE (j2sdk-1_4_2-bin-scsl.zip) = 2513462
-MD5 (bsd-jdk14-patches-7.tar.gz) = fe76afc2dd8651350a2f0e221d928fa5
-SHA256 (bsd-jdk14-patches-7.tar.gz) = 88104498f1f78e28b1db1e7cb3e5e577435db34b5e799acdb909649aff1b3b48
-SIZE (bsd-jdk14-patches-7.tar.gz) = 1137785
+MD5 (bsd-jdk14-patches-8.tar.gz) = e6f5bd43e8e8d46bd29f193d6f256462
+SHA256 (bsd-jdk14-patches-8.tar.gz) = 71e9891f5457b73f3ee055688053bb2cee209749f0ea9da596df6eef929bbbc3
+SIZE (bsd-jdk14-patches-8.tar.gz) = 1148395
diff --git a/java/jdk14/files/patch-deploy-resources-javaws b/java/jdk14/files/patch-deploy-resources-javaws
deleted file mode 100644
index 55e194af4100..000000000000
--- a/java/jdk14/files/patch-deploy-resources-javaws
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/javaws/bsd/resources/javaws	22 Oct 2004 21:59:21 -0000	1.3
-+++ ../../deploy/make/javaws/bsd/resources/javaws	28 Sep 2005 17:05:29 -0000
-@@ -13,8 +13,8 @@
- 
- while [ -L "$PRG" ]; do
-     ls=`/bin/ls -ld "$PRG"`
--    link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
--    if /usr/bin/expr "$link" : '/' > /dev/null; then
-+    link=`/bin/expr "$ls" : '.*-> \(.*\)$'`
-+    if /bin/expr "$link" : '\/' > /dev/null; then
-        prg="$link"
-     else
-        prg="`/usr/bin/dirname $PRG`/$link"
diff --git a/java/jdk14/files/patch-j2se-jar-Main.java b/java/jdk14/files/patch-j2se-jar-Main.java
deleted file mode 100644
index bace7025507f..000000000000
--- a/java/jdk14/files/patch-j2se-jar-Main.java
+++ /dev/null
@@ -1,58 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/classes/sun/tools/jar/Main.java	22 Oct 2003 23:02:47 -0000	1.1.1.2
-+++ ../../j2se/src/share/classes/sun/tools/jar/Main.java	27 Apr 2005 05:01:42 -0000
-@@ -32,6 +32,7 @@
-     Hashtable filesTable = new Hashtable();
-     Vector paths = new Vector();
-     Vector v;
-+    String cwd;
-     CRC32 crc32 = new CRC32();
-     /* cflag: create
-      * uflag: update       
-@@ -671,6 +672,19 @@
-      * Extracts specified entries from JAR file.
-      */
-     void extract(InputStream in, String files[]) throws IOException {
-+    	// Current working directory
-+
-+	cwd = System.getProperty("user.dir");
-+	if (cwd == null) {
-+            fatalError(getMsg("error.no.cwd"));
-+	}
-+	cwd = (new File(cwd)).getCanonicalPath();
-+	if (!cwd.endsWith(File.separator)) {
-+	    cwd += File.separator;
-+	}
-+
-+	// Extract the files
-+
- 	ZipInputStream zis = new ZipInputStream(in);
- 	ZipEntry e;
- 	while ((e = zis.getNextEntry()) != null) {
-@@ -695,6 +709,10 @@
-     void extractFile(ZipInputStream zis, ZipEntry e) throws IOException {
-         String name = e.getName();
- 	File f = new File(e.getName().replace('/', File.separatorChar));
-+	if (!f.getCanonicalPath().startsWith(cwd)) {
-+ 	    output(formatMsg("out.ignore.entry", name));
-+	    return;
-+	}
- 	if (e.isDirectory()) {
- 	    if (!f.exists() && !f.mkdirs() || !f.isDirectory()) {
- 		throw new IOException(formatMsg("error.create.dir", f.getPath()));
-@@ -705,6 +723,10 @@
- 	} else {
- 	    if (f.getParent() != null) {
- 		File d = new File(f.getParent());
-+		if (!d.getCanonicalPath().startsWith(cwd)) {
-+	 	    output(formatMsg("out.ignore.entry", name));
-+		    return;
-+		}
- 		if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
- 		    throw new IOException(formatMsg("error.create.dir", d.getPath()));
- 		}
-Index: j2se/src/share/classes/sun/tools/jar/resources/jar.properties
-===================================================================
-RCS file: /var/jcvs/javasrc_1_4_scsl/j2se/src/share/classes/sun/tools/jar/resources/jar.properties,v
-retrieving revision 1.1.1.3
diff --git a/java/jdk14/files/patch-j2se-resources-jar.properties b/java/jdk14/files/patch-j2se-resources-jar.properties
deleted file mode 100644
index 3d9d46286bb9..000000000000
--- a/java/jdk14/files/patch-j2se-resources-jar.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/share/classes/sun/tools/jar/resources/jar.properties	22 Oct 2003 23:02:47 -0000	1.1.1.3
-+++ ../../j2se/src/share/classes/sun/tools/jar/resources/jar.properties	27 Apr 2005 05:01:59 -0000
-@@ -30,6 +30,8 @@
-         {0} : could not create directory
- error.incorrect.length=\
-         incorrect length while processing: {0}
-+error.no.cwd=\
-+	{0} : could not determine current working directory
- out.added.manifest=\
-         added manifest
- out.update.manifest=\
diff --git a/java/jdk14/files/patch-java-util-TimeZone_md.c b/java/jdk14/files/patch-java-util-TimeZone_md.c
deleted file mode 100644
index 67578c864b4f..000000000000
--- a/java/jdk14/files/patch-java-util-TimeZone_md.c
+++ /dev/null
@@ -1,101 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/java/util/TimeZone_md.c.orig	Tue Apr 12 14:31:28 2005
-+++ ../../j2se/src/solaris/native/java/util/TimeZone_md.c	Wed Apr 13 12:59:23 2005
-@@ -39,7 +39,7 @@
- static const char *sysconfig_clock_file = "/etc/sysconfig/clock";
- #endif
- static const char *zoneinfo_dir = "/usr/share/zoneinfo";
--static const char *defailt_zoneinfo_file = "/etc/localtime";
-+static const char *default_zoneinfo_file = "/etc/localtime";
- 
- /*
-  * Returns a point to the zone ID portion of the given zoneinfo file
-@@ -171,6 +171,7 @@ getPlatformTimeZoneID()
-     int fd;
-     char *buf;
-     size_t size;
-+    char zoneinfo_file[PATH_MAX+1];
- 
- #if defined(__linux__)
-     /*
-@@ -232,11 +233,13 @@ getPlatformTimeZoneID()
-     /*
-      * Next, try /etc/localtime to find the zone ID.
-      */
--    if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
-+    if (lstat(default_zoneinfo_file, &statbuf) == -1) {
- 	return NULL;
-     }
- 
--#if defined(__linux__)
-+    strlcpy(zoneinfo_file, default_zoneinfo_file, PATH_MAX+1);
-+
-+#if defined(__linux__) || defined(_BSD_SOURCE)
-     /*
-      * If it's a symlink, get the link name and its zone ID part. (The
-      * older versions of timeconfig created a symlink as described in
-@@ -245,22 +248,25 @@ getPlatformTimeZoneID()
-      * from /etc/localtime.)
-      */
-     if (S_ISLNK(statbuf.st_mode)) {
--	char linkbuf[PATH_MAX+1];
- 	int len;
- 
--	if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
-+	if ((len = readlink(default_zoneinfo_file, zoneinfo_file, sizeof(zoneinfo_file)-1)) == -1) {
- 	    jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
--			defailt_zoneinfo_file);
-+			default_zoneinfo_file);
- 	    return NULL;
- 	}
--	linkbuf[len] = '\0';
--	tz = getZoneName(linkbuf);
-+	zoneinfo_file[len] = '\0';
-+	tz = getZoneName(zoneinfo_file);
- 	if (tz != NULL) {
- 	    tz = strdup(tz);
-+	    return tz;
-+	} else {
-+	    if (lstat(zoneinfo_file, &statbuf) == -1) {
-+		return NULL;
-+	    }
- 	}
--	return tz;
-     }
--#endif /* __linux__ */
-+#endif /* __linux__ || _BSD_SOURCE */
- 
-     /*
-      * If it's a regular file, we need to find out the same zoneinfo file
-@@ -271,7 +277,7 @@ getPlatformTimeZoneID()
-     if (buf == NULL) {
- 	return NULL;
-     }
--    if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
-+    if ((fd = open(zoneinfo_file, O_RDONLY)) == -1) {
- 	free((void *) buf);
- 	return NULL;
-     }
-@@ -548,18 +554,17 @@ getGMTOffsetID()
- 	return strdup("GMT");
-     }
- 
--    /* Note that the time offset direction is opposite. */
- #if defined(_BSD_SOURCE)
-     clock = time(NULL);
-     tzset();
-     local_tm = localtime(&clock);
--    if (local_tm->tm_gmtoff > 0) {
-+    if (local_tm->tm_gmtoff >= 0) {
-         offset = (time_t) local_tm->tm_gmtoff;
--        sign = '-';
-+        sign = '+';
-     }
-     else {
-         offset = (time_t) -local_tm->tm_gmtoff;
--        sign = '+';
-+        sign = '-';
-     }
- #else
-     if (timezone > 0) {
diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk
index fd995e3c063b..d8a025a8d336 100644
--- a/java/jdk14/files/patch-plugin::common::config.gmk
+++ b/java/jdk14/files/patch-plugin::common::config.gmk
@@ -2,12 +2,20 @@ $FreeBSD$
 
 --- ../../deploy/make/plugin/common/config.gmk.orig	Wed Nov 12 16:53:30 2003
 +++ ../../deploy/make/plugin/common/config.gmk	Wed Nov 12 16:53:43 2003
-@@ -57,7 +57,7 @@
+@@ -52,7 +52,6 @@
+ 
+ ifeq ($(PLATFORM), bsd)
+   PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris
+-  X11BASE = /usr/X11R6
+   OTHER_LDFLAGS = -L$(X11BASE)/lib
+   ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM)))
+     OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
+@@ -61,7 +60,7 @@
  
    # include search paths
    # XXXBSD: these should be defined in other place
--  CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include
-+  CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include
+-  CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include
++  CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include
  
-   ifeq ($(TRUE_PLATFORM), FreeSBD)
-     ifeq ($(FREEBSD_4STABLE), true)
+   ifeq ($(TRUE_PLATFORM), FreeBSD)
+       LDFLAGS_COMMON += -pthread