diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-07-21 11:57:51 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-19 13:57:43 +0200 |
| commit | fd9b1d0682a545c99eb58263b073ce8c51206204 (patch) | |
| tree | bb28ad6cc2050fc95c177205878b75324c5fce73 /external/curl/UnpackedTarball_curl.mk | |
| parent | Bump version to 6.2-32 (diff) | |
| download | core-fd9b1d0682a545c99eb58263b073ce8c51206204.tar.gz core-fd9b1d0682a545c99eb58263b073ce8c51206204.zip | |
curl: upgrade to release 7.78.0
* Fixes CVE-2020-8284 CVE-2021-22924
* Also fixes these which don't look relevant to LO:
CVE-2020-8231
CVE-2020-8285 CVE-2020-8286
CVE-2021-22876 CVE-2021-22890
CVE-2021-22897 CVE-2021-22898 CVE-2021-22901
CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926
* disable some new protocols and dependencies
* remove curl-ios.patch.1 as the code no longer exists upstream
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 946f457c885bd10ff1a7281c351f3981f035f5a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119262
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit 020eb3b363a5c9444c97075a2e15b63ccbe7bf2d)
Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119427
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external/curl/UnpackedTarball_curl.mk')
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 6171f17cba48..1cdb64c0bca2 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,curl)) $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl)) -$(eval $(call gb_UnpackedTarball_update_autoconf_configs,curl)) - $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\ @@ -24,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc-disable-protocols.patch.1 \ external/curl/curl-7.26.0_win-proxy.patch \ external/curl/zlib.patch.0 \ - external/curl/curl-ios.patch.1 \ )) ifeq ($(SYSTEM_NSS),) |