diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-16 15:09:50 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-04-09 23:22:02 +0200 |
| commit | 827264fd169b4d80f570d19a74a526bb46e092bb (patch) | |
| tree | 406326c87167a625f0cabcfa30623935ffa525c1 /solenv | |
| parent | i18npool: don't break line at slash '/' (diff) | |
| download | core-827264fd169b4d80f570d19a74a526bb46e092bb.tar.gz core-827264fd169b4d80f570d19a74a526bb46e092bb.zip | |
mariadb: upgrade to release 3.1.8
Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249
Remove obsolete patches:
* mariadb-msvc.patch.1
* mariadb-swap.patch
* mariadb-inline.patch.1
* mariadb-CONC-104.patch.1
Don't build anything from plugins/ in the hope that it's not needed.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b)
mariadb: forgot to adapt flatpak-manifest.in
mariadb: the "pvio_socket" plugin turns out to be important
... otherwise can't connect to a TCP socket.
(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546)
Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 329c83c57989948d16b4e4d646607b93ee407a9e)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/blacklist | 3 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 09e0c490d1f6..7da33503d52c 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4555,7 +4555,8 @@ external/clucene/configs/clucene-config-generic.h external/libpng/configs/pnglibconf.h external/mariadb-connector-c/configs/linux_my_config.h external/mariadb-connector-c/configs/mac_my_config.h -external/mariadb-connector-c/configs/mysql_version.h +external/mariadb-connector-c/configs/wnt_ma_config.h +external/mariadb-connector-c/configs/mariadb_version.h external/neon/configs/config.h external/redland/raptor/raptor2.h external/redland/raptor/raptor_config.h diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index a22d5f578b0a..cb766aa303ea 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -339,10 +339,10 @@ "dest-filename": "external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz" }, { - "url": "https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz", - "sha256": "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60", + "url": "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz", + "sha256": "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b", "type": "file", - "dest-filename": "external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz" + "dest-filename": "external/tarballs/mariadb-connector-c-3.1.8-src.tar.gz" }, { "url": "https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2", |