From 408a27e5fc45698857b2e7732e8ad15cc62a1589 Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Sun, 15 Feb 2026 02:03:50 +0100
Subject: [PATCH 1/2] fix: install/upgrade MariaDB-server and MariaDB-devel
 only (no client); avoids No match for mariadb-client

---
 cyberpanel_upgrade.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index f2b97351c..4b5f3ce74 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -661,10 +661,10 @@ EOF
                    sqlite-devel libxml2-devel libxslt-devel curl-devel libedit-devel \
                    readline-devel pkgconfig cmake gcc-c++
     
-    # Install/upgrade MariaDB from configured repo (11.8, 10.11, or 12.1 per --mariadb-version)
-    dnf install -y MariaDB-server MariaDB-client MariaDB-devel 2>/dev/null || dnf install -y mariadb-server mariadb-devel mariadb-client
+    # Install/upgrade MariaDB server only (server + devel for Python/php; client not required for panel)
+    dnf install -y MariaDB-server MariaDB-devel 2>/dev/null || dnf install -y mariadb-server mariadb-devel
     # Upgrade to chosen version if already installed (e.g. 10.11 -> 11.8)
-    dnf upgrade -y MariaDB-server MariaDB-client MariaDB-devel 2>/dev/null || true
+    dnf upgrade -y MariaDB-server MariaDB-devel 2>/dev/null || true
     systemctl restart mariadb 2>/dev/null || true
 
     # Install additional required packages

From 845aa68940a1d2ccfc6cb70906c7bd477d12d127 Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Sun, 15 Feb 2026 02:06:01 +0100
Subject: [PATCH 2/2] chore: clarify upgrade messages - INFO not WARNING for
 auto-restore; venv/WSGI wording

---
 cyberpanel_upgrade.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index 4b5f3ce74..ac1655098 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -804,14 +804,14 @@ CYBERCP_ESSENTIAL_DIRS=(
 CYBERCP_MISSING=0
 for dir in "${CYBERCP_ESSENTIAL_DIRS[@]}"; do
     if [ ! -d "$dir" ]; then
-        echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] WARNING: Essential directory missing: $dir" | tee -a /var/log/cyberpanel_upgrade_debug.log
+        echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] INFO: Essential directory missing (will restore): $dir" | tee -a /var/log/cyberpanel_upgrade_debug.log
         CYBERCP_MISSING=1
     fi
 done
 
-# If essential directories are missing, perform recovery
+# If essential directories are missing, perform automatic recovery (normal on some upgrade paths)
 if [ $CYBERCP_MISSING -eq 1 ]; then
-    echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] INFO: Some CyberCP directories are missing. Performing automatic recovery..." | tee -a /var/log/cyberpanel_upgrade_debug.log
+    echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] INFO: Restoring missing CyberCP directories from repository..." | tee -a /var/log/cyberpanel_upgrade_debug.log
     
     # Backup any remaining configuration files if they exist
     if [ -f "/usr/local/CyberCP/CyberCP/settings.py" ]; then
@@ -853,7 +853,7 @@ if [ $CYBERCP_MISSING -eq 1 ]; then
         # Clean up temporary clone
         rm -rf /usr/local/CyberCP_recovery_tmp
         
-        echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Recovery completed successfully. CyberCP structure restored." | tee -a /var/log/cyberpanel_upgrade_debug.log
+        echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Recovery completed. All essential CyberCP directories restored." | tee -a /var/log/cyberpanel_upgrade_debug.log
     else
         echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] ERROR: Failed to clone repository for recovery" | tee -a /var/log/cyberpanel_upgrade_debug.log
         echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Please run full installation instead of upgrade" | tee -a /var/log/cyberpanel_upgrade_debug.log
@@ -925,7 +925,7 @@ elif [[ -d /usr/local/CyberPanel/bin/ ]]; then
 else
   #!/bin/bash
 
-echo -e "\nNothing found, need fresh setup...\n"
+echo -e "\nNo existing virtualenv found; creating fresh Python environment...\n"
 
 # Attempt to create a virtual environment
 if [[ "$Server_OS" = "Ubuntu" ]] && ([[ "$Server_OS_Version" = "22" ]] || [[ "$Server_OS_Version" = "24" ]]); then
@@ -1369,6 +1369,7 @@ if [[ -f Makefile ]]; then
 fi
 
 echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] Compiling WSGI with optimized flags..." | tee -a /var/log/cyberpanel_upgrade_debug.log
+echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] (Upstream WSGI source may show harmless strncpy/gstate warnings; build can still succeed.)" | tee -a /var/log/cyberpanel_upgrade_debug.log
 make clean 2>&1 | tee -a /var/log/cyberpanel_upgrade_debug.log
 make 2>&1 | tee -a /var/log/cyberpanel_upgrade_debug.log