[gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/files/

[Andreas Sturmlechner]

commit:     ab069e11553249e8ea77ccc8c096cebad43e0496
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 15:15:13 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 15:15:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab069e11

kde-apps/akonadi: Add missing patch

Closes: https://bugs.gentoo.org/677436
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/akonadi-18.12.2-mysql56-crash.patch      | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)

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
new file mode 100644
index 00000000000..ede8a19d84d
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
@@ -0,0 +1,52 @@
+From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 26 Jan 2019 21:09:14 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 19.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index dfff6fc29..80039c8ba 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin)
+         QStringLiteral("/usr/local/sbin"),
+         QStringLiteral("/usr/local/libexec"),
+         QStringLiteral("/usr/libexec"),
++        QStringLiteral("/usr/share/mysql/scripts"),
+         QStringLiteral("/opt/mysql/libexec"),
+         QStringLiteral("/opt/local/lib/mysql5/bin"),
+         QStringLiteral("/opt/mysql/sbin"),
+@@ -588,7 +589,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+     return 0 == execute(mMysqlInstallDbPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+         QStringLiteral("--force"),
+-        QStringLiteral("--basedir=%1").arg(baseDir),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+@@ -602,6 +603,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
+     return 0 == execute(mMysqldPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+         QStringLiteral("--initialize"),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+@@ -622,7 +624,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
+     // Don't use --force, it has been removed in MySQL 5.7.5
+     return 0 == execute(mMysqlInstallDbPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+-        QStringLiteral("--basedir=%1").arg(baseDir),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+-- 
+2.20.1
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/files/

[Andreas Sturmlechner]

commit:     1b255239ae8403b699534092d672a18063f27536
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 19:04:27 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 20:09:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b255239

kde-apps/akonadi: Fix README.gentoo with newer mariadb/akonadi

Closes: https://bugs.gentoo.org/792741
Reported-by: Theo Baumgartner <theo.baumgartner <AT> gmail.com>
Reported-by: Sven Eden <sven.eden <AT> prydeworx.com>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/akonadi/files/README.gentoo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
index c778f6d1a211..69bb68c1f000 100644
--- a/kde-apps/akonadi/files/README.gentoo
+++ b/kde-apps/akonadi/files/README.gentoo
@@ -28,8 +28,8 @@ Note:
 
   3) Optional: You may have come here with an already defunct akonadi service.
      To manually fix the akonadi MariaDB backend:
-     $ mysql_upgrade -S /run/user/$(id -u)/akonadi/default/mysql.socket \
-         --defaults-file=~/.local/share/akonadi/mysql.conf
+     $ mysql_upgrade --defaults-file=~/.local/share/akonadi/mysql.conf \
+         -S /run/user/$(id -u)/akonadi/mysql.socket
 
      Don't forget to restart the akonadi service afterwards:
      $ akonadictl restart

[gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/files/

[Andreas Sturmlechner]

commit:     940f202fe0a054d432c8b4029e515fbda748d98d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 17 07:26:30 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 21:49:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940f202f

kde-apps/akonadi: remove unused patch/file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/akonadi/files/README.gentoo               | 39 -----------------
 .../files/akonadi-21.03.80-mysql56-crash.patch     | 51 ----------------------
 2 files changed, 90 deletions(-)

diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
deleted file mode 100644
index 69bb68c1f000..000000000000
--- a/kde-apps/akonadi/files/README.gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-Akonadi QMYSQL backends that were created using <dev-db/mariadb-10.5.9-r3 may
-be in need of a manual fix. Failure to do so could result in akonadi service
-to stop fetching and sending mail for KMail or any other kind of issues in PIM
-applications depending on akonadi like KOrganizer, KAddressBook etc.
-
-Note:
-  - All commands that follow are to be run by a regular user.
-  - They will have to be repeated for any other user of KDE PIM.
-  - Use your favorite terminal.
-
-  1) Check if "mysql" system db is present:
-     $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'select schema_name \
-         from information_schema.schemata where schema_name = "mysql"'
-
-     The output obtained should look like this:
-        +-------------+
-        | schema_name |
-        +-------------+
-        | mysql       |
-        +-------------+
-
-     If so, then automatic DB upgrades will succeed, no further action necessary.
-
-  2) If, however, the above query returned empty, add the missing database:
-     $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'create database mysql'
-
-     Future MariaDB releases should upgrade without manual intervention now.
-
-  3) Optional: You may have come here with an already defunct akonadi service.
-     To manually fix the akonadi MariaDB backend:
-     $ mysql_upgrade --defaults-file=~/.local/share/akonadi/mysql.conf \
-         -S /run/user/$(id -u)/akonadi/mysql.socket
-
-     Don't forget to restart the akonadi service afterwards:
-     $ akonadictl restart
-
-References:
-  [1] https://bugs.gentoo.org/688746
-  [2] https://bugs.kde.org/show_bug.cgi?id=409224

diff --git a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
deleted file mode 100644
index 7cee0b0e815f..000000000000
--- a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From ca023c075e5e239dd6d254722c8866b17a524a3c Mon Sep 17 00:00:00 2001
-From: Manuel Nickschas <sputnick@quassel-irc.org>
-Date: Wed, 10 Feb 2021 09:40:44 +0100
-Subject: [PATCH] Find mysql_install_db and add required option
-
-Rebase patch onto 21.03.80
-Gentoo-bug: 530012
----
- src/server/storage/dbconfigmysql.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index fd057670e..c19cff0e0 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -53,6 +53,7 @@ static QString findExecutable(const QString &bin)
-         QStringLiteral("/usr/local/sbin"),
-         QStringLiteral("/usr/local/libexec"),
-         QStringLiteral("/usr/libexec"),
-+        QStringLiteral("/usr/share/mysql/scripts"),
-         QStringLiteral("/opt/mysql/libexec"),
-         QStringLiteral("/opt/local/lib/mysql5/bin"),
-         QStringLiteral("/opt/mysql/sbin"),
-@@ -597,7 +598,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
-         == execute(mMysqlInstallDbPath,
-                    {QStringLiteral("--defaults-file=%1").arg(confFile),
-                     QStringLiteral("--force"),
--                    QStringLiteral("--basedir=%1").arg(baseDir),
-+                    QStringLiteral("--basedir=/usr"),
-                     QStringLiteral("--datadir=%1/").arg(dataDir)});
- }
- 
-@@ -609,7 +610,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
- {
-     return 0
-         == execute(mMysqldPath,
--                   {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--datadir=%1/").arg(dataDir)});
-+                   {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
- }
- 
- bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
-@@ -629,5 +630,5 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
-     return 0
-         == execute(
-                mMysqlInstallDbPath,
--               {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=%1").arg(baseDir), QStringLiteral("--datadir=%1/").arg(dataDir)});
-+               {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
- }
--- 
-2.30.0
-