ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
fix(distro): patch all 6 failing distro-compatibility probes
Juan Denisab27c7b0582e
diff --git a/backend/app/data/distro-catalog.json b/backend/app/data/distro-catalog.jsonindex cb9f0980..8a5ae200 100644--- a/backend/app/data/distro-catalog.json+++ b/backend/app/data/distro-catalog.json@@ -277,7 +277,7 @@"family": "independent","published_status": "community","architectures": ["amd64"],- "windows_strategy": "Exact stage3 Docker userland probe. Expected failures remain visible because emerge is not an installer package-manager path.",+ "windows_strategy": "Exact stage3 Docker userland probe. Portage (emerge) is a supported installer package-manager path; the stage3's slotted dev-lang/python packages satisfy the version gate.","probes": [{"key": "gentoo", "label": "Gentoo stage3", "image": "gentoo/stage3:latest", "fidelity": "exact", "full_image": null}]diff --git a/backend/serverkit_installer/distro.py b/backend/serverkit_installer/distro.pyindex 92a9767c..fc534feb 100644--- a/backend/serverkit_installer/distro.py+++ b/backend/serverkit_installer/distro.py@@ -10,7 +10,7 @@ import osimport shutilfrom dataclasses import dataclass-FAMILIES = ("debian", "rhel", "fedora", "suse", "arch", "alpine")+FAMILIES = ("debian", "rhel", "fedora", "suse", "arch", "alpine", "gentoo")# Exact ID → family map (matches install.sh's case arms)._ID_FAMILY = {@@ -23,6 +23,7 @@ _ID_FAMILY = {"sles": "suse", "sled": "suse", "suse": "suse", "sle-micro": "suse","arch": "arch", "manjaro": "arch", "endeavouros": "arch", "cachyos": "arch","alpine": "alpine",+ "gentoo": "gentoo", "funtoo": "gentoo",}# ID_LIKE substrings → family, in priority order. rhel before fedora so RHEL@@ -34,6 +35,7 @@ _LIKE_FAMILY = (("suse", "suse"),("arch", "arch"),("alpine", "alpine"),+ ("gentoo", "gentoo"),)diff --git a/backend/tests/test_serverkit_installer.py b/backend/tests/test_serverkit_installer.pyindex 1cda9d09..915af439 100644--- a/backend/tests/test_serverkit_installer.py+++ b/backend/tests/test_serverkit_installer.py@@ -123,7 +123,9 @@ def test_manifest_loads_and_resolves_every_family():manifest = deps.load_manifest()for family in distro.FAMILIES:base = deps.base_packages(manifest, family)- assert "nginx" in base, f"{family} base packages should include nginx"+ # Gentoo names packages as category/atom (www-servers/nginx).+ assert any(p == "nginx" or p.endswith("/nginx") for p in base), \+ f"{family} base packages should include nginx"assert deps.package_manager(manifest, family), f"{family} needs a package manager"assert deps.python_spec(manifest, family), f"{family} needs a python spec"diff --git a/install.sh b/install.shindex be968e69..66db5279 100644--- a/install.sh+++ b/install.sh@@ -89,7 +89,11 @@ PYTHON_MIN="3.11"# in the same place. Raising the ceiling needed SQLAlchemy >= 2.0.31 (see# backend/requirements.txt) and dropping two stacked @classmethod/@staticmethod# decorators that 3.13 no longer collapses.-PYTHON_MAX="3.13"+# 3.14 included since the 2026-08 distro-compatibility baseline: Arch/Manjaro+# rolling ship ONLY python 3.14 from their repos (no versioned python3.1x+# packages exist to fall back to), so a ceiling of 3.13 made every Arch-family+# install fall through to the source build — the same trap trixie was in.+PYTHON_MAX="3.14"PYTHON_BIN=""GITHUB_REPO="${GITHUB_REPO:-jhd3197/ServerKit}"@@ -284,7 +288,7 @@ preflight() {# ---------------------------------------------------------------------------# Pure mapping from /etc/os-release ID (+ ID_LIKE fallback) to a ServerKit# family. Kept as a standalone function so it is unit-testable without a real-# /etc/os-release. Echoes: debian|fedora|rhel|suse|arch|alpine|unknown.+# /etc/os-release. Echoes: debian|fedora|rhel|suse|arch|alpine|gentoo|unknown.os_family_from() {local id="$1" id_like="$2"case "$id" in@@ -300,6 +304,8 @@ os_family_from() {printf 'arch\n'; return ;;alpine)printf 'alpine\n'; return ;;+ gentoo|funtoo)+ printf 'gentoo\n'; return ;;esac# Unknown ID — map via ID_LIKE to the closest supported family. Check rhel# before fedora: RHEL clones advertise ID_LIKE="rhel centos fedora" and want@@ -311,6 +317,7 @@ os_family_from() {*suse*) printf 'suse\n' ;;*arch*) printf 'arch\n' ;;*alpine*) printf 'alpine\n' ;;+ *gentoo*) printf 'gentoo\n' ;;*) printf 'unknown\n' ;;esac}@@ -351,7 +358,7 @@ identify_system() {}# ----------------------------------------------------------------------------# Package manager abstraction (apt / dnf / yum)+# Package manager abstraction (apt / dnf / yum / zypper / pacman / apk / emerge)# ---------------------------------------------------------------------------# Detection order mirrors scripts/lib/pkg.sh. These run during the early# dependency phase — before the repo (and thus scripts/lib) is on disk in the@@ -375,8 +382,10 @@ APT_EOFPKG_MGR="pacman"elif command -v apk &>/dev/null; thenPKG_MGR="apk"+ elif command -v emerge &>/dev/null; then+ PKG_MGR="emerge"else- halt "No supported package manager found (need apt, dnf, yum, zypper, pacman, or apk)."+ halt "No supported package manager found (need apt, dnf, yum, zypper, pacman, apk, or emerge)."fi}@@ -393,6 +402,8 @@ refresh_pkg_index() {zypper) zypper --non-interactive refresh >/dev/null 2>&1 || true ;;pacman) pacman -Sy --noconfirm >/dev/null 2>&1 || true ;;apk) apk update >/dev/null 2>&1 || true ;;+ # Portage keeps a full repo snapshot; --sync just refreshes it.+ emerge) emerge --sync >/dev/null 2>&1 || true ;;esacreturn 0}@@ -439,6 +450,10 @@ pkg_add() {zypper) out=$(zypper --non-interactive install "$@" 2>&1) || rc=$? ;;pacman) out=$(pacman -S --noconfirm "$@" 2>&1) || rc=$? ;;apk) out=$(apk add "$@" 2>&1) || rc=$? ;;+ # --noreplace: already-installed slots are a success, not an error.+ # --ask=n: emerge never prompts by default; pin it anyway (every other+ # arm here carries an explicit non-interactive guard).+ emerge) out=$(emerge --noreplace --ask=n "$@" 2>&1) || rc=$? ;;*) warn "No supported package manager — cannot install: $*"; return 0 ;;esacif [ "$rc" -ne 0 ]; then@@ -680,7 +695,7 @@ ensure_swap() {}# ----------------------------------------------------------------------------# Python 3.11/3.12 — detect a usable interpreter or build one+# Python 3.11–3.14 — detect a usable interpreter or build one# ---------------------------------------------------------------------------ver_in_range() {# true when $1 is >= PYTHON_MIN and <= PYTHON_MAX@@ -710,7 +725,7 @@ locate_python() {# given up on. Sets PYTHON_BIN and returns 0 on success; returns 1# (without aborting) when nothing fits.local c v- for c in python3.13 python3.12 python3.11 python3; do+ for c in python3.14 python3.13 python3.12 python3.11 python3; doif command -v "$c" &>/dev/null; thenv=$("$c" -c 'import sys;print(".".join(map(str,sys.version_info[:2])))' 2>/dev/null || true)if [ -n "$v" ] && ver_in_range "$v"; then@@ -838,10 +853,18 @@ provision_python() {pkg_add python311 python311-develcommand -v python3.11 &>/dev/null || pkg_add python312 python312-develelif [ "$OS_FAMILY" = "arch" ]; then- # Rolling release — `python` is already 3.11+.+ # Rolling release — `python` tracks the newest upstream line the gate+ # covers (3.14 as of the 2026-08 baseline). Arch carries no versioned+ # python3.1x packages, so there is nothing to fall back to here; if the+ # rolling package ever outruns the gate, locate_python below rejects it+ # and the source-build path takes over.pkg_add pythonelif [ "$OS_FAMILY" = "alpine" ]; thenpkg_add python3 python3-dev+ elif [ "$OS_FAMILY" = "gentoo" ]; then+ # Portage carries every supported line as a parallel slot.+ pkg_add dev-lang/python:3.13+ command -v python3.13 &>/dev/null || pkg_add dev-lang/python:3.12fi# Did a distro package give us something usable?@@ -863,6 +886,10 @@ provision_python() {pkg_add gcc gcc-c++ make wget zlib-devel libbz2-devel readline-devel \sqlite3-devel ncurses-devel xz-devel tk-devel libffi-devel \libopenssl-devel+ elif [ "$OS_FAMILY" = "gentoo" ]; then+ pkg_add sys-devel/gcc sys-devel/make net-misc/wget sys-libs/zlib \+ dev-libs/bzip2 sys-libs/readline dev-db/sqlite sys-libs/ncurses \+ dev-libs/libffi dev-libs/opensslelsepkg_add gcc gcc-c++ make wget zlib-devel bzip2-devel readline-devel \sqlite-devel ncurses-devel xz-devel tk-devel libffi-devel \diff --git a/scripts/deps/manifest.yaml b/scripts/deps/manifest.yamlindex 8fa7c21f..22c1312e 100644--- a/scripts/deps/manifest.yaml+++ b/scripts/deps/manifest.yaml@@ -10,6 +10,7 @@# suse → openSUSE Leap/Tumbleweed, SLES/SLED# arch → Arch, Manjaro, EndeavourOS (community-supported, best-effort)# alpine → Alpine (community-supported, best-effort)+# gentoo → Gentoo, Funtoo (community-supported, best-effort)## WHO READS THIS# --------------@@ -20,9 +21,10 @@# the two in sync when editing. This file is therefore both the spec and the# documentation of what "supported distro" actually means.#-# Python policy (Goal G2): accept 3.11 OR 3.12, prefer the distro package over a-# source compile. Debian 12 ships 3.11; Ubuntu 24.04 and Fedora 40 ship 3.12;-# RHEL 9 has 3.11 (and 3.12 on 9.4+) via CRB/EPEL; openSUSE Leap ships python311.+# Python policy (Goal G2): accept 3.11 through 3.14, prefer the distro package+# over a source compile. Debian 12 ships 3.11; Ubuntu 24.04 and Fedora 40 ship+# 3.12; Debian 13 ships only 3.13; Arch/Manjaro rolling ship only 3.14; RHEL 9+# has 3.11 (and 3.12 on 9.4+) via CRB/EPEL; openSUSE Leap ships python311.python:debian:@@ -48,10 +50,13 @@ python:package: python311dev_package: python311-develarch:- package: python # rolling; already 3.11++ package: python # rolling; tracks the newest line the gate coversalpine:package: python3dev_package: python3-dev+ gentoo:+ package: "dev-lang/python:3.13" # portage slot; parallel-installable+ fallback_package: "dev-lang/python:3.12"node:# Node 18 is the floor for the Vite build. Distro nodejs on supported targets@@ -63,6 +68,7 @@ node:suse: { method: distro, package: nodejs20, npm_package: npm20 }arch: { method: distro, package: nodejs, npm_package: npm }alpine: { method: distro, package: nodejs, npm_package: npm }+ gentoo: { method: distro, package: net-libs/nodejs }docker:debian: { method: get.docker.com }@@ -74,6 +80,7 @@ docker:suse: { method: distro, packages: [docker, docker-compose] }arch: { method: distro, packages: [docker, docker-compose] }alpine: { method: distro, packages: [docker, docker-cli-compose] }+ gentoo: { method: distro, packages: [app-containers/docker, app-containers/docker-cli, app-containers/docker-compose] }base_packages:debian: [git, curl, nginx, sqlite3, ca-certificates, openssl]@@ -82,6 +89,7 @@ base_packages:suse: [git, curl, nginx, sqlite3, ca-certificates, openssl]arch: [git, curl, nginx, sqlite, ca-certificates, openssl]alpine: [git, curl, nginx, sqlite, ca-certificates, openssl]+ gentoo: [dev-vcs/git, net-misc/curl, www-servers/nginx, dev-db/sqlite, app-misc/ca-certificates, dev-libs/openssl]# Package-manager + init-system per family, mirrored by scripts/lib/pkg.sh and# scripts/lib/init.sh (which detect at runtime rather than reading this).@@ -92,3 +100,4 @@ package_manager:suse: zypperarch: pacmanalpine: apk+ gentoo: emergediff --git a/scripts/lib/pkg.sh b/scripts/lib/pkg.shindex aed47d02..5e35a30b 100644--- a/scripts/lib/pkg.sh+++ b/scripts/lib/pkg.sh@@ -5,20 +5,20 @@# The ServerKit installer/updater needs to refresh the package index, install a# handful of OS packages, and check whether something is already present — and it# has to do this identically on Debian/Ubuntu (apt), RHEL/Rocky/Alma/Fedora-# (dnf, or yum on older boxes), openSUSE (zypper), Arch (pacman) and Alpine-# (apk). Sprinkling per-distro `if command -v apt` branches through every script+# (dnf, or yum on older boxes), openSUSE (zypper), Arch (pacman), Alpine (apk)+# and Gentoo (emerge). Sprinkling per-distro `if command -v apt` branches through every script# rots fast and is impossible to unit-test, so we centralise the dispatch here.## This bash helper mirrors the semantics of the Python PackageManager class in# backend/app/utils/system.py (same detect → install/is_installed contract,# same sudo-only-when-needed rule) so the host and the running panel agree on# what "installed" means. It covers the three managers the Python side knows-# (apt/dnf/yum) plus the three install-time-only ones (zypper/pacman/apk) that-# the shell installer can hit before the panel is even up.+# (apt/dnf/yum) plus the four install-time-only ones (zypper/pacman/apk/emerge)+# that the shell installer can hit before the panel is even up.## Contract (these names/behaviours are depended on by callers and unit tests —# do not rename them or add extra public functions):-# pkg_detect → echoes: apt|dnf|yum|zypper|pacman|apk|"" (none)+# pkg_detect → echoes: apt|dnf|yum|zypper|pacman|apk|emerge|"" (none)# pkg_refresh → refresh the package index (best-effort)# pkg_install <pkg> [pkg...] → install packages non-interactively# pkg_is_installed <pkg> → return 0 if installed, 1 otherwise@@ -67,7 +67,7 @@ pkg_detect() {return 0filocal mgr- for mgr in apt dnf yum zypper pacman apk; do+ for mgr in apt dnf yum zypper pacman apk emerge; doif command -v "$mgr" >/dev/null 2>&1; thenprintf '%s\n' "$mgr"return 0@@ -92,6 +92,7 @@ pkg_refresh() {zypper) _pkg_run zypper --non-interactive refresh || true ;;pacman) _pkg_run pacman -Sy --noconfirm || true ;;apk) _pkg_run apk update || true ;;+ emerge) _pkg_run emerge --sync || true ;;*) : ;;esacreturn 0@@ -124,6 +125,10 @@ pkg_install() {zypper) _pkg_run zypper --non-interactive install "$@" ;;pacman) _pkg_run pacman -S --noconfirm "$@" ;;apk) _pkg_run apk add "$@" ;;+ # --ask=n pins emerge's explicit-prompt flag off; emerge is already+ # non-interactive by default, this just keeps that true under MAKEOPTS+ # or config drift (mirrors the non-interactivity every other arm gets).+ emerge) _pkg_run emerge --noreplace --ask=n "$@" ;;*)printf ' [pkg] no supported package manager found — cannot install: %s\n' "$*" >&2return 1@@ -166,6 +171,16 @@ pkg_is_installed() {command -v apk >/dev/null 2>&1 || return 1apk info -e "$pkg" >/dev/null 2>&1;;+ emerge)+ # Portage's installed database is /var/db/pkg/<category>/<name-ver>;+ # strip any :slot suffix and glob for a matching install dir.+ local q="${pkg%%:*}"+ [ -d /var/db/pkg ] || return 1+ case "$q" in+ */*) compgen -G "/var/db/pkg/$q-*" >/dev/null ;;+ *) compgen -G "/var/db/pkg/*/$q-*" >/dev/null ;;+ esac+ ;;*)return 1;;diff --git a/scripts/test/distro-compatibility.py b/scripts/test/distro-compatibility.pyindex 8a9425f7..31fd4ae0 100644--- a/scripts/test/distro-compatibility.py+++ b/scripts/test/distro-compatibility.py@@ -37,20 +37,48 @@ CATALOG_PATH = REPO_ROOT / "backend" / "app" / "data" / "distro-catalog.json"DEFAULT_OUTPUT_ROOT = SCRIPT_DIR / "output" / "distro-compatibility"MODES = ("quick", "provision")+# The suites run inside MINIMAL base images, so the harness must guarantee the+# tools the source-level suites legitimately assume a server has: bash, plus+# find (test_update's backup-retention assertions) and awk (test_install /+# test_cli function-body extraction). Amazon Linux 2023 ships no findutils,+# openSUSE Tumbleweed's minimal image has neither, and the SLES BCI has no awk —+# without this bootstrap those are harness gaps, not product failures.BOOTSTRAP_BASH = r"""-if ! command -v bash >/dev/null 2>&1; then- { command -v apt-get >/dev/null 2>&1 && apt-get update -qq && apt-get install -y -qq bash; } ||- { command -v dnf >/dev/null 2>&1 && dnf install -y -q bash; } ||- { command -v yum >/dev/null 2>&1 && yum install -y -q bash; } ||- { command -v zypper >/dev/null 2>&1 && zypper --non-interactive install bash; } ||- { command -v pacman >/dev/null 2>&1 && pacman -Sy --noconfirm bash; } ||- { command -v apk >/dev/null 2>&1 && apk add --no-cache bash; } ||- { command -v emerge >/dev/null 2>&1 && emerge --oneshot app-shells/bash; } || true+need=""+command -v bash >/dev/null 2>&1 || need="$need bash"+command -v find >/dev/null 2>&1 || need="$need find"+command -v awk >/dev/null 2>&1 || need="$need awk"+if [ -n "$need" ]; then+ pkgs=""+ for tool in $need; do+ if command -v emerge >/dev/null 2>&1; then+ case "$tool" in+ bash) pkgs="$pkgs app-shells/bash" ;;+ find) pkgs="$pkgs sys-apps/findutils" ;;+ awk) pkgs="$pkgs sys-apps/gawk" ;;+ esac+ else+ case "$tool" in+ bash) pkgs="$pkgs bash" ;;+ find) pkgs="$pkgs findutils" ;;+ awk) pkgs="$pkgs gawk" ;;+ esac+ fi+ done+ { command -v apt-get >/dev/null 2>&1 && apt-get update -qq && apt-get install -y -qq $pkgs; } ||+ { command -v dnf >/dev/null 2>&1 && dnf install -y -q $pkgs; } ||+ { command -v yum >/dev/null 2>&1 && yum install -y -q $pkgs; } ||+ { command -v zypper >/dev/null 2>&1 && zypper --non-interactive install $pkgs; } ||+ { command -v pacman >/dev/null 2>&1 && pacman -Sy --noconfirm $pkgs; } ||+ { command -v apk >/dev/null 2>&1 && apk add --no-cache $pkgs; } ||+ { command -v emerge >/dev/null 2>&1 && emerge --oneshot $pkgs; } || truefi-command -v bash >/dev/null 2>&1 || {- echo "COMPAT_HARNESS_ERROR=no bash available" >&2- exit 127-}+for tool in bash find awk; do+ command -v "$tool" >/dev/null 2>&1 || {+ echo "COMPAT_HARNESS_ERROR=no $tool available" >&2+ exit 127+ }+done""".strip()MODE_COMMANDS = {diff --git a/scripts/test/test_install.sh b/scripts/test/test_install.shindex bfeef92f..889b70da 100644--- a/scripts/test/test_install.sh+++ b/scripts/test/test_install.sh@@ -56,15 +56,21 @@ mkpy() { # mkpy <name> <major.minor>} > "$PY_STUB/$1"chmod +x "$PY_STUB/$1"}-# python3.12 reports an out-of-range 3.14 (rejected); python3.11 is in range;-# bare python3 is an old 3.10 (rejected). locate_python must therefore pick-# python3.11 — proving it no longer blindly trusts `python3`.+# The newer minor-version stubs report an out-of-range 3.15 (rejected);+# python3.11 is in range; bare python3 is an old 3.10 (rejected). locate_python+# must therefore pick python3.11 — proving it no longer blindly trusts+# `python3`.## The out-of-range stub used to report 3.13, which stopped being out of range-# when the gate moved to cover Debian 13 (issue #99). Pick a version ABOVE-# PYTHON_MAX, and move it whenever the ceiling moves — the point of the stub is-# "too new", not any particular number.-mkpy python3.12 3.14+# when the gate moved to cover Debian 13 (issue #99), then 3.14, which stopped+# being out of range when the gate moved to cover Arch rolling (2026-08+# baseline). Pick a version ABOVE PYTHON_MAX, and move it whenever the ceiling+# moves — the point of the stub is "too new", not any particular number. Every+# candidate name locate_python probes is shadowed so a real python3.1x on the+# host can never win over the fixtures.+mkpy python3.14 3.15+mkpy python3.13 3.15+mkpy python3.12 3.15mkpy python3.11 3.11mkpy python3 3.10export PATH="$STUB_BIN:$PATH"@@ -93,16 +99,18 @@ elsefi# ---------------------------------------------------------------------------# T2 — ver_in_range gate (3.11/3.12/3.13 accepted, 3.10/3.14 rejected).+# T2 — ver_in_range gate (3.11/3.12/3.13/3.14 accepted, 3.10/3.15 rejected).## 3.13 MUST be accepted: Debian 13 ships only python3.13, and this assertion# previously required it to be rejected — the suite was actively pinning the-# bug that made trixie uninstallable (issue #99).+# bug that made trixie uninstallable (issue #99). 3.14 MUST be accepted: Arch/+# Manjaro rolling ship only python 3.14 and carry no versioned fallback+# packages at all (2026-08 compatibility baseline).# --------------------------------------------------------------------------if ( set -Eeuo pipefail; ver_in_range 3.11 ) && ( set -Eeuo pipefail; ver_in_range 3.12 ) && \- ( set -Eeuo pipefail; ver_in_range 3.13 ) && \- ! ( set -Eeuo pipefail; ver_in_range 3.10 ) && ! ( set -Eeuo pipefail; ver_in_range 3.14 ); then- ok "ver_in_range accepts 3.11/3.12/3.13 and rejects 3.10/3.14"+ ( set -Eeuo pipefail; ver_in_range 3.13 ) && ( set -Eeuo pipefail; ver_in_range 3.14 ) && \+ ! ( set -Eeuo pipefail; ver_in_range 3.10 ) && ! ( set -Eeuo pipefail; ver_in_range 3.15 ); then+ ok "ver_in_range accepts 3.11/3.12/3.13/3.14 and rejects 3.10/3.15"elsebad "ver_in_range gate is wrong"fi@@ -117,6 +125,15 @@ elsebad "PYTHON_MAX is $PYTHON_MAX — Debian 13 ships only python3.13 and would fall to a source build"fi+# Same guard for the rolling ceiling: Arch/Manjaro carry ONLY the newest python+# (3.14 at the 2026-08 baseline) and no versioned fallback packages, so a+# ceiling below it can never be satisfied from their repos.+if [ "$PYTHON_MAX" = "3.14" ] || printf '%s\n%s' "3.14" "$PYTHON_MAX" | sort -C -V; then+ ok "PYTHON_MAX ($PYTHON_MAX) covers Arch rolling's python 3.14"+else+ bad "PYTHON_MAX is $PYTHON_MAX — Arch/Manjaro ship only python 3.14 and would fall to a source build"+fi+# --------------------------------------------------------------------------# T3 — node_ready gates on vite 8's Node floor (^20.19.0 || >=22.12.0) AND npm# present. The frontend bundler (rolldown) can't build on older Node — npm@@ -269,6 +286,8 @@ check_fam fedora "" fedoracheck_fam opensuse-leap "" susecheck_fam arch "" archcheck_fam alpine "" alpine+check_fam gentoo "" gentoo+check_fam funtoo "" gentoocheck_fam mydistro "debian" debian # unknown ID, debian-likecheck_fam clone "rhel centos fedora" rhel # RHEL clone: rhel wins over fedoracheck_fam spin "fedora" fedora # pure fedora spin@@ -696,7 +715,12 @@ mkvless() { # mkvless <name> <major.minor> — version OK, `-m venv` broken} > "$PYX/$1"chmod +x "$PYX/$1"}-mkvless python3.12 3.13 # out of range — rejected before the venv probe+# Every candidate name locate_python probes must be shadowed here — a real+# python3.14 (Manjaro) or python3.13 (Gentoo stage3) earlier in PATH would+# otherwise win over the fixtures and turn this into a host-dependent test.+mkvless python3.14 3.15 # out of range — rejected before the venv probe+mkvless python3.13 3.15 # out of range — rejected before the venv probe+mkvless python3.12 3.12 # in range but venv-less — must be rejectedmkvless python3.11 3.11 # in range but venv-less — must be rejectedmkvless python3 3.10 # too oldif ( set -Eeuo pipefail; PATH="$PYX:$PATH"; locate_python ) >/dev/null 2>&1; thendiff --git a/scripts/test/test_lib.sh b/scripts/test/test_lib.shindex ca8921e2..bc201bb6 100644--- a/scripts/test/test_lib.sh+++ b/scripts/test/test_lib.sh@@ -51,12 +51,12 @@ printf '\nmulti-distro lib unit tests\n\n'# ==========================================================================# pkg.sh# ==========================================================================-for mgr in apt dnf yum zypper pacman apk; do+for mgr in apt dnf yum zypper pacman apk emerge; doif ! got="$( set -Eeuo pipefail; PKG_MGR_OVERRIDE="$mgr" pkg_detect )" || [ "$got" != "$mgr" ]; thenbad "pkg_detect override $mgr -> [$got]"fidone-ok "pkg_detect honors PKG_MGR_OVERRIDE for all six managers"+ok "pkg_detect honors PKG_MGR_OVERRIDE for all seven managers"# Each manager's install command, captured in dry-run.declare -A expect_install=(@@ -68,6 +68,7 @@ declare -A expect_install=([zypper]="zypper --non-interactive install git"[pacman]="pacman -S --noconfirm git"[apk]="apk add git"+ [emerge]="emerge --noreplace --ask=n git")allok=1for mgr in "${!expect_install[@]}"; do@@ -87,6 +88,7 @@ declare -A expect_noninteractive=([yum]="-y"[zypper]="--non-interactive"[pacman]="--noconfirm"+ [emerge]="--ask=n")allok=1for mgr in "${!expect_noninteractive[@]}"; dodiff --git a/scripts/test/test_update.sh b/scripts/test/test_update.shindex b88b30d5..158d9f75 100644--- a/scripts/test/test_update.sh+++ b/scripts/test/test_update.sh@@ -333,7 +333,7 @@ rm -f "$STUB_BIN/flask"# --------------------------------------------------------------------------t="$WORK/t10d"; mkdir -p "$t"PY=""-for c in python3.12 python3.11 python3; do+for c in python3.14 python3.13 python3.12 python3.11 python3; doif command -v "$c" >/dev/null 2>&1 && "$c" -c 'import sqlite3' 2>/dev/null; thenPY="$c"; breakfi@@ -478,7 +478,7 @@ rm -f "$STUB_BIN/pg_dump" "$STUB_BIN/pg_restore"# --------------------------------------------------------------------------t="$WORK/t10f"; mkdir -p "$t"PY=""-for c in python3.12 python3.11 python3; do+for c in python3.14 python3.13 python3.12 python3.11 python3; doif command -v "$c" >/dev/null 2>&1 && "$c" -c 'import sqlite3' 2>/dev/null; thenPY="$c"; breakfi@@ -541,7 +541,7 @@ else# real Python: makes locate_python fail exactly as it does on EL9, while# `import sqlite3` keeps working. Shadowing all four candidate names keeps# the precondition true regardless of what the host actually has.- for n in python3.12 python3.11 python3 python; do+ for n in python3.14 python3.13 python3.12 python3.11 python3 python; docat > "$t/bin/$n" <<EOF#!/usr/bin/env bashcase "\$*" in@@ -575,7 +575,7 @@ PYEOF) >/dev/null 2>&1 || el9_rc=$?rows="$("$PY" -c "import sqlite3,sys;print(sqlite3.connect(sys.argv[1]).execute('SELECT COUNT(*) FROM t').fetchone()[0])" "$t/snap.db" 2>/dev/null || true)"if [ "$el9_rc" -eq 0 ] && [ "$rows" = "100" ]; then- ok "SQLite snapshot/verify need only sqlite3, not Python 3.11/3.12 (EL9/22.04 boxes)"+ ok "SQLite snapshot/verify need only sqlite3, not the gated Python 3.11-3.14 (EL9/22.04 boxes)"elsebad "sqlite helpers still gated on locate_python: rc=$el9_rc, rows=[$rows], expected 100"fidiff --git a/scripts/update.sh b/scripts/update.shindex ec6cc2c2..58dee6d0 100644--- a/scripts/update.sh+++ b/scripts/update.sh@@ -568,7 +568,7 @@ preflight_check() {local py_bin py_versionpy_bin="$(locate_python 2>/dev/null || true)"if [ -z "$py_bin" ]; then- halt "Python 3.11 or 3.12 is required. Install python3.11/3.12 and python3-venv."+ halt "Python 3.11-3.14 is required. Install a supported python3.1x and python3-venv."fipy_version="$($py_bin -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"good "Python $py_version available ($py_bin)"@@ -661,7 +661,7 @@ preflight_check() {# ---------------------------------------------------------------------------locate_python() {local c v- for c in python3.12 python3.11 python3; do+ for c in python3.14 python3.13 python3.12 python3.11 python3; doif command -v "$c" &>/dev/null; thenv="$($c -c 'import sys;print(".".join(map(str,sys.version_info[:2])))' 2>/dev/null || true)"# An EMPTY version means the binary/shim exists but can't actually@@ -669,7 +669,7 @@ locate_python() {# below ("" sorts before everything). Reject it and move on.[ -n "$v" ] || continueif printf '%s\n%s' "3.11" "$v" | sort -C -V && \- printf '%s\n%s' "$v" "3.12" | sort -C -V; then+ printf '%s\n%s' "$v" "3.14" | sort -C -V; thenprintf '%s' "$c"return 0fi@@ -683,7 +683,7 @@ rebuild_virtualenv() {step "Rebuilding Python virtual environment..."local py_bin- py_bin="$(locate_python)" || halt "ServerKit requires Python 3.11 or 3.12."+ py_bin="$(locate_python)" || halt "ServerKit requires Python 3.11-3.14."if [ "$DRY_RUN" = "1" ]; theninfo "[dry-run] would recreate venv at $target_dir using $py_bin"@@ -908,8 +908,8 @@ atomic_switch() {# sqlite3; with none available we fail rather than fall back to a racy cp.# ---------------------------------------------------------------------------# Snapshotting or integrity-checking a SQLite file needs nothing more than an-# interpreter carrying the stdlib `sqlite3` module — NOT the 3.11/3.12 that-# rebuild_virtualenv and preflight_check legitimately demand. Reusing+# interpreter carrying the stdlib `sqlite3` module — NOT the gated 3.11-3.14+# that rebuild_virtualenv and preflight_check legitimately demand. Reusing# locate_python here silently coupled the DATA-safety paths to the venv-builder# constraint, and blocked updates for a reason unrelated to the data:# * an all-Docker install returns before preflight_check ever runs and does@@ -923,7 +923,7 @@ atomic_switch() {# present, guaranteed to have the module, and independent of what is on PATH.locate_sqlite_python() {local c- for c in "$@" python3.12 python3.11 python3 python; do+ for c in "$@" python3.14 python3.13 python3.12 python3.11 python3 python; do[ -n "$c" ] || continuecommand -v "$c" >/dev/null 2>&1 || continue"$c" -c 'import sqlite3' >/dev/null 2>&1 || continue