Merging debian version 1:10.11.7-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 57 insertions, 477 deletions

diff --git a/debian/patches/1006531-hurd-no-auth-socket.patch b/debian/patches/1006531-hurd-no-auth-socket.patch
new file mode 100644
index 00000000..c730ae5f
--- /dev/null
+++ b/debian/patches/1006531-hurd-no-auth-socket.patch
@@ -0,0 +1,28 @@
+Forwarded: no
+From: Daniel Black <daniel@mariadb.org>
+To: 1006531@bugs.debian.org
+Subject: mariadb: FTBFS on hurd-i386: undefined reference to misc functions and files
+
+requires https://github.com/MariaDB/server/pull/2893 as debian
+explicit architectures aren't neede since dh_auto_configure handles
+this.
+
+If it works, upstream welcome.
+
+Hurd string from uname -m, "SYSTEM processor: i686-AT386" in mariadb
+output. And wiki reference https://en.wikipedia.org/wiki/Uname
+
+--- a/cmake/build_configurations/mysql_release.cmake
++++ b/cmake/build_configurations/mysql_release.cmake
+@@ -118,7 +118,10 @@ ELSEIF(DEB)
+   SET(WITH_ZLIB system CACHE STRING "")
+   SET(WITH_LIBWRAP ON)
+   SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON)
+-  SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
++  # No hurd implementation
++  IF(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "i686-AT386")
++    SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
++  ENDIF()
+   SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
+   SET(WITH_PCRE system CACHE STRING "")
+   SET(CLIENT_PLUGIN_ZSTD OFF)
diff --git a/debian/patches/2777-fix-disks-disk-test.patch b/debian/patches/2777-fix-disks-disk-test.patch
deleted file mode 100644
index 49b88ef6..00000000
--- a/debian/patches/2777-fix-disks-disk-test.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Forwarded: not-needed
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2777.patch
-Bug: https://github.com/MariaDB/server/pull/2777
-From: Daniel Black <daniel@mariadb.org>
-Date: Thu, 5 Oct 2023 16:55:34 +0300
-Subject: [PATCH] MDEV-21587: disk.disk{_notembedded} test result
-
-Allow for a CI system to be almost out of space, or having so
-little use, that the Total space is the same as available or used.
-
-Thanks Otto Kekäläinen for the bug report and testing.
----
- plugin/disks/mysql-test/disks/disks.result             | 4 ++--
- plugin/disks/mysql-test/disks/disks.test               | 2 +-
- plugin/disks/mysql-test/disks/disks_notembedded.result | 8 ++++----
- plugin/disks/mysql-test/disks/disks_notembedded.test   | 4 ++--
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/plugin/disks/mysql-test/disks/disks.result
-+++ b/plugin/disks/mysql-test/disks/disks.result
-@@ -7,6 +7,6 @@ DISKS	CREATE TEMPORARY TABLE `DISKS` (
-   `Used` bigint(32) NOT NULL,
-   `Available` bigint(32) NOT NULL
- ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
--sum(Total) > sum(Available)	sum(Total)>sum(Used)
-+select sum(Total) >= sum(Available), sum(Total)>=sum(Used) from information_schema.disks;
-+sum(Total) >= sum(Available)	sum(Total)>=sum(Used)
- 1	1
---- a/plugin/disks/mysql-test/disks/disks.test
-+++ b/plugin/disks/mysql-test/disks/disks.test
-@@ -1,3 +1,3 @@
- --replace_regex /varchar\([0-9]+\)/varchar(pathlen)/
- show create table information_schema.disks;
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
-+select sum(Total) >= sum(Available), sum(Total)>=sum(Used) from information_schema.disks;
---- a/plugin/disks/mysql-test/disks/disks_notembedded.result
-+++ b/plugin/disks/mysql-test/disks/disks_notembedded.result
-@@ -6,16 +6,16 @@ CREATE USER user1@localhost;
- GRANT SELECT ON *.* TO user1@localhost;
- connect  con1,localhost,user1,,;
- connection con1;
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
--sum(Total) > sum(Available)	sum(Total)>sum(Used)
-+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
-+sum(Total) >= sum(Available)	sum(Total) >= sum(Used)
- NULL	NULL
- disconnect con1;
- connection default;
- GRANT FILE ON *.* TO user1@localhost;
- connect  con1,localhost,user1,,;
- connection con1;
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
--sum(Total) > sum(Available)	sum(Total)>sum(Used)
-+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
-+sum(Total) >= sum(Available)	sum(Total) >= sum(Used)
- 1	1
- connection default;
- DROP USER user1@localhost;
---- a/plugin/disks/mysql-test/disks/disks_notembedded.test
-+++ b/plugin/disks/mysql-test/disks/disks_notembedded.test
-@@ -10,7 +10,7 @@ GRANT SELECT ON *.* TO user1@localhost;
-
- connect (con1,localhost,user1,,);
- connection con1;
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
-+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
- disconnect con1;
-
- connection default;
-@@ -18,7 +18,7 @@ GRANT FILE ON *.* TO user1@localhost;
-
- connect (con1,localhost,user1,,);
- connection con1;
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
-+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
- connection default;
- DROP USER user1@localhost;
diff --git a/debian/patches/2883-subselect-test-failures.patch b/debian/patches/2883-subselect-test-failures.patch
deleted file mode 100644
index d58d8716..00000000
--- a/debian/patches/2883-subselect-test-failures.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-Forwarded: https://github.com/MariaDB/server/pull/2883
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2883.patch
-Bug: https://jira.mariadb.org/browse/MDEV-32843
-From: Daniel Black <daniel@mariadb.org>
-Date: Thu, 30 Nov 2023 14:14:10 +1100
-Subject: [PATCH] main.subselect* often fails on CI with ER_SUBQUERY_NO_1_ROW
-
-Using mysql.slow_log was a test table would generate more than
-one row if there was more than one row in the table.
-
-Replace this table with a empty table with PK.
-
-Reviewer: Rex Johnston
----
- mysql-test/main/subselect.result                 | 13 ++++++++-----
- mysql-test/main/subselect.test                   | 13 ++++++++-----
- mysql-test/main/subselect_no_exists_to_in.result | 13 ++++++++-----
- mysql-test/main/subselect_no_mat.result          | 13 ++++++++-----
- mysql-test/main/subselect_no_opts.result         | 13 ++++++++-----
- mysql-test/main/subselect_no_scache.result       | 13 ++++++++-----
- mysql-test/main/subselect_no_semijoin.result     | 13 ++++++++-----
- 7 files changed, 56 insertions(+), 35 deletions(-)
-
---- a/mysql-test/main/subselect.result
-+++ b/mysql-test/main/subselect.result
-@@ -7161,23 +7161,26 @@ drop table t1;
- #
- # MDEV-7565: Server crash with Signal 6 (part 2)
- #
-+create table t1 (id int not null primary key);
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
- ControlRev
- NULL
-+drop table t1;
- #
- # MDEV-7445:Server crash with Signal 6
- #
-+create table t1 (id int not null primary key);
- CREATE PROCEDURE procedure2()
- BEGIN
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E           
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
-   From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -7190,6 +7193,7 @@ call procedure2();
- ControlRev
- NULL
- drop procedure procedure2;
-+drop table t1;
- #
- # MDEV-7846:Server crashes in Item_subselect::fix
- #_fields or fails with Thread stack overrun
---- a/mysql-test/main/subselect.test
-+++ b/mysql-test/main/subselect.test
-@@ -1180,8 +1180,10 @@ create table t1 (a int, b decimal(13, 3)
- insert into t1 values (1, 0.123);
- let $outfile_abs= $MYSQLTEST_VARDIR/tmp/subselect.out.file.1;
- let $outfile_rel= ../../tmp/subselect.out.file.1;
-+--disable_warnings
- --error 0,1
- --remove_file $outfile_abs
-+--enable_warnings
- eval select a, (select max(b) from t1) into outfile "$outfile_rel" from t1;
- delete from t1;
- eval load data infile "$outfile_rel" into table t1;
-@@ -6000,24 +6002,28 @@ drop table t1;
- --echo #
- --echo # MDEV-7565: Server crash with Signal 6 (part 2)
- --echo #
-+
-+create table t1 (id int not null primary key);
- Select 
--  (Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--    Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+  (Select Sum(`TestCase`.Revenue) From t1 E
-+    Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
-   ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
-+drop table t1;
- 
- --echo #
- --echo # MDEV-7445:Server crash with Signal 6
- --echo #
- 
-+create table t1 (id int not null primary key);
- --delimiter |
- CREATE PROCEDURE procedure2()
- BEGIN
-   Select 
--    (Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--      Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+    (Select Sum(`TestCase`.Revenue) From t1 E           
-+      Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
-      ) As `ControlRev`
-   From 
-   (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -6029,6 +6035,7 @@ call procedure2();
- call procedure2();
- 
- drop procedure procedure2;
-+drop table t1;
- 
- 
- --echo #
---- a/mysql-test/main/subselect_no_exists_to_in.result
-+++ b/mysql-test/main/subselect_no_exists_to_in.result
-@@ -7161,23 +7161,26 @@ drop table t1;
- #
- # MDEV-7565: Server crash with Signal 6 (part 2)
- #
-+create table t1 (id int not null primary key);
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
- ControlRev
- NULL
-+drop table t1;
- #
- # MDEV-7445:Server crash with Signal 6
- #
-+create table t1 (id int not null primary key);
- CREATE PROCEDURE procedure2()
- BEGIN
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E           
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
-   From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -7190,6 +7193,7 @@ call procedure2();
- ControlRev
- NULL
- drop procedure procedure2;
-+drop table t1;
- #
- # MDEV-7846:Server crashes in Item_subselect::fix
- #_fields or fails with Thread stack overrun
---- a/mysql-test/main/subselect_no_mat.result
-+++ b/mysql-test/main/subselect_no_mat.result
-@@ -7154,23 +7154,26 @@ drop table t1;
- #
- # MDEV-7565: Server crash with Signal 6 (part 2)
- #
-+create table t1 (id int not null primary key);
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
- ControlRev
- NULL
-+drop table t1;
- #
- # MDEV-7445:Server crash with Signal 6
- #
-+create table t1 (id int not null primary key);
- CREATE PROCEDURE procedure2()
- BEGIN
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E           
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
-   From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -7183,6 +7186,7 @@ call procedure2();
- ControlRev
- NULL
- drop procedure procedure2;
-+drop table t1;
- #
- # MDEV-7846:Server crashes in Item_subselect::fix
- #_fields or fails with Thread stack overrun
---- a/mysql-test/main/subselect_no_opts.result
-+++ b/mysql-test/main/subselect_no_opts.result
-@@ -7152,23 +7152,26 @@ drop table t1;
- #
- # MDEV-7565: Server crash with Signal 6 (part 2)
- #
-+create table t1 (id int not null primary key);
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
- ControlRev
- NULL
-+drop table t1;
- #
- # MDEV-7445:Server crash with Signal 6
- #
-+create table t1 (id int not null primary key);
- CREATE PROCEDURE procedure2()
- BEGIN
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E           
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
-   From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -7181,6 +7184,7 @@ call procedure2();
- ControlRev
- NULL
- drop procedure procedure2;
-+drop table t1;
- #
- # MDEV-7846:Server crashes in Item_subselect::fix
- #_fields or fails with Thread stack overrun
---- a/mysql-test/main/subselect_no_scache.result
-+++ b/mysql-test/main/subselect_no_scache.result
-@@ -7167,23 +7167,26 @@ drop table t1;
- #
- # MDEV-7565: Server crash with Signal 6 (part 2)
- #
-+create table t1 (id int not null primary key);
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
- ControlRev
- NULL
-+drop table t1;
- #
- # MDEV-7445:Server crash with Signal 6
- #
-+create table t1 (id int not null primary key);
- CREATE PROCEDURE procedure2()
- BEGIN
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E           
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
-   From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -7196,6 +7199,7 @@ call procedure2();
- ControlRev
- NULL
- drop procedure procedure2;
-+drop table t1;
- #
- # MDEV-7846:Server crashes in Item_subselect::fix
- #_fields or fails with Thread stack overrun
---- a/mysql-test/main/subselect_no_semijoin.result
-+++ b/mysql-test/main/subselect_no_semijoin.result
-@@ -7152,23 +7152,26 @@ drop table t1;
- #
- # MDEV-7565: Server crash with Signal 6 (part 2)
- #
-+create table t1 (id int not null primary key);
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
- From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
- Group By  TestCase.Revenue, TestCase.TemplateID;
- ControlRev
- NULL
-+drop table t1;
- #
- # MDEV-7445:Server crash with Signal 6
- #
-+create table t1 (id int not null primary key);
- CREATE PROCEDURE procedure2()
- BEGIN
- Select 
--(Select Sum(`TestCase`.Revenue) From mysql.slow_log E           
--Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)
-+(Select Sum(`TestCase`.Revenue) From t1 E           
-+Where TestCase.TemplateID not in (Select 1 from t1 where 2=2)
- ) As `ControlRev`
-   From 
- (Select  3 as Revenue, 4 as TemplateID) As `TestCase` 
-@@ -7181,6 +7184,7 @@ call procedure2();
- ControlRev
- NULL
- drop procedure procedure2;
-+drop table t1;
- #
- # MDEV-7846:Server crashes in Item_subselect::fix
- #_fields or fails with Thread stack overrun
diff --git a/debian/patches/fix-spelling-libmarias3.patch b/debian/patches/fix-spelling-libmarias3.patch
deleted file mode 100644
index 58fb5815..00000000
--- a/debian/patches/fix-spelling-libmarias3.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Forwarded: https://github.com/mariadb-corporation/libmarias3/pull/111
-Origin: https://patch-diff.githubusercontent.com/raw/mariadb-corporation/libmarias3/pull/111.patch
-Author: Otto Kekäläinen <otto@kekalainen.net>
-Date: Sat, 11 Mar 2023 12:05:28 -0800
-Subject: [PATCH] Fix spelling: occured -> occurred
-
-All new code of the whole pull request, including one or several files
-that are either new files or modified ones, are contributed under the
-BSD-new license. I am contributing on behalf of my employer Amazon Web
-Services, Inc.
----
- docs/api/functions.rst | 10 +++++-----
- src/xml.c              |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/storage/maria/libmarias3/docs/api/functions.rst
-+++ b/storage/maria/libmarias3/docs/api/functions.rst
-@@ -147,7 +147,7 @@ Example
-    res= ms3_list(ms3, s3bucket, NULL, &list);
-    if (res)
-    {
--       printf("Error occured: %d\n", res);
-+       printf("Error occurred: %d\n", res);
-        return;
-    }
-    list_it= list;
-@@ -220,7 +220,7 @@ Example
-    res= ms3_put(ms3, s3bucket, "test/ms3.txt", (const uint8_t*)test_string, strlen(test_string));
-    if (res)
-    {
--       printf("Error occured: %d\n", res);
-+       printf("Error occurred: %d\n", res);
-        return;
-    }
-    ms3_deinit(ms3);
-@@ -290,7 +290,7 @@ Example
-    res= ms3_get(ms3, s3bucket, "test/ms3.txt", &data, &length);
-    if (res)
-    {
--       printf("Error occured: %d\n", res);
-+       printf("Error occurred: %d\n", res);
-        return;
-    }
-    printf("File contents: %s\n", data);
-@@ -348,7 +348,7 @@ Example
-    res = ms3_delete(ms3, s3bucket, "test/ms3.txt");
-    if (res)
-    {
--       printf("Error occured: %d\n", res);
-+       printf("Error occurred: %d\n", res);
-        return;
-    }
-    ms3_deinit(ms3);
-@@ -384,7 +384,7 @@ Example
-    res= ms3_status(ms3, s3bucket, "test/ms3.txt", &status);
-    if (res)
-    {
--       printf("Error occured: %d\n", res);
-+       printf("Error occurred: %d\n", res);
-        return;
-    }
-    printf("File length: %ld\n", status.length);
---- a/storage/maria/libmarias3/src/xml.c
-+++ b/storage/maria/libmarias3/src/xml.c
-@@ -800,7 +800,7 @@ node_creation:;
- 	return node;
- 
- 
--	/* A failure occured, so free all allocalted resources
-+	/* A failure occurred, so free all allocalted resources
- 	 */
- exit_failure:
- 	if (tag_open) {
diff --git a/debian/patches/install-files-into-usr.patch b/debian/patches/install-files-into-usr.patch
new file mode 100644
index 00000000..29dd6a1f
--- /dev/null
+++ b/debian/patches/install-files-into-usr.patch
@@ -0,0 +1,27 @@
+Forwarded: TODO
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
+From: Michael Biebl <biebl@debian.org>
+Date: Mon, 22 Jan 2024 22:52:25 +0100
+Subject: [PATCH] Install PAM modules and systemd units into /usr
+
+Since Debian trixie all files need to be installed into their canonical
+location under /usr.
+---
+ cmake/install_layout.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/cmake/install_layout.cmake
++++ b/cmake/install_layout.cmake
+@@ -194,10 +194,10 @@ SET(INSTALL_SUPPORTFILESDIR_DEB
+ SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
+ 
+ SET(INSTALL_UNIX_ADDRDIR_DEB            "/run/mysqld/mysqld.sock")
+-SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/lib/systemd/system")
++SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/usr/lib/systemd/system")
+ SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB     "/usr/lib/sysusers.d")
+ SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB     "/usr/lib/tmpfiles.d")
+-SET(INSTALL_PAMDIR_DEB                  "/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
++SET(INSTALL_PAMDIR_DEB                  "/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
+ SET(INSTALL_PAMDATADIR_DEB              "/etc/security")
+ 
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 153cdfbf..a84dbe36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,7 @@ fix-reproducible-builds-rocksdb.patch
 mroonga-mrn-lib-dirs-path-reproducible-build.patch
 2129-new-script-wsrep-sst-backup-fixes.patch
 2541-fix-stack-overflow-in-pinbox-allocator.patch
-fix-spelling-libmarias3.patch
 fix-spelling-libmariadb.patch
-2777-fix-disks-disk-test.patch
-2883-subselect-test-failures.patch
 2980-riscv-use-rdtime.patch
+install-files-into-usr.patch
+1006531-hurd-no-auth-socket.patch