[rpms/akonadi-server] epel10: Merge branch f44 into epel10

[rpms/akonadi-server] epel10: Merge branch f44 into epel10

[Troy Dawson]

A new commit has been pushed.

Repo   : rpms/akonadi-server
Branch : epel10
Commit : d46a19b1d23a298a438dd53366b89f9898ce2879
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-30T08:34:57-07:00
Stats  : +116/-7 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/akonadi-server/c/d46a19b1d23a298a438dd53366b89f9898ce2879?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index e2df7eb..969f672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,8 @@
 /akonadi-25.12.1.tar.xz
 /akonadi-25.12.2.tar.xz
 /akonadi-25.12.3.tar.xz
+/akonadi-26.03.80.tar.xz
+/akonadi-26.04.0.tar.xz
+/akonadi-26.04.1.tar.xz
+/akonadi-26.04.2.tar.xz
+/akonadi-26.04.3.tar.xz

diff --git a/400.patch b/400.patch
new file mode 100644
index 0000000..079765c
--- /dev/null
+++ b/400.patch
@@ -0,0 +1,69 @@
+From f0d71c9a28491b3fa664c1c520558c591061cb99 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 9 Jul 2026 07:25:18 -0400
+Subject: [PATCH] WIP - Fixes for Akonadi killing MariaDB too quickly
+
+[Tested with Fedora44 and mariadb 11.8.8]
+[No idea if these settings are ok for other MySQL variants]
+
+Implement the recommendations in BUG522845 to prevent crashes
+on login/logout when using the MariaDB backend.
+
+Includes these changes:
+- increase the wait from 3 to 30 seconds before termination
+- remove the  `TimeoutSec=5sec` in akonadi_control.service.in
+  so that systemd doesn't try to kill things after 5 seconds wait.
+- add `skip_slave_start` to mysql-global.conf so that replica
+  threads are not started which should improve startup time.
+
+BUG: 522845
+---
+ src/akonadicontrol/akonadi_control.service.in | 1 -
+ src/server/storage/dbconfigmysql.cpp          | 4 ++--
+ src/server/storage/mysql-global.conf          | 3 +++
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/akonadicontrol/akonadi_control.service.in b/src/akonadicontrol/akonadi_control.service.in
+index 03c35ef5d..26f4b1838 100644
+--- a/src/akonadicontrol/akonadi_control.service.in
++++ b/src/akonadicontrol/akonadi_control.service.in
+@@ -9,7 +9,6 @@ PartOf=graphical-session.target
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/akonadi_control
+ Type=dbus
+ BusName=org.freedesktop.Akonadi.Control
+-TimeoutSec=5sec
+ Slice=background.slice
+ # Disable restart as we're dbus activated anyway
+ Restart=no
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index 5f1dbd2e0..bb82a6537 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -609,8 +609,8 @@ void DbConfigMysql::stopInternalServer()
+     }
+ 
+     mDatabaseProcess->terminate();
+-    const bool result = mDatabaseProcess->waitForFinished(3000);
+-    // We've waited nicely for 3 seconds, to no avail, let's be rude.
++    const bool result = mDatabaseProcess->waitForFinished(30000);
++    // We've waited nicely for 30 seconds, to no avail, let's be rude.
+     if (!result) {
+         mDatabaseProcess->kill();
+     }
+diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf
+index b381ea502..9cc47ecf7 100644
+--- a/src/server/storage/mysql-global.conf
++++ b/src/server/storage/mysql-global.conf
+@@ -78,6 +78,9 @@ loose_query_cache_size=0
+ # Do not cache results (default:1)
+ loose_query_cache_type=0
+ 
++# Tells the replica server not to start the replication I/O (receiver) and SQL (applier) threads when the server starts
++skip_slave_start
++
+ # Do not use the privileges mechanisms
+ skip_grant_tables
+ 
+-- 
+GitLab
+

diff --git a/akonadi-server.spec b/akonadi-server.spec
index 13a764c..c8504d8 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -4,8 +4,8 @@
 
 Name:    akonadi-server
 Summary: PIM Storage Service
-Version: 25.12.3
-Release: 1%{?dist}
+Version: 26.04.3
+Release: 2%{?dist}
 
 License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 URL:     https://invent.kde.org/pim/akonadi
@@ -18,6 +18,9 @@ Source11:       akonadiserverrc.sqlite
 
 
 ## upstreamable patches
+## MySQL is killed by akonadi too fast
+## https://invent.kde.org/pim/akonadi/-/merge_requests/400
+Patch0:         400.patch
 
 ## upstream patches
 
@@ -48,12 +51,14 @@ BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(sqlite3) >= 3.6.23
 
-
 ## (some) optional deps
 BuildRequires:  pkgconfig(Qt6Designer)
 BuildRequires:  cmake(AccountsQt6)
 BuildRequires:  cmake(KAccounts6)
 
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+
 %if ! 0%{?flatpak}
 BuildRequires: mariadb-server
 %endif
@@ -100,7 +105,8 @@ Summary:        Akonadi MySQL backend support
 # upgrade path
 Obsoletes:      kf5-akonadi-server-mysql < 24.01.80-1
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       mariadb-server
+Requires:       mariadb-server-any
+Recommends:     mariadb-server
 Requires:       qt6-qtbase-mysql%{?_isa}
 Requires(post): /usr/sbin/update-alternatives
 Requires(postun): /usr/sbin/update-alternatives
@@ -129,6 +135,7 @@ find ./po -type f -name libakonadi5.po -execdir mv {} libakonadi6.po \;
 %cmake_kf6 \
   %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
   -DINSTALL_APPARMOR:BOOL=OFF \
+  -DKDE_INSTALL_SYSTEMDUSERUNITDIR=%{_userunitdir} \
   -DMYSQLD_EXECUTABLE:FILEPATH=%{_libexecdir}/mysqld \
   -DMYSQLD_SCRIPTS_PATH:FILEPATH=%{_bindir}/mysql_install_db \
   -DPOSTGRES_PATH:FILEPATH=%{_bindir}/pg_ctl
@@ -167,6 +174,10 @@ rm -fv %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
   akonadiserverrc \
   %{_sysconfdir}/xdg/akonadi/akonadiserverrc.sqlite \
   8
+%systemd_user_post akonadi_control.service
+
+%preun
+%systemd_preun akonadi_control.service
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -174,6 +185,7 @@ if [ $1 -eq 0 ] ; then
   --remove akonadiserverrc \
   %{_sysconfdir}/xdg/akonadi/akonadiserverrc.sqlite
 fi
+%systemd_postun akonadi_control.service
 
 
 %files -f libakonadi6.lang
@@ -208,6 +220,7 @@ fi
 %{_kf6_datadir}/kf6/akonadi_knut_resource/
 %{_kf6_qmldir}/org/kde/akonadi/
 %{_kf6_datadir}/applications/org.kde.akonadi.configdialog.desktop
+%{_userunitdir}/akonadi_control.service
 
 %files devel
 %{_kf6_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
@@ -224,10 +237,8 @@ fi
 %{_kf6_qtplugindir}/designer/akonadi6widgets.so
 %{_kf6_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2
 %{_kf6_datadir}/kdevappwizard/templates/akonadiserializer.tar.bz2
-%{_qt6_docdir}/*.tags
 
 %files doc
-%{_qt6_docdir}/*.qch
 
 %post mysql
 /usr/sbin/update-alternatives \
@@ -250,6 +261,30 @@ fi
 
 
 %changelog
+* Thu Jul 09 2026 Steve Cossette <farchord@gmail.com> - 26.04.3-2
+- Adding a fix for akonadi killing mysql too quickly
+
+* Tue Jun 30 2026 Steve Cossette <farchord@gmail.com> - 26.04.3-1
+- 26.04.3
+
+* Tue Jun 30 2026 Than Ngo <than@redhat.com> - 26.04.2-2
+- Fix rhbz#2494531, Use '-any' virtual provide for mariadb / mysql dependencies
+
+* Tue Jun 02 2026 Steve Cossette <farchord@gmail.com> - 26.04.2-1
+- 26.04.2
+
+* Wed May 06 2026 Steve Cossette <farchord@gmail.com> - 26.04.1-1
+- 26.04.1
+
+* Thu Apr 16 2026 Jan Grulich <jgrulich@redhat.com> - 26.04.0-2
+- Rebuild (qt6)
+
+* Sat Apr 11 2026 Steve Cossette <farchord@gmail.com> - 26.04.0-1
+- 26.04.0
+
+* Mon Mar 16 2026 Steve Cossette <farchord@gmail.com> - 26.03.80-1
+- 26.03.80
+
 * Sun Mar 08 2026 Steve Cossette <farchord@gmail.com> - 25.12.3-1
 - 25.12.3
 

diff --git a/sources b/sources
index 7a61486..d19d8b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (akonadi-25.12.3.tar.xz) = c58fbd628c9817439b822eb1c9498117e791258fc9adcd7d0dc1f8bb0905424b6115cd9714ae1a275bdd1b0f83508fcd7b0f6861d4c8d1414192d11427270dc1
+SHA512 (akonadi-26.04.3.tar.xz) = 85036cad939c1b294719b24914a512e5bdb5ab2e173ca4f02433274faa850db2ae383e4c45acf6c33be232d927c37e9e1143516290632ae2c09e5940867188c5