summaryrefslogtreecommitdiff
path: root/external/curl/zlib.patch.0
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2021-07-21 11:57:51 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2021-07-22 09:09:30 +0200
commit946f457c885bd10ff1a7281c351f3981f035f5a7 (patch)
tree6a0d830dd589331cff515c6a297eec207dd3e0fc /external/curl/zlib.patch.0
parent5feb7230bf4a06290d0972dc5bf6dd4108e7edbb (diff)
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 Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external/curl/zlib.patch.0')
-rw-r--r--external/curl/zlib.patch.04
1 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0
index 189e820d1afa..f4a0ad4b152f 100644
--- a/external/curl/zlib.patch.0
+++ b/external/curl/zlib.patch.0
@@ -54,8 +54,8 @@
clean_LIBS=$LIBS
-ZLIB_LIBS=""
AC_ARG_WITH(zlib,
- AC_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
- AC_HELP_STRING([--without-zlib],[disable use of zlib]),
+ AS_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
+ AS_HELP_STRING([--without-zlib],[disable use of zlib]),
[OPT_ZLIB="$withval"])
if test "$OPT_ZLIB" = "no" ; then