5 files changed, 65 insertions, 31 deletions
diff --git a/development/OpenJDK11/OpenJDK11.SlackBuild b/development/OpenJDK11/OpenJDK11.SlackBuild
index 17fa2388a2..a48caa2549 100644
--- a/development/OpenJDK11/OpenJDK11.SlackBuild
+++ b/development/OpenJDK11/OpenJDK11.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenJDK11
 
-# Copyright 2021, 2022 Lenard Spencer, Orlando, Florida, USA
+# Copyright 2021, 2022, 2023, 2024 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=OpenJDK11
-VERSION=${VERSION:-11.0.15}
+VERSION=${VERSION:-11.0.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -53,11 +53,12 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  BSARCH="i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  BSARCH="x86_64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -73,16 +74,24 @@ tar xvf $CWD/jdk11u-jdk-${VERSION}-ga.tar.gz
 
 # Building openjdk from source requires bootstrapping from either a
 # current or previous version of the (open)jdk binary installation.
-# Extract the OpenJDK10 binary to bootstrap
+# Extract the OpenJDK11 binary to bootstrap
 # (thanks to BLFS for the binary packages):
-rm -rf $TMP/OpenJDK-10.0.2+13-$BSARCH-bin
-tar xvf $CWD/OpenJDK-10.0.2+13-$BSARCH-bin.tar.xz
-export BOOT_JAVA=$TMP/OpenJDK-10.0.2+13-$BSARCH-bin
+if [ "$ARCH" = "x86_64" ]; then
+  export BSDIR="OpenJDK-11.0.2+9-x86_64-bin"
+  rm -rf $BSDIR
+  tar xvf $CWD/OpenJDK-11.0.2+9-x86_64-bin.tar.xz
+else
+  export BSDIR="OpenJDK-11.0.2+9-i686-bin"
+  rm -rf $BSDIR
+  tar xvf $CWD/OpenJDK-11.0.2+9-i686-bin.tar.xz
+fi
+
+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-4.2.0-tip.tar.gz
+  tar xvf $CWD/jtreg-7.3.1+1.tar.gz
   JTREG="--with-jtreg=$TMP/jtreg"
 else
   JTREG=""
@@ -127,12 +136,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 \
@@ -162,6 +172,8 @@ for s in 16 24 32 48; do
   install -vDm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
    $PKG/usr/share/icons/hicolor/${s}x${s}/apps/java.png
 done
+# the 24x24 icon is missized, so we fix it here:
+cp $CWD/java.png $PKG/usr/share/icons/hicolor/24x24/apps
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -187,9 +199,17 @@ 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 \
+  LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
 ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/legal
@@ -202,7 +222,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/usr/share/applications
 cat > $PKG/usr/share/applications/openjdk-java.desktop << EOF
 [Desktop Entry]
-Name=OpenJDK Java ${VERSION} Runtime
+Name=OpenJDK ${VERSION} Runtime
 Comment=OpenJDK Java ${VERSION} Runtime
 Exec=/usr/lib${LIBDIRSUFFIX}/java/bin/java -jar
 Terminal=false
@@ -221,7 +241,7 @@ Exec=/usr/lib${LIBDIRSUFFIX}/java/bin/jconsole
 Terminal=false
 Type=Application
 Icon=java
-Categories=Application;System;
+Categories=System;
 EOF
 
 # Create /etc/profile.d scripts:
diff --git a/development/OpenJDK11/OpenJDK11.info b/development/OpenJDK11/OpenJDK11.info
index 262577fb84..d84f3101f6 100644
--- a/development/OpenJDK11/OpenJDK11.info
+++ b/development/OpenJDK11/OpenJDK11.info
@@ -1,18 +1,18 @@
 PRGNAM="OpenJDK11"
-VERSION="11.0.15"
+VERSION="11.0.24"
 HOMEPAGE="https://openjdk.java.net/"
-DOWNLOAD="https://github.com/openjdk/jdk11u/archive/jdk-11.0.15-ga/jdk11u-jdk-11.0.15-ga.tar.gz \
-          https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-10.0.2/OpenJDK-10.0.2+13-i686-bin.tar.xz \
-          https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-16.0.2/jtreg-4.2.0-tip.tar.gz"
-MD5SUM="9d4798b6535e81e518279522a9c118b7 \
-        d66af9a4303ce9d0c93c92945048e361 \
-        11818f2ae4be19d2c7ae6501be60ee98"
-DOWNLOAD_x86_64="https://github.com/openjdk/jdk11u/archive/jdk-11.0.15-ga/jdk11u-jdk-11.0.15-ga.tar.gz \
-                 https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-10.0.2/OpenJDK-10.0.2+13-x86_64-bin.tar.xz \
-                 https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-16.0.2/jtreg-4.2.0-tip.tar.gz"
-MD5SUM_x86_64="9d4798b6535e81e518279522a9c118b7 \
-               a550f9e2aa1e8437346bb52a7b36052e \
-               11818f2ae4be19d2c7ae6501be60ee98"
+DOWNLOAD="https://github.com/openjdk/jdk11u/archive/jdk-11.0.24-ga/jdk11u-jdk-11.0.24-ga.tar.gz \
+          https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-11.0.2/OpenJDK-11.0.2+9-i686-bin.tar.xz \
+          https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz"
+MD5SUM="2033f5a1f9b2395c343714d059d1c925 \
+        2b917647040e9804e0f3ccd51f40394b \
+        0038551ecaf37d0cd99832217f79e56d"
+DOWNLOAD_x86_64="https://github.com/openjdk/jdk11u/archive/jdk-11.0.24-ga/jdk11u-jdk-11.0.24-ga.tar.gz \
+                 https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-11.0.2/OpenJDK-11.0.2+9-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="2033f5a1f9b2395c343714d059d1c925 \
+               86ac6b057637f8b0b21bae13071e574e \
+               0038551ecaf37d0cd99832217f79e56d"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/development/OpenJDK11/README b/development/OpenJDK11/README
index bb738313e4..2ede0a1543 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.
@@ -22,11 +22,19 @@ 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 20 to 30 failures and about 30 to 40 errors. The reports will be
+about 2 dozen failures and about 2 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.
+NOTE: This needs almost 4 GB of storage to build, so if space on your
+/tmp is limited, you may want to adjust $TMP to another partition.
+
+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 and 64 bit builds
+of OpenJDK 11 we use for bootstrapping.
diff --git a/development/OpenJDK11/doinst.sh b/development/OpenJDK11/doinst.sh
index ee4d704d04..39ec34e32e 100644
--- a/development/OpenJDK11/doinst.sh
+++ b/development/OpenJDK11/doinst.sh
@@ -7,3 +7,9 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/development/OpenJDK11/java.png b/development/OpenJDK11/java.png
new file mode 100644
index 0000000000..607a4d9b22
--- /dev/null
+++ b/development/OpenJDK11/java.png