development/OpenJDK11: Updated for version 11.0.23.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 24 insertions, 10 deletions

diff --git a/development/OpenJDK11/OpenJDK11.SlackBuild b/development/OpenJDK11/OpenJDK11.SlackBuild
index 95c93e24f5..c8f24532fc 100644
--- a/development/OpenJDK11/OpenJDK11.SlackBuild
+++ b/development/OpenJDK11/OpenJDK11.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=OpenJDK11
-VERSION=${VERSION:-11.0.18}
+VERSION=${VERSION:-11.0.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -127,12 +127,13 @@ sh configure \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-giflib=system \
-  --with-harfbuzz=system \
+  --with-harfbuzz=bundled \
   --with-lcms=system \
   --with-libjpeg=system \
   --with-libpng=system \
-  --with-zlib=system \
+  --with-zlib=bundled \
   --disable-precompiled-headers \
+  --enable-libffi-bundling \
   --enable-unlimited-crypto \
   --disable-warnings-as-errors \
   --with-native-debug-symbols=none \
@@ -189,6 +190,14 @@ mv ja_JP.UTF-8 ja )
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# Thanks to AlienBOB for this part!
+# Generate a cacerts file from the certificates installed by ca-certificates
+# in Slackware - the "cacerts" in the OpenJDK sources may be outdated.
+# This requires 'trust' program from p11-kit:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts 
+trust extract --format=java-cacerts --filter=ca-anchors --purpose=server-auth \
+  $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION README.md \
diff --git a/development/OpenJDK11/OpenJDK11.info b/development/OpenJDK11/OpenJDK11.info
index d77c11e528..64b635534f 100644
--- a/development/OpenJDK11/OpenJDK11.info
+++ b/development/OpenJDK11/OpenJDK11.info
@@ -1,16 +1,16 @@
 PRGNAM="OpenJDK11"
-VERSION="11.0.18"
+VERSION="11.0.23"
 HOMEPAGE="https://openjdk.java.net/"
-DOWNLOAD="https://github.com/openjdk/jdk11u/archive/jdk-11.0.18-ga/jdk11u-jdk-11.0.18-ga.tar.gz \
+DOWNLOAD="https://github.com/openjdk/jdk11u/archive/jdk-11.0.23-ga/jdk11u-jdk-11.0.23-ga.tar.gz \
           https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-10.0.2/OpenJDK-10.0.2+13-i686-bin.tar.xz \
           http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/jtreg-6.1-1.tar.xz"
-MD5SUM="a7b663f0618e3d7e4eefc4b5e0f097b0 \
+MD5SUM="933114e589ecd40ac69eb56f05cfc8ba \
         d66af9a4303ce9d0c93c92945048e361 \
         e3389e74678dcf707b5b3d5ec6c7510d"
-DOWNLOAD_x86_64="https://github.com/openjdk/jdk11u/archive/jdk-11.0.18-ga/jdk11u-jdk-11.0.18-ga.tar.gz \
+DOWNLOAD_x86_64="https://github.com/openjdk/jdk11u/archive/jdk-11.0.23-ga/jdk11u-jdk-11.0.23-ga.tar.gz \
                  https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-10.0.2/OpenJDK-10.0.2+13-x86_64-bin.tar.xz \
                  http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/jtreg-6.1-1.tar.xz"
-MD5SUM_x86_64="a7b663f0618e3d7e4eefc4b5e0f097b0 \
+MD5SUM_x86_64="933114e589ecd40ac69eb56f05cfc8ba \
                a550f9e2aa1e8437346bb52a7b36052e \
                e3389e74678dcf707b5b3d5ec6c7510d"
 REQUIRES=""
diff --git a/development/OpenJDK11/README b/development/OpenJDK11/README
index bb738313e4..428b766aa8 100644
--- a/development/OpenJDK11/README
+++ b/development/OpenJDK11/README
@@ -5,7 +5,7 @@ developing, testing, and running programs written in Java.
 This script builds the package from source using the packages listed
 in the .info file (the source tarball plus a binary of the prevous
 version to bootstrap from), so it is not necessary to have a jdk
-package installed to build this package.
+package installed to build this package.  (See BIG FAT NOTE below.)
 
 By default, the source package uses all available cores to build the
 package, but this can be controlled by passing CORES=<x> to the script.
@@ -28,5 +28,10 @@ saved in $TMP/jtreg-reports if you want to review them.
 After installing this package you will need to logout/login to your
 machine as it will add new files to the /etc/profile.d folder.
 
+BIG FAT NOTE: If you have ANY JDK installed (jdk, zulu-openjdk,
+OpenJDK, etc.), you MUST first uninstall it, then logout/login to
+clear the JAVA_HOME folder from your $PATH in order to build this
+package, otherwise the build will fail.
+
 MANY thanks to the BLFS community for maintaining 32-bit builds of the
-later versions of OpenJDK we use for bootstrapping.
+later versions of OpenJDK 10 we use for bootstrapping.