On 26/05/2023 19.16, Otto Kekäläinen wrote:
I filed now
https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/47
as an exploration to fix this issue.
That worked for me for zoph, but a new failure occurred in tt-rss.
I'm now trying a transitional mariadb-server-10.5 package which seems to
work for both these cases. Will do a complete set of piuparts upgrade
tests for all upgrade paths involving mariadb-server-10.5
If we don't fix this in 10.11 the alternative would be to patch 10.5
and 10.3 to simply never fail on missing mariadb-client-10.3/5
package. I already did
https://salsa.debian.org/mariadb-team/mariadb-10.5/-/merge_requests/14
to make the problem have a proper error message users.
Proper error message is good. ;-)
Ignoring the failure not. :-(
While creating the transitional package I came across some
inconsistencies between Conflicts/Breaks/Replaces. I'm not sure whether
they are intentional, but I'm doing my tests with the three attached
patches applied. They didn't make a difference on their own.
Andreas
From 9c7c48a0d6428535596665590c2e87b4a477abd4 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 1 Jun 2023 09:53:25 +0200
Subject: [PATCH 1/3] drop redundant Breaks+Conflicts
---
debian/control | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index d8b99443551..6f3aff563e3 100644
--- a/debian/control
+++ b/debian/control
@@ -88,10 +88,7 @@ Conflicts: libmariadb-client-lgpl-dev-compat,
libmysqlclient-dev
Provides: libmariadb-client-lgpl-dev-compat,
libmariadbclient-dev-compat
-Breaks: libmariadb-client-lgpl-dev-compat,
- libmariadbclient-dev (<< 1:10.3),
- libmariadbclient-dev-compat,
- libmysqlclient-dev
+Breaks: libmariadbclient-dev (<< 1:10.3)
Replaces: libmariadb-client-lgpl-dev-compat,
libmariadbclient-dev (<< 1:10.3),
libmariadbclient-dev-compat,
--
2.20.1
From c8fd52f3bbe17d888981652823a3e0ac19c9a657 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 1 Jun 2023 09:54:46 +0200
Subject: [PATCH 2/3] tighten server plugin dependencies
---
debian/control | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index 6f3aff563e3..ade3b98e256 100644
--- a/debian/control
+++ b/debian/control
@@ -652,7 +652,7 @@ Description: Spider storage engine for MariaDB
Package: mariadb-plugin-gssapi-server
Architecture: any
Depends: libgssapi-krb5-2,
- mariadb-server,
+ mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-gssapi-server-10.1,
@@ -696,7 +696,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
Package: mariadb-plugin-hashicorp-key-management
Architecture: any
Depends: libcurl4,
- mariadb-server,
+ mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Hashicorp Key Management plugin for MariaDB
@@ -705,7 +705,7 @@ Description: Hashicorp Key Management plugin for MariaDB
Package: mariadb-plugin-provider-bzip2
Architecture: any
-Depends: mariadb-server (>= 1:10.11.1-1),
+Depends: mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Description: BZip2 compression support in the server and storage engines
@@ -719,7 +719,7 @@ Description: BZip2 compression support in the server and storage engines
Package: mariadb-plugin-provider-lz4
Architecture: any
-Depends: mariadb-server (>= 1:10.11.1-1),
+Depends: mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Description: LZ4 compression support in the server and storage engines
@@ -733,7 +733,7 @@ Description: LZ4 compression support in the server and storage engines
Package: mariadb-plugin-provider-lzma
Architecture: any
-Depends: mariadb-server (>= 1:10.11.1-1),
+Depends: mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Description: LZMA compression support in the server and storage engines
@@ -747,7 +747,7 @@ Description: LZMA compression support in the server and storage engines
Package: mariadb-plugin-provider-lzo
Architecture: any
-Depends: mariadb-server (>= 1:10.11.1-1),
+Depends: mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Description: LZO compression support in the server and storage engines
@@ -761,7 +761,7 @@ Description: LZO compression support in the server and storage engines
Package: mariadb-plugin-provider-snappy
Architecture: any
-Depends: mariadb-server (>= 1:10.11.1-1),
+Depends: mariadb-server (= ${server:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Snappy compression support in the server and storage engines
--
2.20.1
From 07f654ffce74f75380065d447f76766d36cd06ea Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 1 Jun 2023 09:55:22 +0200
Subject: [PATCH 3/3] sync Breaks+Replaces
---
debian/control | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/debian/control b/debian/control
index ade3b98e256..6a35515d970 100644
--- a/debian/control
+++ b/debian/control
@@ -366,11 +366,14 @@ Conflicts: mariadb-galera-server-5.5,
mysql-server-8.0,
virtual-mysql-server-core
Breaks: mariadb-client-10.1,
+ mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
mariadb-server-10.3,
mariadb-server-10.4,
+ mariadb-server-10.5,
+ mariadb-server-10.6,
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
@@ -381,6 +384,8 @@ Breaks: mariadb-client-10.1,
mariadb-server-core-5.5,
mysql-client-5.5,
mysql-client-5.6,
+ mysql-client-5.7,
+ mysql-client-8.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
--
2.20.1
