diff options
author | Muflone | 2021-11-28 20:25:12 +0100 |
---|---|---|
committer | Muflone | 2021-11-28 20:25:12 +0100 |
commit | 24fccb54111e32c866b3916c3f2c3db6886909ca (patch) | |
tree | 4d3018fafa3b61b1dd9132b43621434e1cc61b19 | |
download | aur-24fccb54111e32c866b3916c3f2c3db6886909ca.tar.gz |
New package base java-12-openjdk 12.0.2.u10-1
-rw-r--r-- | .SRCINFO | 109 | ||||
-rw-r--r-- | PKGBUILD | 304 | ||||
-rw-r--r-- | bug_8233880.patch | 22 | ||||
-rw-r--r-- | bug_8238380.patch | 23 | ||||
-rw-r--r-- | bug_8238386.patch | 39 | ||||
-rw-r--r-- | bug_8238388.patch | 24 | ||||
-rw-r--r-- | freedesktop-java.desktop | 12 | ||||
-rw-r--r-- | freedesktop-jconsole.desktop | 11 | ||||
-rw-r--r-- | freedesktop-jshell.desktop | 9 | ||||
-rw-r--r-- | install_jdk-openjdk.sh | 50 | ||||
-rw-r--r-- | install_jre-openjdk-headless.sh | 48 | ||||
-rw-r--r-- | install_jre-openjdk.sh | 35 | ||||
-rw-r--r-- | make_4.3.patch | 24 |
13 files changed, 710 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..9836587d4565 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,109 @@ +pkgbase = java-12-openjdk + pkgver = 12.0.2.u10 + pkgrel = 1 + url = https://openjdk.java.net/ + arch = x86_64 + license = custom + makedepends = java-environment<=12 + 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/jdk12u/archive/jdk-12.0.2+10.tar.gz + source = freedesktop-java.desktop + source = freedesktop-jconsole.desktop + source = freedesktop-jshell.desktop + source = bug_8233880.patch + source = bug_8238380.patch + source = bug_8238386.patch + source = bug_8238388.patch + source = make_4.3.patch + sha256sums = b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb + sha256sums = 779dba7cf4f5de7cd512adf969354ec4aefddb33d970757eb3c49ea1fd8d5184 + sha256sums = fa67642a8ba1173c30536a12dfbeeacf5d0f37918849057c1049b88a81f261ed + sha256sums = 0a1d66a3e4774d7fad267c8a4e726ecf362ae2f33df12439567e0fb249655c48 + sha256sums = c9ad7403157dbfcc0bddb5f9c1ef687a718cabb6e93f1bef74b364c527b3b2bf + sha256sums = ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512 + sha256sums = 98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620 + sha256sums = e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a + sha256sums = 41de6b84eacd0926b3c1ccb94ca013e554fe3cbe5ac6c8944f4492ca7317bb8c + +pkgname = jre12-openjdk-headless + pkgdesc = OpenJDK Java 12 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=12 + provides = java-runtime-headless-openjdk=12 + provides = jre12-openjdk-headless=12.0.2.u10-1 + backup = etc/java-12-openjdk/logging.properties + backup = etc/java-12-openjdk/management/jmxremote.access + backup = etc/java-12-openjdk/management/jmxremote.password.template + backup = etc/java-12-openjdk/management/management.properties + backup = etc/java-12-openjdk/net.properties + backup = etc/java-12-openjdk/security/java.policy + backup = etc/java-12-openjdk/security/java.security + backup = etc/java-12-openjdk/security/policy/README.txt + backup = etc/java-12-openjdk/security/policy/limited/default_US_export.policy + backup = etc/java-12-openjdk/security/policy/limited/default_local.policy + backup = etc/java-12-openjdk/security/policy/limited/exempt_local.policy + backup = etc/java-12-openjdk/security/policy/unlimited/default_US_export.policy + backup = etc/java-12-openjdk/security/policy/unlimited/default_local.policy + backup = etc/java-12-openjdk/sound.properties + +pkgname = jre12-openjdk + pkgdesc = OpenJDK Java 12 full runtime environment + install = install_jre-openjdk.sh + depends = jre12-openjdk-headless=12.0.2.u10-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=12 + provides = java-runtime-openjdk=12 + provides = jre12-openjdk=12.0.2.u10-1 + +pkgname = jdk12-openjdk + pkgdesc = OpenJDK Java 12 development kit + install = install_jdk-openjdk.sh + depends = jre12-openjdk=12.0.2.u10-1 + depends = java-environment-common=3 + depends = hicolor-icon-theme + depends = libelf + provides = java-environment=12 + provides = java-environment-jdk=12 + provides = java-environment-openjdk=12 + provides = jdk12-openjdk=12.0.2.u10-1 + +pkgname = openjdk12-src + pkgdesc = OpenJDK Java 12 sources + depends = jdk12-openjdk=12.0.2.u10-1 + provides = openjdk12-src=12.0.2.u10-1 + +pkgname = openjdk12-doc + pkgdesc = OpenJDK Java 12 documentation + depends = jdk12-openjdk=12.0.2.u10-1 + provides = openjdk12-doc=12.0.2.u10-1 diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..1ba011564fc5 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,304 @@ +# 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-12-openjdk +pkgname=('jre12-openjdk-headless' 'jre12-openjdk' 'jdk12-openjdk' 'openjdk12-src' 'openjdk12-doc') +_majorver=12 +_minorver=0 +_securityver=2 +_updatever=10 +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<=12' '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_8233880.patch" + "bug_8238380.patch" + "bug_8238386.patch" + "bug_8238388.patch" + "make_4.3.patch") +sha256sums=('b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb' + '779dba7cf4f5de7cd512adf969354ec4aefddb33d970757eb3c49ea1fd8d5184' + 'fa67642a8ba1173c30536a12dfbeeacf5d0f37918849057c1049b88a81f261ed' + '0a1d66a3e4774d7fad267c8a4e726ecf362ae2f33df12439567e0fb249655c48' + 'c9ad7403157dbfcc0bddb5f9c1ef687a718cabb6e93f1bef74b364c527b3b2bf' + 'ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512' + '98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620' + 'e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a' + '41de6b84eacd0926b3c1ccb94ca013e554fe3cbe5ac6c8944f4492ca7317bb8c') + +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-10, 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-' -m 1)" + + cd "${_jdkdir}" + # Support compilers with multi-digit major version numbers + # https://bugs.openjdk.java.net/browse/JDK-8233880 + patch -p1 -i "${srcdir}/bug_8233880.patch" + + # 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" + + # Fix for make 4.3 + # https://blog.csdn.net/qq_50795908/article/details/118827283 + patch -p1 -i "${srcdir}/make_4.3.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_jre12-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_jre12-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_jdk12-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_openjdk12-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_openjdk12-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_8233880.patch b/bug_8233880.patch new file mode 100644 index 000000000000..c215b16ba45f --- /dev/null +++ b/bug_8233880.patch @@ -0,0 +1,22 @@ + +# HG changeset patch +# User fweimer +# Date 1573592408 0 +# Node ID d6d8fdc95ed252fbce6080b93e52fbf61b54e30b +# Parent 1251d78fafbf9ab67937b450ea31a93fcbc121e7 +8233880: Support compilers with multi-digit major version numbers +Reviewed-by: tbell + +diff -r 1251d78fafbf -r d6d8fdc95ed2 make/autoconf/toolchain.m4 +--- a/make/autoconf/toolchain.m4 Tue Nov 12 20:14:49 2019 +0000 ++++ b/make/autoconf/toolchain.m4 Tue Nov 12 21:00:08 2019 +0000 +@@ -481,7 +481,7 @@ + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ + $SED -e 's/ *Copyright .*//'` + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ +- $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'` ++ $SED -e 's/^.* \(@<:@1-9@:>@<:@0-9@:>@*\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'` + elif test "x$TOOLCHAIN_TYPE" = xclang; then + # clang --version output typically looks like + # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) + 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..acd8701d759f --- /dev/null +++ b/freedesktop-java.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=OpenJDK Java 12 Runtime +Name[fi]=OpenJDK Java 12 - ajonaikainen ympäristö +Comment=OpenJDK Java 12 Runtime +Comment[fi]=OpenJDK Java 12 - ajonaikainen ympäristö +Keywords=java;runtime +Exec=/usr/lib/jvm/java-12-openjdk/bin/java -jar +Terminal=false +Type=Application +Icon=java12-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..acb6472d1bbd --- /dev/null +++ b/freedesktop-jconsole.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=OpenJDK Java 12 Console +Name[fi]=OpenJDK Java 12 - konsoli +Comment=OpenJDK Java 12 Monitoring & Management Console +Comment[fi]=OpenJDK Java 12 - valvonta- ja hallintakonsoli +Keywords=java;console;monitoring +Exec=/usr/lib/jvm/java-12-openjdk/bin/jconsole +Terminal=false +Type=Application +Icon=java12-openjdk +Categories=Application;System; diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop new file mode 100644 index 000000000000..16110b86b8e3 --- /dev/null +++ b/freedesktop-jshell.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=OpenJDK Java 12 Shell +Comment=OpenJDK Java 12 Shell +Keywords=java;shell +Exec=/usr/lib/jvm/java-12-openjdk/bin/jshell +Terminal=true +Type=Application +Icon=java12-openjdk +Categories=Application;System; diff --git a/install_jdk-openjdk.sh b/install_jdk-openjdk.sh new file mode 100644 index 000000000000..cf97693a4f72 --- /dev/null +++ b/install_jdk-openjdk.sh @@ -0,0 +1,50 @@ +THIS_JDK='java-12-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..a340d0bef3ad --- /dev/null +++ b/install_jre-openjdk-headless.sh @@ -0,0 +1,48 @@ +THIS_JRE='java-12-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..03d45d071447 --- /dev/null +++ b/install_jre-openjdk.sh @@ -0,0 +1,35 @@ +THIS_JRE='java-12-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 +} diff --git a/make_4.3.patch b/make_4.3.patch new file mode 100644 index 000000000000..6c65928dc17d --- /dev/null +++ b/make_4.3.patch @@ -0,0 +1,24 @@ +diff -Naur jdk12u-jdk-12.0.2+10.orig/make/common/MakeBase.gmk jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk +--- jdk12u-jdk-12.0.2+10.orig/make/common/MakeBase.gmk 2019-07-16 18:38:28.000000000 +0200 ++++ jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk 2021-11-28 16:36:13.183030878 +0100 +@@ -977,15 +977,16 @@ + # Param 2 - (optional) name of file to store value in + DependOnVariableHelper = \ + $(strip \ +- $(eval -include $(call DependOnVariableFileName, $1, $2)) \ ++ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \ ++ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \ + $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ +- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ ++ $(call MakeDir, $(dir $($1_filename))) \ + $(if $(findstring $(LOG_LEVEL), trace), \ + $(info NewVariable $1: >$(strip $($1))<) \ + $(info OldVariable $1: >$(strip $($1_old))<)) \ + $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ +- $(call DependOnVariableFileName, $1, $2))) \ +- $(call DependOnVariableFileName, $1, $2) \ ++ $($1_filename))) \ ++ $($1_filename) \ + ) + + # Main macro |