Merge branch 'main' into dependabot/github_actions/actions/checkout-5.0.0

Author: thomasleplus

crypt/Dockerfile

@@ -21,7 +21,7 @@ RUN apk -U upgrade \
     git=2.49.1-r0 \
     gnupg=2.4.7-r0 \
     jose=14-r0 \
-    openssl=3.5.1-r0 \
+    openssl=3.5.2-r0 \
     py3-pip=25.1.1-r0 \
     python3=3.12.11-r0 \
     xmlsec=1.3.7-r0 \

crypt/bump-apk-versions.sh

@@ -13,8 +13,8 @@ if [ -f /.dockerenv ]; then
 
 	u=$(\apk -u list | \tr '\n' '|')
 
+	\rm -f .bump.csv.bak
 	\sed -e :a -e '/\\$/N; s/\\\n//; ta' Dockerfile | \grep -o -e 'apk[^\&\;]*add[^\&\;]*' | \grep -o -e '[^ ]*=[^ ]*' | while IFS= read -r l; do
-		\rm -f .bump.csv.bak
 		p="${l%=*}"
 		v1="${l#*=}"
 		v="$(echo "|${u}" | \grep -o -e "\|${p}-[^\|]*upgradable from: ${p}-${v1}" || true)"

crypt/create-bump-prs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-
 set -euo pipefail
+IFS=$'\n\t'
 
 cd "$(\dirname "${0}")"
 
@@ -9,18 +9,21 @@ if [ -f .bump.csv.bak ]; then
 		>&2 echo "error: git repo contains uncommitted changes"
 		exit 1
 	fi
+	\git pull
 	csv="$(\cat .bump.csv.bak)"
 	\rm -f .bump.csv.bak
-	while IFS="," read -r p v1 v2 l1 l2; do
+	while IFS=',' read -r p v1 v2 l1 l2; do
 		b="${p}-${v2//[\~\:]/-}"
 		\git switch --create "${b}"
 		\perl -i -p -e "s|\Q${l1}\E|${l2}|g" Dockerfile
 		\git add Dockerfile
 		\git commit -S -m "build(deps): bump ${p} from ${v1} to ${v2}"
-		echo "Please review and push commit in branch \"${b}\". Waiting..."
-		while \git status | \grep -Fq "Your branch is ahead"; do
+		echo -n "Please review and push commit in branch \"${b}\". Waiting..."
+		while [ "$(git rev-list --count --right-only 'origin...HEAD')" -gt 0 ]; do
 			\sleep 1
+			\echo -n .
 		done
+		\echo
 		\gh pr create -f -l build -l dependencies
 		\git checkout -
 	done <<<"${csv}"