diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-16 15:09:50 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-06-24 10:30:05 +0200 |
| commit | c20025db4a7e57f26562e6b70b2a6e8263588568 (patch) | |
| tree | 8ab9363af6a3a4938eeb2828fe7230bb7475d723 /RepositoryExternal.mk | |
| parent | Move SalInstanceToolbar decl to header file (diff) | |
| download | core-c20025db4a7e57f26562e6b70b2a6e8263588568.tar.gz core-c20025db4a7e57f26562e6b70b2a6e8263588568.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>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9f172d6af448..f6003fc22aba 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -262,6 +262,13 @@ $(call gb_LinkTarget_add_libs,$(1),\ -liconv \ ) endif +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ + ws2_32 \ + advapi32 \ + kernel32 \ + shlwapi \ + crypt32 \ +) endef define gb_ExternalProject__use_mariadb-connector-c |