Merge branch 'master' into dev/dnf-hold

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Add option to rotate Webmin and Usermin webserver logs using `logrotate` instead of periodically clearing them [#2821](https://github.com/webmin/webmin/pull/2821)
 * Add DNF 4 and 5 package hold management to the Software Package Updates module
 * Fix DNF update confirmations by previewing packages and dependencies that will be installed or updated
+* Fix PostgreSQL initialization on EL systems to use SCRAM-SHA-256 authentication by default
 
 #### 2.660 (August 20, 2026)
 * Add support for creating `vfsv1` Linux quota files for limits above 4 TiB, while preserving existing quota file formats

postgresql/postgresql-lib.pl

@@ -986,6 +986,11 @@ return undef;
 sub setup_postgresql
 {
 return undef if (!$config{'setup_cmd'});
+# Use SCRAM defaults for new clusters when supported by the EL setup wrapper
+local $ENV{'PGSETUP_INITDB_OPTIONS'} = '--auth-host=scram-sha-256'
+	if ($config{'setup_cmd'} =~ /\bpostgresql-setup\b/ &&
+	    &get_postgresql_version(1) >= 10 &&
+	    !$ENV{'PGSETUP_INITDB_OPTIONS'});
 local $temp = &transname();
 local $rv = &system_logged("($config{'setup_cmd'}) >$temp 2>&1");
 local $out = `cat $temp`;