summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.2' into 10.3Sergei Golubchik2021-07-211-2/+2
|\
| * Update description of mariadb-common packageAnel Husakovic2021-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Commit https://github.com/mariadb/server/commit/438ed0408c69 introduced `mariadb-common` package and added description. Example in description is confusing since files referred to are not installed and not related/owned by the `mariadb-common` package. - Patch is updating real file/directory description section pointing to the real examples owned by the package. - Example: ``` mariadb-client-10.3 install mariadb-client-core-10.3 install mariadb-common install mariadb-server install mariadb-server-10.3 install mariadb-server-core-10.3 install /. /etc /etc/mysql /etc/mysql/mariadb.cnf /etc/mysql/mariadb.conf.d /usr /usr/share /usr/share/doc /usr/share/doc/mariadb-common /usr/share/doc/mariadb-common/changelog.Debian.gz /usr/share/doc/mariadb-common/copyright ``` Closes PR #1690 Reviewed by: otto@kekalainen.net
* | 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.
* | 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 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 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.
* | 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
* | Merge branch '10.2' into 10.3Sujatha2020-09-282-2/+2
|\ \ | |/
| * Merge branch '10.1' into 10.2Sujatha2020-09-282-2/+2
| |\
| | * MDEV-23697: /usr/bin/perl for debian scriptsDaniel Black2020-09-241-1/+1
| | |
| | * MDEV-23697: perl -w -> perlDaniel Black2020-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave debian/additions/mysqlreport as #!/usr/bin/perl Acknowledge that `env perl` is a hack, a complete fix needs to consider which path perl is at and insert into these scripts. The usefulness of these scripts is questionable.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-07-021-1/+1
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2bb-10.2-mergeMarko Mäkelä2020-07-011-1/+1
| |\ \ | | |/
| | * mtr: use env for perlDaniel Black2020-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD, perl isn't in /usr/bin, its in /usr/local/bin or elsewhere in the path. Like storage/{maria/unittest/,}ma_test_* , we use /usr/bin/env to find perl and run it.
| | * cracklib-runtime needs a comma after to parse properlyVicențiu Ciorbaru2019-11-261-1/+1
| | |
| | * MDEV-13288: Proper fix for cracklib-runtimeVicențiu Ciorbaru2019-11-262-2/+1
| | | | | | | | | | | | | | | The required dependencies should be added through the autobake script, to also cover distributions that do not support libcrack2.
| | * MDEV-13288: Upstream debian patchVicențiu Ciorbaru2019-11-261-0/+1
| | |
| * | Travis-CI: Shorten deb build log to keep it under 4 MBOtto Kekäläinen2020-05-171-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is a 4 MB hard limit on Travis-CI and build output needs to be less than that. Silencing the 'make install' step gets rid of a lot of "Installing.." and "Missing.." and removing all mysql-test files will make the dh_missing warnings much shorter. Cherry-picked from 41952c85f1644690249ce624de7609cbebb93638.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-04-281-1/+1
|\ \ \ | |/ /
| * | MDEV-21331 installation fails on a server with containersSergei Golubchik2020-04-281-1/+1
| | | | | | | | | | | | | | | when detecting running mysqld processes to stop, ignore processes in different namespaces.
* | | Travis-CI: Shorten deb build log to keep it under 4 MBOtto Kekäläinen2020-04-051-2/+7
| | | | | | | | | | | | | | | | | | | | | There is a 4 MB hard limit on Travis-CI and build output needs to be less than that. Silencing the 'make install' step gets rid of a lot of "Installing.." and "Missing.." and removing all mysql-test files will make the dh_missing warnings much shorter.
* | | Change exec bit to allow dh-exec to workVicențiu Ciorbaru2020-03-181-0/+0
| | |
* | | Correctly link mysqlclient.pc to mariadb.pc under multi-arch supportVicențiu Ciorbaru2020-03-082-1/+3
| | |
* | | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2020-03-081-3/+0
|\ \ \ | |/ /
| * | Update install layout to account for multi-arch setupDaniel Black2020-03-081-3/+0
| | | | | | | | | | | | | | | | | | | | | Cleanup install_layout to account for multi-arch setup and remove redundant defines in debian rules. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-03-061-1/+1
|\ \ \ | |/ /
| * | MDEV-19208 mariadb.pc: install into libdirVicențiu Ciorbaru2020-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | The .pc file installed by mariadb mentions archful directories and therefore must be archful itself. This fixes MDEV-14340.
* | | Deb: Run 'wrap-and-sort -a' so comparison across releases is easierOtto Kekäläinen2020-02-136-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. Apply this in 10.3 so eventually it is merged to 10.4 and 10.5, which in turn will have separate wrap-and-sort runs but only for new lines, and not affecting badly next merges from 10.3 to 10.4 to 10.5. Also remove a duplicate line that was found thanks to wrap-and-sort.
* | | Deb: Remove unnecessary manual libzstd1 dependency from RocksDB pluginOtto Kekäläinen2020-02-132-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Debian build tools add all run-time dependencies automatically. For the mariadb-rocksdb-plugin the "${misc:Depends}, ${shlibs:Depends}" will become (based on the build dependencies at build time): Depends: mariadb-server-10.4 (= 1:10.4.12-1), rocksdb-tools, libc6 (>= 2.29), liblz4-1 (>= 0.0~r130), libsnappy1v5 (>= 1.1.8), libstdc++6 (>= 7), libzstd1 (>= 1.3.3), zlib1g (>= 1:1.1.4) There is no need to manually add run-time build dependencies. Only external dependencies need to be defined, for example rocksdb-tools could come in question for mariadb-plugin-rocksdb, and it will be eventually added when downstream official Debian packaging is merged upstream in a later commit.
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-241-0/+2
|\ \ \ | |/ /
| * | MDEV-17292 Package the pam_user_map moduleSergei Golubchik2020-01-211-0/+2
| | |
* | | Lintian complains on spelling errorFaustin Lammler2019-12-021-1/+1
| | | | | | | | | | | | | | | The lintian check complains on spelling error: https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
* | | Revert "Fix upgrade errors on eoan"Sergei Golubchik2019-11-291-10/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 0d345ec2e358ec8f42865be9a17e6f007585931d. Upgrades from 8.0 don't work yet, one has to dump/restore manually to get the metadata out of the data dictionary.
* | | Fix upgrade errors on eoanSergei Golubchik2019-11-281-0/+10
| | | | | | | | | | | | mariadb packages conflict with mysql-8.0
* | | Merge 10.2 into 10.3Marko Mäkelä2019-11-141-1/+1
|\ \ \ | |/ /
| * | Fix a typo in mariadb-plugin-mroonga.prermYasuhiro Horimoto2019-11-121-1/+1
| | | | | | | | | | | | Closes #1407
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-311-2/+0
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-10-301-2/+0
| |\ \ | | |/
| | * Remove bogus adviceMarko Mäkelä2019-10-281-2/+0
| | | | | | | | | | | | | | | | | | Ever since MariaDB 10.0 (and MySQL 5.6.8), the innodb_log_file_size and innodb_log_files_in_group can be changed between server restarts, and the redo log files will be resized on server startup if needed.
* | | Merge 10.2 into 10.3Marko Mäkelä2019-09-231-5/+5
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-09-231-5/+5
| |\ \ | | |/