Adding debian version 1:10.11.7-3.debian/1%10.11.7-3

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

15 files changed, 101 insertions, 9 deletions

diff --git a/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch b/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch
index 77ced337..538dc6b5 100644
--- a/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch
+++ b/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch
@@ -2,7 +2,8 @@ From: Ondrej Sury <ondrej@debian.org>
 Date: Wed, 22 Nov 2017 20:32:51 +0000
 Subject: Change the default optimization from -O3 to -O2 in
  mysql_release.cmake BUILD_CONFIG profile
-Forwarded: https://jira.mariadb.org/browse/MDEV-19734?focusedCommentId=156606&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-156606
+Forwarded: no
+Bug: https://jira.mariadb.org/browse/MDEV-19734?focusedCommentId=156606&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-156606
 
 ---
  cmake/build_configurations/mysql_release.cmake           | 12 ++++++------
diff --git a/debian/patches/1006531-hurd-no-auth-socket.patch b/debian/patches/1006531-hurd-no-auth-socket.patch
index c730ae5f..d6ae82fe 100644
--- a/debian/patches/1006531-hurd-no-auth-socket.patch
+++ b/debian/patches/1006531-hurd-no-auth-socket.patch
@@ -1,10 +1,10 @@
 Forwarded: no
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006531
 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
+explicit architectures aren't needed since dh_auto_configure handles
 this.
 
 If it works, upstream welcome.
diff --git a/debian/patches/1063738-revert-c432c9ef.patch b/debian/patches/1063738-revert-c432c9ef.patch
index d13fa9db..e5e2668e 100644
--- a/debian/patches/1063738-revert-c432c9ef.patch
+++ b/debian/patches/1063738-revert-c432c9ef.patch
@@ -1,3 +1,5 @@
+Forwarded: no
+From: Otto Kekäläinen <otto@debian.org>
 Date: Wed, 21 Feb 2024 20:34:12 -0800
 Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs"
 
diff --git a/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch b/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch
index 8e49a076..7607cfd7 100644
--- a/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch
+++ b/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch
@@ -1,4 +1,4 @@
-Forwarded: https://github.com/MariaDB/server/pull/2129
+Forwarded: https://github.com/MariaDB/server/pull/2129 (merged in Feb 2024)
 Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2129.patch
 From: Otto Kekäläinen <otto@kekalainen.net>
 Date: Sun, 22 May 2022 10:13:33 -0700
diff --git a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch
index 82f3b5b1..bbc1af6b 100644
--- a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch
+++ b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch
@@ -1,5 +1,6 @@
 Forwarded: https://github.com/MariaDB/server/pull/2541
 Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2541.patch
+Bug: https://jira.mariadb.org/browse/MDEV-31151
 From: Hugo Wen <wenhug@amazon.com>
 Date: Sat, 11 Mar 2023 00:27:42 +0000
 Subject: [PATCH] Fix a stack overflow in pinbox allocator
diff --git a/debian/patches/2980-riscv-use-rdtime.patch b/debian/patches/2980-riscv-use-rdtime.patch
index 254187bc..a2e21ddb 100644
--- a/debian/patches/2980-riscv-use-rdtime.patch
+++ b/debian/patches/2980-riscv-use-rdtime.patch
@@ -1,4 +1,4 @@
-Forwarded: https://github.com/MariaDB/server/pull/2980
+Forwarded: https://github.com/MariaDB/server/pull/2980 (merged in Feb 2024)
 Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2980.patch
 From: Aurelien Jarno <aurelien@aurel32.net>
 Date: Thu, 4 Jan 2024 11:30:34 +0100
diff --git a/debian/patches/3039-os-data-file-no-o-direct.patch b/debian/patches/3039-os-data-file-no-o-direct.patch
index 3a55269f..634bfbd9 100644
--- a/debian/patches/3039-os-data-file-no-o-direct.patch
+++ b/debian/patches/3039-os-data-file-no-o-direct.patch
@@ -1,4 +1,4 @@
-Forwarded: https://github.com/MariaDB/server/pull/3039
+Forwarded: https://github.com/MariaDB/server/pull/3039 (merged in Feb 2024)
 Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3039.patch
 From: Daniel Black <daniel@mariadb.org>
 Date: Fri, 2 Feb 2024 11:38:00 +1100
diff --git a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch b/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
index 4fa54955..e1282019 100644
--- a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
+++ b/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
@@ -1,4 +1,4 @@
-Origin: https://github.com/MariaDB/server/commit/1b37cb71f44549c94acf8914cf93d43a4293a449
+Origin: https://github.com/MariaDB/server/commit/1b37cb71f44549c94acf8914cf93d43a4293a449 (merged in Feb 2024)
 Bug: https://jira.mariadb.org/browse/MDEV-32975
 From: Alexander Barkov <bar@mariadb.com>
 Date: Fri, 26 Jan 2024 13:12:03 +0400
diff --git a/debian/patches/env-perl-usr-bin-perl.patch b/debian/patches/env-perl-usr-bin-perl.patch
index 559e7f2e..96376243 100644
--- a/debian/patches/env-perl-usr-bin-perl.patch
+++ b/debian/patches/env-perl-usr-bin-perl.patch
@@ -1,4 +1,4 @@
-Forwarded: https://github.com/MariaDB/server/pull/1718
+Forwarded: https://github.com/MariaDB/server/pull/1718 (rejected, will never be merged)
 Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/1718.patch
 From: Otto Kekäläinen <otto@debian.org>
 Date: Sun, 20 Dec 2020 20:58:42 +0200
diff --git a/debian/patches/fix-spelling-mariadb.patch b/debian/patches/fix-spelling-mariadb.patch
new file mode 100644
index 00000000..0eb88d3f
--- /dev/null
+++ b/debian/patches/fix-spelling-mariadb.patch
@@ -0,0 +1,16 @@
+Forwarded: no
+Author: Otto Kekäläinen <otto@debian.org>
+Date: Sun, 10 Mar 2024 16:56:13 +0000
+Subject: [PATCH] Fix misc spelling in MariaDB Server repository
+
+--- a/storage/connect/odbconn.cpp
++++ b/storage/connect/odbconn.cpp
+@@ -281,7 +281,7 @@ static CATPARM *AllocCatInfo(PGLOBAL g,
+ 		cap->Status = (UWORD *)PlugSubAlloc(g, NULL, m * sizeof(UWORD));
+ 
+ 	} catch (int n) {
+-		htrc("Exeption %d: %s\n", n, g->Message);
++		htrc("Exception %d: %s\n", n, g->Message);
+ 		cap = NULL;
+ 	} catch (const char *msg) {
+ 		htrc(g->Message, msg);
diff --git a/debian/patches/fix-spelling-rocksdb.patch b/debian/patches/fix-spelling-rocksdb.patch
index d9007c3a..6e681097 100644
--- a/debian/patches/fix-spelling-rocksdb.patch
+++ b/debian/patches/fix-spelling-rocksdb.patch
@@ -1,5 +1,6 @@
 Forwarded: https://github.com/facebook/rocksdb/pull/9653
 Origin: https://patch-diff.githubusercontent.com/raw/facebook/rocksdb/pull/9653.patch
+# Merged in RocksDB 7.3.1, but not updated into MariaDB yet
 From: Otto Kekäläinen <otto@debian.org>
 Date: Wed, 2 Mar 2022 18:13:18 -0800
 Subject: Fix various spelling errors still found in code
diff --git a/debian/patches/install-files-into-usr.patch b/debian/patches/install-files-into-usr.patch
index 29dd6a1f..37884778 100644
--- a/debian/patches/install-files-into-usr.patch
+++ b/debian/patches/install-files-into-usr.patch
@@ -1,4 +1,4 @@
-Forwarded: TODO
+Forwarded: no
 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
diff --git a/debian/patches/rocksdb-kfreebsd.patch b/debian/patches/rocksdb-kfreebsd.patch
index da15484b..2b7f2d92 100644
--- a/debian/patches/rocksdb-kfreebsd.patch
+++ b/debian/patches/rocksdb-kfreebsd.patch
@@ -1,4 +1,5 @@
 Forwarded: https://github.com/facebook/rocksdb/pull/6992
+# Merged in RocksDB 6.12.6 but not updated into MariaDB yet
 From: Andrew Kryczka <andrewkr@fb.com>
 Date: Tue, 16 Jun 2020 19:34:21 -0700
 # Merged in RocksDB 6.13.fb, but not updated into MariaDB yet
diff --git a/debian/patches/series b/debian/patches/series
index 8ea54cc5..a2462aea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@ install-files-into-usr.patch
 3039-os-data-file-no-o-direct.patch
 1063738-revert-c432c9ef.patch
 MDEV-32975-chartset-collation-fix-php.patch
+startup-message.patch
+fix-spelling-mariadb.patch
diff --git a/debian/patches/startup-message.patch b/debian/patches/startup-message.patch
new file mode 100644
index 00000000..27b86b3d
--- /dev/null
+++ b/debian/patches/startup-message.patch
@@ -0,0 +1,68 @@
+Forwarded: no
+Author: Otto Kekäläinen <otto@debian.org>
+Date: Sun, 10 Mar 2024 16:56:13 +0000
+Subject: [PATCH] Show banner in server and client startup to drive community engagement
+
+Suggest to users that they can support MariaDB development by simply giving a
+star on GitHub. This patch experiments with how well such a banner works, and
+may later change the contents to drive some other kind of engagement.
+
+Client output:
+    Welcome to the MariaDB monitor.  Commands end with ; or \g.
+    Your MariaDB connection id is 34
+    Server version: 10.11.7-MariaDB-3 Debian n/a
+
+    Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.
+    Support MariaDB developers by giving a star at https://github.com/MariaDB/server
+
+    Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+
+    MariaDB [(none)]>
+
+Server output:
+    [Note] Support MariaDB developers by giving a star at https://github.com/MariaDB/server
+
+Server output if build in git directory:
+    [Note] Starting MariaDB 10.11.7-MariaDB-3 source revision 219efb0a6ab0ee8ce2ec831c715783586c4db2ef as process 5426
+
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -1326,6 +1326,9 @@ int main(int argc,char *argv[])
+             mysql_thread_id(&mysql), server_version_string(&mysql));
+     put_info((char*) glob_buffer.ptr(),INFO_INFO);
+     put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
++    put_info("Support MariaDB developers by giving a star at "
++             "https://github.com/MariaDB/server",
++             INFO_INFO);
+   }
+ 
+ #ifdef HAVE_READLINE
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -4983,12 +4983,21 @@ static int init_server_components()
+   proc_info_hook= set_thd_stage_info;
+ 
+   /*
+-    Print source revision hash, as one of the first lines, if not the
+-    first in error log, for troubleshooting and debugging purposes
++    Print source revision hash, if set, for troubleshooting and debugging
++     purposes. If not, suggest database adming to help project by giving a
++     star on GitHub.
+   */
+-  if (!opt_help)
+-    sql_print_information("Starting MariaDB %s source revision %s as process %lu",
+-                          server_version, SOURCE_REVISION, (ulong) getpid());
++  if (!opt_help) {
++    if (SOURCE_REVISION) {
++      sql_print_information("Starting MariaDB %s source revision %s as process %lu",
++                            server_version, SOURCE_REVISION, (ulong) getpid());
++    } else {
++      sql_print_information("Starting MariaDB %s as process %lu",
++                            server_version, (ulong) getpid());
++      sql_print_information("Support MariaDB developers by giving a star at "
++                            "https://github.com/MariaDB/server");
++    }
++  }
+ 
+ #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
+   /*