* Fri Apr 05 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme

- tidy spec and sources for mariadb10.5 support [SME: 12524]
- try to make compatible with higher version from mariadb repo [SME: 11856]
- fix logrotate duplicate entry [SME: 12554]

* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-3.sme
- Set license file to GPL2.0  [SME: 12577]

root/sbin/e-smith/systemd/mariadb-initialize

@@ -3,12 +3,9 @@
 exec 2>&1
 if [ ! -f /var/lib/mysql/mysql/user.frm ]
 then
-    setuidgid mysql sh /usr/bin/mysql_install_db
-    /usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables < /var/lib/mysql/set.password
+    setuidgid mysql sh /usr/bin/mysql_install_db --rpm --skip-test-db --user=mysql --group=mysql
     if [ -f /home/e-smith/db/mysql/mysql.dump ]
     then
         /sbin/e-smith/expand-template /etc/e-smith/sql/init/00_restore_dumped_dbs
     fi
-else
-   /usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables < /var/lib/mysql/set.password
 fi

root/sbin/e-smith/systemd/mariadb-post

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+for i in $(seq 1 20);
+do
+  if [ -S /var/lib/mysql/mysql.sock ]
+  then
+      /usr/bin/mysql < /var/lib/mysql.private/set.password
+      echo  "root password set"
+      exit 0
+  fi
+  echo waiting for mariadb to start to set root password
+  sleep 1
+done
+echo  failed to set root password
+# we fail silently, mariadb will still work, only issue is for phpmyadmin
+# and non socket access
+exit 0
+

root/sbin/e-smith/systemd/mysql.init

@@ -65,7 +65,7 @@ do
 	done 
 	exit $exit_value
     fi
-    echo "Waiting for mysql to startup" >&2
+    echo "Waiting for mariadb to startup" >&2
     sleep 2
 done