diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-16 15:09:50 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-06-17 12:02:34 +0200 |
| commit | 3ef68518ec95a177ace883ef2976fc5ef7307543 (patch) | |
| tree | 7e6baeac343d16216de180b4def8498c7a57eeca /RepositoryExternal.mk | |
| parent | tdf#132944 sw_redlinehide: delete of insert redline (diff) | |
| download | core-3ef68518ec95a177ace883ef2976fc5ef7307543.tar.gz core-3ef68518ec95a177ace883ef2976fc5ef7307543.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.
Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96497
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
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 ba6437276f28..e052d70d5136 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -295,6 +295,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 |