diff options
Diffstat (limited to 'debian')
29 files changed, 193 insertions, 41 deletions
diff --git a/debian/changelog b/debian/changelog index 18dba0fd..959c4334 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mariadb (1:10.11.7-3) unstable; urgency=medium + + * Add 'dpkg-dev (>= 1.22.5)' to Build-Depends for time_t transition + (Closes: #1065275) + + -- Otto Kekäläinen <otto@debian.org> Sat, 02 Mar 2024 08:26:26 -0800 + mariadb (1:10.11.7-2~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 070f75ac..115e792a 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Build-Depends: bison, debhelper-compat (= 13), debhelper (>= 13.13~), dh-exec, + dpkg-dev (>= 1.22.5), gdb <!nocheck>, libboost-dev, libbz2-dev, @@ -168,14 +169,15 @@ Description: MariaDB embedded database, development files language in the world. The main goals of MariaDB are speed, robustness and ease of use. . - This package includes the MariaDB embedded server library development and header files. + This package includes the MariaDB embedded server library development and + header files. Package: mariadb-common Architecture: all Depends: mysql-common (>= 5.6.25), ${misc:Depends} Multi-Arch: foreign -Description: MariaDB database common files (e.g. /etc/mysql/mariadb.conf.d/) +Description: MariaDB database common config files (/etc/mysql/mariadb.conf.d/) MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MariaDB are speed, robustness and @@ -716,7 +718,8 @@ Description: CrackLib Password Validation Plugin for MariaDB server This password validation plugin uses cracklib to allow only sufficiently secure (as defined by cracklib) user passwords in MariaDB server. . - Install and configure this to enforce stronger passwords for MariaDB server users. + Install and configure this to enforce stronger passwords for MariaDB server + users. Package: mariadb-plugin-hashicorp-key-management Architecture: any diff --git a/debian/libmariadb-dev.lintian-overrides b/debian/libmariadb-dev.lintian-overrides index ca2b76c1..1a3c0d5f 100644 --- a/debian/libmariadb-dev.lintian-overrides +++ b/debian/libmariadb-dev.lintian-overrides @@ -1,2 +1,7 @@ # This is how upstream does it, wont' fix repeated-path-segment mariadb [usr/include/mariadb/mariadb/] +# Man page syntax needs to be fixed upstream +groff-message an.tmac:<standard input>:*: warning: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/* +groff-message troff:<standard input>:*: warning: cannot select font 'C' [usr/share/man/*] +# mysql_config and mariadb_config location is this by old convention +development-package-ships-elf-binary-in-path [usr/bin/mariadb_config] diff --git a/debian/libmariadb3.lintian-overrides b/debian/libmariadb3.lintian-overrides new file mode 100644 index 00000000..f7ebae37 --- /dev/null +++ b/debian/libmariadb3.lintian-overrides @@ -0,0 +1,4 @@ +# Most likely false positive +hardening-no-fortify-functions [usr/lib/x86_64-linux-gnu/libmariadb3/plugin/caching_sha2_password.so] +hardening-no-fortify-functions [usr/lib/x86_64-linux-gnu/libmariadb3/plugin/dialog.so] +hardening-no-fortify-functions [usr/lib/x86_64-linux-gnu/libmariadb3/plugin/sha256_password.so] diff --git a/debian/libmariadbd19.lintian-overrides b/debian/libmariadbd19.lintian-overrides index a7fd30db..528bcdd6 100644 --- a/debian/libmariadbd19.lintian-overrides +++ b/debian/libmariadbd19.lintian-overrides @@ -2,5 +2,10 @@ spelling-error-in-binary noone no one [usr/lib/*/libmariadbd.so.19] spelling-error-in-binary thats that's [usr/lib/*/libmariadbd.so.19] spelling-error-in-binary theres there's [usr/lib/*/libmariadbd.so.19] -# False positive from Lintian, these strings are nowhere in test in source code +# This cannot be found in sources, seems like some artifact spelling-error-in-binary AfE Safe [usr/lib/*/libmariadbd.so.19] +# libmariadbd cannot have a symbols file as it would be massively large with all +# the _ZNK* prefixed symbols leaking +no-symbols-control-file usr/lib/x86_64-linux-gnu/libmariadbd.so.19 +# Probably due to leaking ABI symbols +exit-in-shared-library [usr/lib/x86_64-linux-gnu/libmariadbd.so.19] diff --git a/debian/mariadb-client-core.lintian-overrides b/debian/mariadb-client-core.lintian-overrides new file mode 100644 index 00000000..a20ba263 --- /dev/null +++ b/debian/mariadb-client-core.lintian-overrides @@ -0,0 +1,2 @@ +# Man syntax needs to be fixed upstream +groff-message troff:<standard input>:*: warning: macro 'an-trap' not defined [usr/share/man/*] diff --git a/debian/mariadb-client.lintian-overrides b/debian/mariadb-client.lintian-overrides index a8ea542f..1e0263b0 100644 --- a/debian/mariadb-client.lintian-overrides +++ b/debian/mariadb-client.lintian-overrides @@ -1,2 +1,4 @@ # The Innotop changelog has this name for a valid reason wrong-name-for-upstream-changelog [usr/share/doc/mariadb-client/changelog.innotop.gz] +# Man syntax needs to be fixed upstream +groff-message troff:<standard input>:*: warning: macro 'an-trap' not defined [usr/share/man/*] diff --git a/debian/mariadb-plugin-mroonga.lintian-overrides b/debian/mariadb-plugin-mroonga.lintian-overrides index 64a66db6..7c8c1da7 100644 --- a/debian/mariadb-plugin-mroonga.lintian-overrides +++ b/debian/mariadb-plugin-mroonga.lintian-overrides @@ -1,3 +1,5 @@ # False positive from Lintian, these strings are nowhere in test in source code spelling-error-in-binary nam name [usr/lib/mysql/plugin/ha_mroonga.so] spelling-error-in-binary tage stage [usr/lib/mysql/plugin/ha_mroonga.so] +# Copyright information in debian/copyright, extra file unnecessary +extra-license-file [usr/share/mysql/mroonga/COPYING] diff --git a/debian/mariadb-server-core.lintian-overrides b/debian/mariadb-server-core.lintian-overrides index 667228f5..8d999271 100644 --- a/debian/mariadb-server-core.lintian-overrides +++ b/debian/mariadb-server-core.lintian-overrides @@ -6,3 +6,5 @@ spelling-error-in-binary theres there's [usr/sbin/mariadbd] spelling-error-in-binary AfE Safe [usr/sbin/mariadbd] # Valid reason for extra documentation in context in directory package-contains-documentation-outside-usr-share-doc [usr/share/mysql/charsets/README] +# Man syntax needs to be fixed upstream +groff-message troff:<standard input>:*: warning: macro 'an-trap' not defined [usr/share/man/*] diff --git a/debian/mariadb-server.lintian-overrides b/debian/mariadb-server.lintian-overrides index b39e9989..587b983b 100644 --- a/debian/mariadb-server.lintian-overrides +++ b/debian/mariadb-server.lintian-overrides @@ -8,3 +8,17 @@ spelling-error-in-binary theres there's [usr/bin/*] spelling-error-in-binary AfE Safe [usr/bin/*] # Intentional in-context documentation package-contains-documentation-outside-usr-share-doc [usr/share/mysql/errmsg-utf8.txt] +# Man syntax needs to be fixed upstream +groff-message troff:<standard input>:*: warning: macro 'an-trap' not defined [usr/share/man/*] +# Most likely false positive +hardening-no-fortify-functions [usr/lib/mysql/plugin/auth_pam_v1.so] +hardening-no-fortify-functions [usr/lib/mysql/plugin/auth_pam.so] +hardening-no-fortify-functions [usr/lib/mysql/plugin/file_key_management.so] +hardening-no-fortify-functions [usr/lib/mysql/plugin/ha_archive.so] +hardening-no-fortify-functions [usr/lib/mysql/plugin/ha_blackhole.so] +hardening-no-fortify-functions [usr/lib/x86_64-linux-gnu/security/pam_user_map.so] +# Special purpose executable to implement custom system permissions +executable-in-usr-lib [usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool] +# Intentional to handle upgrades from versioned package names to versionless +# (e.g. mariadb-server-10.5 -> mariadb-server) +uses-dpkg-database-directly [postinst] diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides index 447f39dd..9557c03e 100644 --- a/debian/mariadb-test-data.lintian-overrides +++ b/debian/mariadb-test-data.lintian-overrides @@ -17,6 +17,7 @@ repeated-path-segment sequence [usr/share/mysql/mysql-test/plugin/sequence/seque repeated-path-segment sphinx [usr/share/mysql/mysql-test/plugin/sphinx/sphinx/] repeated-path-segment spider [usr/share/mysql/mysql-test/plugin/spider/spider/] repeated-path-segment type_inet [usr/share/mysql/mysql-test/plugin/type_inet/type_inet/] +repeated-path-segment type_mysql_timestamp [usr/share/mysql/mysql-test/plugin/type_mysql_timestamp/type_mysql_timestamp/] repeated-path-segment type_test [usr/share/mysql/mysql-test/plugin/type_test/type_test/] repeated-path-segment type_uuid [usr/share/mysql/mysql-test/plugin/type_uuid/type_uuid/] repeated-path-segment user_variables [usr/share/mysql/mysql-test/plugin/user_variables/user_variables/] diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides index c553f8df..372f8d90 100644 --- a/debian/mariadb-test.lintian-overrides +++ b/debian/mariadb-test.lintian-overrides @@ -16,3 +16,5 @@ shared-library-lacks-prerequisites [usr/lib/mysql/plugin/test_sql_service.so] # The file mysql-test-run.pl is a symlink for mariadb-test-run.pl, which does # not have a man page, so the man page is indeed used and not a spare one spare-manual-page [usr/share/man/man1/mysql-test-run.pl.1.gz] +# Text script, should be moved to another path +no-manual-page [usr/bin/test-connect-t] 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 + /* diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index abcd3361..ca2c14b1 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -6,7 +6,16 @@ include: # Override Salsa-CI with MariaDB specific variations variables: - BUILT_PACKAGES: "libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data" + BUILT_PACKAGES: "libmariadb-dev libmariadb-dev-compat libmariadb3 + libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core + mariadb-client mariadb-server-core mariadb-server mariadb-backup + mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb + mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider + mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client + mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management + mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 + mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo + mariadb-plugin-provider-snappy mariadb-test mariadb-test-data" DEB_BUILD_OPTIONS: "nocheck noautodbgsym" RELEASE: sid # Reprotest works, but takes very long time and often fails due to timeouts. @@ -366,9 +375,7 @@ simple upgrade: stage: upgrade MariaDB script: - *test-prepare-container - # @TODO: Re-enable the line below once libmariadbd19 exists in repository - #- apt-get install -qq --yes 'default-mysql*' ${BUILT_PACKAGES} - - apt-get install -qq --yes 'default-mysql*' libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data + - apt-get install -qq --yes 'default-mysql*' ${BUILT_PACKAGES} - *test-full-upgrade - service mariadb status # There is no init.d/mysql in MariaDB 10.5+ - *test-verify-final @@ -717,18 +724,9 @@ default-libmysqlclient-dev and Bullseye upgrade: - *test-install-all-libs - *test-verify-libs -default-libmysqlclient-dev and Buster upgrade: - extends: .salsa-ci-template-for-mariadb - stage: upgrade MariaDB and distro - image: debian:buster - script: - - *test-prepare-container - - apt-get install -qq --yes pkg-config default-libmysqlclient-dev - - pkg-config --list-all - - *test-enable-sid-repos - # Due to usrmerge, full-upgrade from Bullseye to Trixie or newer cannot work - - *test-install-all-libs - - *test-verify-libs +# No longer possible since as it pulls as dependencies packages that trigger +# usrmerge, which cannot run in a container +#default-libmysqlclient-dev and Buster upgrade: # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump. # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh. @@ -739,7 +737,7 @@ mysql-8.0 in Sid upgrade: script: - *test-prepare-container # The postinst fails often if 'ps' is missing from system, so install procps - - apt-get install -qq --yes procps mysql-server 'libmysqlc*' + - apt-get install -qq --yes 'mysql*' libmysqlcppconn7 # Ensure MySQL 8.0 package actually got installed - dpkg -l | grep -e "mysql-server.*8\.0" - *test-verify-initial @@ -764,7 +762,7 @@ mysql-8.0 in Ubuntu 23.10 upgrade: image: ubuntu:mantic script: - *test-prepare-container - - apt-get install -qq --yes mysql-server 'libmysqlc*' + - apt-get install -qq --yes procps mysql-server 'libmysqlc*' # Ensure MySQL 8.0 package actually got installed - dpkg -l | grep mysql - service mysql status @@ -993,7 +991,7 @@ mysql.com-5.7 with Buster upgrade: apt-key adv --recv-keys --keyserver hkps://keyserver.ubuntu.com:443 B7B3B788A8D3785C echo "deb https://repo.mysql.com/apt/debian/ buster mysql-5.7" > /etc/apt/sources.list.d/mysql.list apt-get update -qq - - apt-get install -qq --yes 'mysql*' 'libmysqlc*' + - apt-get install -qq --yes mysql-server 'libmysqlc*' # Ensure MySQL 5.7 package actually got installed - dpkg -l | grep -e "mysql-server.*5.7" - *test-verify-initial diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 9a0e0627..72674895 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -4,6 +4,13 @@ version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev source-is-missing [sql/share/charsets/languages.html] source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html] # Data or test files where long lines are justified +very-long-line-length-in-source-file * [*.dfm:*] +very-long-line-length-in-source-file * [*.expected:*] +very-long-line-length-in-source-file * [*.frm:*] +very-long-line-length-in-source-file * [*.MYD:*] +very-long-line-length-in-source-file * [*.MYI:*] +very-long-line-length-in-source-file * [*.p7b:*] +very-long-line-length-in-source-file * [*.pcap:*] very-long-line-length-in-source-file * [*.result:*] very-long-line-length-in-source-file * [*.test:*] very-long-line-length-in-source-file * [*COPYING.rtf:*] @@ -14,10 +21,13 @@ very-long-line-length-in-source-file * [*.launch:*] very-long-line-length-in-source-file * [*.md:*] very-long-line-length-in-source-file * [*.scfg:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/configure.ac:*] +very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/ssl.h:*] +very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/types.h:*] +very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/wolfio.h:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/formats/html/html_changes/tabs.css:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/IDE/Espressif/ESP-IDF/test/test_wolfssl.c:*] very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/IDE/IAR-MSP430/main.c:*] -very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/scripts/*.pcap:*] +very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/README:*] # Preprocessed C files which have long lines very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/wolfcrypt/src/*.i:*] # These are all results for test cases and similar so they can be @@ -25,13 +35,10 @@ very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/wolfcrypt/src/*.i: very-long-line-length-in-source-file * [mysql-test/*.000*:*] very-long-line-length-in-source-file * [mysql-test/*.ARZ:*] very-long-line-length-in-source-file * [mysql-test/*.dump:*] -very-long-line-length-in-source-file * [mysql-test/*.frm:*] very-long-line-length-in-source-file * [mysql-test/*.ibd:*] very-long-line-length-in-source-file * [mysql-test/*.inc:*] very-long-line-length-in-source-file * [mysql-test/*.MAD:*] very-long-line-length-in-source-file * [mysql-test/*.MAI:*] -very-long-line-length-in-source-file * [mysql-test/*.MYD:*] -very-long-line-length-in-source-file * [mysql-test/*.MYI:*] very-long-line-length-in-source-file * [mysql-test/*.rdiff:*] very-long-line-length-in-source-file * [mysql-test/*.txt:*] very-long-line-length-in-source-file * [mysql-test/*.weekly:*] @@ -39,10 +46,6 @@ very-long-line-length-in-source-file * [mysql-test/*001:*] very-long-line-length-in-source-file * [mysql-test/*ibdata*:*] very-long-line-length-in-source-file * [mysql-test/std_data/Moscow_leap:*] very-long-line-length-in-source-file * [mysql-test/suite/parts/r/*.out:*] -# Test file -very-long-line-length-in-source-file * [libmysqld/examples/builder-sample/emb_samples.dfm:*] -very-long-line-length-in-source-file * [plugin/handler_socket/regtest/test_01_lib/test19.expected:*] -very-long-line-length-in-source-file * [storage/connect/mysql-test/connect/std_data/mdev9949.frm:*] # SQL source file that has very long inserts/selects very-long-line-length-in-source-file * [scripts/fill_help_tables.sql:*] very-long-line-length-in-source-file * [scripts/mysql_system_tables.sql:*] @@ -50,7 +53,7 @@ very-long-line-length-in-source-file * [scripts/mysql_system_tables.sql:*] very-long-line-length-in-source-file * [sql/share/charsets/languages.html:*] very-long-line-length-in-source-file * [sql/share/errmsg-utf8.txt:*] # Very long test string -very-long-line-length-in-source-file 1052 > 512 [storage/archive/archive_test.c:30] +very-long-line-length-in-source-file * [storage/archive/archive_test.c:*] # ColumnStore ignores # In Directory mysql-test are some long test includes very-long-line-length-in-source-file * [storage/columnstore/columnstore/.drone.jsonnet:*] @@ -83,3 +86,13 @@ source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/* source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/*.rc] source-contains-autogenerated-visual-c++-file [win/upgrade_wizard/resource.h] source-contains-autogenerated-visual-c++-file [win/upgrade_wizard/upgrade.rc] +# Known cases, pending to be fixed upstream +very-long-line-length-in-source-file * [libmariadb/benchmark/main-benchmark.cc:*] +very-long-line-length-in-source-file * [man/mysql.1:*] +very-long-line-length-in-source-file * [scripts/msql2mysql.sh:*] +very-long-line-length-in-source-file * [scripts/wsrep_sst_mysqldump.sh:*] +very-long-line-length-in-source-file * [sql-bench/bench-init.pl.sh:*] +very-long-line-length-in-source-file * [sql-bench/test-ATIS.sh:*] +very-long-line-length-in-source-file * [sql-bench/test-wisconsin.sh:*] +very-long-line-length-in-source-file * [storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.cpp:*] +very-long-line-length-in-source-file * [strings/ctype-czech.c:*] |