/[smeserver]/rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch
ViewVC logotype

Diff of /rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.4 by jpp, Mon Mar 14 02:39:16 2022 UTC Revision 1.5 by jpp, Mon Mar 14 03:57:48 2022 UTC
# Line 15  diff -Nur --no-dereference smeserver-mys Line 15  diff -Nur --no-dereference smeserver-mys
15                 flush-engine-log flush-general-log flush-slow-log                 flush-engine-log flush-general-log flush-slow-log
16          fi          fi
17       endscript       endscript
18    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
19    --- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize      2022-03-12 00:27:43.000000000 -0500
20    +++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize  2022-03-13 01:24:53.334000000 -0500
21    @@ -34,8 +34,11 @@
22             fi
23             exit $ret
24         fi
25    -    # set root password
26    -    /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
27    +    # set root password , 104 and above have a different syntax and allow root passwordless access
28    +    if [ !!!VER!!! -le  103 ]
29    +    then
30    +      /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
31    +    fi
32         # upgrade does not need to be run on a fresh datadir
33         #echo "5.7.24" >"$datadir/mysql_upgrade_info"
34         # In case we're running as root, make sure files are owned properly
35    @@ -46,7 +49,10 @@
36             /sbin/e-smith/expand-template /etc/e-smith/sql/init!!!VER!!!/00_restore_dumped_dbs
37         fi
38     else
39    -   # else we set root password anyway ! just to be sure !
40    -   /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
41    -
42    +   # else we set root password anyway ! just to be sure ! 104 and above have a different syntax and allow root passwordless access
43    +   if [ !!!VER!!! -le  103 ]
44    +   then
45    +     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
46    +   fi
47    +   exit 0
48     fi
49  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_  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_
50  --- 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.old/rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_    2022-03-12 16:39:10.000000000 -0500
51  +++ 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  +++ 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
# Line 39  diff -Nur --no-dereference smeserver-mys Line 70  diff -Nur --no-dereference smeserver-mys
70       then       then
71          exit_value=0          exit_value=0
72          HOME=/root          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";  
 +  
  }  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed