From 1232b55c132e110a682326a4ebfd70847f3a713a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Tue, 8 Apr 2025 23:21:55 -0400
Subject: [PATCH] * Tue Apr 08 2025 Jean-Philippe Pialasse <jpp@koozali.org>
 1.6-9.sme - fix login to roundcube after restore [SME: 12981]

---
 .../etc/e-smith/sql/init/80roundcube          | 22 +++++++++++--------
 smeserver-roundcube.spec                      |  7 ++++--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube b/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube
index 45ca27f..37ba68f 100644
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube
+++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube
@@ -3,23 +3,27 @@
     my $user = $roundcube{DbUser} || 'roundcube';
     my $pass = $roundcube{DbPassword} || 'changeme';
     $OUT .= <<END
-#! /bin/sh
-    if [ -d /var/lib/mysql/$db ]; then
+#!/bin/sh
+
+
+    if [ ! -d /var/lib/mysql/$db ]; then
 #if you need to add plugins:
-#    /usr/bin/mysql  $db < /usr/share/roundcubemail/plugins/calendar/drivers/database/SQL/mysql.initial.sql
-#    /usr/bin/mysql  $db < /usr/share/roundcubemail/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
-#    /usr/bin/mysql  $db < /usr/share/roundcubemail/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
-    exit
-    fi
-    /usr/bin/mysql <<EOF
+#    /usr/bin/mariadb  $db < /usr/share/roundcubemail/plugins/calendar/drivers/database/SQL/mysql.initial.sql
+#    /usr/bin/mariadb  $db < /usr/share/roundcubemail/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
+#    /usr/bin/mariadb  $db < /usr/share/roundcubemail/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
+
+    /usr/bin/mariadb <<EOF
     CREATE DATABASE $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
     use $db;
     source /usr/share/roundcubemail/SQL/mysql.initial.sql;
+EOF
+    fi
+    /usr/bin/mariadb <<EOF
     use mysql;
     GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost
             IDENTIFIED BY '$pass';
     flush privileges;
 EOF
-
+exit 0
 END
 }
diff --git a/smeserver-roundcube.spec b/smeserver-roundcube.spec
index cd9cdc1..c681b0e 100644
--- a/smeserver-roundcube.spec
+++ b/smeserver-roundcube.spec
@@ -1,8 +1,8 @@
 %define name smeserver-roundcube
 %define version 1.6
-%define release 8
+%define release 9
 
-Summary: smserver rpm to setup roundcube, an IMAP mail client
+Summary: smeserver rpm to setup roundcube, an IMAP mail client
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -85,6 +85,9 @@ fi
 %attr(755,root,root) /usr/bin/rcplugin_update.sh
 
 %changelog
+* Tue Apr 08 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-9.sme
+- fix login to roundcube after restore [SME: 12981]
+
 * Sun Mar 30 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-8.sme
 - remove service handling from post-upgrade event [SME: 12977]