From db4f5b5e9cdf9877d0308ff672a07b05fae24726 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Sun, 28 Dec 2025 19:39:52 +0200 Subject: [PATCH 1/4] Fix to skip uninstall when package is replaced by rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit *Note: This is to support clean upgrade and replacement of wbm-* → webmin-* modules --- makemodulerpm.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makemodulerpm.pl b/makemodulerpm.pl index c7e83a9be..1b8c95240 100755 --- a/makemodulerpm.pl +++ b/makemodulerpm.pl @@ -551,6 +551,9 @@ if [ "$istheme" = "1" -a "\$1" = "0" ]; then fi # Run the pre-uninstall script, if we are not upgrading if [ "$prog" = "webmin" -a "\$1" = "0" -a -r "/usr/libexec/$prog/$mod/uninstall.pl" ]; then + # Skip if replaced by a different package (wbm-foo - webmin-foo) + owner=\$(rpm -qf --qf '%%{NAME}\\n' "/usr/libexec/$prog/$mod/uninstall.pl" 2>/dev/null || true) + [ -n "\$owner" -a "\$owner" != "%{name}" ] && exit 0 cd /usr/libexec/$prog WEBMIN_CONFIG=/etc/$prog WEBMIN_VAR=/var/$prog /usr/libexec/$prog/run-uninstalls.pl $mod fi From 2510b985b1d088db3cf368da9ee1e5a010d1bafc Mon Sep 17 00:00:00 2001 From: hayden-t Date: Tue, 30 Dec 2025 13:54:39 +1100 Subject: [PATCH 2/4] incorrect ssl_enforce setting for HSTS https://github.com/webmin/webmin/issues/2611 --- setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.sh b/setup.sh index b03a92608..7840d0c4a 100755 --- a/setup.sh +++ b/setup.sh @@ -839,8 +839,8 @@ if [ "$upgrading" != 1 ]; then # Enable HSTS by default echo "ssl_hsts=1" >> $config_dir/miniserv.conf - # Enable force redirect to SSL by default - echo "ssl_enforce=1" >> $config_dir/miniserv.conf + # Enable force redirect to SSL with HSTS by default + echo "ssl_enforce=2" >> $config_dir/miniserv.conf # Disallow unknown referers by default echo "referers_none=1" >>$config_dir/config @@ -851,10 +851,10 @@ else echo "ssl_hsts=1" >> $config_dir/miniserv.conf fi - # Enable force redirect to SSL if not set + # Enable force redirect to SSL with HSTS if not set grep ssl_enforce= $config_dir/miniserv.conf >/dev/null if [ "$?" != "0" ]; then - echo "ssl_enforce=1" >> $config_dir/miniserv.conf + echo "ssl_enforce=2" >> $config_dir/miniserv.conf fi # Disallow unknown referers if not set From 476915850a047fae0931fe77d08563c953ec7d46 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Wed, 31 Dec 2025 12:46:07 +0200 Subject: [PATCH 3/4] Fix displaying correct IP version label https://github.com/webmin/webmin/issues/2613 --- bind8/bind8-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl index 1c0fd4eb2..f1b271c6b 100755 --- a/bind8/bind8-lib.pl +++ b/bind8/bind8-lib.pl @@ -1124,7 +1124,7 @@ else { @v = ( ); } if ($type eq "A" || $type eq "AAAA") { - print &ui_table_row($text{'value_A1'}, + print &ui_table_row($text{"value_${type}1"}, &ui_textbox("value0", $v[0], 20)." ". (!defined($_[5]) && $type eq "A" ? &free_address_button("value0") : ""), 3); From d4ab826097ddec894b549ba9c298c8b0a389ff83 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Sun, 4 Jan 2026 15:21:32 +0200 Subject: [PATCH 4/4] Add support for Ubuntu 26.04 --- os_list.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/os_list.txt b/os_list.txt index eaec6d858..55e120a17 100644 --- a/os_list.txt +++ b/os_list.txt @@ -128,6 +128,7 @@ Ubuntu Linux $1 debian-linux 11.0 $os_release =~ /Ubuntu\s+(20\.[0-9\.]+)/ || Ubuntu Linux $1 debian-linux 12.0 $os_release =~ /Ubuntu\s+(21\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(21\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+(hirsute|impish)/i Ubuntu Linux $1 debian-linux 13.0 $os_release =~ /Ubuntu\s+(22\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(22\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+jammy/i Ubuntu Linux $1 debian-linux 14.0 $os_release =~ /Ubuntu\s+(24\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(24\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+noble/i +Ubuntu Linux $1 debian-linux 15.0 $os_release =~ /Ubuntu\s+(26\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(26\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+resolute/i Ubuntu Linux $1 debian-linux 3.1 $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i Mepis Linux $1 debian-linux $1 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/ Mepis Linux $1 debian-linux 4.0 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /(stable)/