apply merge request to fix breaking database on upgrade, see https://invent.kde.org/pim/akonadi/-/merge_requests/105 [release 22.04.2-2mamba;Sat Jun 18 2022]
This commit is contained in:
parent
3de818efa2
commit
e037e1bba1
34
akonadi-22.04.2-revert-deleting-ib_logfile0.patch
Normal file
34
akonadi-22.04.2-revert-deleting-ib_logfile0.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 6567fbcae7cbb3331ed93575b7b331d8f2fde23d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Antonio Rojas <arojas@archlinux.org>
|
||||||
|
Date: Fri, 17 Jun 2022 18:28:58 +0200
|
||||||
|
Subject: [PATCH] Don't delete mariadb log files
|
||||||
|
|
||||||
|
The ib_logfile0 file is mandatory in MariaDB 10.8 [1] so akonadi deleting it on upgrade breaks the database self-check and prevents akonadi from working
|
||||||
|
|
||||||
|
[1] https://jira.mariadb.org/browse/MDEV-14425
|
||||||
|
|
||||||
|
BUG: 454948
|
||||||
|
---
|
||||||
|
src/server/storage/dbconfigmysql.cpp | 6 ------
|
||||||
|
1 file changed, 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
|
||||||
|
index 8c5a52628..35fffd865 100644
|
||||||
|
--- a/src/server/storage/dbconfigmysql.cpp
|
||||||
|
+++ b/src/server/storage/dbconfigmysql.cpp
|
||||||
|
@@ -390,12 +390,6 @@ bool DbConfigMysql::startInternalServer()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate
|
||||||
|
- if (confUpdate) {
|
||||||
|
- QFile(dataDir + QDir::separator() + QLatin1String("ib_logfile0")).remove();
|
||||||
|
- QFile(dataDir + QDir::separator() + QLatin1String("ib_logfile1")).remove();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
qCDebug(AKONADISERVER_LOG) << "Executing:" << mMysqldPath << arguments.join(QLatin1Char(' '));
|
||||||
|
mDatabaseProcess = new QProcess;
|
||||||
|
mDatabaseProcess->start(mMysqldPath, arguments);
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
%define gccver %(gcc -dumpversion)
|
%define gccver %(gcc -dumpversion)
|
||||||
Name: akonadi
|
Name: akonadi
|
||||||
Version: 22.04.2
|
Version: 22.04.2
|
||||||
Release: 1mamba
|
Release: 2mamba
|
||||||
Summary: PIM Storage Service
|
Summary: PIM Storage Service
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -10,6 +10,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
|||||||
URL: https://userbase.kde.org/Akonadi
|
URL: https://userbase.kde.org/Akonadi
|
||||||
Source: http://download.kde.org/stable/release-service/%{version}/src/akonadi-%{version}.tar.xz
|
Source: http://download.kde.org/stable/release-service/%{version}/src/akonadi-%{version}.tar.xz
|
||||||
Patch0: akonadi-16.04.2-qt-5.7.0-sqlite3.patch
|
Patch0: akonadi-16.04.2-qt-5.7.0-sqlite3.patch
|
||||||
|
Patch1: akonadi-22.04.2-revert-deleting-ib_logfile0.patch
|
||||||
License: LGPL
|
License: LGPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@ -83,6 +84,7 @@ This package contains static libraries and header files need for development.
|
|||||||
#-D -T
|
#-D -T
|
||||||
#:<< _EOF
|
#:<< _EOF
|
||||||
#%patch0 -p1
|
#%patch0 -p1
|
||||||
|
%patch1 -p1 -b .revert-deleting-ib_logfile0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#:<< _EOF
|
#:<< _EOF
|
||||||
@ -176,6 +178,9 @@ update-mime-database -n %{_datadir}/mime &> /dev/null
|
|||||||
%doc NEWS README.md
|
%doc NEWS README.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jun 18 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 22.04.2-2mamba
|
||||||
|
- apply merge request to fix breaking database on upgrade, see https://invent.kde.org/pim/akonadi/-/merge_requests/105
|
||||||
|
|
||||||
* Thu Jun 09 2022 Automatic Build System <autodist@mambasoft.it> 22.04.2-1mamba
|
* Thu Jun 09 2022 Automatic Build System <autodist@mambasoft.it> 22.04.2-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user