diff options
Diffstat (limited to 'java/openjdk7/files')
13 files changed, 0 insertions, 272 deletions
diff --git a/java/openjdk7/files/cacerts b/java/openjdk7/files/cacerts Binary files differdeleted file mode 100644 index 318a166205d4..000000000000 --- a/java/openjdk7/files/cacerts +++ /dev/null diff --git a/java/openjdk7/files/patch-icedtea-web b/java/openjdk7/files/patch-icedtea-web deleted file mode 100644 index 42fff72b89b1..000000000000 --- a/java/openjdk7/files/patch-icedtea-web +++ /dev/null @@ -1,106 +0,0 @@ ---- jdk/src/share/classes/sun/applet/AppletPanel.java Mon Nov 22 21:55:09 2010 +0000 -+++ jdk/src/share/classes/sun/applet/AppletPanel.java Wed Dec 08 23:26:01 2010 +0000 -@@ -67,7 +67,7 @@ abstract class AppletPanel extends Panel - /** - * The applet (if loaded). - */ -- Applet applet; -+ protected Applet applet; - - /** - * Applet will allow initialization. Should be -@@ -161,7 +161,8 @@ abstract class AppletPanel extends Panel - * Creates a thread to run the applet. This method is called - * each time an applet is loaded and reloaded. - */ -- synchronized void createAppletThread() { -+ //Overridden by NetxPanel. -+ protected synchronized void createAppletThread() { - // Create a thread group for the applet, and start a new - // thread to load the applet. - String nm = "applet-" + getCode(); -@@ -305,7 +306,7 @@ abstract class AppletPanel extends Panel - /** - * Get an event from the queue. - */ -- synchronized AppletEvent getNextEvent() throws InterruptedException { -+ protected synchronized AppletEvent getNextEvent() throws InterruptedException { - while (queue == null || queue.isEmpty()) { - wait(); - } -@@ -694,7 +695,8 @@ abstract class AppletPanel extends Panel - * applet event processing so that it can be gracefully interrupted from - * things like HotJava. - */ -- private void runLoader() { -+ //Overridden by NetxPanel. -+ protected void runLoader() { - if (status != APPLET_DISPOSE) { - showAppletStatus("notdisposed"); - return; ---- jdk/src/share/classes/sun/applet/AppletViewerPanel.java Mon Nov 22 21:55:09 2010 +0000 -+++ jdk/src/share/classes/sun/applet/AppletViewerPanel.java Wed Dec 08 23:26:01 2010 +0000 -@@ -42,25 +42,25 @@ import sun.tools.jar.*; - * - * @author Arthur van Hoff - */ --class AppletViewerPanel extends AppletPanel { -+public class AppletViewerPanel extends AppletPanel { - - /* Are we debugging? */ -- static boolean debug = false; -+ protected static boolean debug = false; - - /** - * The document url. - */ -- URL documentURL; -+ protected URL documentURL; - - /** - * The base url. - */ -- URL baseURL; -+ protected URL baseURL; - - /** - * The attributes of the applet. - */ -- Hashtable atts; -+ protected Hashtable<String,String> atts; - - /* - * JDK 1.1 serialVersionUID -@@ -70,7 +70,7 @@ class AppletViewerPanel extends AppletPa - /** - * Construct an applet viewer and start the applet. - */ -- AppletViewerPanel(URL documentURL, Hashtable atts) { -+ protected AppletViewerPanel(URL documentURL, Hashtable<String,String> atts) { - this.documentURL = documentURL; - this.atts = atts; - -@@ -106,7 +106,7 @@ class AppletViewerPanel extends AppletPa - * Get an applet parameter. - */ - public String getParameter(String name) { -- return (String)atts.get(name.toLowerCase()); -+ return atts.get(name.toLowerCase()); - } - - /** -@@ -202,12 +202,12 @@ class AppletViewerPanel extends AppletPa - return (AppletContext)getParent(); - } - -- static void debug(String s) { -+ protected static void debug(String s) { - if(debug) - System.err.println("AppletViewerPanel:::" + s); - } - -- static void debug(String s, Throwable t) { -+ protected static void debug(String s, Throwable t) { - if(debug) { - t.printStackTrace(); - debug(s); diff --git a/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile b/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile deleted file mode 100644 index cb938848989d..000000000000 --- a/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- jdk/make/java/instrument/Makefile.orig 2020-03-01 17:52:15.797379000 -0800 -+++ jdk/make/java/instrument/Makefile 2020-03-01 18:45:55.324964000 -0800 -@@ -117,8 +117,8 @@ - LDFLAGS += -Wl,--no-whole-archive - ifneq ($(OS_NAME), netbsd) - # Use CPPFLAGS instead of OTHER_INCLUDES to force this last -- CPPFLAGS += -I$(PACKAGE_PATH)/include -- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -+ CPPFLAGS += %%ICONV_CPPFLAGS%% -+ OTHER_LDLIBS += %%ICONV_LDFLAGS%% - endif - endif - diff --git a/java/openjdk7/files/patch-jdk_make_java_npt_Makefile b/java/openjdk7/files/patch-jdk_make_java_npt_Makefile deleted file mode 100644 index 1a2771cb5b48..000000000000 --- a/java/openjdk7/files/patch-jdk_make_java_npt_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- jdk/make/java/npt/Makefile.orig 2020-03-01 18:39:54.449760000 -0800 -+++ jdk/make/java/npt/Makefile 2020-03-01 18:46:01.524983000 -0800 -@@ -77,8 +77,8 @@ - # Add location of iconv headers - ifeq ($(PLATFORM), bsd) - ifneq ($(OS_NAME), netbsd) -- CPPFLAGS += -I$(PACKAGE_PATH)/include -- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -+ CPPFLAGS += %%ICONV_CPPFLAGS%% -+ OTHER_LDLIBS += %%ICONV_LDFLAGS%% - endif - endif - diff --git a/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile b/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile deleted file mode 100644 index 001331e64007..000000000000 --- a/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- jdk/make/sun/splashscreen/Makefile.orig 2020-03-01 18:41:52.052960000 -0800 -+++ jdk/make/sun/splashscreen/Makefile 2020-03-01 18:46:07.203955000 -0800 -@@ -93,8 +93,8 @@ - ifeq ($(OS_NAME), netbsd) - OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) - else -- CPPFLAGS += -I$(PACKAGE_PATH)/include -- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -+ CPPFLAGS += %%ICONV_CPPFLAGS%% -+ OTHER_LDLIBS += %%ICONV_LDFLAGS%% - endif - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread diff --git a/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java b/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java deleted file mode 100644 index a846cb8af99e..000000000000 --- a/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java +++ /dev/null @@ -1,15 +0,0 @@ ---- jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -+++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -@@ -477,10 +477,8 @@ - String[] dirs = new String[] { - userHome + sep + ".themes", - System.getProperty("swing.metacitythemedir"), -- "/usr/X11R6/share/themes", -- "/usr/X11R6/share/gnome/themes", -- "/usr/local/share/themes", -- "/usr/local/share/gnome/themes", -+ "%%LOCALBASE%%/share/themes", -+ "%%LOCALBASE%%/share/gnome/themes", - "/usr/share/themes", - "/usr/gnome/share/themes", // Debian/Redhat/Solaris - "/opt/gnome2/share/themes" // SuSE diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c deleted file mode 100644 index 1fb1f50b330c..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- jdk/src/solaris/native/java/lang/childproc.c -+++ jdk/src/solaris/native/java/lang/childproc.c -@@ -33,6 +33,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h deleted file mode 100644 index d65624d8a234..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- jdk/src/solaris/native/java/lang/childproc.h -+++ jdk/src/solaris/native/java/lang/childproc.h -@@ -119,7 +119,7 @@ typedef struct _SpawnInfo { - * The cached and split version of the JDK's effective PATH. - * (We don't support putenv("PATH=...") in native code) - */ --const char * const *parentPathv; -+extern const char * const *parentPathv; - - ssize_t restartableWrite(int fd, const void *buf, size_t count); - int restartableDup2(int fd_from, int fd_to); diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c deleted file mode 100644 index be20c35c9d79..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.orig 2020-10-13 23:04:42.602966000 -0700 -+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2020-10-13 23:05:10.165713000 -0700 -@@ -28,6 +28,9 @@ - #include <dlfcn.h> - #include "NativeFunc.h" - -+/* global GSS function table */ -+GSS_FUNCTION_TABLE_PTR ftab; -+ - /* standard GSS method names (ordering is from mapfile) */ - static const char RELEASE_NAME[] = "gss_release_name"; - static const char IMPORT_NAME[] = "gss_import_name"; diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h deleted file mode 100644 index 0e49a7a35502..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h +++ /dev/null @@ -1,10 +0,0 @@ ---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.orig 2020-10-13 23:03:46.002701000 -0700 -+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-10-13 23:04:24.830082000 -0700 -@@ -265,6 +265,6 @@ - typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; - - /* global GSS function table */ --GSS_FUNCTION_TABLE_PTR ftab; -+extern GSS_FUNCTION_TABLE_PTR ftab; - - #endif diff --git a/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp b/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp deleted file mode 100644 index a2e4b5601ee0..000000000000 --- a/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-10-06 17:10:00.000000000 -0400 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-10-08 10:23:14.000000000 -0400 -@@ -458,7 +458,7 @@ - * 7: The default directories, normally /lib and /usr/lib. - */ - #ifndef DEFAULT_LIBPATH --#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib" -+#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib" - #endif - - #define EXTENSIONS_DIR "/lib/ext" diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java deleted file mode 100644 index 8897cbe56e30..000000000000 --- a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java +++ /dev/null @@ -1,21 +0,0 @@ ---- jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.orig -+++ jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java -@@ -27,6 +27,7 @@ - - import java.nio.file.*; - import java.nio.file.attribute.*; -+import java.nio.file.spi.FileSystemProvider; - import java.io.IOException; - - /** -@@ -38,6 +39,10 @@ - super(); - } - -+ public BsdFileSystemProvider(FileSystemProvider f) { -+ super(); -+ } -+ - @Override - BsdFileSystem newFileSystem(String dir) { - return new BsdFileSystem(this, dir); diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java deleted file mode 100644 index 879be08c9206..000000000000 --- a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java +++ /dev/null @@ -1,37 +0,0 @@ ---- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Mar 10 14:04:37 2013 -0400 -+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Mar 26 18:25:51 2013 -0700 -@@ -28,6 +28,8 @@ - import java.nio.file.spi.FileSystemProvider; - import java.security.AccessController; - import java.security.PrivilegedAction; -+import java.util.Set; -+import java.util.HashSet; - import sun.security.action.GetPropertyAction; - - /** -@@ -37,6 +39,14 @@ - public class DefaultFileSystemProvider { - private DefaultFileSystemProvider() { } - -+ private static final Set<String> validFileSystemProviders -+ = new HashSet<String>(); -+ static { -+ validFileSystemProviders.add("sun.nio.fs.SolarisFileSystemProvider"); -+ validFileSystemProviders.add("sun.nio.fs.LinuxFileSystemProvider"); -+ validFileSystemProviders.add("sun.nio.fs.BsdFileSystemProvider"); -+ } -+ - @SuppressWarnings("unchecked") - private static FileSystemProvider createProvider(final String cn) { - return AccessController -@@ -64,6 +74,10 @@ - public static FileSystemProvider create() { - String osname = AccessController - .doPrivileged(new GetPropertyAction("os.name")); -+ String fileSystemProvider = System -+ .getProperty("java.nio.file.spi.DefaultFileSystemProvider"); -+ if (validFileSystemProviders.contains(fileSystemProvider)) -+ return createProvider(fileSystemProvider); - if (osname.equals("SunOS")) - return createProvider("sun.nio.fs.SolarisFileSystemProvider"); - if (osname.equals("Linux")) |