From f18952d28b315ea619db40802d8e9c7cbf4c9201553845afb725ba8de1383ee7 Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Mon, 10 Nov 2025 06:57:17 +0100 Subject: [PATCH] V8.13.400.2025.11.08 Signed-off-by: Marc S. Weidner --- config/hooks/live/0020_dropbear_build.chroot | 17 ++++++----------- lib/lib_primordial.sh | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/config/hooks/live/0020_dropbear_build.chroot b/config/hooks/live/0020_dropbear_build.chroot index a3c2853..5af4538 100644 --- a/config/hooks/live/0020_dropbear_build.chroot +++ b/config/hooks/live/0020_dropbear_build.chroot @@ -16,17 +16,14 @@ printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 '%s' starting ... \e[0m\n" " [[ -r /root/ciss_xdg_tmp.sh ]] && . /root/ciss_xdg_tmp.sh export DEBIAN_FRONTEND="noninteractive" INITRD="No" -apt-get install -y --no-install-recommends musl musl-dev musl-tools - -printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ apt-get install -y --no-install-recommends musl musl-dev musl-tools \e[0m\n" -sleep 16 - -set -x - ### Declare Arrays, HashMaps, and Variables. declare var_dropbear_version="2025.88" -declare var_build_dir="/root/build" -declare var_logfile="${var_build_dir}/_build.log" +declare var_tar="/root/dropbear/dropbear-${var_dropbear_version}.tar.bz2" +declare var_build_dir="/root/build/dropbear-${var_dropbear_version}" +declare var_logfile="/root/.ciss/cdlb/log/0020_dropbear_build.log" + +mkdir -p "/root/build" +cp "${var_tar}" "/root/build" tar xjf "/root/dropbear/dropbear-${var_dropbear_version}.tar.bz2" -C "/root/build" cp "/root/dropbear/localoptions.h" "${var_build_dir}" cd "${var_build_dir}" @@ -61,8 +58,6 @@ setsid bash -c ' rm -rf /root/dropbear - - printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ '%s' applied successfully. \e[0m\n" "${0}" exit 0 diff --git a/lib/lib_primordial.sh b/lib/lib_primordial.sh index fd984c3..18817d5 100644 --- a/lib/lib_primordial.sh +++ b/lib/lib_primordial.sh @@ -39,8 +39,6 @@ init_primordial() { install -m 0444 "${VAR_WORKDIR}/upgrades/dropbear/localoptions.h" \ "${VAR_HANDLER_BUILD_DIR}/config/includes.chroot/root/dropbear/localoptions.h" - - ### Check for SOPS AGE key integration --------------------------------------------------------------------------------------- if [[ "${VAR_AGE,,}" == "true" ]]; then