From 7ea337f6b4fb0bda46c7472e6e6b873e16260ba2 Mon Sep 17 00:00:00 2001
From: sevenuz <julius@athenstaedt.net>
Date: Tue, 21 Jan 2025 14:45:44 +0100
Subject: [PATCH 1/4] update capstone to 5.0.5

---
 CHANGELOG.md                                             | 2 +-
 scripts/profiles/0.9.4/agios.specs                       | 2 +-
 scripts/profiles/0.9.4/arm.specs                         | 2 +-
 scripts/profiles/0.9.4/default.specs                     | 2 +-
 scripts/profiles/0.9.4/default_zmq.specs                 | 2 +-
 scripts/profiles/0.9.4/infiniband_verbs.specs            | 2 +-
 scripts/profiles/0.9.4/install/capstone.install          | 2 +-
 scripts/profiles/0.9.4/install/syscall_intercept.install | 7 ++++++-
 scripts/profiles/0.9.4/marenostrum4.specs                | 2 +-
 scripts/profiles/0.9.4/mogon2.specs                      | 2 +-
 scripts/profiles/0.9.4/mogon3.specs                      | 2 +-
 scripts/profiles/0.9.4/ngio.specs                        | 2 +-
 scripts/profiles/0.9.4/omnipath_psm2.specs               | 2 +-
 scripts/profiles/0.9.4/p9.specs                          | 4 ++--
 tests/scripts/dl_dep.sh/0.9.4/agios.out                  | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/arm.out                    | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/default.out                | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/default_zmq.out            | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out       | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out           | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/mogon2.out                 | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/mogon3.out                 | 4 ++--
 tests/scripts/dl_dep.sh/0.9.4/ngio.out                   | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out          | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/p9.out                     | 2 +-
 25 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a98f59b7..c582555e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### New
 ### Changed
-- Unify dependency scripts (dl and compile): Unify `-d` and `-p` flags ([!174](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/174)).
+- Update capstone to version 5.0.5 ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).
 - Support for `close_range` syscall. ([!201](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/201)).
   - Removal of `O_PATH` check in `gkfs_open`, allows cp with asterisk. This is for newer kernels.
   - Support to print newer syscall (although not implemented). Added syscall number to log for easy capture missing ones.
diff --git a/scripts/profiles/0.9.4/agios.specs b/scripts/profiles/0.9.4/agios.specs
index bda8a2c5..705aaf4c 100644
--- a/scripts/profiles/0.9.4/agios.specs
+++ b/scripts/profiles/0.9.4/agios.specs
@@ -38,7 +38,7 @@ comment="All dependencies (except transport-specific and experimental)"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/arm.specs b/scripts/profiles/0.9.4/arm.specs
index a207f517..cf39df46 100644
--- a/scripts/profiles/0.9.4/arm.specs
+++ b/scripts/profiles/0.9.4/arm.specs
@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/default.specs b/scripts/profiles/0.9.4/default.specs
index be1cc810..bce96e1c 100644
--- a/scripts/profiles/0.9.4/default.specs
+++ b/scripts/profiles/0.9.4/default.specs
@@ -38,7 +38,7 @@ comment="All dependencies"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/default_zmq.specs b/scripts/profiles/0.9.4/default_zmq.specs
index 65998036..7ef4d6d0 100644
--- a/scripts/profiles/0.9.4/default_zmq.specs
+++ b/scripts/profiles/0.9.4/default_zmq.specs
@@ -38,7 +38,7 @@ comment="All dependencies"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/infiniband_verbs.specs b/scripts/profiles/0.9.4/infiniband_verbs.specs
index 175ce1aa..70cca1b5 100644
--- a/scripts/profiles/0.9.4/infiniband_verbs.specs
+++ b/scripts/profiles/0.9.4/infiniband_verbs.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Infiniband supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/install/capstone.install b/scripts/profiles/0.9.4/install/capstone.install
index afd7794a..197481d6 100644
--- a/scripts/profiles/0.9.4/install/capstone.install
+++ b/scripts/profiles/0.9.4/install/capstone.install
@@ -48,7 +48,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release ..
+    ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS=ON ..
     make -j"${CORES}" install
 }
 
diff --git a/scripts/profiles/0.9.4/install/syscall_intercept.install b/scripts/profiles/0.9.4/install/syscall_intercept.install
index f69393d3..8bbe57ab 100644
--- a/scripts/profiles/0.9.4/install/syscall_intercept.install
+++ b/scripts/profiles/0.9.4/install/syscall_intercept.install
@@ -48,11 +48,16 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     EXTRA_INSTALL_ARGS="${PROFILE_EXTRA_INSTALL_ARGS[${ID}]}"
     prepare_build_dir "${CURR}"
+
+    # patch path for new capstone 5.0.5 include location
+    sed -i 's/\#include <capstone.h>/\#include <capstone\/capstone.h>/g' \
+      ${CURR}/src/capstone_wrapper.h
+
     if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then
         cd "${CURR}"/arch/aarch64/
         mkdir -p build
         cd build
-    else    
+    else
         cd "${CURR}"/build
     fi
     $CMAKE -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" \
diff --git a/scripts/profiles/0.9.4/marenostrum4.specs b/scripts/profiles/0.9.4/marenostrum4.specs
index f678fd93..ae6ed2e9 100644
--- a/scripts/profiles/0.9.4/marenostrum4.specs
+++ b/scripts/profiles/0.9.4/marenostrum4.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Marenostrum 4 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/mogon2.specs b/scripts/profiles/0.9.4/mogon2.specs
index 8f5801f0..60460588 100644
--- a/scripts/profiles/0.9.4/mogon2.specs
+++ b/scripts/profiles/0.9.4/mogon2.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Mogon 2 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.1"
     ["rocksdb"]="8.10.0"
     ["psm2"]="11.2.185"
diff --git a/scripts/profiles/0.9.4/mogon3.specs b/scripts/profiles/0.9.4/mogon3.specs
index 1eec2d16..ff754236 100644
--- a/scripts/profiles/0.9.4/mogon3.specs
+++ b/scripts/profiles/0.9.4/mogon3.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Mogon 2 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/ngio.specs b/scripts/profiles/0.9.4/ngio.specs
index d6988929..84a541a6 100644
--- a/scripts/profiles/0.9.4/ngio.specs
+++ b/scripts/profiles/0.9.4/ngio.specs
@@ -38,7 +38,7 @@ comment="Dependencies for NEXTGenIO prototype cluster"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/omnipath_psm2.specs b/scripts/profiles/0.9.4/omnipath_psm2.specs
index 3666fde8..80456367 100644
--- a/scripts/profiles/0.9.4/omnipath_psm2.specs
+++ b/scripts/profiles/0.9.4/omnipath_psm2.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Omnipath supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/scripts/profiles/0.9.4/p9.specs b/scripts/profiles/0.9.4/p9.specs
index c10ea7f4..6a679ebe 100644
--- a/scripts/profiles/0.9.4/p9.specs
+++ b/scripts/profiles/0.9.4/p9.specs
@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="4.0.2"
+    ["capstone"]="5.0.5"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -66,7 +66,7 @@ clonedeps_patches=(
 
 # Ordering that MUST be followed when downloading
 order=(
-    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" 
+    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date"
 )
 
 # Extra arguments passed to the installation script. As such, they can
diff --git a/tests/scripts/dl_dep.sh/0.9.4/agios.out b/tests/scripts/dl_dep.sh/0.9.4/agios.out
index 62276d28..b7288f0a 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/agios.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/agios.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/arm.out b/tests/scripts/dl_dep.sh/0.9.4/arm.out
index 86918584..36c40fe9 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/arm.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/arm.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/default.out b/tests/scripts/dl_dep.sh/0.9.4/default.out
index 501bc718..3a51e9a2 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/default.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/default.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out b/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out
index 01351e09..252eb68f 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out b/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out
index 970a2edd..94eb489b 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric%verbs' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out
index 1a8af2b9..11b0ae50 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/mogon2.out b/tests/scripts/dl_dep.sh/0.9.4/mogon2.out
index 442b8368..9e570e5c 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/mogon2.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/mogon2.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/mogon3.out b/tests/scripts/dl_dep.sh/0.9.4/mogon3.out
index 91c6a673..315bdb76 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/mogon3.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/mogon3.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
@@ -9,4 +9,4 @@ Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept'
 Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
 Downloaded 'https://github.com/zeromq/libzmq/archive/v4.3.5.tar.gz' to 'libzmq'
 Downloaded 'https://github.com/zeromq/cppzmq/archive/v4.10.0.tar.gz' to 'cppzmq'
-Done
\ No newline at end of file
+Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/ngio.out b/tests/scripts/dl_dep.sh/0.9.4/ngio.out
index 1a8af2b9..11b0ae50 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/ngio.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/ngio.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out
index 3d957553..523eb08c 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
diff --git a/tests/scripts/dl_dep.sh/0.9.4/p9.out b/tests/scripts/dl_dep.sh/0.9.4/p9.out
index e8e9a02d..ca7dc02d 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/p9.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/p9.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
-- 
GitLab


From 9e0ee7eaaee8eb3e59da1c9346c5d7cdf4868f79 Mon Sep 17 00:00:00 2001
From: Julius Athenstaedt <julius.athenstaedt@bsc.es>
Date: Fri, 31 Jan 2025 18:44:56 +0100
Subject: [PATCH 2/4] update capstone to 6.0.0-Alpha1, use new
 syscall_intercept commits

---
 CHANGELOG.md                                             | 2 +-
 scripts/profiles/0.9.4/agios.specs                       | 9 ++-------
 scripts/profiles/0.9.4/arm.specs                         | 9 ++-------
 scripts/profiles/0.9.4/default.specs                     | 9 ++-------
 scripts/profiles/0.9.4/default_zmq.specs                 | 9 ++-------
 scripts/profiles/0.9.4/infiniband_verbs.specs            | 9 ++-------
 scripts/profiles/0.9.4/install/syscall_intercept.install | 4 ----
 scripts/profiles/0.9.4/marenostrum4.specs                | 9 ++-------
 scripts/profiles/0.9.4/mogon2.specs                      | 9 ++-------
 scripts/profiles/0.9.4/mogon3.specs                      | 9 ++-------
 scripts/profiles/0.9.4/ngio.specs                        | 9 ++-------
 scripts/profiles/0.9.4/omnipath_psm2.specs               | 9 ++-------
 scripts/profiles/0.9.4/p9.specs                          | 2 +-
 tests/scripts/dl_dep.sh/0.9.4/agios.out                  | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/arm.out                    | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/default.out                | 6 ++----
 tests/scripts/dl_dep.sh/0.9.4/default_zmq.out            | 6 ++----
 tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out       | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out           | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/mogon2.out                 | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/mogon3.out                 | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/ngio.out                   | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out          | 5 ++---
 tests/scripts/dl_dep.sh/0.9.4/p9.out                     | 2 +-
 24 files changed, 43 insertions(+), 109 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c582555e..fb8b8c58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### New
 ### Changed
-- Update capstone to version 5.0.5 ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).
+- Update capstone to version 6.0.0-Alpha1 ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).
 - Support for `close_range` syscall. ([!201](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/201)).
   - Removal of `O_PATH` check in `gkfs_open`, allows cp with asterisk. This is for newer kernels.
   - Support to print newer syscall (although not implemented). Added syscall number to log for easy capture missing ones.
diff --git a/scripts/profiles/0.9.4/agios.specs b/scripts/profiles/0.9.4/agios.specs
index 705aaf4c..7c20ffaf 100644
--- a/scripts/profiles/0.9.4/agios.specs
+++ b/scripts/profiles/0.9.4/agios.specs
@@ -38,7 +38,7 @@ comment="All dependencies (except transport-specific and experimental)"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -49,7 +49,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"
 )
 
@@ -58,11 +58,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "agios"
diff --git a/scripts/profiles/0.9.4/arm.specs b/scripts/profiles/0.9.4/arm.specs
index cf39df46..39d609c2 100644
--- a/scripts/profiles/0.9.4/arm.specs
+++ b/scripts/profiles/0.9.4/arm.specs
@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -50,7 +50,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="fb73c3924b502e2840a5dc8a18746e395b06a8a6"
+    ["syscall_intercept"]="34a41033fce94195700c5ab1e097f40741d7f016"
 )
 
 # Extra arguments for git clone
@@ -58,11 +58,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch.arm64"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"
diff --git a/scripts/profiles/0.9.4/default.specs b/scripts/profiles/0.9.4/default.specs
index bce96e1c..89de15f5 100644
--- a/scripts/profiles/0.9.4/default.specs
+++ b/scripts/profiles/0.9.4/default.specs
@@ -38,7 +38,7 @@ comment="All dependencies"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -49,7 +49,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
 # Extra arguments for git clone
@@ -57,11 +57,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch syscall_intercept_clone3.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"
diff --git a/scripts/profiles/0.9.4/default_zmq.specs b/scripts/profiles/0.9.4/default_zmq.specs
index 7ef4d6d0..436c93ac 100644
--- a/scripts/profiles/0.9.4/default_zmq.specs
+++ b/scripts/profiles/0.9.4/default_zmq.specs
@@ -38,7 +38,7 @@ comment="All dependencies"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -51,7 +51,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
 # Extra arguments for git clone
@@ -59,11 +59,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch syscall_intercept_clone3.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "libzmq" "cppzmq"
diff --git a/scripts/profiles/0.9.4/infiniband_verbs.specs b/scripts/profiles/0.9.4/infiniband_verbs.specs
index 70cca1b5..abb00777 100644
--- a/scripts/profiles/0.9.4/infiniband_verbs.specs
+++ b/scripts/profiles/0.9.4/infiniband_verbs.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Infiniband supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -49,7 +49,7 @@ clonedeps=(
     ["libfabric%verbs"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
 # Extra arguments for git clone
@@ -57,11 +57,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading/installing
 order=(
     "lz4" "capstone" "json-c" "libfabric%verbs" "mercury" "argobots" "margo" "rocksdb"
diff --git a/scripts/profiles/0.9.4/install/syscall_intercept.install b/scripts/profiles/0.9.4/install/syscall_intercept.install
index 8bbe57ab..03a27be5 100644
--- a/scripts/profiles/0.9.4/install/syscall_intercept.install
+++ b/scripts/profiles/0.9.4/install/syscall_intercept.install
@@ -49,10 +49,6 @@ pkg_install() {
     EXTRA_INSTALL_ARGS="${PROFILE_EXTRA_INSTALL_ARGS[${ID}]}"
     prepare_build_dir "${CURR}"
 
-    # patch path for new capstone 5.0.5 include location
-    sed -i 's/\#include <capstone.h>/\#include <capstone\/capstone.h>/g' \
-      ${CURR}/src/capstone_wrapper.h
-
     if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then
         cd "${CURR}"/arch/aarch64/
         mkdir -p build
diff --git a/scripts/profiles/0.9.4/marenostrum4.specs b/scripts/profiles/0.9.4/marenostrum4.specs
index ae6ed2e9..0c20e8ba 100644
--- a/scripts/profiles/0.9.4/marenostrum4.specs
+++ b/scripts/profiles/0.9.4/marenostrum4.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Marenostrum 4 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -50,7 +50,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
     ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd"
 )
@@ -60,11 +60,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "parallax"
diff --git a/scripts/profiles/0.9.4/mogon2.specs b/scripts/profiles/0.9.4/mogon2.specs
index 60460588..42db16e8 100644
--- a/scripts/profiles/0.9.4/mogon2.specs
+++ b/scripts/profiles/0.9.4/mogon2.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Mogon 2 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.1"
     ["rocksdb"]="8.10.0"
     ["psm2"]="11.2.185"
@@ -50,7 +50,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.3.1"
     ["margo"]="v0.15.0"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
 )
 
@@ -59,11 +59,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "psm2"
diff --git a/scripts/profiles/0.9.4/mogon3.specs b/scripts/profiles/0.9.4/mogon3.specs
index ff754236..9e4c180b 100644
--- a/scripts/profiles/0.9.4/mogon3.specs
+++ b/scripts/profiles/0.9.4/mogon3.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Mogon 2 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -51,7 +51,7 @@ clonedeps=(
 #    ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
 # Extra arguments for git clone
@@ -59,11 +59,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "libzmq" "cppzmq"
diff --git a/scripts/profiles/0.9.4/ngio.specs b/scripts/profiles/0.9.4/ngio.specs
index 84a541a6..7ba84d41 100644
--- a/scripts/profiles/0.9.4/ngio.specs
+++ b/scripts/profiles/0.9.4/ngio.specs
@@ -38,7 +38,7 @@ comment="Dependencies for NEXTGenIO prototype cluster"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -50,7 +50,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
     ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd"
 )
@@ -60,11 +60,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "parallax"
diff --git a/scripts/profiles/0.9.4/omnipath_psm2.specs b/scripts/profiles/0.9.4/omnipath_psm2.specs
index 80456367..268b5292 100644
--- a/scripts/profiles/0.9.4/omnipath_psm2.specs
+++ b/scripts/profiles/0.9.4/omnipath_psm2.specs
@@ -38,7 +38,7 @@ comment="Dependencies for Omnipath supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -50,7 +50,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
 )
 
@@ -59,11 +59,6 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
     "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date"
diff --git a/scripts/profiles/0.9.4/p9.specs b/scripts/profiles/0.9.4/p9.specs
index 6a679ebe..a0abcf6a 100644
--- a/scripts/profiles/0.9.4/p9.specs
+++ b/scripts/profiles/0.9.4/p9.specs
@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="6.0.0-Alpha1"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
diff --git a/tests/scripts/dl_dep.sh/0.9.4/agios.out b/tests/scripts/dl_dep.sh/0.9.4/agios.out
index b7288f0a..9df97276 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/agios.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/agios.out
@@ -1,12 +1,11 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Cloned 'https://github.com/francielizanon/agios.git' to 'agios' with commit '[c26a6544200f823ebb8f890dd94e653d148bf226]' and flags '--branch=development'
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/arm.out b/tests/scripts/dl_dep.sh/0.9.4/arm.out
index 36c40fe9..abb22e38 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/arm.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/arm.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
@@ -7,6 +7,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[fb73c3924b502e2840a5dc8a18746e395b06a8a6]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch.arm64'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[34a41033fce94195700c5ab1e097f40741d7f016]' and flags ''
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/default.out b/tests/scripts/dl_dep.sh/0.9.4/default.out
index 3a51e9a2..126bbb2a 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/default.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/default.out
@@ -1,12 +1,10 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept_clone3.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out b/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out
index 252eb68f..a932e3f3 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/default_zmq.out
@@ -1,14 +1,12 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept_clone3.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Downloaded 'https://github.com/zeromq/libzmq/archive/v4.3.5.tar.gz' to 'libzmq'
 Downloaded 'https://github.com/zeromq/cppzmq/archive/v4.10.0.tar.gz' to 'cppzmq'
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out b/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out
index 94eb489b..f19412d1 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out
@@ -1,11 +1,10 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric%verbs' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out b/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out
index 11b0ae50..0297ebb5 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
@@ -7,8 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/mogon2.out b/tests/scripts/dl_dep.sh/0.9.4/mogon2.out
index 9e570e5c..9a13f8ed 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/mogon2.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/mogon2.out
@@ -1,13 +1,12 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.1.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/mogon3.out b/tests/scripts/dl_dep.sh/0.9.4/mogon3.out
index 315bdb76..c23ea4b2 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/mogon3.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/mogon3.out
@@ -1,12 +1,11 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Downloaded 'https://github.com/zeromq/libzmq/archive/v4.3.5.tar.gz' to 'libzmq'
 Downloaded 'https://github.com/zeromq/cppzmq/archive/v4.10.0.tar.gz' to 'cppzmq'
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/ngio.out b/tests/scripts/dl_dep.sh/0.9.4/ngio.out
index 11b0ae50..0297ebb5 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/ngio.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/ngio.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
@@ -7,8 +7,7 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Cloned 'https://github.com/CARV-ICS-FORTH/parallax.git' to 'parallax' with commit '[c130decd7a71c60c20b98d6a23924f05f754c3cd]' and flags ''
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out b/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out
index 523eb08c..3a16dbe9 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/omnipath_psm2.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
@@ -7,7 +7,6 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
 Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.15.0]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'
-Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2c8765fa292bc9c28a22624c528580d54658813d]' and flags ''
-Applying patch '/builds/gitlab/hpc/gekkofs/scripts/patches/syscall_intercept.patch'...
+Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Cloned 'https://github.com/HowardHinnant/date.git' to 'date' with commit '[e7e1482087f58913b80a20b04d5c58d9d6d90155]' and flags ''
 Done
diff --git a/tests/scripts/dl_dep.sh/0.9.4/p9.out b/tests/scripts/dl_dep.sh/0.9.4/p9.out
index ca7dc02d..41c26630 100644
--- a/tests/scripts/dl_dep.sh/0.9.4/p9.out
+++ b/tests/scripts/dl_dep.sh/0.9.4/p9.out
@@ -1,5 +1,5 @@
 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
-- 
GitLab


From dfc29e94e1d7d279a4fd533ea5c556d925bf935c Mon Sep 17 00:00:00 2001
From: Julius Athenstaedt <julius.athenstaedt@bsc.es>
Date: Mon, 3 Feb 2025 13:06:02 +0100
Subject: [PATCH 3/4] capstone for ci is not pulled from package manager

---
 docker/0.9.4/core/Dockerfile    |  2 +-
 docker/build_env.docker         |  8 ++++----
 scripts/profiles/0.9.4/ci.specs | 12 ++++--------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/docker/0.9.4/core/Dockerfile b/docker/0.9.4/core/Dockerfile
index ced6c14a..38ba0309 100644
--- a/docker/0.9.4/core/Dockerfile
+++ b/docker/0.9.4/core/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update && \
 		# RocksDB dependencies
 		liblz4-dev \
 		# syscall_intercept dependencies
-		libcapstone-dev \
+		# libcapstone-dev \
 		# GekkoFS dependencies
 		libboost-program-options-dev \
 		uuid-dev ccache && \
diff --git a/docker/build_env.docker b/docker/build_env.docker
index 346807b8..947db64a 100644
--- a/docker/build_env.docker
+++ b/docker/build_env.docker
@@ -42,8 +42,8 @@ RUN yum -y -q update  && yum -y -q install \
 	devtoolset-8-gcc-c++ \
 	libuuid-devel \
 	# syscall_intercept
-	capstone \
-	capstone-devel \
+	# capstone \
+	# capstone-devel \
 && yum -y -q clean all
 
 # Enable gcc/g++ 8.x
@@ -100,8 +100,8 @@ RUN yum -y -q update  && yum -y -q install \
 	devtoolset-8-gcc-c++ \
 	libuuid-devel \
 	# syscall_intercept
-	capstone \
-	capstone-devel \
+	# capstone \
+	# capstone-devel \
 && yum -y -q clean all
 
 
diff --git a/scripts/profiles/0.9.4/ci.specs b/scripts/profiles/0.9.4/ci.specs
index 59fc54cb..b1199689 100644
--- a/scripts/profiles/0.9.4/ci.specs
+++ b/scripts/profiles/0.9.4/ci.specs
@@ -40,6 +40,7 @@ wgetdeps=(
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["prometheus-cpp"]="v1.0.0"
+    ["capstone"]="6.0.0-Alpha1"
     )
 
 # Dependencies that must be cloned
@@ -47,7 +48,7 @@ clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
     ["mercury"]="v2.4.0"
     ["margo"]="v0.18.3"
-    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"
+    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"
     ["parallax"]="ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd"
     )
@@ -57,15 +58,10 @@ clonedeps_args=(
     ["mercury"]="--recurse-submodules"
 )
 
-# Patches that should be applied post-clone
-clonedeps_patches=(
-    ["syscall_intercept"]="syscall_intercept.patch"
-)
-
 # Ordering that MUST be followed when downloading
 order=(
-    "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"
-    "agios" "parallax" "prometheus-cpp" 
+    "capstone" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"
+    "agios" "parallax" "prometheus-cpp"
 )
 
 # Extra arguments passed to the installation script. As such, they can
-- 
GitLab


From 0ad1f2edb570ea9ee5a311572726b28a9088ec87 Mon Sep 17 00:00:00 2001
From: Ramon Nou <ramon.nou@bsc.es>
Date: Mon, 3 Feb 2025 15:06:57 +0100
Subject: [PATCH 4/4] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb8b8c58..8f274197 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### New
 ### Changed
-- Update capstone to version 6.0.0-Alpha1 ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).
+
+- Unify dependency scripts (dl and compile): Unify `-d` and `-p` flags ([!174](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/174)).
 - Support for `close_range` syscall. ([!201](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/201)).
   - Removal of `O_PATH` check in `gkfs_open`, allows cp with asterisk. This is for newer kernels.
   - Support to print newer syscall (although not implemented). Added syscall number to log for easy capture missing ones.
@@ -16,6 +17,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Increased merge assert for files with size 0, specific for DLIO with GekkoFS in Debug ([!208])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/208)).
 - Added code to correct fork issues. `pthread_at_fork` cleans and starts GekkoFS ([!210](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/210)).
 - Updated mochi to solve ucx corruption issues ([!211])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/211)).
+- Update capstone to version 6.0.0-Alpha1 and syscall intercept to match ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).
 ### Fixed
 
 ## [0.9.3] - 2024-07
-- 
GitLab