summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuflone2021-11-28 22:17:49 +0100
committerMuflone2021-11-28 22:17:49 +0100
commitc131d8ffa55cc321e2d76cbcaa28d2855affb42b (patch)
tree1c009edc8203590e94b328edac67588638fa5555
downloadaur-c131d8ffa55cc321e2d76cbcaa28d2855affb42b.tar.gz
New package base java-13-openjdk 13.0.5.1.u1-1
-rw-r--r--.SRCINFO105
-rw-r--r--PKGBUILD292
-rw-r--r--bug_8238380.patch23
-rw-r--r--bug_8238386.patch39
-rw-r--r--bug_8238388.patch24
-rw-r--r--freedesktop-java.desktop12
-rw-r--r--freedesktop-jconsole.desktop11
-rw-r--r--freedesktop-jshell.desktop9
-rw-r--r--install_jdk-openjdk.sh50
-rw-r--r--install_jre-openjdk-headless.sh48
-rw-r--r--install_jre-openjdk.sh35
11 files changed, 648 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..292720f5aa84
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,105 @@
+pkgbase = java-13-openjdk
+ pkgver = 13.0.5.1.u1
+ pkgrel = 1
+ url = https://openjdk.java.net/
+ arch = x86_64
+ license = custom
+ makedepends = java-environment-jdk<=13
+ makedepends = cpio
+ makedepends = unzip
+ makedepends = zip
+ makedepends = libelf
+ makedepends = libcups
+ makedepends = libx11
+ makedepends = libxrender
+ makedepends = libxtst
+ makedepends = libxt
+ makedepends = libxext
+ makedepends = libxrandr
+ makedepends = alsa-lib
+ makedepends = pandoc
+ makedepends = graphviz
+ makedepends = freetype2
+ makedepends = libjpeg-turbo
+ makedepends = giflib
+ makedepends = libpng
+ makedepends = lcms2
+ makedepends = libnet
+ makedepends = bash
+ source = http://hg.openjdk.java.net/jdk-updates/jdk13u/archive/jdk-13.0.5.1+1.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 = c8ff6ceda71ec75aeeda6d037205f62fb5a5f4c59a572408201b4be9f00bda03
+ sha256sums = 4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580
+ sha256sums = d759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd
+ sha256sums = 939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc
+ sha256sums = ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512
+ sha256sums = 98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620
+ sha256sums = e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a
+
+pkgname = jre13-openjdk-headless
+ pkgdesc = OpenJDK Java 13 headless runtime environment
+ install = install_jre-openjdk-headless.sh
+ depends = java-runtime-common>=3
+ depends = ca-certificates-utils
+ depends = nss
+ depends = libjpeg-turbo
+ depends = lcms2
+ depends = libnet
+ depends = freetype2
+ optdepends = java-rhino: for some JavaScript support
+ provides = java-runtime-headless=13
+ provides = java-runtime-headless-openjdk=13
+ provides = jre13-openjdk-headless=13.0.5.1.u1-1
+ backup = etc/java-13-openjdk/logging.properties
+ backup = etc/java-13-openjdk/management/jmxremote.access
+ backup = etc/java-13-openjdk/management/jmxremote.password.template
+ backup = etc/java-13-openjdk/management/management.properties
+ backup = etc/java-13-openjdk/net.properties
+ backup = etc/java-13-openjdk/security/java.policy
+ backup = etc/java-13-openjdk/security/java.security
+ backup = etc/java-13-openjdk/security/policy/README.txt
+ backup = etc/java-13-openjdk/security/policy/limited/default_US_export.policy
+ backup = etc/java-13-openjdk/security/policy/limited/default_local.policy
+ backup = etc/java-13-openjdk/security/policy/limited/exempt_local.policy
+ backup = etc/java-13-openjdk/security/policy/unlimited/default_US_export.policy
+ backup = etc/java-13-openjdk/security/policy/unlimited/default_local.policy
+ backup = etc/java-13-openjdk/sound.properties
+
+pkgname = jre13-openjdk
+ pkgdesc = OpenJDK Java 13 full runtime environment
+ install = install_jre-openjdk.sh
+ depends = jre13-openjdk-headless=13.0.5.1.u1-1
+ 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=13
+ provides = java-runtime-openjdk=13
+ provides = jre13-openjdk=13.0.5.1.u1-1
+
+pkgname = jdk13-openjdk
+ pkgdesc = OpenJDK Java 13 development kit
+ install = install_jdk-openjdk.sh
+ depends = jre13-openjdk=13.0.5.1.u1-1
+ depends = java-environment-common=3
+ depends = hicolor-icon-theme
+ depends = libelf
+ provides = java-environment=13
+ provides = java-environment-jdk=13
+ provides = java-environment-openjdk=13
+ provides = jdk13-openjdk=13.0.5.1.u1-1
+
+pkgname = openjdk13-src
+ pkgdesc = OpenJDK Java 13 sources
+ depends = jdk13-openjdk=13.0.5.1.u1-1
+ provides = openjdk13-src=13.0.5.1.u1-1
+
+pkgname = openjdk13-doc
+ pkgdesc = OpenJDK Java 13 documentation
+ depends = jdk13-openjdk=13.0.5.1.u1-1
+ provides = openjdk13-doc=13.0.5.1.u1-1
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..44a258d05976
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,292 @@
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
+
+# TODO add test, see about packaging jtreg and using it here
+
+pkgbase=java-13-openjdk
+pkgname=('jre13-openjdk-headless' 'jre13-openjdk' 'jdk13-openjdk' 'openjdk13-src' 'openjdk13-doc')
+_majorver=13
+_minorver=0
+_securityver=5.1
+_updatever=1
+pkgrel=1
+pkgver="${_majorver}.${_minorver}.${_securityver}.u${_updatever}"
+_hg_tag="jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}"
+arch=('x86_64')
+url='https://openjdk.java.net/'
+license=('custom')
+makedepends=('java-environment-jdk<=13' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
+ 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
+ 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
+ 'libnet' 'bash')
+source=("http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz"
+ "freedesktop-java.desktop"
+ "freedesktop-jconsole.desktop"
+ "freedesktop-jshell.desktop"
+ "bug_8238380.patch"
+ "bug_8238386.patch"
+ "bug_8238388.patch")
+sha256sums=('c8ff6ceda71ec75aeeda6d037205f62fb5a5f4c59a572408201b4be9f00bda03'
+ '4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580'
+ 'd759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd'
+ '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc'
+ 'ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512'
+ '98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620'
+ 'e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a')
+
+case "${CARCH}" in
+ x86_64) _JARCH='x86_64';;
+ i686) _JARCH='x86';;
+esac
+
+_jvmdir="/usr/lib/jvm/java-${_majorver}-openjdk"
+_jdkdir="jdk${_majorver}u-${_hg_tag}"
+_imgdir="${_jdkdir}/build/linux-${_JARCH}-server-release/images"
+
+_nonheadless=(lib/libawt_xawt.{so,debuginfo}
+ lib/libjawt.{so,debuginfo}
+ lib/libjsound.{so,debuginfo}
+ lib/libsplashscreen.{so,debuginfo})
+
+prepare() {
+ # Avoid the use of any Java 8-11, 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-' -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() {
+ cd "${_jdkdir}"
+
+ NUM_PROC_OPT=''
+ MAKEFLAG_J="$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p')"
+ if [ -n "${MAKEFLAG_J}" ]; then
+ # http://hg.openjdk.java.net/jdk10/jdk10/file/85e6cb013b98/make/InitSupport.gmk#l105
+ echo "Removing '-j${MAKEFLAG_J}' from MAKEFLAGS to prevent build fail. Passing it directly to ./configure."
+ export MAKEFLAGS="${MAKEFLAGS/-j${MAKEFLAG_J}/}"
+ NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}"
+ fi
+
+ # Avoid optimization of HotSpot to be lowered from O3 to O2
+ local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS}"
+ local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS}"
+ local _LDFLAGS="${LDFLAGS}"
+ if [[ ${CARCH} = i686 ]]; then
+ echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture"
+ _CFLAGS="${CFLAGS/-fno-plt/}"
+ _CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+ fi
+
+ # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning
+ # in the output of ./configure unless used like such:
+ # --with-extra-cflags="${CFLAGS}"
+ # --with-extra-cxxflags="${CXXFLAGS}"
+ # --with-extra-ldflags="${LDFLAGS}"
+ # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_hg_tag}/common/doc/building.md
+ unset CFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+
+ bash configure \
+ --with-version-build="${_updatever}" \
+ --with-version-pre="" \
+ --with-version-opt="" \
+ --with-stdc++lib=dynamic \
+ --with-extra-cflags="${_CFLAGS}" \
+ --with-extra-cxxflags="${_CXXFLAGS}" \
+ --with-extra-ldflags="${_LDFLAGS}" \
+ --with-libjpeg=system \
+ --with-giflib=system \
+ --with-libpng=system \
+ --with-lcms=system \
+ --with-zlib=system \
+ --with-jvm-features=zgc \
+ --with-boot-jdk="${JAVA_HOME}" \
+ --enable-unlimited-crypto \
+ --disable-warnings-as-errors \
+ "${NUM_PROC_OPT}"
+ #--disable-javac-server
+
+ make images legacy-jre-image docs
+
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
+}
+
+check() {
+ cd "jdk${_majorver}u-${_hg_tag}"
+ # TODO package jtreg
+ # make -k check
+}
+
+package_jre13-openjdk-headless() {
+ pkgdesc="OpenJDK Java ${_majorver} headless runtime environment"
+ depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2')
+ optdepends=('java-rhino: for some JavaScript support')
+ provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+ backup=("etc/${pkgbase}/logging.properties"
+ "etc/${pkgbase}/management/jmxremote.access"
+ "etc/${pkgbase}/management/jmxremote.password.template"
+ "etc/${pkgbase}/management/management.properties"
+ "etc/${pkgbase}/net.properties"
+ "etc/${pkgbase}/security/java.policy"
+ "etc/${pkgbase}/security/java.security"
+ "etc/${pkgbase}/security/policy/README.txt"
+ "etc/${pkgbase}/security/policy/limited/default_US_export.policy"
+ "etc/${pkgbase}/security/policy/limited/default_local.policy"
+ "etc/${pkgbase}/security/policy/limited/exempt_local.policy"
+ "etc/${pkgbase}/security/policy/unlimited/default_US_export.policy"
+ "etc/${pkgbase}/security/policy/unlimited/default_local.policy"
+ "etc/${pkgbase}/sound.properties")
+ install=install_jre-openjdk-headless.sh
+
+ cd "${_imgdir}/jre"
+
+ install -dm 755 "${pkgdir}${_jvmdir}"
+
+ cp -a bin lib \
+ "${pkgdir}${_jvmdir}"
+
+ for f in "${_nonheadless[@]}"; do
+ rm "${pkgdir}${_jvmdir}/${f}"
+ done
+
+ cp ../jdk/release "${pkgdir}${_jvmdir}"
+ cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib"
+
+ # Conf
+ install -dm 755 "${pkgdir}/etc"
+ cp -r conf "${pkgdir}/etc/${pkgbase}"
+ ln -s "/etc/${pkgbase}" "${pkgdir}/${_jvmdir}/conf"
+
+ # Legal
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
+ ln -s "${pkgbase}" "${pkgdir}/usr/share/licenses/${pkgname}"
+ ln -s "/usr/share/licenses/${pkgbase}" "${pkgdir}/${_jvmdir}/legal"
+
+ # Man pages
+ for f in bin/*; do
+ f=$(basename "${f}")
+ _man=../jdk/man/man1/"${f}.1"
+ test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+ done
+ ln -s "/usr/share/man" "${pkgdir}/${_jvmdir}/man"
+
+ # Link JKS keystore from ca-certificates-utils
+ rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
+ ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+}
+
+package_jre13-openjdk() {
+ pkgdesc="OpenJDK Java ${_majorver} full runtime environment"
+ depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib')
+ optdepends=('alsa-lib: for basic sound support'
+ 'gtk2: for the Gtk+ 2 look and feel - desktop usage'
+ 'gtk3: for the Gtk+ 3 look and feel - desktop usage')
+ provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ install=install_jre-openjdk.sh
+
+ cd "${_imgdir}/jre"
+
+ install -dm 755 "${pkgdir}${_jvmdir}"
+
+ for f in "${_nonheadless[@]}"; do
+ install -Dm 644 "${f}" "${pkgdir}${_jvmdir}/${f}"
+ done
+
+ # Licenses
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ ln -s "${pkgbase}" "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk13-openjdk() {
+ pkgdesc="OpenJDK Java ${_majorver} development kit"
+ depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf')
+ provides=("java-environment=${_majorver}" "java-environment-jdk=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ install=install_jdk-openjdk.sh
+
+ cd "${_imgdir}/jdk"
+
+ install -dm 755 "${pkgdir}${_jvmdir}"
+
+ cp -a bin demo include jmods lib \
+ "${pkgdir}${_jvmdir}"
+
+ rm "${pkgdir}${_jvmdir}/lib/src.zip"
+
+ # Remove files held by JRE
+ pushd ../jre
+ for d in bin lib; do
+ find "${d}" ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \;
+ done
+ popd
+ find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete
+
+ # Conf files all belong to JRE
+
+ # Legal
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
+ pushd ../jre/legal
+ find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \;
+ popd
+ find "${pkgdir}/usr/share/licenses" -type d -empty -delete
+ ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # Man pages
+ for f in bin/*; do
+ f=$(basename "${f}")
+ _man=man/man1/"${f}.1"
+ test -f "../jre/bin/${f}" && continue
+ test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+ done
+
+ # Icons
+ for s in 16 24 32 48; do
+ install -Dm 644 \
+ "${srcdir}/jdk${_majorver}u-${_hg_tag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png"
+ done
+
+ # Desktop files
+ for f in jconsole java jshell; do
+ install -Dm 644 \
+ "${srcdir}/freedesktop-${f}.desktop" \
+ "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
+ done
+}
+
+package_openjdk13-src() {
+ pkgdesc="OpenJDK Java ${_majorver} sources"
+ # Depends on JDK to get license files
+ depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ provides=("openjdk${_majorver}-src=${pkgver}-${pkgrel}")
+
+ install -Dm 644 -t "${pkgdir}${_jvmdir}/lib" "${_imgdir}/jdk/lib/src.zip"
+
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ ln -s "${pkgbase}" "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_openjdk13-doc() {
+ pkgdesc="OpenJDK Java ${_majorver} documentation"
+ # Depends on JDK to get license files
+ depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}")
+
+ install -dm 755 "${pkgdir}/usr/share/doc"
+ cp -r "${_imgdir}/docs" "${pkgdir}/usr/share/doc/${pkgbase}"
+
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ ln -s "${pkgbase}" "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
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
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
new file mode 100644
index 000000000000..dbbd26bc1436
--- /dev/null
+++ b/freedesktop-java.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenJDK Java 13 Runtime
+Name[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
+Comment=OpenJDK Java 13 Runtime
+Comment[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
+Keywords=java;runtime
+Exec=/usr/lib/jvm/java-13-openjdk/bin/java -jar
+Terminal=false
+Type=Application
+Icon=java13-openjdk
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
new file mode 100644
index 000000000000..6252b0d26fcb
--- /dev/null
+++ b/freedesktop-jconsole.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenJDK Java 13 Console
+Name[fi]=OpenJDK Java 13 - konsoli
+Comment=OpenJDK Java 13 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 13 - valvonta- ja hallintakonsoli
+Keywords=java;console;monitoring
+Exec=/usr/lib/jvm/java-13-openjdk/bin/jconsole
+Terminal=false
+Type=Application
+Icon=java13-openjdk
+Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
new file mode 100644
index 000000000000..6a684b24b967
--- /dev/null
+++ b/freedesktop-jshell.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=OpenJDK Java 13 Shell
+Comment=OpenJDK Java 13 Shell
+Keywords=java;shell
+Exec=/usr/lib/jvm/java-13-openjdk/bin/jshell
+Terminal=true
+Type=Application
+Icon=java13-openjdk
+Categories=Application;System;
diff --git a/install_jdk-openjdk.sh b/install_jdk-openjdk.sh
new file mode 100644
index 000000000000..2e9dc19995e8
--- /dev/null
+++ b/install_jdk-openjdk.sh
@@ -0,0 +1,50 @@
+THIS_JDK='java-13-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ ;;
+ ${THIS_JDK})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ default=$(fix_default)
+ if [ -z "${default}" ]; then
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+ # Check JRE is still available
+ if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ fi
+ fi
+}
diff --git a/install_jre-openjdk-headless.sh b/install_jre-openjdk-headless.sh
new file mode 100644
index 000000000000..c498dadf1e66
--- /dev/null
+++ b/install_jre-openjdk-headless.sh
@@ -0,0 +1,48 @@
+THIS_JRE='java-13-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ if [ -z "$(fix_default)" ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ default=$(fix_default)
+ if [ "x${default}" = "x${THIS_JRE}" ]; then
+ /usr/bin/archlinux-java unset
+ echo "No Java environment is set as default anymore"
+ fi
+}
diff --git a/install_jre-openjdk.sh b/install_jre-openjdk.sh
new file mode 100644
index 000000000000..408226ebc9f5
--- /dev/null
+++ b/install_jre-openjdk.sh
@@ -0,0 +1,35 @@
+THIS_JRE='java-13-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ echo "when you use a non-reparenting window manager,"
+ echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+}
+
+post_upgrade() {
+ if [ -z "$(fix_default)" ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+}