summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2021-06-081-4/+0
|\
| * Merge 10.3 into 10.4Marko Mäkelä2021-06-081-4/+0
| |\
| | * Merge 10.2 into 10.3Marko Mäkelä2021-06-081-4/+0
| | |\
| | | * Revert "CONNECT: move jar files to /usr/share and include them in DEBs"Otto Kekäläinen2021-06-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit d7321893d8c50071632a102e17a7869da9cb03a5. The *.jar files are not being built and all Debian builds are failing as dh_install stops on missing files. To build them we would need to also add new Java build dependencies. In a stable release (10.2->10.5) we shouldn't add new files and certainly not any new build dependencies, so reverting commit. Also, the files are located in a different path, and already included in the mariadb-test-data package: /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/JavaWrappers.jar /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/Mongo2.jar /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/Mongo3.jar This change needs to be redesigned and applies only on 10.6 or newer.
* | | | Deb: Misc cleanup and autobake-deb.sh and Salsa-CI fixesOtto Kekäläinen2021-06-058-48/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up autobake-deb.sh - No need to define any TokuDB rules, there is no such package - No need to define RocksDB arch, it already has "Architecture:" line - No need to dh-systemd backwards compat stanza, neither Debian Jessie nor Ubuntu Xenial has any new MariaDB 10.5 releases anymore - Minor spelling fixes * Ensure dch runs non-interactively so builds pass with new dch version A recent version of dch (available in Ubuntu Hirsute and Debian Bullseye) had a change in behaviour that it started prompting if the DEBEMAIL or EMAIL variable as unset, asking for confirmation. We can't have anything interactive in our build scripts, so prevent this prompt by giving --controlmaint to the command, so it always uses the name and email from the debian/control file and does not prompt anything. The command-line argument has been around for a long time, so it is safe to use on all Debian/Ubuntu builds we have. See https://manpages.debian.org/jessie/devscripts/dch.1.en.html Since MariaDB 10.5 is the oldest release we still release for Ubuntu Hisute and Debian Bullseye, merge this on 10.5 and from there merge up to latest. No need to consider 10.2, 10.3 and 10.4 as those will not be released for Ubuntu Bullseye or Ubuntu Hirsute. * Minor Salsa-CI cleanup - Fix spelling (synced from downstream Debian) * Many minor spelling fixes (synced from downstream Debian)
* | | | Deb: Innotop: Add support for MariaDB 10.5+Otto Kekäläinen2021-05-282-5/+5
| | | | | | | | | | | | | | | | | | | | Synced from downstream Debian: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/7015e8e4b5ed3a7727a8e442039fceb2c5b1a6b9
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-05-261-0/+4
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-05-251-0/+4
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-241-0/+4
| | |\ \ | | | |/
| | | * CONNECT: move jar files to /usr/share and include them in DEBsSergei Golubchik2021-05-221-0/+4
| | | |
* | | | Merge branch 'bb-10.5-release' into 10.5Oleksandr Byelkin2021-05-071-1/+0
|\ \ \ \
| * | | | Follow-up for Deb: Stop depending on empty transitional package dh-systemdVicențiu Ciorbaru2021-05-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 058d93d47af79e650dc6a7abc107a400d8598e45 introduced a switch in autobake script to append dh-systemd package when it is necessary. However, the change was not complete as it didn't actually remove the dh-systemd dependency in debian/control.
* | | | | MCOL-4535: Clean up libreadline as ColumnStore no longer needs itOtto Kekäläinen2021-05-042-16/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Keep the readline installation step in Salsa-CI stages that install MariaDB.org packages in Debian Sid (or releases after is, such as Debian 11 "Bullseye" or Ubuntu 21.04 "Hirsute") as those old packages still depend on readline for the MariaDB Server itself.
* | | | Revert "Deb: Use build flag to enforce default charset as utf8mb4"bb-10.5-danielblack-pr-1722-revertDaniel Black2021-04-162-35/+0
| | | | | | | | | | | | | | | | This reverts commit f26e3259a15cc26dac0a0a77e2488abb87892cf4.
* | | | Deb: Use build flag to enforce default charset as utf8mb4Otto Kekäläinen2021-04-152-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible now since https://github.com/mariadb-corporation/mariadb-connector-c/commit/29720950eeae75f1ea7ef1376a6149cabeb79d13 Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/ca5e93c754209f9c1a729bb057332ab3b0b76363 Closes: #1722
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-143-3/+12
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-04-143-3/+12
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-132-1/+10
| | |\ \ | | | |/
| | | * Deb: Stop depending on empty transitional package dh-systemdOtto Kekäläinen2021-04-122-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MariaDB Server still supports Ubuntu 16.04 "Xenial" until it goes EOL in April 30, 2021. Thus we need to include a customization for backwards compatibility. This change is intended to be applied for all MariaDB versions still supported, i.e. 10.2 to 10.6.
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-091-2/+2
| | |\ \ | | | |/
| | | * Fix postinst trigger when systemd is not running (Closes: #983563)bb-10.2-anel-systemdpatchArnaud Rebillout2021-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for the existence of the systemctl command only tells us that systemd is installed, however it does not tell us if systemd is running. What we really want to do here is reload systemd if it's installed AND if it's running. The usual way to check if systemd is running is to check for the existence of '/run/systemd/system'. Why would systemd be installed but not running? This is something that happens when one sets up or upgrade a system in a chroot or container. For more details refer to the bug report: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983563> Closes PR #1787
| * | | Merge branch '10.3' into 10.4Daniel Black2021-02-251-0/+1
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/10.2' into 10.3Daniel Black2021-02-251-0/+1
| | |\ \ | | | |/
| | | * MDEV-24728: Debian include client caching_sha2_password pluginDaniel Black2021-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 4bc31a904f22 Include client libraries for auth caching_sha2_password and sha256_password in the libmariadb3 client library package.
| | | * Skip TokuDB within autobake-deb.shVicențiu Ciorbaru2021-01-292-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Skipping the package within debian/rules won't work because starting with Debian 10, the helper scripts read the control file before the recipe.
* | | | Deb: Fix failing Salsa-CI by syncing fixes from downstream to upstreamOtto Kekäläinen2021-03-291-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes jobs: - mysql-8.0 Sid to mariadb-10.5 upgrade - mariadb.org-10.5 to mariadb-10.5 upgrade Downstream source: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/8db0e530872fea258e87533349fa83568eeed02d
* | | | Deb: Add Breaks/ReplacesOtto Kekäläinen2021-03-292-29/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following Breaks/Replaces errors detected by Salsa-CI: [ERROR] mariadb-server-10.5 conflicts with mysql-client-core-8.0 files: {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'} [ERROR] mariadb-server-10.5 conflicts with mysql-server-core-8.0 files: {'/usr/share/man/man1/mysqlbinlog.1.gz', '/usr/share/man/man1/myisamlog.1.gz', '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz', '/usr/share/man/man1/perror.1.gz', '/usr/share/man/man1/myisampack.1.gz', '/usr/bin/mysqld_safe', '/usr/share/man/man1/myisamchk.1.gz', '/usr/bin/myisamchk', '/usr/bin/mysql_secure_installation', '/usr/bin/mysqld_multi', '/usr/bin/mysql_tzinfo_to_sql', '/usr/bin/perror', '/usr/share/man/man1/mysqld_multi.1.gz', '/usr/bin/myisampack', '/usr/share/man/man1/mysqld_safe.1.gz', '/usr/bin/myisamlog', '/usr/share/man/man1/mysql_secure_installation.1.gz', '/usr/bin/mysqlbinlog'} [ERROR] mariadb-test conflicts with mysql-server-core-8.0 files: {'/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/mypluglib.so'} Upstreamed from Debian packaging commits: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/9b6a67b53c2adf1bb5497d8649eb079767419835 https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/f6d5545a0241de2cda81c878a157517b83378c04 Also: - remove excess '<< ${source:Version}' on mysql-client-* and mysql-server-* - move more packages to Conflicts as it is semantically more correct than having those packages in Replaces
* | | | Revert "MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic ↵Otto Kekäläinen2021-03-291-30/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore" This reverts commit 44885273f2cffd3b269fb18b0c369b343d9de512. Reverting this commit is necessary to fix missing-breaks errors in the Debian packaging. The original fix was also not entirely necessary as a fix to the original problem. Partially also reverts commit e7c7f5c1bbac9a081775a1dc50088ae1e32e2a8d where this unsorted debian/control file was sorted.
* | | | Deb: Sync updates to debconf templates and translations from downstreamOtto Kekäläinen2021-03-1721-1877/+303
| | | |
* | | | Deb: Add Finnish and Vietnamese debconf translationsOtto Kekäläinen2021-03-172-0/+214
| | | | | | | | | | | | | | | | Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/tree/master/debian/po
* | | | Deb: Sync downstream changes upstreamOtto Kekäläinen2021-03-104-40/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reduce Build-Depends https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/150bf990c6059a2fca95ea9bc4d108c9789b179d Dependencies chrpath, dh-apparmor and libarchive-dev are not needed. Fixes buildbot sid failures that error on: Unmet build dependencies: chrpath dh-apparmor libarchive-dev - Salsa-CI: Remove mysql-5.7 upgrade in Sid test as package was removed https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/6f55ac620ce26046475b2a430838367732b47d54 Also clean away extra Salsa-CI markup not needed anymore. - Autopkgtest: Simplify autopkgtest 'smoke' to be easier to debug https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/836907989ad8d355b2f88f8013a6acb8a64cf7d9 - Autopkgtest: Skip main.failed_auth_unixsocket on armhf and i386 https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/74601f8b31a6c59e825089c52a1ca21545062813
* | | | Merge mariadb-10.5.9Marko Mäkelä2021-02-171-0/+7
|\ \ \ \
| * \ \ \ Merge branch 'bb-10.4-release' into bb-10.5-releaseSergei Golubchik2021-02-151-0/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-0/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution" was null-merged. 10.4 version of the fix is coming up separately
| | | * | Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-0/+6
| | | |\ \
| | | | * | Skip TokuDB within autobake-deb.shVicențiu Ciorbaru2021-01-292-5/+6
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Skipping the package within debian/rules won't work because starting with Debian 10, the helper scripts read the control file before the recipe.
| | | | * travis: 10.2 only - make fasterDaniel Black2020-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove from debian build: * tokudb * mroonga * spider * ograph * embedded server Add ccache to debian build. Backport 10.3 changes to autobake-deb that make travis faster. Merge instructions: Drop this commit on merge to 10.3
* | | | | Deb: Remove build depencency libreadline-gplv2-dev no longer availableOtto Kekäläinen2021-02-113-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Readline library is no longer available in Debian Sid. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980504 Add the dependency on-the-fly in autobake-deb.sh for older distro versions and keep the native build in a state that works on Debian Sid as-is.
* | | | | Salsa-CI: Install readline from Buster as it was removed from SidOtto Kekäläinen2021-02-111-0/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The older MariaDB.org packages were built against libreadline5 and depend on it to install. As it was removed from Sid (and Bullseye), fetch and install it from Buster. This can eventually be removed once we stop backwards compat testing for older MariaDB versions (new ones don't depend on it). Upstreamed from Debian packaging repository commit https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/4b729db7f89f573dbe92d601a2d984fab158fc4f
* | | | deb: relax server version dependencies for non-storage-engine pluginsSergei Golubchik2021-01-121-2/+2
| | | |
* | | | deb: remove i386 from Build-Depends of ColumnStoreSergei Golubchik2021-01-121-9/+9
| | | |
* | | | deb: use ${server:Version} for the version of the server packageSergei Golubchik2021-01-123-12/+16
| | | | | | | | | | | | | | | | | | | | and not ${binary:Version}, which is the version of the current package, whatever it is.
* | | | Deb: Ignore Lintian error on ColumnStore libjemalloc.so inclusionOtto Kekäläinen2021-01-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related: MDEV-24124 Partial upstreaming of Debian packaging commit https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/93a02bbe848ef9810d44635a3b4d409e71bd0628
* | | | Salsa-CI: Use aptitude to resolve build dependenciesOtto Kekäläinen2021-01-031-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt the same install-build-deps.sh the upstream Salsa-CI has started using. Since we have our own custom build step (to support autobake-deb.sh) we need to maintain in like this and adopt to upstream changes. This change will make the stretch-backports build pass and use the backported libzstd-dev 1.3.8 library (to satisfy the > 1.3.3 requirement). Also clean away excess autopkgtest stanza and allow missing-breaks to fail so that in total Salsa-CI would now pass.
* | | | Deb: Revert emptying /etc/mysql/debian.cnf on upgradesOtto Kekäläinen2021-01-031-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the user and password definitions as e.g. dbconfig-common expects to find them there. Extend the file to document (in context) why it is about to be obsoleted to facilitate users migrating away from it. Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/a6583c15226ad9a0ca37861e1bd01057bcff32a5
* | | | Deb: Sync misc changes from downstream DebianOtto Kekäläinen2021-01-035-26/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add cracklib-runtime and libarchive-dev as build dependencies - Update Debian policy standards version to 4.5.0 - Add libssl-dev to libmariadb-dev run-time dependency - Add "Multi-Arch: same" to packages that have it in Debian - Sync README.Debian - Sync debian/rules formatting - Sync autopkgtests
* | | | Deb: Fix upgrade from Percona.com by ensuring server uses mariadb.cnfOtto Kekäläinen2021-01-031-0/+12
| | | | | | | | | | | | | | | | Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/13e3a7903e5c72e70c02b98a3e51a6de70b9b6ef
* | | | Deb: Make dependencies and debian/rules cross-compile compatibleOtto Kekäläinen2021-01-032-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clean away impossible/unnecessary "Multi-Arch: same" stanzas. Mostly upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/f0ba31e1565feaca9c2a6f2534e55bfc29af7021 Omitted 'libzstd-dev (>= 1.3.3)' as the version requirement would need stretch-backports to be available on buildbot.askmonty.org builders and they are not yet.
* | | | Deb: Correct documentation about systemd using debian-startOtto Kekäläinen2021-01-032-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mariadb.service systemd file indeed does contain: ExecStartPost=/etc/mysql/debian-start So don't claim it does not use debian-start. Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/af869e703014b25795b0891e3450520c599d3650
* | | | Deb: Unify config file syntax styleOtto Kekäläinen2021-01-033-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - no space after comment - align equal signs in groups Upstreamed from: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/a8c67e15c9a58199f085ae84cdb97c542667767d
View Lorry Controller Status