From d5c5fab942b1d068dc36e28740a655b607c8e321 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Fri, 12 Sep 2025 22:13:44 -0400
Subject: [PATCH] * Fri Sep 12 2025 Jean-Philippe Pialasse <jpp@koozali.org>
 1.0-10.sme - revert using core mariadb [SME: 13143]

---
 contriborbase                                             | 1 -
 createlinks                                               | 4 ++--
 root/etc/e-smith/db/configuration/migrate/80bugzilla      | 8 --------
 .../etc/e-smith/sql/{init105 => init}/91bugzilla          | 0
 .../e-smith/templates/etc/bugzilla/localconfig/30database | 2 +-
 .../etc/e-smith/sql/{init105 => init}/91bugzilla          | 0
 smeserver-bugzilla.spec                                   | 5 ++++-
 7 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 contriborbase
 rename root/etc/e-smith/templates.metadata/etc/e-smith/sql/{init105 => init}/91bugzilla (100%)
 rename root/etc/e-smith/templates/etc/e-smith/sql/{init105 => init}/91bugzilla (100%)

diff --git a/contriborbase b/contriborbase
deleted file mode 100644
index 9b7fd51..0000000
--- a/contriborbase
+++ /dev/null
@@ -1 +0,0 @@
-contribs10
diff --git a/createlinks b/createlinks
index 0d548e3..171911c 100644
--- a/createlinks
+++ b/createlinks
@@ -10,7 +10,7 @@ for my $event (qw(
 {
     templates2events("/etc/bugzilla.conf", $event);
     templates2events("/etc/bugzilla/localconfig", $event);
-    templates2events("/etc/e-smith/sql/init105/91bugzilla", $event);
+    templates2events("/etc/e-smith/sql/init/91bugzilla", $event);
 }
 
 for my $event (qw(
@@ -21,6 +21,6 @@ for my $event (qw(
     templates2events("/etc/httpd/conf/httpd.conf", $event);
     safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
     event_link("bugzilla", $event, "91");
-    safe_symlink("restart","root/etc/e-smith/events/$event/services2adjust/mariadb105-mysql.init")
+    safe_symlink("restart","root/etc/e-smith/events/$event/services2adjust/mysql.init")
 }
 
diff --git a/root/etc/e-smith/db/configuration/migrate/80bugzilla b/root/etc/e-smith/db/configuration/migrate/80bugzilla
index 48d995e..ff09a34 100644
--- a/root/etc/e-smith/db/configuration/migrate/80bugzilla
+++ b/root/etc/e-smith/db/configuration/migrate/80bugzilla
@@ -5,22 +5,14 @@
     my $rec;
     my $pw;
 
-    # Enable InnoDB (needed for Bugzilla)
-    $service = 'mysqld';
-
-    $rec = $DB->get($service) || $DB->new_record($service, {type => 'service'});
-    $rec->set_prop('InnoDB', 'enabled');
-
     # Store the Bugzilla password in the configuration database (if not already there)
     $service = 'bugzilla';
 
     $rec = $DB->get($service) || $DB->new_record($service, {type => 'service'});
 
     $pw = $rec->prop('DbPassword');
-#    return "" if $pw;
 
     $adminpw = $rec->prop('AdminPassword');
-#    return "" if $pw;
 
 	if (! $pw)
     	{
diff --git a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/91bugzilla b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/91bugzilla
similarity index 100%
rename from root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/91bugzilla
rename to root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/91bugzilla
diff --git a/root/etc/e-smith/templates/etc/bugzilla/localconfig/30database b/root/etc/e-smith/templates/etc/bugzilla/localconfig/30database
index d69a526..8625d0b 100644
--- a/root/etc/e-smith/templates/etc/bugzilla/localconfig/30database
+++ b/root/etc/e-smith/templates/etc/bugzilla/localconfig/30database
@@ -28,7 +28,7 @@ $db_port = 0;
 # MySQL Only: Enter a path to the unix socket for MySQL. If this is
 # blank, then MySQL's compiled-in default will be used. You probably
 # want that.
-$db_sock = '/var/lib/mysql/mariadb105.sock';
+$db_sock = '/var/lib/mysql/mysql.sock';
 
 # Should checksetup.pl try to verify that your database setup is correct?
 # (with some combinations of database servers/Perl modules/moonphase this
diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init105/91bugzilla b/root/etc/e-smith/templates/etc/e-smith/sql/init/91bugzilla
similarity index 100%
rename from root/etc/e-smith/templates/etc/e-smith/sql/init105/91bugzilla
rename to root/etc/e-smith/templates/etc/e-smith/sql/init/91bugzilla
diff --git a/smeserver-bugzilla.spec b/smeserver-bugzilla.spec
index ba2590f..c205213 100644
--- a/smeserver-bugzilla.spec
+++ b/smeserver-bugzilla.spec
@@ -5,7 +5,7 @@
 Summary: Set up bugzilla for SME Server.
 %define name smeserver-bugzilla
 %define version 1.0
-%define release 9
+%define release 10
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -48,6 +48,9 @@ AutoReqProv: no
 rpm to setup bugzilla
 
 %changelog
+* Fri Sep 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.0-10.sme
+- revert using core mariadb [SME: 13143]
+
 * Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 1.0-9.sme
 - Fix e-smith references in smeserver-bugzilla [SME: 12732]