4 files changed, 39 insertions, 18 deletions
diff --git a/development/zulu-openjdk17/zulu-openjdk17.SlackBuild b/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
index 06c9ea27c2..82fbb653fb 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
+++ b/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for zulu-openjdk17
 
 # Copyright (c) 2021, Gustavo B. Schenkel <gustavo dot schenkel at gmail.com>
-# Copyright (c) 2022, Andrew Clemons, Tokyo Japan
+# Copyright (c) 2022-2024, Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -12,7 +12,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -26,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zulu-openjdk17
-VERSION=${VERSION:-17.0.5}
-ZULUVERSION=${ZULUVERSION:-17.38.21}
+VERSION=${VERSION:-17.0.11}
+ZULUVERSION=${ZULUVERSION:-17.50.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -51,22 +51,26 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i686" ]; then
   ZULU_ARCH=i686
+  ZULU_SUFFIX=""
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   ZULU_ARCH=x64
+  ZULU_SUFFIX=""
   LIBDIRSUFFIX="64"
 elif  [ "$ARCH" = "arm" ]; then
   ZULU_ARCH=aarch32hf
+  ZULU_SUFFIX="-c2"
   LIBDIRSUFFIX=""
 elif  [ "$ARCH" = "aarch64" ]; then
   ZULU_ARCH=aarch64
+  ZULU_SUFFIX=""
   LIBDIRSUFFIX="64"
 else
   echo "Architecture ${ARCH} is not supported."
   exit 1
 fi
 
-SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_$ZULU_ARCH
+SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}$ZULU_SUFFIX-linux_$ZULU_ARCH
 
 set -e
 
@@ -85,6 +89,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+if [ "$ARCH" = "aarch64" ] ; then
+  find $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+    | cut -f 1 -d : | xargs patchelf --set-interpreter /lib64/ld-linux-aarch64.so.1 2> /dev/null || true
+fi
+
+find $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true
+
 mkdir -p ${PKG}/etc/profile.d
 for SCRIPT in ${PRGNAM}.sh ${PRGNAM}.csh ; do
   sed -e s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g ${CWD}/${SCRIPT} > ${PKG}/etc/profile.d/${SCRIPT}
@@ -106,5 +117,5 @@ cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.
 mkdir -p ${PKG}/install
 cat ${CWD}/slack-desc > ${PKG}/install/slack-desc
 
-cd ${PKG}
-/sbin/makepkg -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.$PKGTYPE
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/zulu-openjdk17/zulu-openjdk17.csh b/development/zulu-openjdk17/zulu-openjdk17.csh
index 0f7eefc2c6..f2ee2498cd 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.csh
+++ b/development/zulu-openjdk17/zulu-openjdk17.csh
@@ -2,4 +2,9 @@
 setenv JAVA_HOME /usr/lib%LIBDIRSUFFIX%/zulu-openjdk17
 setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
 setenv PATH ${PATH}:${JAVA_HOME}/bin
-setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server
+
+if ($?LD_LIBRARY_PATH == 1) then
+  setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server
+else
+  setenv LD_LIBRARY_PATH ${JAVA_HOME}/lib/server
+endif
diff --git a/development/zulu-openjdk17/zulu-openjdk17.info b/development/zulu-openjdk17/zulu-openjdk17.info
index f9e1ddfb08..da41a715e8 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.info
+++ b/development/zulu-openjdk17/zulu-openjdk17.info
@@ -1,14 +1,14 @@
 PRGNAM="zulu-openjdk17"
-VERSION="17.0.5"
+VERSION="17.0.11"
 HOMEPAGE="https://www.azul.com/downloads/"
-DOWNLOAD="https://cdn.azul.com/zulu-embedded/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch32hf.tar.gz \
-          https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_i686.tar.gz"
-MD5SUM="4981d71bb53e235f808120e6235ac16c \
-        01cfc50c7c098a47256ec35ba4050f7d"
-DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz \
-                 https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz"
-MD5SUM_x86_64="f6cd6277a01caa1a43d296ccc3075f95 \
-               b3b418940e5c9e6bf0f38fc2e03d33b8"
+DOWNLOAD="https://cdn.azul.com/zulu-embedded/bin/zulu17.50.19-ca-jdk17.0.11-c2-linux_aarch32hf.tar.gz \
+          https://cdn.azul.com/zulu/bin/zulu17.50.19-ca-jdk17.0.11-linux_i686.tar.gz"
+MD5SUM="33834000861b9b7d35d444013f6f4b49 \
+        8c5595b5cfc4d536233782d3ae0ae5a6"
+DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu17.50.19-ca-jdk17.0.11-linux_x64.tar.gz \
+                 https://cdn.azul.com/zulu/bin/zulu17.50.19-ca-jdk17.0.11-linux_aarch64.tar.gz"
+MD5SUM_x86_64="6497ded4396d535611ec401d785d440e \
+               1d5a9cd2a7831ed7311194722b431269"
 REQUIRES=""
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/development/zulu-openjdk17/zulu-openjdk17.sh b/development/zulu-openjdk17/zulu-openjdk17.sh
index 9eba29a1a2..4ca737961c 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.sh
+++ b/development/zulu-openjdk17/zulu-openjdk17.sh
@@ -2,4 +2,9 @@
 export JAVA_HOME=/usr/lib%LIBDIRSUFFIX%/zulu-openjdk17
 export MANPATH="${MANPATH}:${JAVA_HOME}/man"
 export PATH="${PATH}:${JAVA_HOME}/bin"
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server"
+
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="${JAVA_HOME}/lib/server"
+else
+  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server"
+fi