diff options
author | Muflone | 2023-12-23 21:31:14 +0100 |
---|---|---|
committer | Muflone | 2023-12-23 21:31:14 +0100 |
commit | fcc208f1aa714f04199e2d1f9da109b26f171fbe (patch) | |
tree | 0a1c850b9d17ffb53005cc1d4dc44d9bc532b846 | |
parent | 031cbb5cc835c6666e0109e2de56a4b8429c4aad (diff) | |
download | aur-fcc208f1aa714f04199e2d1f9da109b26f171fbe.tar.gz |
Updated package java-13-openjdk 13.0.14.u5-1
-rw-r--r-- | .SRCINFO | 32 | ||||
-rw-r--r-- | PKGBUILD | 42 | ||||
-rw-r--r-- | bug_8238380.patch | 23 | ||||
-rw-r--r-- | bug_8238386.patch | 39 | ||||
-rw-r--r-- | bug_8238388.patch | 24 |
5 files changed, 24 insertions, 136 deletions
@@ -1,6 +1,6 @@ pkgbase = java-13-openjdk - pkgver = 13.0.5.1.u1 - pkgrel = 2 + pkgver = 13.0.14.u5 + pkgrel = 1 url = https://openjdk.java.net/ arch = x86_64 license = custom @@ -27,20 +27,14 @@ pkgbase = java-13-openjdk makedepends = libnet makedepends = bash options = !lto - source = https://hg.openjdk.java.net/jdk-updates/jdk13u/archive/jdk-13.0.5.1+1.tar.gz + source = java-13-openjdk-13.0.14.u5.tar.gz::https://github.com/openjdk/jdk13u/archive/refs/tags/jdk-13.0.14+5.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 = 4c8e88490ed30276ea0145d37f33e094fcf436ce528bab29f6a9a3546820faf4 sha256sums = 4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580 sha256sums = d759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd sha256sums = 939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc - sha256sums = ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512 - sha256sums = 98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620 - sha256sums = e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a pkgname = jre13-openjdk-headless pkgdesc = OpenJDK Java 13 headless runtime environment @@ -55,7 +49,7 @@ pkgname = jre13-openjdk-headless 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-2 + provides = jre13-openjdk-headless=13.0.14.u5-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 @@ -74,33 +68,33 @@ pkgname = jre13-openjdk-headless pkgname = jre13-openjdk pkgdesc = OpenJDK Java 13 full runtime environment install = install_jre-openjdk.sh - depends = jre13-openjdk-headless=13.0.5.1.u1-2 + depends = jre13-openjdk-headless=13.0.14.u5-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-2 + provides = jre13-openjdk=13.0.14.u5-1 pkgname = jdk13-openjdk pkgdesc = OpenJDK Java 13 development kit install = install_jdk-openjdk.sh - depends = jre13-openjdk=13.0.5.1.u1-2 + depends = jre13-openjdk=13.0.14.u5-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-2 + provides = jdk13-openjdk=13.0.14.u5-1 pkgname = openjdk13-src pkgdesc = OpenJDK Java 13 sources - depends = jdk13-openjdk=13.0.5.1.u1-2 - provides = openjdk13-src=13.0.5.1.u1-2 + depends = jdk13-openjdk=13.0.14.u5-1 + provides = openjdk13-src=13.0.14.u5-1 pkgname = openjdk13-doc pkgdesc = OpenJDK Java 13 documentation - depends = jdk13-openjdk=13.0.5.1.u1-2 - provides = openjdk13-doc=13.0.5.1.u1-2 + depends = jdk13-openjdk=13.0.14.u5-1 + provides = openjdk13-doc=13.0.14.u5-1 @@ -8,9 +8,9 @@ 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=2 +_securityver=14 +_updatever=5 +pkgrel=1 pkgver="${_majorver}.${_minorver}.${_securityver}.u${_updatever}" _hg_tag="jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}" arch=('x86_64') @@ -21,20 +21,14 @@ makedepends=('java-environment-jdk<=13' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc' 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' 'libnet' 'bash') -source=("https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz" +source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/openjdk/jdk${_majorver}u/archive/refs/tags/${_hg_tag}.tar.gz" "freedesktop-java.desktop" "freedesktop-jconsole.desktop" - "freedesktop-jshell.desktop" - "bug_8238380.patch" - "bug_8238386.patch" - "bug_8238388.patch") -sha256sums=('c8ff6ceda71ec75aeeda6d037205f62fb5a5f4c59a572408201b4be9f00bda03' + "freedesktop-jshell.desktop") +sha256sums=('4c8e88490ed30276ea0145d37f33e094fcf436ce528bab29f6a9a3546820faf4' '4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580' 'd759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd' - '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc' - 'ae89106474b59a8e9b76e7645bcb05f0c45e6609f359b97f58147f9d55edc512' - '98cd6af562097fcb70ad0e533e9276f1a7b5c4a6b76755c811e8902c5d812620' - 'e25600513da65ea42b40785fef27d7a33ced1157269e733e9a92897a141b9e0a') + '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc') case "${CARCH}" in x86_64) _JARCH='x86_64';; @@ -42,7 +36,7 @@ case "${CARCH}" in esac _jvmdir="/usr/lib/jvm/java-${_majorver}-openjdk" -_jdkdir="jdk${_majorver}u-${_hg_tag}" +_jdkdir="jdk${_majorver}u-jdk-${_majorver}.${_minorver}.${_securityver}-${_updatever}" _imgdir="${_jdkdir}/build/linux-${_JARCH}-server-release/images" _nonheadless=(lib/libawt_xawt.{so,debuginfo} @@ -53,15 +47,6 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo} prepare() { # Use only Java versions 12-13 export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -E '12-|13-' -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() { @@ -130,12 +115,6 @@ build() { 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') @@ -219,7 +198,8 @@ package_jre13-openjdk() { package_jdk13-openjdk() { pkgdesc="OpenJDK Java ${_majorver} development kit" - depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf') + 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 @@ -262,7 +242,7 @@ package_jdk13-openjdk() { # 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" \ + "${srcdir}/${_jdkdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \ "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png" done diff --git a/bug_8238380.patch b/bug_8238380.patch deleted file mode 100644 index 2262e41c98d5..000000000000 --- a/bug_8238380.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 79de5de3a3d2..000000000000 --- a/bug_8238386.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 63f156bff5c4..000000000000 --- a/bug_8238388.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 |