From 0c462960660e1253a37f6caac29ebd4b576895bf Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:31:33 -0500
Subject: [PATCH] add rhel9-aarch64 and rhel9-ppc64le types, update to 4.42

---
 ChangeLog         |  5 +++++
 ci/make-and-test  |  2 +-
 ci/privileged-run |  4 ++--
 cvmfsexec         |  2 +-
 makedist          | 30 ++++++++++++++++++++++++++----
 singcvmfs         |  2 +-
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 888bced..a7229f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+cvmfsexec-4.42 - 24 September 2024
+- Add rhel9-aarch64 and rhel9-ppc64le machine types.
+- In makedist help, split machine types from different distributions
+  onto different lines.
+
 cvmfsexec-4.41 - 9 September 2024
 - Switch to the archive for el7 epel packages.
 - Add CI checks on every pull request for a fairly through test of
diff --git a/ci/make-and-test b/ci/make-and-test
index 10636f0..13bb98c 100755
--- a/ci/make-and-test
+++ b/ci/make-and-test
@@ -62,7 +62,7 @@ for DIST in default osg egi; do
     SINGCVMFS_REPOSITORIES=atlas.cern.ch PATH=$PATH:$PWD/apptainer/bin \
         ./singcvmfs exec -cip docker://$DOCKER_HUB_URI sh -c \
         "ls /cvmfs/atlas.cern.ch/repo && mount|grep $CACHEPAT"
-    if [[ "$VERSION_ID" == 8* ]]; then
+    if [[ "$VERSION_ID" == 8* ]] || [[ "$VERSION_ID" == 9* ]]; then
         : try to at least make other supported architecture distributions
         for arch in aarch64 ppc64le; do
             rm -rf dist /tmp/cvmfsexec
diff --git a/ci/privileged-run b/ci/privileged-run
index 78c561a..a48e10a 100755
--- a/ci/privileged-run
+++ b/ci/privileged-run
@@ -5,11 +5,11 @@
 set -ex
 if [ -f /usr/bin/zypper ]; then
     # suse
-    zypper install -y tar gzip openssl-1_1 fuse fuse3 e2fsprogs fuse2fs
+    zypper install -y tar gzip procps openssl-1_1 fuse fuse3 e2fsprogs fuse2fs
 else
     # rhel
     yum install -y procps-ng cpio findutils fuse fuse3 e2fsprogs
-    if [[ $DOCKER_HUB_URI == *:8 ]]; then
+    if [[ $DOCKER_HUB_URI == *:8 ]] || [[ $DOCKER_HUB_URI == *:9 ]]; then
         yum install -y yum-utils
     fi
 fi
diff --git a/cvmfsexec b/cvmfsexec
index 758a95b..7de4894 100755
--- a/cvmfsexec
+++ b/cvmfsexec
@@ -9,7 +9,7 @@
 #set -x
 #PS4='c$$+ '
 
-VERSION=4.41
+VERSION=4.42
 
 usage()
 {
diff --git a/makedist b/makedist
index 3db1ec5..834eefe 100755
--- a/makedist
+++ b/makedist
@@ -5,7 +5,26 @@
 # Written by Dave Dykstra 17 April 2019
 #
 
-SUPPORTEDTYPES="rhel7-x86_64 rhel8-aarch64 rhel8-x86_64 rhel8-ppc64le rhel9-x86_64 suse15-x86_64"
+SUPPORTEDTYPES="rhel7-x86_64 rhel8-aarch64 rhel8-x86_64 rhel8-ppc64le rhel9-aarch64 rhel9-x86_64 rhel9-ppc64le suse15-x86_64"
+
+supportedtypes() {
+    typeset LASTDISTRO=""
+    typeset TYPES=""
+    typeset TYPE THISDISTRO
+    for TYPE in $SUPPORTEDTYPES; do
+        THISDISTRO="${TYPE%-*}"
+        if [ "$THISDISTRO" != "$LASTDISTRO" ]; then
+            if [ -n "$TYPES" ]; then
+                echo "$1$TYPES" >&2
+            fi
+            LASTDISTRO="$THISDISTRO"
+            TYPES="$TYPE"
+        else
+            TYPES="$TYPES $TYPE"
+        fi
+    done
+    echo "$1$TYPES" >&2
+}
 
 usage()
 {
@@ -15,7 +34,7 @@ usage()
     echo " The first usage creates a distribution in 'dist' directory."
     echo "   The -m option selects machinetype for the distribution."
     echo "   The default is the current machine.  Supported types:"
-    echo "      $SUPPORTEDTYPES"
+    supportedtypes "     "
     echo " The second usage puts 'dist' and cvmfsexec tools into one script with the"
     echo "   given file name that self extracts and executes cvmfsexec."
     echo "   After extraction, files are left behind under '.cvmfsexec' in the same"
@@ -84,12 +103,14 @@ DISTRO="`distroname`"
 VERS="`distroversion`"
 ARCH="`distroarch`"
 
-MACHTYPE=$DISTRO$VERS-$ARCH
+if [ -z "$MACHTYPE" ]; then
+    MACHTYPE=$DISTRO$VERS-$ARCH
+fi
 
 if [[ " $SUPPORTEDTYPES " != *" $MACHTYPE "* ]]; then
     echo "$MACHTYPE not a supported machine type" >&2
     echo "Supported types are:" >&2
-    echo "  $SUPPORTEDTYPES" >&2
+    supportedtypes "  " >&2
     exit 1
 fi
 
@@ -235,6 +256,7 @@ if [ "$ARCH" = "ppc64le" ]; then
     fi
     CVMFSURL="$(dirname $CVMFSRPMURL)"
     CVMFSRPMNAME="$(basename $CVMFSRPMURL)"
+    CVMFSVERSION="`echo "$CVMFSRPMNAME" 's/.*cvmfs-\([^-]*\)-.*/\1/'`"
 else
     # Now that we can figure out the latest cvmfs version, download the
     #   corresponding cvmfs packages from CERN instead
diff --git a/singcvmfs b/singcvmfs
index 7ede655..9ecd8e2 100755
--- a/singcvmfs
+++ b/singcvmfs
@@ -3,7 +3,7 @@
 #   with the singularity --fusemount option.
 # Written by Dave Dykstra March 2020
 
-VERSION=4.41
+VERSION=4.42
 
 ME="`basename $0`"