| 1 |
commit: ab069e11553249e8ea77ccc8c096cebad43e0496 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 7 15:15:13 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 7 15:15:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab069e11 |
| 7 |
|
| 8 |
kde-apps/akonadi: Add missing patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/677436 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
.../files/akonadi-18.12.2-mysql56-crash.patch | 52 ++++++++++++++++++++++ |
| 15 |
1 file changed, 52 insertions(+) |
| 16 |
|
| 17 |
diff --git a/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..ede8a19d84d |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch |
| 22 |
@@ -0,0 +1,52 @@ |
| 23 |
+From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 25 |
+Date: Sat, 26 Jan 2019 21:09:14 +0100 |
| 26 |
+Subject: [PATCH] Find mysql_install_db and add required option |
| 27 |
+ |
| 28 |
+Rebase patch onto 19.03.80 |
| 29 |
+Gentoo-bug: 530012 |
| 30 |
+--- |
| 31 |
+ src/server/storage/dbconfigmysql.cpp | 6 ++++-- |
| 32 |
+ 1 file changed, 4 insertions(+), 2 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp |
| 35 |
+index dfff6fc29..80039c8ba 100644 |
| 36 |
+--- a/src/server/storage/dbconfigmysql.cpp |
| 37 |
++++ b/src/server/storage/dbconfigmysql.cpp |
| 38 |
+@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin) |
| 39 |
+ QStringLiteral("/usr/local/sbin"), |
| 40 |
+ QStringLiteral("/usr/local/libexec"), |
| 41 |
+ QStringLiteral("/usr/libexec"), |
| 42 |
++ QStringLiteral("/usr/share/mysql/scripts"), |
| 43 |
+ QStringLiteral("/opt/mysql/libexec"), |
| 44 |
+ QStringLiteral("/opt/local/lib/mysql5/bin"), |
| 45 |
+ QStringLiteral("/opt/mysql/sbin"), |
| 46 |
+@@ -588,7 +589,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt |
| 47 |
+ return 0 == execute(mMysqlInstallDbPath, { |
| 48 |
+ QStringLiteral("--defaults-file=%1").arg(confFile), |
| 49 |
+ QStringLiteral("--force"), |
| 50 |
+- QStringLiteral("--basedir=%1").arg(baseDir), |
| 51 |
++ QStringLiteral("--basedir=/usr"), |
| 52 |
+ QStringLiteral("--datadir=%1/").arg(dataDir) |
| 53 |
+ }); |
| 54 |
+ } |
| 55 |
+@@ -602,6 +603,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const |
| 56 |
+ return 0 == execute(mMysqldPath, { |
| 57 |
+ QStringLiteral("--defaults-file=%1").arg(confFile), |
| 58 |
+ QStringLiteral("--initialize"), |
| 59 |
++ QStringLiteral("--basedir=/usr"), |
| 60 |
+ QStringLiteral("--datadir=%1/").arg(dataDir) |
| 61 |
+ }); |
| 62 |
+ } |
| 63 |
+@@ -622,7 +624,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri |
| 64 |
+ // Don't use --force, it has been removed in MySQL 5.7.5 |
| 65 |
+ return 0 == execute(mMysqlInstallDbPath, { |
| 66 |
+ QStringLiteral("--defaults-file=%1").arg(confFile), |
| 67 |
+- QStringLiteral("--basedir=%1").arg(baseDir), |
| 68 |
++ QStringLiteral("--basedir=/usr"), |
| 69 |
+ QStringLiteral("--datadir=%1/").arg(dataDir) |
| 70 |
+ }); |
| 71 |
+ } |
| 72 |
+-- |
| 73 |
+2.20.1 |
| 74 |
+ |
Archives