development/zulu-openjdk17: Updated for version 17.0.4.1, new maint.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

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

4 files changed, 32 insertions, 16 deletions

diff --git a/development/zulu-openjdk17/zulu-openjdk17.SlackBuild b/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
index a3600673dbf18..9e5f7dd1d7500 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
+++ b/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
@@ -3,6 +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
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +26,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zulu-openjdk17
-VERSION=${VERSION:-17.0.2}
-ZULUVERSION=${ZULUVERSION:-17.32.13}
+VERSION=${VERSION:-17.0.4.1}
+ZULUVERSION32=${ZULUVERSION32:-17.36.19}
+ZULUVERSION64=${ZULUVERSION64:-17.36.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +52,19 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i686" ]; then
   ZULU_ARCH=i686
+  ZULUVERSION=$ZULUVERSION32
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   ZULU_ARCH=x64
+  ZULUVERSION=$ZULUVERSION64
+  LIBDIRSUFFIX="64"
+elif  [ "$ARCH" = "arm" ]; then
+  ZULU_ARCH=aarch32hf
+  ZULUVERSION=$ZULUVERSION32
+  LIBDIRSUFFIX=""
+elif  [ "$ARCH" = "aarch64" ]; then
+  ZULU_ARCH=aarch64
+  ZULUVERSION=$ZULUVERSION64
   LIBDIRSUFFIX="64"
 else
   echo "Architecture ${ARCH} is not supported."
@@ -66,8 +78,8 @@ set -e
 rm -rf ${PKG}
 mkdir -p ${TMP} ${PKG} ${OUTPUT}
 
-mkdir -p ${PKG}/usr/lib64/
-cd ${PKG}/usr/lib64/
+mkdir -p ${PKG}/usr/lib$LIBDIRSUFFIX/
+cd ${PKG}/usr/lib$LIBDIRSUFFIX/
 tar xvf ${CWD}/${SRCNAM}.tar.gz
 mv ${SRCNAM} ${PRGNAM}
 
@@ -80,7 +92,7 @@ find -L . \
 
 mkdir -p ${PKG}/etc/profile.d
 for SCRIPT in ${PRGNAM}.sh ${PRGNAM}.csh ; do
-  cat ${CWD}/${SCRIPT} > ${PKG}/etc/profile.d/${SCRIPT}
+  sed -e s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g ${CWD}/${SCRIPT} > ${PKG}/etc/profile.d/${SCRIPT}
   chmod 755 ${PKG}/etc/profile.d/${SCRIPT}
 done
 
@@ -88,10 +100,10 @@ mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 
 # move folder demo/ in documentation directory
 #
-mv ${PKG}/usr/lib64/${PRGNAM}/demo ${PKG}/usr/doc/${PRGNAM}-${VERSION}
+mv ${PKG}/usr/lib$LIBDIRSUFFIX/${PRGNAM}/demo ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 
 for CFILE in DISCLAIMER Welcome.html readme.txt ; do
-  mv ${PKG}/usr/lib64/${PRGNAM}/${CFILE} ${PKG}/usr/doc/${PRGNAM}-${VERSION}
+  mv ${PKG}/usr/lib$LIBDIRSUFFIX/${PRGNAM}/${CFILE} ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 done
 
 cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
diff --git a/development/zulu-openjdk17/zulu-openjdk17.csh b/development/zulu-openjdk17/zulu-openjdk17.csh
index de5f757fd8160..0f7eefc2c626f 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.csh
+++ b/development/zulu-openjdk17/zulu-openjdk17.csh
@@ -1,5 +1,5 @@
 #!/bin/csh
-setenv JAVA_HOME /usr/lib64/zulu-openjdk17
+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
diff --git a/development/zulu-openjdk17/zulu-openjdk17.info b/development/zulu-openjdk17/zulu-openjdk17.info
index a54e490bb19ac..034eaaffdfac0 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.info
+++ b/development/zulu-openjdk17/zulu-openjdk17.info
@@ -1,10 +1,14 @@
 PRGNAM="zulu-openjdk17"
-VERSION="17.0.2"
+VERSION="17.0.4.1"
 HOMEPAGE="https://www.azul.com/downloads/"
-DOWNLOAD="https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_i686.tar.gz"
-MD5SUM="7d0f12884ce51289cb4520e2abb7afd3"
-DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz"
-MD5SUM_x86_64="159fc999c02b9cf3e78028f769981c72"
+DOWNLOAD="https://cdn.azul.com/zulu-embedded/bin/zulu17.36.19-ca-jdk17.0.4.1-linux_aarch32hf.tar.gz \
+          https://cdn.azul.com/zulu/bin/zulu17.36.19-ca-jdk17.0.4.1-linux_i686.tar.gz"
+MD5SUM="1bfd3a835d440e4ef911a6321ad2933c \
+        5a0e73d69e40ba9bdcdf742891e41286"
+DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu17.36.17-ca-jdk17.0.4.1-linux_x64.tar.gz \
+                 https://cdn.azul.com/zulu/bin/zulu17.36.17-ca-jdk17.0.4.1-linux_aarch64.tar.gz"
+MD5SUM_x86_64="1bdbbf13616542c3edcf3a665a900f83 \
+               e60d25c1c7f5e8f9318969548d1c8f2f"
 REQUIRES=""
-MAINTAINER="Sébastien Ballet"
-EMAIL="slacker6896@gmail.com"
+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 35665ad9d87d3..9eba29a1a25bd 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.sh
+++ b/development/zulu-openjdk17/zulu-openjdk17.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export JAVA_HOME=/usr/lib64/zulu-openjdk17
+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"