openjdk11: update to 11.0.17_8

1 files changed, 11 insertions, 20 deletions

diff --git a/openjdk11/build/openjdk11.SlackBuild b/openjdk11/build/openjdk11.SlackBuild
index dfb72b48..8b2ddfb8 100755
--- a/openjdk11/build/openjdk11.SlackBuild
+++ b/openjdk11/build/openjdk11.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id$
 # Copyright 2021, 2022 Lenard Spencer, Orlando, Florida, USA
 # Copyright 2022  Eric Hameleers, Eindhoven, NL
@@ -36,6 +36,8 @@
 # Changelog:   
 # 11.0.16_8-1: 08/aug/2022 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 11.0.17_8-1: 27/nov/2022 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh openjdk11.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -44,7 +46,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=openjdk11
-VERSION=${VERSION:-11.0.16}
+VERSION=${VERSION:-11.0.17}
 UPDVER=${UPDVER:-"8"}          # used as "+number" or "-ga"!
 PKGVER=${VERSION}_${UPDVER}
 BOOTVER=${BOOTVER:-"10.0.2+13"}
@@ -57,7 +59,8 @@ TAG=${TAG:-alien}
 # Do we bootstrap our Java11 using a binary Java10 or Java11 distribution?
 BOOTSTRAP=${BOOTSTRAP:-"NO"}
 
-DOCS="ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION LICENSE README"
+DOCS="ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION LICENSE README*"
+
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -104,7 +107,7 @@ esac
 # Sources:
 # Take care of the '-' or '+' in the archive name:
 [ "$UPDVER" == "ga" ] && EXTRAVER="-${UPDVER}" || EXTRAVER="+${UPDVER}"
-SOURCE[0]="$SRCDIR/sources//jdk11u-jdk-${VERSION}${EXTRAVER}.tar.gz"
+SOURCE[0]="$SRCDIR/sources/jdk11u-jdk-${VERSION}${EXTRAVER}.tar.gz"
 SRCURL[0]="https://github.com/openjdk/jdk11u/archive/jdk-${VERSION}${EXTRAVER}/jdk11u-jdk-${VERSION}${EXTRAVER}.tar.gz"
 
 if [ "${BOOTSTRAP}" != "NO" ]; then
@@ -276,22 +279,10 @@ fi
 
 # Generate a cacerts file from the certificates installed by ca-certificates
 # in Slackware - the "cacerts" in the OpenJDK sources may be outdated.
-# This will only work if we already have a proper JDK/JRE installed:
-if which keytool 1>/dev/null 2>&1 ; then
-  rm -f $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts 
-  mkdir certgen
-  ( cd certgen
-    cp $SRCDIR/scripts/generate-cacerts.pl .
-    for cert in /usr/share/ca-certificates/*/*.crt; do
-      openssl x509 -text -in "${cert}" >> all.crt
-    done
-    perl generate-cacerts.pl keytool all.crt
-    install -p -m0644 cacerts $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security
-  ) || true
-else
-  echo "** Not installing a fresh cacerts file !"
-  echo "** Missing keytool program (do you really have a Java installed?)"
-fi
+# 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
 
 # Symlinks are present in Slackware historically:
 ln -sf java $PKG/usr/lib${LIBDIRSUFFIX}/jdk${VERSION%%.*}