Updated package java-14-openjdk 14.0.2.u12-2

5 files changed, 131 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd7c6f3a0cee..ab9f35dc4d93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-14-openjdk
 	pkgver = 14.0.2.u12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -26,14 +26,21 @@ pkgbase = java-14-openjdk
 	makedepends = lcms2
 	makedepends = libnet
 	makedepends = bash
+	options = !lto
 	source = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive/jdk-14.0.2+12.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
+	source = bug_8238380.patch
+	source = bug_8238386.patch
+	source = bug_8238388.patch
 	sha256sums = dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 	sha256sums = 165273caba29f70496e697c9ed5bf61a4322ab324888f78559820f0032df48c9
 	sha256sums = 1e3decf29075b6f62238a5b2ac537679f00c185ce36d83db254004237cfe7084
 	sha256sums = 676c74c8aed53d6cd4c4755ece2b2e3ab1a72b1bd2ef53983dcad0229d91af3c
+	sha256sums = ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512
+	sha256sums = 98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620
+	sha256sums = e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a
 
 pkgname = jre14-openjdk-headless
 	pkgdesc = OpenJDK Java 14 headless runtime environment
@@ -48,7 +55,7 @@ pkgname = jre14-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=14
 	provides = java-runtime-headless-openjdk=14
-	provides = jre14-openjdk-headless=14.0.2.u12-1
+	provides = jre14-openjdk-headless=14.0.2.u12-2
 	backup = etc/java-14-openjdk/logging.properties
 	backup = etc/java-14-openjdk/management/jmxremote.access
 	backup = etc/java-14-openjdk/management/jmxremote.password.template
@@ -67,33 +74,33 @@ pkgname = jre14-openjdk-headless
 pkgname = jre14-openjdk
 	pkgdesc = OpenJDK Java 14 full runtime environment
 	install = install_jre-openjdk.sh
-	depends = jre14-openjdk-headless=14.0.2.u12-1
+	depends = jre14-openjdk-headless=14.0.2.u12-2
 	depends = giflib
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=14
 	provides = java-runtime-openjdk=14
-	provides = jre14-openjdk=14.0.2.u12-1
+	provides = jre14-openjdk=14.0.2.u12-2
 
 pkgname = jdk14-openjdk
 	pkgdesc = OpenJDK Java 14 development kit
 	install = install_jdk-openjdk.sh
-	depends = jre14-openjdk=14.0.2.u12-1
+	depends = jre14-openjdk=14.0.2.u12-2
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	provides = java-environment=14
 	provides = java-environment-jdk=14
 	provides = java-environment-openjdk=14
-	provides = jdk14-openjdk=14.0.2.u12-1
+	provides = jdk14-openjdk=14.0.2.u12-2
 
 pkgname = openjdk14-src
 	pkgdesc = OpenJDK Java 14 sources
-	depends = jdk14-openjdk=14.0.2.u12-1
-	provides = openjdk14-src=14.0.2.u12-1
+	depends = jdk14-openjdk=14.0.2.u12-2
+	provides = openjdk14-src=14.0.2.u12-2
 
 pkgname = openjdk14-doc
 	pkgdesc = OpenJDK Java 14 documentation
-	depends = jdk14-openjdk=14.0.2.u12-1
-	provides = openjdk14-doc=14.0.2.u12-1
+	depends = jdk14-openjdk=14.0.2.u12-2
+	provides = openjdk14-doc=14.0.2.u12-2
diff --git a/PKGBUILD b/PKGBUILD
index f1866517240c..79a076ad8f96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,13 @@ _majorver=14
 _minorver=0
 _securityver=2
 _updatever=12
-pkgrel=1
+pkgrel=2
 pkgver="${_majorver}.${_minorver}.${_securityver}.u${_updatever}"
 _hg_tag="jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}"
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
+options=('!lto')
 makedepends=('java-environment-jdk<=14' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
              'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
@@ -23,11 +24,17 @@ makedepends=('java-environment-jdk<=14' 'cpio' 'unzip' 'zip' 'libelf' 'libcups'
 source=("https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz"
         "freedesktop-java.desktop"
         "freedesktop-jconsole.desktop"
-        "freedesktop-jshell.desktop")
+        "freedesktop-jshell.desktop"
+        "bug_8238380.patch"
+        "bug_8238386.patch"
+        "bug_8238388.patch")
 sha256sums=('dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935'
             '165273caba29f70496e697c9ed5bf61a4322ab324888f78559820f0032df48c9'
             '1e3decf29075b6f62238a5b2ac537679f00c185ce36d83db254004237cfe7084'
-            '676c74c8aed53d6cd4c4755ece2b2e3ab1a72b1bd2ef53983dcad0229d91af3c')
+            '676c74c8aed53d6cd4c4755ece2b2e3ab1a72b1bd2ef53983dcad0229d91af3c'
+            'ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512'
+            '98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620'
+            'e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a')
 
 case "${CARCH}" in
   x86_64) _JARCH='x86_64';;
@@ -44,8 +51,16 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
               lib/libsplashscreen.{so,debuginfo})
 
 prepare() {
-  # Avoid the use of any Java 8-12, actually incompatible with the build
-  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '8-|9-|10-|11-|12-' -m 1)"
+  # Use only Java versions 13-14
+  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -E '13-|14-' -m 1)"
+  cd "${_jdkdir}"
+  # Fixes for GCC 10
+  # https://bugs.openjdk.java.net/browse/JDK-8238380
+  patch -p1 -i "${srcdir}/bug_8238380.patch"
+  # https://bugs.openjdk.java.net/browse/JDK-8238386
+  patch -p1 -i "${srcdir}/bug_8238386.patch"
+  # https://bugs.openjdk.java.net/browse/JDK-8238388
+  patch -p1 -i "${srcdir}/bug_8238388.patch"
 }
 
 build() {
@@ -70,6 +85,14 @@ build() {
     _CXXFLAGS="${CXXFLAGS/-fno-plt/}"
   fi
 
+  # TODO: Should be rechecked for the next releases
+  # compiling with -fexceptions leads to:
+  # /usr/bin/ld: /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/build/linux-x86_64-server-release/hotspot/variant-server/libjvm/objs/zPhysicalMemory.o: in function `ZList<ZMemory>::~ZList()':
+  # /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/src/hotspot/share/gc/z/zList.hpp:54: undefined reference to `ZListNode<ZMemory>::~ZListNode()'
+  # collect2: error: ld returned 1 exit status
+  _CFLAGS=${CFLAGS/-fexceptions/}
+  _CXXFLAGS=${CXXFLAGS/-fexceptions/}
+
   # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning
   # in the output of ./configure unless used like such:
   #  --with-extra-cflags="${CFLAGS}"
diff --git a/bug_8238380.patch b/bug_8238380.patch
new file mode 100644
index 000000000000..2262e41c98d5
--- /dev/null
+++ b/bug_8238380.patch
@@ -0,0 +1,23 @@
+diff -Naur jdk12u-jdk-12.0.2+10.orig/src/java.base/unix/native/libjava/childproc.c jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.c
+--- jdk12u-jdk-12.0.2+10.orig/src/java.base/unix/native/libjava/childproc.c	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.c	2021-11-28 17:07:34.716995346 +0100
+@@ -33,6 +33,7 @@
+ 
+ #include "childproc.h"
+ 
++const char * const *parentPathv;
+ 
+ ssize_t
+ restartableWrite(int fd, const void *buf, size_t count)
+diff -Naur jdk12u-jdk-12.0.2+10.orig/src/java.base/unix/native/libjava/childproc.h jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.h
+--- jdk12u-jdk-12.0.2+10.orig/src/java.base/unix/native/libjava/childproc.h	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.h	2021-11-28 17:07:49.040530118 +0100
+@@ -118,7 +118,7 @@
+  * 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/bug_8238386.patch b/bug_8238386.patch
new file mode 100644
index 000000000000..79de5de3a3d2
--- /dev/null
+++ b/bug_8238386.patch
@@ -0,0 +1,39 @@
+diff -Naur jdk12u-jdk-12.0.2+10.orig/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/Sctp.h
+--- jdk12u-jdk-12.0.2+10.orig/src/jdk.sctp/unix/native/libsctp/Sctp.h	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/Sctp.h	2021-11-28 17:16:57.454740208 +0100
+@@ -322,12 +322,12 @@
+ 
+ #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 -Naur jdk12u-jdk-12.0.2+10.orig/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/SctpNet.c
+--- jdk12u-jdk-12.0.2+10.orig/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/SctpNet.c	2021-11-28 17:17:28.778497579 +0100
+@@ -43,6 +43,13 @@
+ 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;
diff --git a/bug_8238388.patch b/bug_8238388.patch
new file mode 100644
index 000000000000..63f156bff5c4
--- /dev/null
+++ b/bug_8238388.patch
@@ -0,0 +1,24 @@
+diff -Naur jdk12u-jdk-12.0.2+10.orig/src/java.security.jgss/share/native/libj2gss/NativeFunc.c jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
+--- jdk12u-jdk-12.0.2+10.orig/src/java.security.jgss/share/native/libj2gss/NativeFunc.c	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.c	2021-11-28 17:26:14.142894977 +0100
+@@ -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 -Naur jdk12u-jdk-12.0.2+10.orig/src/java.security.jgss/share/native/libj2gss/NativeFunc.h jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
+--- jdk12u-jdk-12.0.2+10.orig/src/java.security.jgss/share/native/libj2gss/NativeFunc.h	2019-07-16 18:38:28.000000000 +0200
++++ jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.h	2021-11-28 17:26:32.046873805 +0100
+@@ -277,6 +277,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