Merge branch 'master' into master-android

scripts/desktop/build-lib-linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

scripts/desktop/build-lib-mac.sh

@@ -3,7 +3,7 @@
 set -e
 
 OS=mac
-ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
+ARCH="${1:-$(uname -m)}"
 COMPOSE_ARCH=$ARCH
 GHC_VERSION=8.10.7
 DATABASE_BACKEND="${2:-sqlite}"

scripts/desktop/make-appimage-linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

scripts/desktop/prepare-vlc-linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

scripts/desktop/prepare-vlc-mac.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
+ARCH="${1:-$(uname -m)}" 
 if [ "$ARCH" == "arm64" ]; then
     ARCH=aarch64
     vlc_arch=arm64

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."58212c421aa6abb6ad894b8231d8a380849b704b" = "1awgvhqfi7gv3xl10h21a6w2hhqc48pq6yq4f83awg1zxkh3hiqn";
+  "https://github.com/simplex-chat/simplexmq.git"."8fdc0703bc9b89dae8b2fe6820b705580a669281" = "1s3ihb8pyhvxbk1f205wmcfr7d0m7slpjq771z3zz6cvg3fyppbg";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";

scripts/simplex-chat-reproduce-builds-android.sh

@@ -18,6 +18,7 @@ CMDS="curl git docker"
 
 INIT_DIR="$PWD"
 TEMPDIR="$(mktemp -d)"
+PID_MAX_ORIGINAL="$(sysctl -n kernel.pid_max)"
 
 ARCHES="${ARCHES:-aarch64 armv7a}"
 
@@ -32,6 +33,15 @@ cleanup() {
   rm -rf -- "${TEMPDIR}"
   docker rm --force "${CONTAINER_NAME}" 2>/dev/null || :
   docker image rm "${IMAGE_NAME}" 2>/dev/null || :
+
+  if [ "$(sysctl -n kernel.pid_max)" != "$PID_MAX_ORIGINAL" ]; then
+    printf 'Adjusting kernel.pid_max back to original value...\n'
+    if $SUDO sysctl kernel.pid_max="$PID_MAX_ORIGINAL"; then
+      printf 'Successfully adjusted kernel.pid_max\n'
+    else
+      printf 'Failed to adjust kernel.pid_max. Please set the value manually with: %s sysctl kernel.pid_max=%s\n' "$SUDO" "$PID_MAX_ORIGINAL"
+    fi
+  fi
 }
 trap 'cleanup' EXIT INT
 
@@ -52,6 +62,19 @@ check() {
     exit 1
   fi
 
+  if [ "$PID_MAX_ORIGINAL" -gt 65535 ]; then
+    SUDO=$(command -v sudo || command -v doas) || { echo "No sudo or doas"; exit 1; }
+
+    printf 'Adjusting kernel.pid_max value to 65535...\n'
+
+    if $SUDO sysctl kernel.pid_max=65535; then
+      printf 'Successfully adjusted kernel.pid_max\n'
+    else
+      printf 'Failed to adjust kernel.pid_max, aborting.\n'
+      exit 1
+    fi
+  fi
+
   set -u
 }
 
@@ -182,6 +205,9 @@ main() {
 3) build core library with nix (12-24 hours).
 4) build APK and compare with downloaded one
 
+The script will ask for sudo password to adjust kernel.pid_max (needed for armv7a build)
+and set it back to otiginal value when the build is done.
+
 Continue?'
 
   read _