diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-03-24 10:48:04 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-03-24 23:28:36 +0100 |
commit | 9e22575c8383fc26d94c6bc5407d9b7f08b9ee87 (patch) | |
tree | f0d67885bbb38e261d619370616497978b65c5c8 /external/icu/UnpackedTarball_icu.mk | |
parent | Fix build with boost < 1.68 (diff) | |
download | core-9e22575c8383fc26d94c6bc5407d9b7f08b9ee87.tar.gz core-9e22575c8383fc26d94c6bc5407d9b7f08b9ee87.zip |
icu: add patch to fix CVE-2020-10531
Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 002d1152dc418f7d624409e76cd9d4ac0b42c7f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90975
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 63b573faf984875cda7a879e696ea75fae81df57)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90988
Diffstat (limited to 'external/icu/UnpackedTarball_icu.mk')
-rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 9e5f7974a700..a5416b7ee078 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -39,6 +39,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/gcc9.patch \ external/icu/char8_t.patch \ external/icu/CVE-2018-18928.patch.2 \ + external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 \ )) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) |