Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --combined appimage/build_appimage.sh
index 665d8dd381fa40e68a83c328e4fcafac79df43cf,c7cd74d42d62c497b9c680a1e23253d13286b8a3..4fddec1a54083bd3769255e4acdddeafb41685db
--- 1/appimage/build_appimage.sh
--- 2/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@@ -92,11 -92,13 +92,13 @@@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD
  cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 21
  
  CPU=`uname -m`
 -basefilename=citadel-`date +%s`
 +basefilename=citadel-`cat ../release_version.txt`
  if [ $CPU == x86_64 ] ; then
        export ARCH=x86_64
  elif [ $CPU == armv7l ] ; then
-       export ARCH=ARM
+       export ARCH=armhf
+ elif [ $CPU == aarch64 ] ; then
+       export ARCH=aarch64
  fi
  echo ARCH: $ARCH
  echo CPU: $CPU