Various fixes

Author: TheAssassin

ci/build.sh

@@ -63,7 +63,17 @@ make -j$(nproc)
 make install DESTDIR=AppDir
 
 ARCH="$(dpkg --print-architecture)"
-[[ "$ARCH" == "amd64" ]] && ARCH=x86_64
+
+# "translate" to linuxdeploy/AppImage architecture
+# note: linuxdeploy and AppImage differ in i386/i686, but we don't support that any more anyway
+case "$ARCH" in
+    amd64)
+        ARCH=x86_64
+        ;;
+    arm64)
+        ARCH=aarch64
+        ;;
+esac
 
 # build release formats
 wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage

ci/install-deps.sh

@@ -68,6 +68,7 @@ packages=(
     libtool
     patch
     wget
+    curl
     vim-common
     desktop-file-utils
     pkg-config
@@ -105,7 +106,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 apt-get -y --no-install-recommends install "${packages[@]}"
 
-# install more recent CMake
+# install more recent CMake and patchelf
 cmake_arch="$(dpkg --print-architecture)"
 
 case "$cmake_arch" in
@@ -115,14 +116,17 @@ case "$cmake_arch" in
     arm64)
         cmake_arch=aarch64
         ;;
+    armhf)
+        patchelf_arch=armv7l
+        ;;
 esac
 
-wget https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.29.6-ubuntu-focal-"${cmake_arch}".tar.gz -O - | \
+patchelf_arch="${patchelf_arch:-$cmake_arch}"
+
+curl -L https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.29.6-ubuntu-focal-"${cmake_arch}".tar.gz | \
     tar xz --strip-components=1 -C /usr
 
-# install recent patchelf
-patchelf_arch="$cmake_arch"
-wget https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-"$patchelf_arch".tar.gz -O- | tar xz -C/usr/local
+curl -L https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-"$patchelf_arch".tar.gz | tar xz -C/usr/local
 
   # g{cc,++}-multilib usually install these dependencies for us
   # however, as the multilib stuff is not available for ARM, we have to install these dev packages ourselves

src/binfmt-bypass/fix-preload-library.sh

@@ -2,7 +2,9 @@
 
 set -euo pipefail
 
-glibc_ok_version="2.4"
+# 2.17 ensures compatibility with CentOS 7 and beyond
+# cf. https://gist.github.com/wagenet/35adca1a032cec2999d47b6c40aa45b1
+glibc_ok_version="2.17"
 
 find_too_new_symbols() {
     glibc_symbols=( "$(nm --dynamic --undefined-only --with-symbol-versions "$1" | grep "GLIBC_")" )