aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-02-19 10:33:41 +0100
committerBart Ribbers <bribbers@disroot.org>2021-02-19 09:43:54 +0000
commit664f437c945a33190230e7696e8a9fd2f59217e7 (patch)
treed66799cca4e0d11dec1ce0272793ba9b584d3698
parent956321989c6cbf4dff92552ff9ac869612e2cbd7 (diff)
downloadaports-664f437c945a33190230e7696e8a9fd2f59217e7.tar.gz
aports-664f437c945a33190230e7696e8a9fd2f59217e7.tar.bz2
aports-664f437c945a33190230e7696e8a9fd2f59217e7.tar.xz
community/akonadi: backport fix for MySQL8+ usage
-rw-r--r--community/akonadi/APKBUILD9
-rw-r--r--community/akonadi/fix-mysql-8+-usage.patch75
2 files changed, 81 insertions, 3 deletions
diff --git a/community/akonadi/APKBUILD b/community/akonadi/APKBUILD
index 30c80b4ec0..6c6a3a3236 100644
--- a/community/akonadi/APKBUILD
+++ b/community/akonadi/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi
pkgver=20.12.2
-pkgrel=1
+pkgrel=2
pkgdesc="A cross-desktop storage service for PIM data and meta data providing concurrent read, write, and query access"
arch="all !armhf !mips !mips64 !s390x" # polkit
url="https://community.kde.org/KDE_PIM"
@@ -40,7 +40,9 @@ checkdepends="
cmd:dbus-run-session
xvfb-run
"
-source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz
+ fix-mysql-8+-usage.patch
+ "
subpackages="$pkgname-dev $pkgname-lang $pkgname-dbg"
build() {
@@ -85,4 +87,5 @@ check() {
package() {
DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c akonadi-20.12.2.tar.xz"
+sha512sums="2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c akonadi-20.12.2.tar.xz
+fd6a87e8f8e23f1bee1f8ebd856f455b976ef3c46ab0dace8161f5586e24c2c07cc4c4055e5f916965f4d80e76d7c60d3928c2f8c40e88d05c6d12ad7551e74e fix-mysql-8+-usage.patch"
diff --git a/community/akonadi/fix-mysql-8+-usage.patch b/community/akonadi/fix-mysql-8+-usage.patch
new file mode 100644
index 0000000000..5411f30bff
--- /dev/null
+++ b/community/akonadi/fix-mysql-8+-usage.patch
@@ -0,0 +1,75 @@
+From 9c666d0d6039a87f6286014c7d9c7281a5bd9dd1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Feb 2021 21:38:14 +0100
+Subject: [PATCH] MySQL server settings: Make use of 'loose_' option prefix
+
+Idea by one of the Gentoo MySQL maintainers. This makes MySQL skip over
+unsupported options rather than fail, which is important with >=MySQL-8.
+
+See also:
+https://dev.mysql.com/doc/refman/8.0/en/option-files.html#option-file-syntax
+https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-prefixes
+
+BUG: 421922
+
+Thanks-to: Thomas Deutschmann <whissi@gentoo.org>
+---
+ src/server/storage/mysql-global-mobile.conf | 6 +++---
+ src/server/storage/mysql-global.conf | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/server/storage/mysql-global-mobile.conf b/src/server/storage/mysql-global-mobile.conf
+index 19649d347..48e150af7 100644
+--- a/src/server/storage/mysql-global-mobile.conf
++++ b/src/server/storage/mysql-global-mobile.conf
+@@ -65,7 +65,7 @@ innodb_large_prefix=1
+ log_error=mysql.err
+
+ # print warnings and connection errors (default:1)
+-log_warnings=2
++loose_log_warnings=2
+
+ # Convert table named to lowercase
+ lower_case_table_names=1
+@@ -80,10 +80,10 @@ max_connections=256
+ # (make sense when having the same query multiple times)
+
+ # Memory allocated for caching query results (default:0 (disabled))
+-query_cache_size=0
++loose_query_cache_size=0
+
+ # Do not cache results (default:1)
+-query_cache_type=0
++loose_query_cache_type=0
+
+ # Do not use the privileges mechanisms
+ skip_grant_tables
+diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf
+index ab4a4a1e3..b67a4ec1e 100644
+--- a/src/server/storage/mysql-global.conf
++++ b/src/server/storage/mysql-global.conf
+@@ -62,7 +62,7 @@ innodb_log_file_size=64M
+ log_error=mysql.err
+
+ # print warnings and connection errors (default:1)
+-log_warnings=2
++loose_log_warnings=2
+
+ # Convert table named to lowercase
+ lower_case_table_names=1
+@@ -77,10 +77,10 @@ max_connections=256
+ # (make sense when having the same query multiple times)
+
+ # Memory allocated for caching query results (default:0 (disabled))
+-query_cache_size=0
++loose_query_cache_size=0
+
+ # Do not cache results (default:1)
+-query_cache_type=0
++loose_query_cache_type=0
+
+ # Do not use the privileges mechanisms
+ skip_grant_tables
+--
+GitLab
+