development/OpenJDK17: Updated for version 17.0.10.

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

3 files changed, 31 insertions, 20 deletions

diff --git a/development/OpenJDK17/OpenJDK17.SlackBuild b/development/OpenJDK17/OpenJDK17.SlackBuild
index bcbb342ab9..fb25bfff3a 100644
--- a/development/OpenJDK17/OpenJDK17.SlackBuild
+++ b/development/OpenJDK17/OpenJDK17.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=OpenJDK17
-VERSION=${VERSION:-17.0.6}
+VERSION=${VERSION:-17.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -87,7 +87,7 @@ export BOOT_JAVA=$TMP/$BSDIR
 # Unpack the jtreg package to run the tests:
 if [ "${TESTS:-no}" = "yes" ]; then
   rm -rf $TMP/jtreg{,-reports}
-  tar xvf $CWD/jtreg-6.1+1.tar.gz
+  tar xvf $CWD/jtreg-7.3.1+1.tar.gz
   JTREG="--with-jtreg=$TMP/jtreg"
 else
   JTREG=""
@@ -132,12 +132,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 $PKG/usr/lib$LIBDIRSUFFIX/java/man $PKG/usr
 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 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/OpenJDK17/OpenJDK17.info b/development/OpenJDK17/OpenJDK17.info
index 6e511f4559..5a7f7b3341 100644
--- a/development/OpenJDK17/OpenJDK17.info
+++ b/development/OpenJDK17/OpenJDK17.info
@@ -1,18 +1,18 @@
 PRGNAM="OpenJDK17"
-VERSION="17.0.6"
+VERSION="17.0.10"
 HOMEPAGE="https://openjdk.java.net/"
-DOWNLOAD="https://github.com/openjdk/jdk17u/archive/jdk-17.0.6-ga/jdk17u-jdk-17.0.6-ga.tar.gz \
-          http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-16.0.2-ga-linux-i586-bin.tar.xz \
-          https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-17.0.1/jtreg-6.1+1.tar.gz"
-MD5SUM="b1e04cf1feec28c6d5aa2e3315d21bcf \
+DOWNLOAD="https://github.com/openjdk/jdk17u/archive/jdk-17.0.10-ga/jdk17u-jdk-17.0.10-ga.tar.gz \
+          https://slackware.uk/people/alien/slackbuilds/openjdk17/build/sources/OpenJDK-16.0.2-ga-linux-i586-bin.tar.xz \
+          https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz"
+MD5SUM="622d3d09c98173b875d839339fabe99f \
         1122a0355d0f85af1f4458965661d37f \
-        49e6bfa2506e96f461a01f9421a0961c"
-DOWNLOAD_x86_64="https://github.com/openjdk/jdk17u/archive/jdk-17.0.6-ga/jdk17u-jdk-17.0.6-ga.tar.gz \
-                 http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-16.0.2-ga-linux-x86_64-bin.tar.xz \
-                 https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-17.0.1/jtreg-6.1+1.tar.gz"
-MD5SUM_x86_64="b1e04cf1feec28c6d5aa2e3315d21bcf \
+        0038551ecaf37d0cd99832217f79e56d"
+DOWNLOAD_x86_64="https://github.com/openjdk/jdk17u/archive/jdk-17.0.10-ga/jdk17u-jdk-17.0.10-ga.tar.gz \
+                 https://slackware.uk/people/alien/slackbuilds/openjdk17/build/sources/OpenJDK-16.0.2-ga-linux-x86_64-bin.tar.xz \
+                 https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz"
+MD5SUM_x86_64="622d3d09c98173b875d839339fabe99f \
                5a78816bed3c90f4552dc2163282faca \
-               49e6bfa2506e96f461a01f9421a0961c"
+               0038551ecaf37d0cd99832217f79e56d"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/development/OpenJDK17/README b/development/OpenJDK17/README
index d3c65f9fc0..38d5533c40 100644
--- a/development/OpenJDK17/README
+++ b/development/OpenJDK17/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.
@@ -22,11 +22,13 @@ removed before running this script.
 
 To test the build, pass TESTS=yes.  This will unpack the jtreg package
 to run the tests.  You should expect to see somewhere in the area of
-about 30 to 40 failures and about a dozen errors. The reports will be
-saved in $TMP/jtreg-reports if you want to review them.
+about 40 failures and about a dozen errors. The reports will be 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.
 
-MANY thanks to the BLFS community for maintaining 32-bit builds of the
-later versions of OpenJDK we use for bootstrapping.
+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.