--- rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch	2022/03/13 06:33:40	1.1
+++ rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch	2022/03/14 02:34:44	1.3
@@ -46,3 +46,55 @@ diff -Nur --no-dereference smeserver-mys
 +   fi
 +   exit 0
  fi
+diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_ smeserver-mysql-2.7.0/rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_
+--- smeserver-mysql-2.7.0.old/rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_	2022-03-12 16:39:10.000000000 -0500
++++ smeserver-mysql-2.7.0/rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_	2022-03-13 21:14:10.966000000 -0400
+@@ -3,7 +3,7 @@
+ $cfg['Servers'][$i]['host'] = 'localhost';
+ $cfg['Servers'][$i]['extension'] = 'mysqli';
+ $cfg['Servers'][$i]['connect_type'] = 'socket';
+-$cfg['Servers'][$i]['socket'] = '/var/lib/mysql/mariadb!!!VER!!!.sock';
++$cfg['Servers'][$i]['socket'] = '!!!SOCKET!!!';
+ $cfg['Servers'][$i]['compress'] = false;
+ # standalone or login mode
+ $scriptname=end(explode('/',$_SERVER['PHP_SELF']));
+diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-mysql.init smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-mysql.init
+--- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-mysql.init	2022-03-11 20:43:05.000000000 -0500
++++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-mysql.init	2022-03-13 21:13:39.386000000 -0400
+@@ -52,7 +52,7 @@
+ 
+ for i in $(seq 1 10)
+ do
+-    if test -e /var/lib/mysql/mariadb!!!VER!!!.sock
++    if test -e !!!SOCKET!!!
+     then
+ 	exit_value=0
+ 	HOME=/root
+diff -Nur --no-dereference smeserver-mysql-2.7.0.old/root/etc/e-smith/templates/var/lib/mysql/set.password smeserver-mysql-2.7.0/root/etc/e-smith/templates/var/lib/mysql/set.password
+--- smeserver-mysql-2.7.0.old/root/etc/e-smith/templates/var/lib/mysql/set.password	2022-03-11 10:32:13.000000000 -0500
++++ smeserver-mysql-2.7.0/root/etc/e-smith/templates/var/lib/mysql/set.password	2022-03-13 22:32:50.035000000 -0400
+@@ -3,9 +3,20 @@
+ 
+     my $pw = esmith::util::LdapPassword();
+ 
+-    $OUT .= "use mysql;\n";
+-    $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
+-    $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
+-    $OUT .= "DELETE FROM user WHERE user='';\n";
++    $OUT .= "DELIMITER //\n";
++    $OUT .= "use mysql //\n";
++    $OUT .= "SET \@vers := (SELECT REPLACE(SUBSTRING( \@\@VERSION , 1 , LOCATE( '.' , \@\@VERSION, LOCATE( '.' , \@\@VERSION )+1 ) ), '.','' ) ) //\n";
++    $OUT .= "BEGIN NOT ATOMIC \n";
++    $OUT .= "IF \@vers < 104 THEN \n";
++    $OUT .= "  ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
++    $OUT .= "  UPDATE user SET password=password('$pw') WHERE user='root';\n";
++    $OUT .= "  DELETE FROM db WHERE user='';\n";
++    $OUT .= "  DELETE FROM user WHERE user='';\n";
++    $OUT .= "ELSE  \n";
++    $OUT .= "  SET PASSWORD FOR 'root'\@localhost = PASSWORD(\"$pw\"); \n";
++    $OUT .= "END IF; \n";
++    $OUT .= "END // \n";
++    $OUT .= "DELIMITER ; \n";
+     $OUT .= "FLUSH PRIVILEGES;\n";
++
+ }