--- 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:39:16	1.4
@@ -15,34 +15,55 @@ diff -Nur --no-dereference smeserver-mys
                flush-engine-log flush-general-log flush-slow-log
  	fi
      endscript
-diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize
---- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize	2022-03-12 00:27:43.000000000 -0500
-+++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize	2022-03-13 01:24:53.334000000 -0500
-@@ -34,8 +34,11 @@
-         fi
-         exit $ret
-     fi
--    # set root password
--    /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
-+    # set root password , 104 and above have a different syntax and allow root passwordless access
-+    if [ !!!VER!!! -le  103 ]
-+    then
-+      /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
-+    fi
-     # upgrade does not need to be run on a fresh datadir
-     #echo "5.7.24" >"$datadir/mysql_upgrade_info"
-     # In case we're running as root, make sure files are owned properly
-@@ -46,7 +49,10 @@
-         /sbin/e-smith/expand-template /etc/e-smith/sql/init!!!VER!!!/00_restore_dumped_dbs
-     fi
- else
--   # else we set root password anyway ! just to be sure !
--   /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
--
-+   # else we set root password anyway ! just to be sure ! 104 and above have a different syntax and allow root passwordless access
-+   if [ !!!VER!!! -le  103 ]
-+   then
-+     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
-+   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";
++
+ }