2.621 update

debian/patches/fix-module-dependencies.diff

@@ -5,7 +5,7 @@ Description: Patch fdisk and lvm module.info dependencies
  with the control file.
 Author: Jeremy Davis <jeremy@turnkeylinux.org>
 Forwarded: no
-Last-Update: 2025-11-25
+Last-Update: 2026-01-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/modules/fdisk/module.info
@@ -14,8 +14,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  category=hardware
  os_support=*-linux
  desc=Partitions on Local Disks
--depends=mount proc raid 2.610
-+depends=mount proc 2.610
+-depends=mount proc raid 2.621
++depends=mount proc 2.621
  longdesc=Create and edit partitions on local SCSI, IDE and SATA disks on Linux.
  novserver=1
  noopenvz=1
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  desc=Logical Volume Management
  category=hardware
  os_support=*-linux
--depends=mount fdisk 2.610
-+depends=mount fdisk raid 2.610
+-depends=mount fdisk 2.621
++depends=mount fdisk raid 2.621
  longdesc=Configure volume groups, physical volumes and logical volumes for Linux LVM.
- version=2.610
+ version=2.621

modules/adsl-client/module.info

@@ -3,5 +3,5 @@ desc=ADSL Client
 os_support=*-linux
 category=net
 longdesc=Set up a PPP client with the RP-PPPoE package.
-depends=net 2.610
-version=2.610
+depends=net 2.621
+version=2.621

modules/apache/lang/en

@@ -161,6 +161,7 @@ manual_efile=Invalid Apache config file
 manual_etest=Configuration file error detected : $1
 manual_editfile=Edit config file:
 manual_switch=Edit
+manual_evirt=Virtual host could not be found after manual changes - maybe the ServerName was changed?
 
 dir_title=Per-Directory Options
 dir_proxyall=All proxy requests

modules/apache/manual_save.cgi

@@ -73,6 +73,14 @@ if ($config{'test_manual'}) {
 		&error(&text('manual_etest',
 			     "<pre>".&html_escape($err)."</pre>"));
 		}
+	if (defined($in{'virt'}) && !defined($in{'idx'})) {
+		undef(@get_config_cache);
+		($conf, $v) = &get_virtual_config($in{'virt'});
+		if (!$v) {
+			&copy_source_dest($temp, $file);
+			&error($text{'manual_evirt'});
+			}
+		}
 	}
 unlink($temp);
 &unlock_file($file);

modules/apache/module.info

@@ -5,5 +5,5 @@ desc=Apache Webserver
 longdesc=Configure almost all Apache directives and features.
 readonly=1
 syslog=1
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/at/module.info

@@ -3,6 +3,6 @@ desc=Scheduled Commands
 os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux open-linux turbo-linux corel-linux msc-linux freebsd netbsd openbsd generic-linux openserver macos gentoo-linux irix sol-linux coherent-linux openmamba-linux syno-linux
 category=system
 longdesc=Schedule the execution of one-off commands or scripts.
-depends=proc 2.610
+depends=proc 2.621
 readonly=1
-version=2.610
+version=2.621

modules/backup-config/module.info

@@ -1,6 +1,6 @@
 desc=Backup Configuration Files
 category=webmin
 longdesc=Perform manual or scheduled backups and restores of configuration files managed by Webmin modules.
-depends=cron mailboxes 2.610
+depends=cron mailboxes 2.621
 readonly=1
-version=2.610
+version=2.621

modules/bacula-backup/module.info

@@ -1,5 +1,5 @@
 desc=Bacula Backup System
 category=system
-depends=proc cron 1.250 2.610
+depends=proc cron 1.250 2.621
 longdesc=Configure Bacula to perform backups and restores manually or on schedule, for one or many systems.
-version=2.610
+version=2.621

modules/bandwidth/module.info

@@ -1,6 +1,6 @@
 desc=Bandwidth Monitoring
-depends=net cron 2.610
+depends=net cron 2.621
 category=net
 longdesc=View reports on bandwidth usage by host, port, protocol and time on a Linux system.
 os_support=!windows
-version=2.610
+version=2.621

modules/bind8/bind8-lib.pl

@@ -70,12 +70,18 @@ sub get_rand_flag
 if ($gconfig{'os_type'} =~ /-linux$/ &&
     $config{'force_random'} eq '0' &&
     -r "/dev/urandom" &&
-    &compare_version_numbers($bind_version, 9) >= 0 &&
-    &compare_version_numbers($bind_version, '9.14.2') < 0) {
-	# Version: 9.14.2 deprecated the use of -r option
-	# in favor of using /dev/random [bugs:#5370]
-	return "-r /dev/urandom";
+    &compare_version_numbers($bind_version, 9) >= 0) {
+	if (&compare_version_numbers($bind_version, '9.14.2') < 0) {
+		return "-r /dev/urandom";
+		}
+	else {
+		# Version: 9.14.2 deprecated the use of -r option
+		# in favor of using /dev/random [bugs:#5370]. So no
+		# entropy generation is needed.
+		return undef;
+		}
 	}
+# No random flag, and entropy is needed
 return "";
 }
 
@@ -1118,7 +1124,7 @@ sub record_input
 	@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);
@@ -3458,7 +3464,8 @@ sub create_dnssec_key
 
 # Fork a background job to do lots of IO, to generate entropy
 my $pid;
-if (!&get_rand_flag()) {
+my $flag = &get_rand_flag();
+if (defined($flag) && !$flag) {
 	$pid = fork();
 	if (!$pid) {
 		exec("find / -type f >/dev/null 2>&1");
@@ -3507,7 +3514,7 @@ sub create_dnssec_key
 		"cd ".quotemeta($fn)." && ".
 		"$config{'keygen'} -a ".quotemeta($alg).
 		" -b ".quotemeta($zonesize).
-		" -n ZONE ".&get_rand_flag()." $dom 2>&1");
+		" -n ZONE ".($flag || "")." $dom 2>&1");
 	if ($?) {
 		kill('KILL', $pid) if ($pid);
 		return $out;
@@ -3519,7 +3526,7 @@ sub create_dnssec_key
 			"cd ".quotemeta($fn)." && ".
 			"$config{'keygen'} -a ".quotemeta($alg).
 			" -b ".quotemeta($size).
-			" -n ZONE -f KSK ".&get_rand_flag()." $dom 2>&1");
+			" -n ZONE -f KSK ".($flag || "")." $dom 2>&1");
 		kill('KILL', $pid) if ($pid);
 		if ($?) {
 			return $out;
@@ -3589,7 +3596,8 @@ sub resign_dnssec_key
 
 # Fork a background job to do lots of IO, to generate entropy
 my $pid;
-if (!&get_rand_flag()) {
+my $flag = &get_rand_flag();
+if (defined($flag) && !$flag) {
 	$pid = fork();
 	if (!$pid) {
 		exec("find / -type f >/dev/null 2>&1");
@@ -3606,7 +3614,7 @@ sub resign_dnssec_key
 my $out = &backquote_logged(
 	"cd ".quotemeta($dir)." && ".
 	"$config{'keygen'} -a ".quotemeta($alg)." -b ".quotemeta($zonesize).
-	" -n ZONE ".&get_rand_flag()." $dom 2>&1");
+	" -n ZONE ".($flag || "")." $dom 2>&1");
 kill('KILL', $pid) if ($pid);
 if ($?) {
 	return "Failed to generate new zone key : $out";

modules/bind8/module.info

@@ -2,8 +2,8 @@ name=BIND
 category=servers
 os_support=*-linux solaris hpux freebsd osf1 irix unixware openserver macos openbsd aix netbsd windows 
 desc=BIND DNS Server
-depends=servers 2.610
+depends=servers 2.621
 longdesc=Create and edit domains, DNS records, BIND options and views.
 readonly=1
 syslog=1
-version=2.610
+version=2.621

modules/change-user/module.info

@@ -1,7 +1,7 @@
 name=ChangeUser
 desc=Change Language and Theme
 category=webmin
-depends=acl webmin 2.610
+depends=acl webmin 2.621
 longdesc=Allows the current Webmin user to change his language, theme and possibly password.
 readonly=1
-version=2.610
+version=2.621

modules/cluster-copy/module.info

@@ -1,5 +1,5 @@
 desc=Cluster Copy Files
 category=cluster
-depends=cron 2.610
+depends=cron 2.621
 longdesc=Schedule the transfer of files from this server to multiple servers in a Webmin cluster.
-version=2.610
+version=2.621

modules/cluster-cron/module.info

@@ -1,6 +1,6 @@
 desc=Cluster Cron Jobs
 category=cluster
 os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos openbsd aix netbsd 
-depends=cron 2.610
+depends=cron 2.621
 longdesc=Create scheduled Cron jobs that run on multiple servers simultaneously.
-version=2.610
+version=2.621

modules/cluster-passwd/module.info

@@ -1,6 +1,6 @@
 desc=Cluster Change Passwords
 category=cluster
-depends=cluster-useradmin passwd useradmin 2.610
+depends=cluster-useradmin passwd useradmin 2.621
 longdesc=Change passwords on multiple systems in a Webmin cluster at once.
 os_support=!windows
-version=2.610
+version=2.621

modules/cluster-shell/module.info

@@ -1,5 +1,5 @@
 desc=Cluster Shell Commands
 category=cluster
 longdesc=Run commands on multiple servers at once.
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/cluster-software/module.info

@@ -1,7 +1,7 @@
 name=Cluster Software
 desc=Cluster Software Packages
 os_support=cobalt-linux mandrake-linux redhat-linux open-linux msc-linux suse-linux united-linux turbo-linux debian-linux solaris openserver gentoo-linux trustix-linux coherent-linux slackware-linux windows pardus-linux
-depends=software servers 2.610
+depends=software servers 2.621
 category=cluster
 longdesc=Install RPMs, debian and solaris packages across multiple servers from one source.
-version=2.610
+version=2.621

modules/cluster-useradmin/module.info

@@ -1,7 +1,7 @@
 name=Cluster Users
 desc=Cluster Users and Groups
 os_support=*-linux solaris hpux freebsd osf1 unixware openbsd irix netbsd aix openserver macos 
-depends=useradmin servers 2.610
+depends=useradmin servers 2.621
 category=cluster
 longdesc=Create, update and delete users and groups across multiple servers. Unlike NIS, each server has its own passwd and group files which are remotely updated by this module.
-version=2.610
+version=2.621

modules/cluster-usermin/module.info

@@ -1,7 +1,7 @@
 name=Cluster Usermin
 desc=Cluster Usermin Servers
 category=cluster
-depends=usermin servers 2.610
+depends=usermin servers 2.621
 longdesc=Install and manage modules and themes across multiple Usermin servers.
 os_support=!windows
-version=2.610
+version=2.621

modules/cluster-webmin/module.info

@@ -1,6 +1,6 @@
 name=Cluster Webmin
 desc=Cluster Webmin Servers
 category=cluster
-depends=webmin servers 2.610
+depends=webmin servers 2.621
 longdesc=Install and manage modules, themes, users, groups and access control settings across multiple Webmin servers.
-version=2.610
+version=2.621

modules/cpan/module.info

@@ -2,5 +2,5 @@ desc=Perl Modules
 name=CPAN
 longdesc=Install new Perl modules on your system, and view those already installed.
 os_support=!windows
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/custom/module.info

@@ -1,6 +1,6 @@
 name=Custom
 desc=Custom Commands
-depends=proc 2.610
+depends=proc 2.621
 longdesc=Create buttons to execute commonly used commands or edit files on your system.
 readonly=1
-version=2.610
+version=2.621

modules/dhcpd/module.info

@@ -3,5 +3,5 @@ category=servers
 os_support=debian-linux freebsd osf1 redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux irix netbsd msc-linux generic-linux gentoo-linux hpux trustix-linux macos sol-linux coherent-linux openmamba-linux pardus-linux
 desc=DHCP Server
 longdesc=Manage shared networks, subnets, hosts and groups for ISC DHCPD.
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/dovecot/module.info

@@ -1,6 +1,6 @@
 desc=Dovecot IMAP/POP3 Server
 category=servers
-depends=init 2.610
+depends=init 2.621
 longdesc=Configure the Dovecot IMAP and POP3 mail retrieval server.
 os_support=!windows
-version=2.610
+version=2.621

modules/exim/module.info

@@ -2,5 +2,5 @@ name=Exim Mail Server
 category=servers
 hidden=1
 desc=Exim Mailserver
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/exports/module.info

@@ -3,6 +3,6 @@ name=Export Manager
 category=net
 os_support=*-linux aix 
 desc=NFS Exports
-depends=mount 1.276 2.610
-version=2.610
+depends=mount 1.276 2.621
+version=2.621
 novserver=1

modules/fail2ban/module.info

@@ -1,6 +1,6 @@
 desc=Fail2Ban Intrusion Detector
 category=net
 longdesc=Fail2ban protects your system from brute force attacks by detecting them and blocking their source IPs.
-depends=init 2.610
+depends=init 2.621
 syslog=1
-version=2.610
+version=2.621

modules/fdisk/module.info

@@ -2,8 +2,8 @@ name=Partition Manager
 category=hardware
 os_support=*-linux
 desc=Partitions on Local Disks
-depends=mount proc raid 2.610
+depends=mount proc raid 2.621
 longdesc=Create and edit partitions on local SCSI, IDE and SATA disks on Linux.
 novserver=1
 noopenvz=1
-version=2.610
+version=2.621

modules/fetchmail/module.info

@@ -3,5 +3,5 @@ desc=Fetchmail Mail Retrieval
 name=Fetchmail
 longdesc=Configure the popular fetchmail program for automatically retrieving mail from other servers.
 os_support=!windows
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/filemin/module.info

@@ -3,5 +3,5 @@ longdesc=Fast and light File Manager written in Perl.
 name=File Manager
 usermin=1
 desc=File Manager
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/filter/module.info

@@ -7,5 +7,5 @@ usermin=1
 webmin=1
 webmin_hidden=1
 webmin_noui=1
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/firewall/module.info

@@ -3,5 +3,5 @@ desc=Linux Firewall
 os_support=*-linux
 category=net
 longdesc=Configure a Linux firewall using iptables. Allows the editing of all tables, chains, rules and options.
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/firewall6/module.info

@@ -4,5 +4,5 @@ longdesc=Configure a Linux firewall using ip6tables. Allows the editing of all t
 name=Firewall6
 os_support=*-linux
 library=firewall-lib.pl
-version=2.610
-depends=2.610
+version=2.621
+depends=2.621

modules/firewalld/module.info

@@ -1,6 +1,6 @@
 desc=FirewallD
 os_support=*-linux
-depends=net init 2.610
+depends=net init 2.621
 category=net
 longdesc=Configure a Linux firewall using FirewallD, by editing allowed services and ports.
-version=2.610
+version=2.621