9 files changed, 0 insertions, 173 deletions
diff --git a/java/jdk12/files/cacerts b/java/jdk12/files/cacerts
deleted file mode 100644
index aff2e72fc003..000000000000
--- a/java/jdk12/files/cacerts
+++ /dev/null
diff --git a/java/jdk12/files/patch-HAE_API_bsd.c b/java/jdk12/files/patch-HAE_API_bsd.c
deleted file mode 100644
index ee1c4e9ec0e9..000000000000
--- a/java/jdk12/files/patch-HAE_API_bsd.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../src/bsd/native/sun/audio/HAE_API_bsd.c	11 Sep 2001 05:01:58 -0000	1.7
-+++ ../../src/bsd/native/sun/audio/HAE_API_bsd.c	20 Feb 2003 07:10:48 -0000
-@@ -51,7 +51,7 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #elif __OpenBSD__
- #include <soundcard.h>
- #endif
diff --git a/java/jdk12/files/patch-aa b/java/jdk12/files/patch-aa
deleted file mode 100644
index c5ac59a63b98..000000000000
--- a/java/jdk12/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$FreeBSD$
-
---- makefiles/Defs-bsd.gmk	2000/10/13 00:16:56	1.1
-+++ makefiles/Defs-bsd.gmk	2000/10/13 00:20:36
-@@ -59,10 +59,10 @@
- GCC_STYLE	= -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
- GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
- CFLAGS_COMMON   = $(GCC_WARNINGS) -pipe
--CFLAGS_OPT      = $(POPT) -fomit-frame-pointer # -mcpu=i686
-+CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686
- CFLAGS_DBG      = -g3
- CXXFLAGS_COMMON = $(GCC_WARNINGS) -pipe -DFD_SETSIZE=2048
--CXXFLAGS_OPT	= $(POPT) -fomit-frame-pointer # -mcpu=i686
-+CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686
- CXXFLAGS_DBG	= -g3
- endif
- 
-@@ -232,7 +232,7 @@
-     _OPT = -xO4
- else
- ifneq ($(ARCH), alpha)
--    _OPT = -O2
-+    _OPT = #-O2
- endif
- endif
-     CPPFLAGS_DBG    += -DLOGGING 
-@@ -248,7 +248,7 @@
-     _OPT = -xO2
- else
- ifneq ($(ARCH), alpha)
--    _OPT = -O2
-+    _OPT = #-O2
- endif
- endif
- endif
diff --git a/java/jdk12/files/patch-hprof_method.c b/java/jdk12/files/patch-hprof_method.c
deleted file mode 100644
index 8e128d761e81..000000000000
--- a/java/jdk12/files/patch-hprof_method.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../src/share/tools/hprof/hprof_method.c	26 Oct 1999 20:42:59 -0000	1.3
-+++ ../../src/share/tools/hprof/hprof_method.c	20 Feb 2003 07:11:17 -0000
-@@ -123,7 +123,7 @@
-     int stack_depth;
-     int trace_depth;
-     unsigned int hash = 0;
--#if defined __GNUC__ && (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-+#if defined(__GNUC__) && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 8) || (__GNUC__ >= 3))
-     jlong total_time = 0;
- #endif
-     int i;
diff --git a/java/jdk12/files/patch-javai_md.c b/java/jdk12/files/patch-javai_md.c
deleted file mode 100644
index a3dde4d9de48..000000000000
--- a/java/jdk12/files/patch-javai_md.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../src/bsd/javavm/runtime/javai_md.c	Mon Jan 19 12:37:59 2004
-+++ ../../src/bsd/javavm/runtime/javai_md.c	Mon Jan 19 12:32:23 2004
-@@ -147,7 +147,7 @@
-     }
- 
-     /* Where to look for native libraries */
--#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */
-+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */
-     {
- 	/* Get the user setting of LD_LIBRARY_PATH */
- 	v = getenv("LD_LIBRARY_PATH");
diff --git a/java/jdk12/files/patch-jdbc::GNUmakefile b/java/jdk12/files/patch-jdbc::GNUmakefile
deleted file mode 100644
index 7a4f304d6d2b..000000000000
--- a/java/jdk12/files/patch-jdbc::GNUmakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- sun/jdbc/GNUmakefile.orig	Thu Jan 15 13:02:51 2004
-+++ sun/jdbc/GNUmakefile	Thu Jan 15 13:03:39 2004
-@@ -44,8 +44,8 @@
- ODBCDIR = $(_ODBCDIR$(ALT_ODBCDIR))$(ALT_ODBCDIR)
- 
- ifeq ($(PLATFORM),bsd)
--LDFLAGS += -L$(ODBCDIR)/lib -lodbcinst -lodbc
--CFLAGS  += -I$(ODBCDIR)/include
-+OTHER_LDFLAGS += -L$(ODBCDIR)/lib -lodbcinst -lodbc
-+OTHER_CPPFLAGS += -I$(ODBCDIR)/include
- else
- LDFLAGS += -L$(ODBCDIR)/ISLIodbc/2.11/lib -lodbcinst -lodbc
- endif
diff --git a/java/jdk12/files/patch-src-jar-Main.java b/java/jdk12/files/patch-src-jar-Main.java
deleted file mode 100644
index fc30976d8bd6..000000000000
--- a/java/jdk12/files/patch-src-jar-Main.java
+++ /dev/null
@@ -1,58 +0,0 @@
-$FreeBSD$
-
---- ../../src/share/classes/sun/tools/jar/Main.java	4 Aug 1999 21:07:59 -0000	1.1.1.2
-+++ ../../src/share/classes/sun/tools/jar/Main.java	1 May 2005 04:57:29 -0000
-@@ -37,6 +37,7 @@
-     Hashtable filesTable = new Hashtable();
-     Vector paths = new Vector();
-     Vector v;
-+    String cwd;
-     CRC32 crc32 = new CRC32();
-     /* cflag: create
-      * uflag: update       
-@@ -632,6 +633,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) {
-@@ -656,6 +670,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()));
-@@ -666,6 +684,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: src/share/classes/sun/tools/jar/resources/jar.properties
-===================================================================
-RCS file: /var/jcvs/javasrc/src/share/classes/sun/tools/jar/resources/jar.properties,v
-retrieving revision 1.1.1.1
diff --git a/java/jdk12/files/patch-src-resources-jar.properties b/java/jdk12/files/patch-src-resources-jar.properties
deleted file mode 100644
index cf9f7a02f564..000000000000
--- a/java/jdk12/files/patch-src-resources-jar.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../src/share/classes/sun/tools/jar/resources/jar.properties	4 Aug 1999 21:07:59 -0000	1.1.1.1
-+++ ../../src/share/classes/sun/tools/jar/resources/jar.properties	1 May 2005 04:57:38 -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/jdk12/files/patch-src-util-TreeMap.java b/java/jdk12/files/patch-src-util-TreeMap.java
deleted file mode 100644
index 14e039bcfb52..000000000000
--- a/java/jdk12/files/patch-src-util-TreeMap.java
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../src/share/classes/java/util/TreeMap.java	4 Aug 1999 21:07:46 -0000	1.1.1.2
-+++ ../../src/share/classes/java/util/TreeMap.java	12 Jul 2005 20:46:37 -0000
-@@ -889,7 +889,7 @@
- 		Object key = entry.getKey();
-                 if (!inRange(key))
-                     return false;
--                Entry node = getEntry(key);
-+                TreeMap.Entry node = getEntry(key);
-                 if (node!=null && valEquals(node.getValue(),entry.getValue())){
- 		    deleteEntry(node);
- 		    return true;