------------------------------------------------------------
revno: 731
committer: Matthias Klose <[email protected]>
branch nick: openjdk8
timestamp: Sun 2019-03-17 18:34:59 +0100
message:
- Refresh patches
modified:
debian/patches/atk-wrapper-security.patch
debian/patches/autoconf-select.diff
debian/patches/compiler-flags.diff
debian/patches/default-jvm-cfg-default.diff
debian/patches/hotspot-disable-exec-shield-workaround.patch
debian/patches/hotspot-disable-werror.diff
debian/patches/hotspot-ia64.diff
debian/patches/hotspot-libpath-default.diff
debian/patches/hotspot-warn-no-errformat.diff
debian/patches/jdk-8132985-backport-double-free.patch
debian/patches/jdk-8139803-backport-warning.patch
debian/patches/jdk-841269-filechooser.patch
debian/patches/jdk-getAccessibleValue.diff
debian/patches/jdk-i18n-pt_BR.diff
debian/patches/jdk-java-nio-bits-unligned-aarch64.diff
debian/patches/ld-symbolic-functions-default.diff
debian/patches/libjpeg-fix.diff
debian/patches/link-with-as-needed.diff
debian/patches/ppc64el.diff
debian/patches/system-lcms.diff
debian/patches/system-libjpeg.diff
debian/patches/system-libpng.diff
debian/patches/system-pcsclite.diff
debian/patches/workaround_expand_exec_shield_cs_limit.diff
debian/patches/zero-sh.diff
debian/patches/zero-x32.diff
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/patches/atk-wrapper-security.patch'
--- debian/patches/atk-wrapper-security.patch 2015-07-06 17:50:26 +0000
+++ debian/patches/atk-wrapper-security.patch 2019-03-17 17:34:59 +0000
@@ -1,5 +1,3 @@
-Index: b/jdk/src/share/lib/security/java.security-linux
-===================================================================
--- a/jdk/src/share/lib/security/java.security-linux
+++ b/jdk/src/share/lib/security/java.security-linux
@@ -186,6 +186,7 @@ keystore.type.compat=true
=== modified file 'debian/patches/autoconf-select.diff'
--- debian/patches/autoconf-select.diff 2017-01-23 10:17:38 +0000
+++ debian/patches/autoconf-select.diff 2019-03-17 17:34:59 +0000
@@ -1,6 +1,6 @@
--- a/common/autoconf/autogen.sh
+++ b/common/autoconf/autogen.sh
-@@ -43,7 +43,9 @@ fi
+@@ -61,7 +61,9 @@ fi
custom_hook=$custom_script_dir/custom-hook.m4
@@ -8,5 +8,5 @@
AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
+fi
- echo "Autoconf found: ${AUTOCONF}"
-
+ if test "x${AUTOCONF}" = x; then
+ echo "You need autoconf installed to be able to regenerate the configure script"
=== modified file 'debian/patches/compiler-flags.diff'
--- debian/patches/compiler-flags.diff 2016-11-04 19:15:44 +0000
+++ debian/patches/compiler-flags.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/hotspot/make/linux/makefiles/ppc64.make
+++ b/hotspot/make/linux/makefiles/ppc64.make
-@@ -47,5 +47,5 @@
+@@ -47,5 +47,5 @@ else
CFLAGS += -DVM_LITTLE_ENDIAN -DABI_ELFv2
# Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
=== modified file 'debian/patches/default-jvm-cfg-default.diff'
--- debian/patches/default-jvm-cfg-default.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/default-jvm-cfg-default.diff 2019-03-17 17:34:59 +0000
@@ -1,6 +1,6 @@
--- a/jdk/src/share/bin/java.c
+++ b/jdk/src/share/bin/java.c
-@@ -1715,7 +1715,7 @@ jint
+@@ -1724,7 +1724,7 @@ jint
ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
{
FILE *jvmCfg;
@@ -9,7 +9,7 @@
int cnt = 0;
int lineno = 0;
jlong start, end;
-@@ -1730,6 +1730,10 @@ ReadKnownVMs(const char *jvmCfgName, jbo
+@@ -1739,6 +1739,10 @@ ReadKnownVMs(const char *jvmCfgName, jbo
jvmCfg = fopen(jvmCfgName, "r");
if (jvmCfg == NULL) {
=== modified file 'debian/patches/hotspot-disable-exec-shield-workaround.patch'
--- debian/patches/hotspot-disable-exec-shield-workaround.patch 2017-11-23 17:54:49 +0000
+++ debian/patches/hotspot-disable-exec-shield-workaround.patch 2019-03-17 17:34:59 +0000
@@ -2,8 +2,8 @@
# DP: This workaround interacts badly with kernel changes to enlarge the stack
# DP: gap, causing applications using JNI to crash (Debian bug #865303).
# DP: Debian has never applied the Exec Shield patches.
---- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -890,7 +890,7 @@ void os::verify_stack_alignment() {
* updates (JDK-8023956).
*/
=== modified file 'debian/patches/hotspot-disable-werror.diff'
--- debian/patches/hotspot-disable-werror.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/hotspot-disable-werror.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
-@@ -197,7 +197,7 @@ else
+@@ -201,7 +201,7 @@ else
endif
# Compiler warnings are treated as errors
=== modified file 'debian/patches/hotspot-ia64.diff'
--- debian/patches/hotspot-ia64.diff 2018-04-28 12:52:46 +0000
+++ debian/patches/hotspot-ia64.diff 2019-03-17 17:34:59 +0000
@@ -1,6 +1,6 @@
---- openjdk/hotspot/src/share/vm/runtime/os.cpp 2018-03-19 19:46:40.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2018-04-27 23:22:22.321348018 +0200
-@@ -1038,7 +1038,7 @@
+--- a/hotspot/src/share/vm/runtime/os.cpp
++++ b/hotspot/src/share/vm/runtime/os.cpp
+@@ -1060,7 +1060,7 @@ void os::print_location(outputStream* st
// if C stack is walkable beyond current frame. The check for fp() is not
// necessary on Sparc, but it's harmless.
bool os::is_first_C_frame(frame* fr) {
=== modified file 'debian/patches/hotspot-libpath-default.diff'
--- debian/patches/hotspot-libpath-default.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/hotspot-libpath-default.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -316,10 +316,10 @@ void os::init_system_properties_values()
+@@ -366,10 +366,10 @@ void os::init_system_properties_values()
// 1: ...
// ...
// 7: The default directories, normally /lib and /usr/lib.
=== modified file 'debian/patches/hotspot-warn-no-errformat.diff'
--- debian/patches/hotspot-warn-no-errformat.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/hotspot-warn-no-errformat.diff 2019-03-17 17:34:59 +0000
@@ -13,7 +13,7 @@
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
-@@ -197,7 +197,7 @@ else
+@@ -201,7 +201,7 @@ else
endif
# Compiler warnings are treated as errors
=== modified file 'debian/patches/jdk-8132985-backport-double-free.patch'
--- debian/patches/jdk-8132985-backport-double-free.patch 2018-12-05 08:04:39 +0000
+++ debian/patches/jdk-8132985-backport-double-free.patch 2019-03-17 17:34:59 +0000
@@ -7,148 +7,145 @@
8132985: Crash in freetypescaler.c due to double free
Reviewed-by: prr, simonis
-diff -r b5125fa7ef4b -r 9b0e9d8ccccf jdk/src/share/native/sun/font/freetypeScaler.c
---- a/jdk/src/share/native/sun/font/freetypeScaler.c Mon Oct 05 15:29:23 2015 +0300
-+++ b/jdk/src/share/native/sun/font/freetypeScaler.c Mon Oct 05 15:36:43 2015 +0300
-@@ -60,6 +60,7 @@
- JNIEnv* env;
- FT_Library library;
- FT_Face face;
-+ FT_Stream faceStream;
- jobject font2D;
- jobject directBuffer;
-
-@@ -107,16 +108,10 @@
- if (scalerInfo == NULL)
- return;
-
-- //apparently Done_Face will only close the stream
-- // but will not relase the memory of stream structure.
-- // We need to free it explicitly to avoid leak.
-- //Direct access to the stream field might be not ideal solution as
-- // it is considred to be "private".
-- //Alternatively we could have stored pointer to the structure
-- // in the scalerInfo but this will increase size of the structure
-- // for no good reason
-- stream = scalerInfo->face->stream;
--
-+ // FT_Done_Face always closes the stream, but only frees the memory
-+ // of the data structure if it was internally allocated by FT.
-+ // We hold on to a pointer to the stream structure if we provide it
-+ // ourselves, so that we can free it here.
- FT_Done_Face(scalerInfo->face);
- FT_Done_FreeType(scalerInfo->library);
-
-@@ -128,10 +123,9 @@
- free(scalerInfo->fontData);
- }
-
-- if (stream != NULL) {
-- free(stream);
-- }
--
-+ if (scalerInfo->faceStream != NULL) {
-+ free(scalerInfo->faceStream);
-+ }
- free(scalerInfo);
- }
-
-@@ -302,6 +296,9 @@
- &ft_open_args,
- indexInCollection,
- &scalerInfo->face);
-+ if (!error) {
-+ scalerInfo->faceStream = ftstream;
-+ }
- }
- if (error || scalerInfo->directBuffer == NULL) {
- free(ftstream);
-diff -r b5125fa7ef4b -r 9b0e9d8ccccf jdk/test/java/awt/FontClass/FontDisposer/FontDisposeTest.java
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/jdk/test/java/awt/FontClass/FontDisposer/FontDisposeTest.java Mon Oct 05 15:36:43 2015 +0300
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+import java.awt.Font;
-+import java.awt.Graphics2D;
-+import java.awt.font.FontRenderContext;
-+import java.awt.image.BufferedImage;
-+import java.io.FileInputStream;
-+import java.io.ByteArrayInputStream;
-+import java.io.InputStream;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.Method;
-+
-+import sun.font.Font2DHandle;
-+import sun.font.Font2D;
-+import sun.font.FontScaler;
-+import sun.font.Type1Font;
-+
-+/**
-+ * @bug 8132985
-+ * @summary Tests to verify Type1 Font scaler dispose crashes
-+ * @modules java.desktop/sun.font
-+ */
-+public class FontDisposeTest
-+{
-+ public static void main(String[] args) throws Exception
-+ {
-+ // The bug only happens with Type 1 fonts. The Ghostscript font files
-+ // should be commonly available. From distro pacakge or
-+ // ftp://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz
-+ // Pass pfa/pfb font file as argument
-+ String path = args[0];
-+
-+ // Load
-+ InputStream stream = new FileInputStream(path);
-+ Font font = Font.createFont(Font.TYPE1_FONT,stream);
-+
-+ // Ensure native bits have been generated
-+ BufferedImage img = new BufferedImage(100,100,
-+ BufferedImage.TYPE_INT_ARGB);
-+ Graphics2D g2d = img.createGraphics();
-+ FontRenderContext frc = g2d.getFontRenderContext();
-+
-+ font.getLineMetrics("derp",frc);
-+
-+ // Force disposal -
-+ // System.gc() is not sufficient.
-+ Field font2DHandleField = Font.class.getDeclaredField("font2DHandle");
-+ font2DHandleField.setAccessible(true);
-+ sun.font.Font2DHandle font2DHandle =
-+ (sun.font.Font2DHandle)font2DHandleField.get(font);
-+
-+ sun.font.Font2D font2D = font2DHandle.font2D;
-+ sun.font.Type1Font type1Font = (sun.font.Type1Font)font2D;
-+
-+ Method getScalerMethod =
-+ sun.font.Type1Font.class.getDeclaredMethod("getScaler");
-+ getScalerMethod.setAccessible(true);
-+ sun.font.FontScaler scaler =
-+ (sun.font.FontScaler)getScalerMethod.invoke(type1Font);
-+
-+ // dispose should not crash due to double free
-+ scaler.dispose();
-+ }
-+}
-
+--- a/jdk/src/share/native/sun/font/freetypeScaler.c
++++ b/jdk/src/share/native/sun/font/freetypeScaler.c
+@@ -60,6 +60,7 @@ typedef struct {
+ JNIEnv* env;
+ FT_Library library;
+ FT_Face face;
++ FT_Stream faceStream;
+ jobject font2D;
+ jobject directBuffer;
+
+@@ -107,16 +108,10 @@ static void freeNativeResources(JNIEnv *
+ if (scalerInfo == NULL)
+ return;
+
+- //apparently Done_Face will only close the stream
+- // but will not relase the memory of stream structure.
+- // We need to free it explicitly to avoid leak.
+- //Direct access to the stream field might be not ideal solution as
+- // it is considred to be "private".
+- //Alternatively we could have stored pointer to the structure
+- // in the scalerInfo but this will increase size of the structure
+- // for no good reason
+- stream = scalerInfo->face->stream;
+-
++ // FT_Done_Face always closes the stream, but only frees the memory
++ // of the data structure if it was internally allocated by FT.
++ // We hold on to a pointer to the stream structure if we provide it
++ // ourselves, so that we can free it here.
+ FT_Done_Face(scalerInfo->face);
+ FT_Done_FreeType(scalerInfo->library);
+
+@@ -128,10 +123,9 @@ static void freeNativeResources(JNIEnv *
+ free(scalerInfo->fontData);
+ }
+
+- if (stream != NULL) {
+- free(stream);
+- }
+-
++ if (scalerInfo->faceStream != NULL) {
++ free(scalerInfo->faceStream);
++ }
+ free(scalerInfo);
+ }
+
+@@ -302,6 +296,9 @@ Java_sun_font_FreetypeFontScaler_initNat
+ &ft_open_args,
+ indexInCollection,
+ &scalerInfo->face);
++ if (!error) {
++ scalerInfo->faceStream = ftstream;
++ }
+ }
+ if (error || scalerInfo->directBuffer == NULL) {
+ free(ftstream);
+--- /dev/null
++++ b/jdk/test/java/awt/FontClass/FontDisposer/FontDisposeTest.java
+@@ -0,0 +1,84 @@
++/*
++ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++import java.awt.Font;
++import java.awt.Graphics2D;
++import java.awt.font.FontRenderContext;
++import java.awt.image.BufferedImage;
++import java.io.FileInputStream;
++import java.io.ByteArrayInputStream;
++import java.io.InputStream;
++import java.lang.reflect.Field;
++import java.lang.reflect.Method;
++
++import sun.font.Font2DHandle;
++import sun.font.Font2D;
++import sun.font.FontScaler;
++import sun.font.Type1Font;
++
++/**
++ * @bug 8132985
++ * @summary Tests to verify Type1 Font scaler dispose crashes
++ * @modules java.desktop/sun.font
++ */
++public class FontDisposeTest
++{
++ public static void main(String[] args) throws Exception
++ {
++ // The bug only happens with Type 1 fonts. The Ghostscript font files
++ // should be commonly available. From distro pacakge or
++ // ftp://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz
++ // Pass pfa/pfb font file as argument
++ String path = args[0];
++
++ // Load
++ InputStream stream = new FileInputStream(path);
++ Font font = Font.createFont(Font.TYPE1_FONT,stream);
++
++ // Ensure native bits have been generated
++ BufferedImage img = new BufferedImage(100,100,
++ BufferedImage.TYPE_INT_ARGB);
++ Graphics2D g2d = img.createGraphics();
++ FontRenderContext frc = g2d.getFontRenderContext();
++
++ font.getLineMetrics("derp",frc);
++
++ // Force disposal -
++ // System.gc() is not sufficient.
++ Field font2DHandleField = Font.class.getDeclaredField("font2DHandle");
++ font2DHandleField.setAccessible(true);
++ sun.font.Font2DHandle font2DHandle =
++ (sun.font.Font2DHandle)font2DHandleField.get(font);
++
++ sun.font.Font2D font2D = font2DHandle.font2D;
++ sun.font.Type1Font type1Font = (sun.font.Type1Font)font2D;
++
++ Method getScalerMethod =
++ sun.font.Type1Font.class.getDeclaredMethod("getScaler");
++ getScalerMethod.setAccessible(true);
++ sun.font.FontScaler scaler =
++ (sun.font.FontScaler)getScalerMethod.invoke(type1Font);
++
++ // dispose should not crash due to double free
++ scaler.dispose();
++ }
++}
=== modified file 'debian/patches/jdk-8139803-backport-warning.patch'
--- debian/patches/jdk-8139803-backport-warning.patch 2018-12-05 08:04:39 +0000
+++ debian/patches/jdk-8139803-backport-warning.patch 2019-03-17 17:34:59 +0000
@@ -7,15 +7,13 @@
8139803: Fix for 8132985 breaks OpenJDK build on windows.
Reviewed-by: serb, simonis
-diff -r 8e4b93a5a036 -r dfeaf40df800 jdk/src/share/native/sun/font/freetypeScaler.c
---- a/jdk/src/share/native/sun/font/freetypeScaler.c Tue Oct 27 14:14:08 2015 +0300
-+++ b/jdk/src/share/native/sun/font/freetypeScaler.c Tue Oct 27 14:16:24 2015 +0300
-@@ -103,7 +103,6 @@
- }
-
- static void freeNativeResources(JNIEnv *env, FTScalerInfo* scalerInfo) {
-- void *stream;
-
- if (scalerInfo == NULL)
- return;
-
+--- a/jdk/src/share/native/sun/font/freetypeScaler.c
++++ b/jdk/src/share/native/sun/font/freetypeScaler.c
+@@ -103,7 +103,6 @@ Java_sun_font_FreetypeFontScaler_initIDs
+ }
+
+ static void freeNativeResources(JNIEnv *env, FTScalerInfo* scalerInfo) {
+- void *stream;
+
+ if (scalerInfo == NULL)
+ return;
=== modified file 'debian/patches/jdk-841269-filechooser.patch'
--- debian/patches/jdk-841269-filechooser.patch 2017-01-23 10:17:38 +0000
+++ debian/patches/jdk-841269-filechooser.patch 2019-03-17 17:34:59 +0000
@@ -1,26 +1,26 @@
---- openjdk/jdk/src/share/classes/sun/awt/shell/ShellFolder.java 2016-10-19 11:41:05.669056845 +0530
-+++ openjdk/jdk/src/share/classes/sun/awt/shell/ShellFolder.java 2016-10-19 11:44:37.957056845 +0530
-@@ -30,6 +30,10 @@
- import java.awt.Toolkit;
- import java.io.*;
- import java.io.FileNotFoundException;
-+import java.nio.file.Files;
-+import java.nio.file.LinkOption;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
- import java.util.*;
- import java.util.concurrent.Callable;
-
-@@ -240,10 +244,11 @@
- * @exception FileNotFoundException if file does not exist
- */
- public static ShellFolder getShellFolder(File file) throws FileNotFoundException {
-+ Path path = Paths.get(file.getPath());
- if (file instanceof ShellFolder) {
- return (ShellFolder)file;
- }
-- if (!file.exists()) {
-+ if (!Files.exists(path, LinkOption.NOFOLLOW_LINKS)) {
- throw new FileNotFoundException();
- }
- return shellFolderManager.createShellFolder(file);
+--- a/jdk/src/share/classes/sun/awt/shell/ShellFolder.java
++++ b/jdk/src/share/classes/sun/awt/shell/ShellFolder.java
+@@ -30,6 +30,10 @@ import java.awt.Image;
+ import java.awt.Toolkit;
+ import java.io.*;
+ import java.io.FileNotFoundException;
++import java.nio.file.Files;
++import java.nio.file.LinkOption;
++import java.nio.file.Path;
++import java.nio.file.Paths;
+ import java.util.*;
+ import java.util.concurrent.Callable;
+
+@@ -240,10 +244,11 @@ public abstract class ShellFolder extend
+ * @exception FileNotFoundException if file does not exist
+ */
+ public static ShellFolder getShellFolder(File file) throws FileNotFoundException {
++ Path path = Paths.get(file.getPath());
+ if (file instanceof ShellFolder) {
+ return (ShellFolder)file;
+ }
+- if (!file.exists()) {
++ if (!Files.exists(path, LinkOption.NOFOLLOW_LINKS)) {
+ throw new FileNotFoundException();
+ }
+ return shellFolderManager.createShellFolder(file);
=== modified file 'debian/patches/jdk-getAccessibleValue.diff'
--- debian/patches/jdk-getAccessibleValue.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/jdk-getAccessibleValue.diff 2019-03-17 17:34:59 +0000
@@ -1,6 +1,6 @@
--- a/jdk/src/share/classes/javax/swing/JTree.java
+++ b/jdk/src/share/classes/javax/swing/JTree.java
-@@ -4962,7 +4962,7 @@ public class JTree extends JComponent im
+@@ -4969,7 +4969,7 @@ public class JTree extends JComponent im
public AccessibleSelection getAccessibleSelection() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac != null && isLeaf) {
@@ -9,7 +9,7 @@
} else {
return this;
}
-@@ -4977,7 +4977,7 @@ public class JTree extends JComponent im
+@@ -4984,7 +4984,7 @@ public class JTree extends JComponent im
public AccessibleText getAccessibleText() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac != null) {
@@ -18,7 +18,7 @@
} else {
return null;
}
-@@ -4992,7 +4992,7 @@ public class JTree extends JComponent im
+@@ -4999,7 +4999,7 @@ public class JTree extends JComponent im
public AccessibleValue getAccessibleValue() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac != null) {
@@ -29,7 +29,7 @@
}
--- a/jdk/src/share/classes/javax/swing/table/JTableHeader.java
+++ b/jdk/src/share/classes/javax/swing/table/JTableHeader.java
-@@ -1083,7 +1083,12 @@ public class JTableHeader extends JCompo
+@@ -1088,7 +1088,12 @@ public class JTableHeader extends JCompo
}
public AccessibleAction getAccessibleAction() {
@@ -43,7 +43,7 @@
}
/**
-@@ -1099,15 +1104,30 @@ public class JTableHeader extends JCompo
+@@ -1104,15 +1109,30 @@ public class JTableHeader extends JCompo
}
public AccessibleSelection getAccessibleSelection() {
@@ -79,7 +79,7 @@
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
-@@ -8218,7 +8218,12 @@ public class JTable extends JComponent i
+@@ -8224,7 +8224,12 @@ public class JTable extends JComponent i
* @return the <code>AccessibleAction</code>, or <code>null</code>
*/
public AccessibleAction getAccessibleAction() {
@@ -93,7 +93,7 @@
}
/**
-@@ -8240,7 +8245,12 @@ public class JTable extends JComponent i
+@@ -8246,7 +8251,12 @@ public class JTable extends JComponent i
* <code>null</code>
*/
public AccessibleSelection getAccessibleSelection() {
@@ -107,7 +107,7 @@
}
/**
-@@ -8250,7 +8260,12 @@ public class JTable extends JComponent i
+@@ -8256,7 +8266,12 @@ public class JTable extends JComponent i
* @return the <code>AccessibleText</code>, or <code>null</code>
*/
public AccessibleText getAccessibleText() {
@@ -121,7 +121,7 @@
}
/**
-@@ -8260,7 +8275,12 @@ public class JTable extends JComponent i
+@@ -8266,7 +8281,12 @@ public class JTable extends JComponent i
* @return the <code>AccessibleValue</code>, or <code>null</code>
*/
public AccessibleValue getAccessibleValue() {
@@ -135,7 +135,7 @@
}
-@@ -9019,7 +9039,12 @@ public class JTable extends JComponent i
+@@ -9025,7 +9045,12 @@ public class JTable extends JComponent i
* @return the <code>AccessibleAction</code>, or <code>null</code>
*/
public AccessibleAction getAccessibleAction() {
@@ -149,7 +149,7 @@
}
/**
-@@ -9041,7 +9066,12 @@ public class JTable extends JComponent i
+@@ -9047,7 +9072,12 @@ public class JTable extends JComponent i
* <code>null</code>
*/
public AccessibleSelection getAccessibleSelection() {
@@ -163,7 +163,7 @@
}
/**
-@@ -9051,7 +9081,12 @@ public class JTable extends JComponent i
+@@ -9057,7 +9087,12 @@ public class JTable extends JComponent i
* @return the <code>AccessibleText</code>, or <code>null</code>
*/
public AccessibleText getAccessibleText() {
@@ -177,7 +177,7 @@
}
/**
-@@ -9061,7 +9096,12 @@ public class JTable extends JComponent i
+@@ -9067,7 +9102,12 @@ public class JTable extends JComponent i
* @return the <code>AccessibleValue</code>, or <code>null</code>
*/
public AccessibleValue getAccessibleValue() {
=== modified file 'debian/patches/jdk-i18n-pt_BR.diff'
--- debian/patches/jdk-i18n-pt_BR.diff 2017-07-21 13:59:23 +0000
+++ debian/patches/jdk-i18n-pt_BR.diff 2019-03-17 17:34:59 +0000
@@ -1,6 +1,6 @@
---- src/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties~ 2017-07-03 22:18:56.000000000 +0200
-+++ src/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties 2017-07-07 13:35:30.906139485 +0200
-@@ -13,7 +13,7 @@
+--- a/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties
++++ b/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties
+@@ -13,7 +13,7 @@ AWT.altGraph=Alt Graph
# Key names
AWT.enter=Enter
AWT.backSpace=Backspace
=== modified file 'debian/patches/jdk-java-nio-bits-unligned-aarch64.diff'
--- debian/patches/jdk-java-nio-bits-unligned-aarch64.diff 2017-08-24 00:17:21 +0000
+++ debian/patches/jdk-java-nio-bits-unligned-aarch64.diff 2019-03-17 17:34:59 +0000
@@ -8,10 +8,9 @@
Reviewed-by: andrew
Contributed-by: Derek White <[email protected]>
-diff -r 0c14af84f624 -r 64e09337b9b7 src/share/classes/java/nio/Bits.java
---- openjdk/jdk/src/share/classes/java/nio/Bits.java Fri Jul 14 07:29:12 2017 +0100
-+++ openjdk/jdk/src/share/classes/java/nio/Bits.java Fri Aug 11 01:05:45 2017 +0100
-@@ -615,7 +615,8 @@
+--- a/jdk/src/share/classes/java/nio/Bits.java
++++ b/jdk/src/share/classes/java/nio/Bits.java
+@@ -615,7 +615,8 @@ class Bits {
new sun.security.action.GetPropertyAction("os.arch"));
unaligned = arch.equals("i386") || arch.equals("x86")
|| arch.equals("amd64") || arch.equals("x86_64")
@@ -21,10 +20,9 @@
unalignedKnown = true;
return unaligned;
}
-diff -r 0c14af84f624 -r 64e09337b9b7 src/share/classes/sun/security/provider/ByteArrayAccess.java
---- openjdk/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java Fri Jul 14 07:29:12 2017 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java Fri Aug 11 01:05:45 2017 +0100
-@@ -94,7 +94,8 @@
+--- a/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
++++ b/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
+@@ -94,7 +94,8 @@ final class ByteArrayAccess {
String arch = java.security.AccessController.doPrivileged
(new sun.security.action.GetPropertyAction("os.arch", ""));
return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
@@ -34,4 +32,3 @@
}
/**
-
=== modified file 'debian/patches/ld-symbolic-functions-default.diff'
--- debian/patches/ld-symbolic-functions-default.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/ld-symbolic-functions-default.diff 2019-03-17 17:34:59 +0000
@@ -1,7 +1,7 @@
--- a/hotspot/agent/src/os/linux/Makefile
+++ b/hotspot/agent/src/os/linux/Makefile
-@@ -77,7 +77,7 @@ endif
- LFLAGS_LIBSA += $(LDFLAGS_HASH_STYLE)
+@@ -80,7 +80,7 @@ LDFLAGS_NO_EXEC_STACK="-Wl,-z,noexecstac
+ LFLAGS_LIBSA += $(LDFLAGS_NO_EXEC_STACK)
$(LIBSA): $(ARCH) $(OBJS) mapfile
- $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
@@ -11,7 +11,7 @@
$(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
-@@ -287,6 +287,7 @@ endif
+@@ -293,6 +293,7 @@ endif
# Enable linker optimization
LFLAGS += -Xlinker -O1
=== modified file 'debian/patches/libjpeg-fix.diff'
--- debian/patches/libjpeg-fix.diff 2017-01-23 10:17:38 +0000
+++ debian/patches/libjpeg-fix.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -739,7 +739,7 @@ endif
+@@ -730,7 +730,7 @@ endif
ifeq ($(USE_EXTERNAL_LIBJPEG), true)
LIBJPEG_LIBS := -ljpeg
BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
=== modified file 'debian/patches/link-with-as-needed.diff'
--- debian/patches/link-with-as-needed.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/link-with-as-needed.diff 2019-03-17 17:34:59 +0000
@@ -25,7 +25,7 @@
PROGRAM := unpack200, \
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -760,10 +760,10 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -751,10 +751,10 @@ $(eval $(call SetupNativeCompilation,BUI
$(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
$(BUILD_LIBJAVAJPEG_HEADERS), \
MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
=== modified file 'debian/patches/ppc64el.diff'
--- debian/patches/ppc64el.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/ppc64el.diff 2019-03-17 17:34:59 +0000
@@ -18,7 +18,7 @@
define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -4934,6 +4934,7 @@ void os::init(void) {
+@@ -5042,6 +5042,7 @@ void os::init(void) {
pthread_mutex_init(&dl_mutex, NULL);
@@ -26,7 +26,7 @@
// If the pagesize of the VM is greater than 8K determine the appropriate
// number of initial guard pages. The user can change this with the
// command line arguments, if needed.
-@@ -4942,6 +4943,7 @@ void os::init(void) {
+@@ -5050,6 +5051,7 @@ void os::init(void) {
StackRedPages = 1;
StackShadowPages = round_to((StackShadowPages*Linux::vm_default_page_size()), vm_page_size()) / vm_page_size();
}
@@ -34,7 +34,7 @@
}
// To install functions for atexit system call
-@@ -4992,9 +4994,16 @@ jint os::init_2(void)
+@@ -5104,9 +5106,16 @@ jint os::init_2(void)
// size. Add a page for compiler2 recursion in main thread.
// Add in 2*BytesPerWord times page size to account for VM stack during
// class initialization depending on 32 or 64 bit VM.
=== modified file 'debian/patches/system-lcms.diff'
--- debian/patches/system-lcms.diff 2017-01-23 10:17:38 +0000
+++ debian/patches/system-lcms.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
-@@ -666,6 +666,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+@@ -782,6 +782,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
###############################################################################
#
@@ -51,7 +51,7 @@
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -667,8 +667,8 @@ endif
+@@ -658,8 +658,8 @@ endif
##########################################################################################
# TODO: Update awt lib path when awt is converted
@@ -62,7 +62,7 @@
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
LANG := C, \
-@@ -687,19 +687,19 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -678,19 +678,19 @@ $(eval $(call SetupNativeCompilation,BUI
LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
=== modified file 'debian/patches/system-libjpeg.diff'
--- debian/patches/system-libjpeg.diff 2017-11-01 06:40:38 +0000
+++ debian/patches/system-libjpeg.diff 2019-03-17 17:34:59 +0000
@@ -4,7 +4,7 @@
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
-@@ -595,11 +595,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+@@ -711,11 +711,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
# Check for the jpeg library
#
@@ -48,7 +48,7 @@
###############################################################################
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -703,21 +703,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
+@@ -694,21 +694,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
##########################################################################################
@@ -79,7 +79,7 @@
# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
# or 'vfork'": this warning indicates that some variable is placed to
# a register by optimized compiler and it's value might be lost on longjmp().
-@@ -729,37 +732,50 @@ endif
+@@ -720,37 +723,50 @@ endif
# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
# ifeq ($(CC_43_OR_NEWER), 1)
@@ -144,7 +144,7 @@
##########################################################################################
-@@ -1199,6 +1215,13 @@ ifndef BUILD_HEADLESS_ONLY
+@@ -1140,6 +1156,13 @@ ifndef BUILD_HEADLESS_ONLY
GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
endif
@@ -158,7 +158,7 @@
ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
-@@ -1259,11 +1282,13 @@ ifndef BUILD_HEADLESS_ONLY
+@@ -1195,11 +1218,13 @@ ifndef BUILD_HEADLESS_ONLY
EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
LANG := C, \
OPTIMIZATION := LOW, \
=== modified file 'debian/patches/system-libpng.diff'
--- debian/patches/system-libpng.diff 2017-01-23 10:17:38 +0000
+++ debian/patches/system-libpng.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
-@@ -666,6 +666,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+@@ -782,6 +782,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
###############################################################################
#
@@ -52,7 +52,7 @@
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
-@@ -567,6 +567,7 @@ endif
+@@ -571,6 +571,7 @@ endif
ENABLE_JFR=@ENABLE_JFR@
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
@@ -62,7 +62,7 @@
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -1205,7 +1205,6 @@ endif
+@@ -1146,7 +1146,6 @@ endif
ifndef BUILD_HEADLESS_ONLY
LIBSPLASHSCREEN_DIRS := \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
@@ -70,7 +70,7 @@
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
ifeq ($(USE_EXTERNAL_LIBGIF), true)
-@@ -1222,6 +1221,13 @@ ifndef BUILD_HEADLESS_ONLY
+@@ -1163,6 +1162,13 @@ ifndef BUILD_HEADLESS_ONLY
LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
endif
@@ -84,7 +84,7 @@
ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
-@@ -1283,12 +1289,12 @@ ifndef BUILD_HEADLESS_ONLY
+@@ -1219,12 +1225,12 @@ ifndef BUILD_HEADLESS_ONLY
LANG := C, \
OPTIMIZATION := LOW, \
CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
=== modified file 'debian/patches/system-pcsclite.diff'
--- debian/patches/system-pcsclite.diff 2017-01-23 10:17:38 +0000
+++ debian/patches/system-pcsclite.diff 2019-03-17 17:34:59 +0000
@@ -1,6 +1,6 @@
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
-@@ -747,6 +747,53 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+@@ -863,6 +863,53 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
###############################################################################
#
@@ -56,7 +56,7 @@
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
-@@ -569,6 +569,7 @@ ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
+@@ -573,6 +573,7 @@ ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
=== modified file 'debian/patches/workaround_expand_exec_shield_cs_limit.diff'
--- debian/patches/workaround_expand_exec_shield_cs_limit.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/workaround_expand_exec_shield_cs_limit.diff 2019-03-17 17:34:59 +0000
@@ -11,7 +11,7 @@
* Take the highest VA the OS will give us and exec
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -5021,7 +5021,7 @@ ZERO_ONLY (
+@@ -5133,7 +5133,7 @@ ZERO_ONLY (
Linux::capture_initial_stack(JavaThread::stack_size_at_create());
=== modified file 'debian/patches/zero-sh.diff'
--- debian/patches/zero-sh.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/zero-sh.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -1910,7 +1910,8 @@ void * os::dll_load(const char *filename
+@@ -1966,7 +1966,8 @@ void * os::dll_load(const char *filename
{EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
{EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
{EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
@@ -12,7 +12,7 @@
};
#if (defined IA32)
-@@ -1941,9 +1942,11 @@ void * os::dll_load(const char *filename
+@@ -1997,9 +1998,11 @@ void * os::dll_load(const char *filename
static Elf32_Half running_arch_code=EM_MIPS;
#elif (defined M68K)
static Elf32_Half running_arch_code=EM_68K;
=== modified file 'debian/patches/zero-x32.diff'
--- debian/patches/zero-x32.diff 2018-04-28 13:05:21 +0000
+++ debian/patches/zero-x32.diff 2019-03-17 17:34:59 +0000
@@ -2,7 +2,7 @@
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -1915,7 +1915,7 @@ void * os::dll_load(const char *filename
+@@ -1971,7 +1971,7 @@ void * os::dll_load(const char *filename
#if (defined IA32)
static Elf32_Half running_arch_code=EM_386;
@@ -55,7 +55,7 @@
;;
i?86)
VAR_CPU=x86
-@@ -447,7 +454,13 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
+@@ -449,7 +456,13 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
ppc64) ZERO_ARCHDEF=PPC64 ;;
s390*) ZERO_ARCHDEF=S390 ;;
sparc*) ZERO_ARCHDEF=SPARC ;;
__
This is the maintainer address of Debian's Java team
<https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
[email protected] for discussions and questions.
