Hello community,
here is the log from the commit of package java-11-openjdk for
openSUSE:Leap:15.2 checked in at 2020-06-04 16:01:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/java-11-openjdk (Old)
and /work/SRC/openSUSE:Leap:15.2/.java-11-openjdk.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk"
Thu Jun 4 16:01:42 2020 rev:70 rq:810779 version:11.0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/java-11-openjdk/java-11-openjdk.changes
2020-02-04 17:54:19.268745707 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.java-11-openjdk.new.3606/java-11-openjdk.changes
2020-06-04 16:03:22.951461843 +0200
@@ -1,0 +2,597 @@
+Tue Apr 21 08:29:08 UTC 2020 - Fridrich Strba <[email protected]>
+
+- update to upstream tag jdk-11.0.7+10 (April 2020 CPU,
+ bsc#1169511)
+ * Security fixes:
+ + S8223898, CVE-2020-2754: Forward references to Nashorn
+ + S8223904, CVE-2020-2755: Improve Nashorn matching
+ + S8224541, CVE-2020-2756: Better mapping of serial ENUMs
+ + S8224549, CVE-2020-2757: Less Blocking Array Queues
+ + S8225603: Enhancement for big integers
+ + S8226346: Build better binary builders
+ + S8227467: Better class method invocations
+ + S8227542: Manifest improved jar headers
+ + S8229733: TLS message handling improvements
+ + S8231415, CVE-2020-2773: Better signatures in XML
+ + S8231785: Improved socket permissions
+ + S8232424, CVE-2020-2778: More constrained algorithms
+ + S8232581, CVE-2020-2767: Improve TLS verification
+ + S8233250: Better X11 rendering
+ + S8233410: Better Build Scripting
+ + S8234027: Better JCEKS key support
+ + S8234408, CVE-2020-2781: Improve TLS session handling
+ + S8234825, CVE-2020-2800: Better Headings for HTTP Servers
+ + S8234841, CVE-2020-2803: Enhance buffering of byte buffers
+ + S8235274, CVE-2020-2805: Enhance typing of methods
+ + S8235691, CVE-2020-2816: Enhance TLS connectivity
+ + S8236201, CVE-2020-2830: Better Scanner conversions
+ + S8238960: linux-i586 builds are inconsistent as the newly
+ built jdk is not able to reserve enough space for object heap
+ * Other changes:
+ + S4919790: Errors in alert ssl message does not reflect the
+ actual certificate status
+ + S4949105: Access Bridge lacks html tags parsing
+ + S7092821: java.security.Provider.getService() is synchronized
+ and became scalability bottleneck
+ + S7143743: Potential memory leak with zip provider
+ + S8005819: Support cross-realm MSSFU
+ + S8042383: [TEST_BUG] Test javax/swing/plaf/basic/BasicMenuUI/
+ /4983388/bug4983388.java fails with shortcuts on menus do not
+ work
+ + S8068184: Fix for JDK-8032832 caused a deadlock
+ + S8145845: [AOT] NullPointerException in
+ compiler/whitebox/GetCodeHeapEntriesTest.java
+ + S8152988: [AOT] Update test batch definitions to include
+ aot-ed java.base module mode into hs-comp testing
+ + S8160926: FLAGS_COMPILER_CHECK_ARGUMENTS doesn't handle
+ cross-compilation
+ + S8163083: SocketListeningConnector does not allow invocations
+ with port 0
+ + S8163251: Hard coded loop limit prevents reading of smart
+ card data greater than 8k
+ + S8167276: jvmci/compilerToVM/MaterializeVirtualObjectTest.java
+ fails with -XX:-EliminateAllocations
+ + S8169718: nsk/jdb/locals/locals002: ERROR: Cannot find
+ boolVar with expected value: false
+ + S8176556:
+ java/awt/dnd/ImageTransferTest/ImageTransferTest.java fails
+ for JFIF
+ + S8178798: Two compiler/aot/verification/vmflags tests fail by
+ timeout with UseAVX=3
+ + S8183107: PKCS11 regression regarding checkKeySize
+ + S8185005: Improve performance of
+ ThreadMXBean.getThreadInfo(long ids[], int maxDepth)
+ + S8189633: Missing -Xcheck:jni checking for DeleteWeakGlobalRef
+ + S8189861: Refactor CacheFind
+ + S8193042: NativeLookup::lookup_critical_entry() should only
+ load shared library once
+ + S8193596: java/net/DatagramPacket/ReuseBuf.java failed due to
+ timeout
+ + S8194944: Regression automated test 'open/test/jdk/javax/
+ /swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java'
+ fails
+ + S8196467: javax/swing/JInternalFrame/Test6325652.java fails
+ + S8196969: JTreg Failure: serviceability/sa/ClhsdbJstack.java
+ causes NPE
+ + S8198321: javax/swing/JEditorPane/5076514/bug5076514.java
+ fails
+ + S8198398: Test javax/swing/JColorChooser/Test6199676.java
+ fails in mach5
+ + S8199072: Test javax/swing/GroupLayout/6613904/
+ /bug6613904.java is unstable
+ + S8200432: javadoc fails with ClassCastException on {@link
+ byte[]}
+ + S8201349: build broken when configured with
+ --with-zlib=bundled on gcc 7.3
+ + S8201355: Avoid native memory allocation in
+ sun.security.mscapi.PRNG.generateSeed
+ + S8201513: nsk/jvmti/IterateThroughHeap/filter-* are broken
+ + S8203364: Some serviceability/sa/ tests intermittently fail
+ with java.io.IOException: LingeredApp terminated with non-zero
+ exit code 3
+ + S8203687: javax/net/ssl/compatibility/Compatibility.java
+ supports TLS 1.3
+ + S8203904: javax/swing/JSplitPane/4816114/bug4816114.java: The
+ divider location is wrong
+ + S8203911: Test runtime/modules/getModuleJNI/GetModule fails
+ with -Xcheck:jni
+ + S8204525: [TESTBUG] runtime/NMT/MallocStressTest.java ran out
+ of java heap
+ + S8204529: gc/TestAllocateHeapAtMultiple.java fail with Agent
+ 7 timed out
+ + S8204551: Event descriptions are truncated in logs
+ + S8206963: [AOT] bug with multiple class loaders
+ + S8207367: 10 vmTestbase/nsk/jdi tests timed out when running
+ with jtreg
+ + S8207832: serviceability/sa/ClhsdbCDSCore.java failed with
+ "Couldn't find core file location"
+ + S8207938: At step6,Click Add button,case failed automatically.
+ + S8208157: requires.VMProps throws NPE for missing properties
+ in "release" file
+ + S8208379: compiler/jvmci/events/
+ /JvmciNotifyInstallEventTest.java failed with "Got unexpected
+ event count after 2nd install attempt: expected 9 to equal 2"
+ + S8208658: Make CDS archived heap regions usable even if
+ compressed oop encoding has changed
+ + S8208715: Conversion of milliseconds to nanoseconds in
+ UNIXProcess contains bug
+ + S8209361: [AOT] Unexpected number of references for
+ JVMTI_HEAP_REFERENCE_CONSTANT_POOL [111-->111]: 0 (expected
+ at least 1)
+ + S8209385: CDS runtime classpath checking is too strict when
+ only classes from the system modules are archived
+ + S8209389: SIGSEGV in WalkOopAndArchiveClosure::do_oop_work.
+ + S8209418: Synchronize test/jdk/sanity/client/lib/jemmy with
+ code-tools/jemmy/v2
+ + S8209494: Create a test for SwingSet InternalFrameDemo
+ + S8209499: Create test for SwingSet EditorPaneDemo
+ + S8209574: [AOT] breakpoint events are generated in different
+ threads does not meet expected count
+ + S8209686: cleanup arguments to PhaseIdealLoop() constructor
+ + S8209789: Synchronize test/jdk/sanity/client/lib/jemmy with
+ code-tools/jemmy/v2
+ + S8209802: Garbage collectors should register JFR types
+ themselves to avoid build errors.
+ + S8209807: improve handling exception in requires.VMProps
+ + S8209817: stack is executable when building with Clang on
+ Linux
+ + S8209824: Improve the code coverage for ThreadLocal
+ + S8209826: Undefined reference to os::write after JDK-8209657
+ (filemap.hpp cleanup)
+ + S8209850: Allow NamedThreads to use GlobalCounter critical
+ sections
+ + S8209976: Improve iteration over non-JavaThreads
+ + S8209993: Create a test for SwingSet3 ToolTipDemo
+ + S8210024: JFR calls virtual is_Java_thread from ~Thread()
+ + S8210052: Enable testing for all the available look and feels
+ in SwingSet3 demo tests
+ + S8210055: Enable different look and feel tests in SwingSet3
+ demo tests
+ + S8210057: Enable different look and feels in SwingSet3 demo
+ test InternalFrameDemoTest
+ + S8210058: Algorithmic Italic font leans opposite angle in
+ Printing
+ + S8210220: [AOT] jdwp test cases are failing with error #
+ ERROR: TEST FAILED: Cought IOException while receiving event
+ packet
+ + S8210289: ArchivedKlassSubGraphInfoRecord is incomplete
+ + S8210459: Add support for generating compile_commands.json
+ + S8210476: sun/security/mscapi/PrngSlow.java fails with Still
+ too slow
+ + S8210512: [Testbug] vmTestbase/nsk/jdi/ObjectReference/
+ /referringObjects/referringObjects002/referringObjects002.java
+ fails with unexpected size of
+ ClassLoaderReference.referringObjects
+ + S8210523: runtime/appcds/cacheObject/DifferentHeapSizes.java
+ crash
+ + S8210632: Add key exchange algorithm to
+ javax/net/ssl/TLSCommon/CipherSuite.java
+ + S8210699: Problem list tests which times out in Xcomp mode
+ + S8210793: [JVMCI] AllocateCompileIdTest.java failed to find
+ DiagnosticCommand.class
+ + S8210910: Create test for FileChooserDemo
+ + S8210994: Create test for SwingSet3 FrameDemo
+ + S8211139: Increase timeout value in all tests under
+ jdk/sanity/client/SwingSet/src
+ + S8211160: Handle different look and feels in
+ JInternalFrameOperator
+ + S8211211: vmTestbase/metaspace/stressDictionary/
+ /StressDictionary.java timeout
+ + S8211322: Reduce the timeout of tooltip in SwingSet2DemoTest
+ + S8211443: Enable different look and feels in SwingSet3 demo
+ test SplitPaneDemoTest
+ + S8211703: JInternalFrame : java.lang.AssertionError: cannot
+ find the internal frame
+ + S8211781: re-building fails after changing Graal sources
+ + S8212897: Some improvements in the EditorPaneDemotest
+ + S8212903: [TestBug] Tests test/jdk/javax/swing/LookAndFeel/
+ /8145547/DemandGTK2.sh and DemandGTK3.sh fail on Ubuntu 18.04
+ LTS
+ + S8213009: Refactoring existing SunMSCAPI classes
+ + S8213010: Supporting keys created with certmgr.exe
+ + S8213168: Enable different look and feel tests in SwingSet3
+ demo test FileChooserDemoTest
+ + S8213348: jdk.internal.vm.compiler.management service
+ providers missing in module descriptor
+ + S8213906: Update arm devkits with libXrandr headers
+ + S8213908: AssertionError in DeferredAttr at setOverloadKind
++++ 403 more lines (skipped)
++++ between
/work/SRC/openSUSE:Leap:15.2/java-11-openjdk/java-11-openjdk.changes
++++ and
/work/SRC/openSUSE:Leap:15.2/.java-11-openjdk.new.3606/java-11-openjdk.changes
Old:
----
837b7afec083.tar.bz2
New:
----
44ce940b344b.tar.bz2
JDK-8228407.patch
gcc-fno-common-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.31voCg/_old 2020-06-04 16:03:24.891468333 +0200
+++ /var/tmp/diff_new_pack.31voCg/_new 2020-06-04 16:03:24.895468348 +0200
@@ -32,13 +32,13 @@
# Standard JPackage naming and versioning defines.
%global featurever 11
%global interimver 0
-%global updatever 6
+%global updatever 7
%global patchver 0
-%global datever 2020-01-14
+%global datever 2020-04-14
%global buildver 10
%global hg_project jdk-updates
%global hg_repository jdk11u
-%global hg_revision 837b7afec083
+%global hg_revision 44ce940b344b
%global icedtea_sound_version 1.0.1
# JavaEE modules
%global java_atk_wrapper_version 0.33.2
@@ -209,6 +209,10 @@
Patch20: loadAssistiveTechnologies.patch
#
Patch30: JDK-8208602.patch
+# 8228407: JVM crashes with shared archive file mismatch
+# Summary: Stop processing other header fields if initial header check has
failed.
+Patch31: JDK-8228407.patch
+Patch32: gcc-fno-common-fix.patch
#
# OpenJDK specific patches
#
@@ -504,6 +508,8 @@
%patch20 -p1
%patch30 -p1
+%patch31 -p1
+%patch32 -p1
# s390 build fixes
@@ -938,7 +944,7 @@
for s in 16 24 32 48 ; do
install -D -p -m 644 \
src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
- %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}.png
+
%{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-openjdk.png
done
# Install desktop file.
@@ -993,18 +999,24 @@
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
--slave %{_bindir}/jjs jjs %{jrebindir}/jjs \
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
+ --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
--slave %{_bindir}/rmid rmid %{jrebindir}/rmid \
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry \
+ --slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
--slave %{_mandir}/man1/java.1$ext java.1$ext \
%{_mandir}/man1/java-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \
%{_mandir}/man1/jjs-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
%{_mandir}/man1/keytool-%{sdklnk}.1$ext \
+ --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \
+ %{_mandir}/man1/pack200-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \
%{_mandir}/man1/rmid-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \
%{_mandir}/man1/rmiregistry-%{sdklnk}.1$ext \
+ --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \
+ %{_mandir}/man1/unpack200-%{sdklnk}.1$ext \
|| :
update-alternatives \
@@ -1088,10 +1100,8 @@
--slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
--slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
--slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
- --slave %{_bindir}/pack200 pack200 %{sdkbindir}/pack200 \
--slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
--slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \
- --slave %{_bindir}/unpack200 unpack200 %{sdkbindir}/unpack200 \
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \
%{_mandir}/man1/jar-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \
@@ -1124,14 +1134,10 @@
%{_mandir}/man1/jstat-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jstatd.1$ext jstatd.1$ext \
%{_mandir}/man1/jstatd-%{sdklnk}.1$ext \
- --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \
- %{_mandir}/man1/pack200-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \
%{_mandir}/man1/rmic-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \
%{_mandir}/man1/serialver-%{sdklnk}.1$ext \
- --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \
- %{_mandir}/man1/unpack200-%{sdklnk}.1$ext \
--slave %{_datadir}/applications/jconsole.desktop jconsole.desktop \
%{_jvmdir}/%{sdkdir}/lib/desktop/jconsole.desktop \
|| :
@@ -1183,7 +1189,7 @@
%{_jvmdir}/%{sdkdir}/lib/libjawt.so
%{_jvmdir}/%{sdkdir}/lib/libsplashscreen.so
%dir %{_datadir}/icons/hicolor
-%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png
+%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-openjdk.png
%files headless
%dir %{_jvmdir}
@@ -1215,8 +1221,10 @@
%{_jvmdir}/%{sdkdir}/bin/jfr
%{_jvmdir}/%{sdkdir}/bin/jjs
%{_jvmdir}/%{sdkdir}/bin/keytool
+%{_jvmdir}/%{sdkdir}/bin/pack200
%{_jvmdir}/%{sdkdir}/bin/rmid
%{_jvmdir}/%{sdkdir}/bin/rmiregistry
+%{_jvmdir}/%{sdkdir}/bin/unpack200
%{_jvmdir}/%{sdkdir}/conf/logging.properties
%{_jvmdir}/%{sdkdir}/conf/management/jmxremote.access
%{_jvmdir}/%{sdkdir}/conf/management/jmxremote.password.template
@@ -1289,8 +1297,10 @@
%{_mandir}/man1/java-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/jjs-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/keytool-%{sdklnk}.1%{?ext_man}
+%{_mandir}/man1/pack200-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/rmid-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/rmiregistry-%{sdklnk}.1%{?ext_man}
+%{_mandir}/man1/unpack200-%{sdklnk}.1%{?ext_man}
%files devel
%dir %{_jvmdir}/%{sdkdir}/bin
@@ -1330,10 +1340,8 @@
%{_jvmdir}/%{sdkdir}/bin/jstack
%{_jvmdir}/%{sdkdir}/bin/jstat
%{_jvmdir}/%{sdkdir}/bin/jstatd
-%{_jvmdir}/%{sdkdir}/bin/pack200
%{_jvmdir}/%{sdkdir}/bin/rmic
%{_jvmdir}/%{sdkdir}/bin/serialver
-%{_jvmdir}/%{sdkdir}/bin/unpack200
%{_jvmdir}/%{sdkdir}/include/classfile_constants.h
%{_jvmdir}/%{sdkdir}/include/jawt.h
%{_jvmdir}/%{sdkdir}/include/jdwpTransport.h
@@ -1370,10 +1378,8 @@
%{_mandir}/man1/jstack-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/jstat-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/jstatd-%{sdklnk}.1%{?ext_man}
-%{_mandir}/man1/pack200-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/rmic-%{sdklnk}.1%{?ext_man}
%{_mandir}/man1/serialver-%{sdklnk}.1%{?ext_man}
-%{_mandir}/man1/unpack200-%{sdklnk}.1%{?ext_man}
%if %{with_systemtap}
%{tapsetroot}
++++++ 837b7afec083.tar.bz2 -> 44ce940b344b.tar.bz2 ++++++
/work/SRC/openSUSE:Leap:15.2/java-11-openjdk/837b7afec083.tar.bz2
/work/SRC/openSUSE:Leap:15.2/.java-11-openjdk.new.3606/44ce940b344b.tar.bz2
differ: char 11, line 1
++++++ JDK-8228407.patch ++++++
# HG changeset patch
# User ccheung
# Date 1564075552 25200
# Thu Jul 25 10:25:52 2019 -0700
# Node ID f1332f6025515e4fc9e42fbf79f983d782abaaf0
# Parent 966fc6d784a737ec25cd0b1be48109a4a3fa02ad
8228407: JVM crashes with shared archive file mismatch
Summary: Stop processing other header fields if initial header check has failed.
Reviewed-by: dholmes, jiangli
diff --git a/src/hotspot/share/memory/filemap.cpp
b/src/hotspot/share/memory/filemap.cpp
--- a/src/hotspot/share/memory/filemap.cpp
+++ b/src/hotspot/share/memory/filemap.cpp
@@ -1287,7 +1287,9 @@
}
init_from_file(_fd);
- if (!validate_header()) {
+ // UseSharedSpaces could be disabled if the checking of some of the header
fields in
+ // init_from_file has failed.
+ if (!UseSharedSpaces || !validate_header()) {
return false;
}
return true;
diff --git a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
--- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
@@ -385,8 +385,16 @@
output.shouldNotContain("Checksum verification failed");
copyFile(orgJsaFile, jsa);
+ // modify _jvm_ident and run with -Xshare:auto
+ System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n");
+ modifyJvmIdent();
+ output = TestCommon.execAuto(execArgs);
+ output.shouldContain("The shared archive file was created by a
different version or build of HotSpot");
+ output.shouldContain("Hello World");
+
+ copyFile(orgJsaFile, jsa);
// modify _magic and _paths_misc_info_size, test should fail
- System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size,
should fail\n");
+ System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size,
should fail\n");
modifyHeaderIntField(offset_magic, 0x00000000);
modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
output = TestCommon.execCommon(execArgs);
@@ -395,7 +403,7 @@
copyFile(orgJsaFile, jsa);
// modify _version and _paths_misc_info_size, test should fail
- System.out.println("\n2c. Corrupt _version and _paths_misc_info_size,
should fail\n");
+ System.out.println("\n2d. Corrupt _version and _paths_misc_info_size,
should fail\n");
modifyHeaderIntField(offset_version, 0x00000000);
modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
output = TestCommon.execCommon(execArgs);
++++++ gcc-fno-common-fix.patch ++++++
>From a59e8a7f6fed2accd1034eebf16545ef78c3ea1b Mon Sep 17 00:00:00 2001
From: Patrick Zhang <[email protected]>
Date: Tue, 4 Feb 2020 21:27:10 +0800
Subject: [PATCH] 8238380: java.base/unix/native/libjava/childproc.c "multiple
definition" link errors with GCC10
Reviewed-by: stuefe, clanger, rriggs
---
src/java.base/unix/native/libjava/childproc.c | 3 ++-
src/java.base/unix/native/libjava/childproc.h | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/java.base/unix/native/libjava/childproc.c
b/src/java.base/unix/native/libjava/childproc.c
index 811aaeac5f..1044b8ee22 100644
--- a/src/java.base/unix/native/libjava/childproc.c
+++ b/src/java.base/unix/native/libjava/childproc.c
@@ -34,6 +34,7 @@
#include "childproc.h"
+const char * const *parentPathv;
ssize_t
restartableWrite(int fd, const void *buf, size_t count)
diff --git a/src/java.base/unix/native/libjava/childproc.h
b/src/java.base/unix/native/libjava/childproc.h
index 0911509302..2190dd1792 100644
--- a/src/java.base/unix/native/libjava/childproc.h
+++ b/src/java.base/unix/native/libjava/childproc.h
@@ -126,7 +126,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);
--
2.25.1
>From 1d42f083c1b64e68eec19471c3f7045c6cbc841f Mon Sep 17 00:00:00 2001
From: Patrick Zhang <[email protected]>
Date: Wed, 5 Feb 2020 17:14:15 +0800
Subject: [PATCH] 8238386: (sctp) jdk.sctp/unix/native/libsctp/SctpNet.c
"multiple definition" link errors with GCC10
Fixed libsctp link errors caused by GCC10 default -fno-common
Reviewed-by: chegar
---
src/jdk.sctp/unix/native/libsctp/Sctp.h | 14 +++++++-------
src/jdk.sctp/unix/native/libsctp/SctpNet.c | 9 ++++++++-
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h
b/src/jdk.sctp/unix/native/libsctp/Sctp.h
index cc1367f781..d6810d61be 100644
--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h
+++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h
@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
#endif /* __linux__ */
-sctp_getladdrs_func* nio_sctp_getladdrs;
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
-sctp_bindx_func* nio_sctp_bindx;
-sctp_peeloff_func* nio_sctp_peeloff;
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
+extern sctp_bindx_func* nio_sctp_bindx;
+extern sctp_peeloff_func* nio_sctp_peeloff;
jboolean loadSocketExtensionFuncs(JNIEnv* env);
diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c
b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
index d40c15aa35..b8d0ad8ab2 100644
--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c
+++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0;
static const char* nativeSctpLib = "libsctp.so.1";
static jboolean funcsLoaded = JNI_FALSE;
+sctp_getladdrs_func* nio_sctp_getladdrs;
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
+sctp_bindx_func* nio_sctp_bindx;
+sctp_peeloff_func* nio_sctp_peeloff;
+
JNIEXPORT jint JNICALL DEF_JNI_OnLoad
(JavaVM *vm, void *reserved) {
return JNI_VERSION_1_2;
--
2.25.1
>From 03721247d8f3d6b2aefe2826a59c10fd1fad51cb Mon Sep 17 00:00:00 2001
From: Patrick Zhang <[email protected]>
Date: Wed, 5 Feb 2020 20:31:09 +0800
Subject: [PATCH] 8238388: libj2gss/NativeFunc.o "multiple definition" link
errors with GCC10
Fixed libj2gss link errors caused by GCC10 default -fno-common
Reviewed-by: weijun
---
src/java.security.jgss/share/native/libj2gss/NativeFunc.c | 5 ++++-
src/java.security.jgss/share/native/libj2gss/NativeFunc.h | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
index da7bc0445b..577b6ec5be 100644
--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
@@ -27,6 +27,9 @@
#include <stdlib.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/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
index 82914387c2..d695120122 100644
--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE {
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
/* global GSS function table */
-GSS_FUNCTION_TABLE_PTR ftab;
+extern GSS_FUNCTION_TABLE_PTR ftab;
#endif
--
2.25.1
