/[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.1 by jpp, Sun Mar 13 06:33:40 2022 UTC Revision 1.3 by jpp, Mon Mar 14 02:34:44 2022 UTC
# Line 46  diff -Nur --no-dereference smeserver-mys Line 46  diff -Nur --no-dereference smeserver-mys
46  +   fi  +   fi
47  +   exit 0  +   exit 0
48   fi   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_
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
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
52    @@ -3,7 +3,7 @@
53     $cfg['Servers'][$i]['host'] = 'localhost';
54     $cfg['Servers'][$i]['extension'] = 'mysqli';
55     $cfg['Servers'][$i]['connect_type'] = 'socket';
56    -$cfg['Servers'][$i]['socket'] = '/var/lib/mysql/mariadb!!!VER!!!.sock';
57    +$cfg['Servers'][$i]['socket'] = '!!!SOCKET!!!';
58     $cfg['Servers'][$i]['compress'] = false;
59     # standalone or login mode
60     $scriptname=end(explode('/',$_SERVER['PHP_SELF']));
61    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
62    --- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-mysql.init      2022-03-11 20:43:05.000000000 -0500
63    +++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-mysql.init  2022-03-13 21:13:39.386000000 -0400
64    @@ -52,7 +52,7 @@
65    
66     for i in $(seq 1 10)
67     do
68    -    if test -e /var/lib/mysql/mariadb!!!VER!!!.sock
69    +    if test -e !!!SOCKET!!!
70         then
71            exit_value=0
72            HOME=/root
73    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
74    --- smeserver-mysql-2.7.0.old/root/etc/e-smith/templates/var/lib/mysql/set.password     2022-03-11 10:32:13.000000000 -0500
75    +++ smeserver-mysql-2.7.0/root/etc/e-smith/templates/var/lib/mysql/set.password 2022-03-13 22:32:50.035000000 -0400
76    @@ -3,9 +3,20 @@
77    
78         my $pw = esmith::util::LdapPassword();
79    
80    -    $OUT .= "use mysql;\n";
81    -    $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
82    -    $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
83    -    $OUT .= "DELETE FROM user WHERE user='';\n";
84    +    $OUT .= "DELIMITER //\n";
85    +    $OUT .= "use mysql //\n";
86    +    $OUT .= "SET \@vers := (SELECT REPLACE(SUBSTRING( \@\@VERSION , 1 , LOCATE( '.' , \@\@VERSION, LOCATE( '.' , \@\@VERSION )+1 ) ), '.','' ) ) //\n";
87    +    $OUT .= "BEGIN NOT ATOMIC \n";
88    +    $OUT .= "IF \@vers < 104 THEN \n";
89    +    $OUT .= "  ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
90    +    $OUT .= "  UPDATE user SET password=password('$pw') WHERE user='root';\n";
91    +    $OUT .= "  DELETE FROM db WHERE user='';\n";
92    +    $OUT .= "  DELETE FROM user WHERE user='';\n";
93    +    $OUT .= "ELSE  \n";
94    +    $OUT .= "  SET PASSWORD FOR 'root'\@localhost = PASSWORD(\"$pw\"); \n";
95    +    $OUT .= "END IF; \n";
96    +    $OUT .= "END // \n";
97    +    $OUT .= "DELIMITER ; \n";
98         $OUT .= "FLUSH PRIVILEGES;\n";
99    +
100     }

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