download.lst | 4
external/curl/ExternalPackage_curl.mk | 2
external/curl/ExternalProject_curl.mk | 2
external/curl/UnpackedTarball_curl.mk | 1
external/curl/configure-eval-fix.patch.0 | 146 -------------------------------
5 files changed, 4 insertions(+), 151 deletions(-)
New commits:
commit 58a3bf5199818e30ef4207213f29692d81b519c6
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu May 12 11:43:59 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu May 12 17:04:33 2022 +0200
curl: upgrade to release 7.83.1
Fixes CVE-2022-27774 CVE-2022-27775 CVE-2022-27776 CVE-2022-27781
plus 6 more CVEs that shouldn't affect LO.
Remove obsolete configure-eval-fix.patch.0.
Change-Id: Ifbd7ff5acf390df1d95d6b8be0dc7751e4753bbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134225
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index a532607e465e..bef96b45a1ce 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export COINMP_SHA256SUM :=
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8
export COINMP_TARBALL := CoinMP-1.7.6.tgz
export CPPUNIT_SHA256SUM :=
89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7
export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
-export CURL_SHA256SUM :=
ac8e1087711084548d788ef18b9b732c8de887457b81f616fc681d1044b32f98
-export CURL_TARBALL := curl-7.81.0.tar.gz
+export CURL_SHA256SUM :=
2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4
+export CURL_TARBALL := curl-7.83.1.tar.xz
export EBOOK_SHA256SUM :=
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
export EPOXY_SHA256SUM :=
d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4
diff --git a/external/curl/ExternalPackage_curl.mk
b/external/curl/ExternalPackage_curl.mk
index 0485dacb2d3b..ee0cf4501478 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -20,7 +20,7 @@ $(eval $(call
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli
else ifeq ($(OS),AIX)
$(eval $(call
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
else
-$(eval $(call
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.7.0))
+$(eval $(call
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.8.0))
endif
endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 6b524f4d5a1a..cad4199b5927 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(gb_RUN_CONFIGURE) ./configure \
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
- $(if $(ENABLE_NSS),--with-nss$(if
$(SYSTEM_NSS),,="$(call
gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
+ $(if $(ENABLE_NSS),--with-nss$(if
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")
--with-nss-deprecated,--without-nss)) \
--without-ssl --without-gnutls --without-polarssl
--without-cyassl --without-axtls --without-mbedtls \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index 7a8f5a265341..b89b000228c9 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/zlib.patch.0 \
external/curl/configurable-z-option.patch.0 \
- external/curl/configure-eval-fix.patch.0 \
))
ifeq ($(SYSTEM_NSS),)
diff --git a/external/curl/configure-eval-fix.patch.0
b/external/curl/configure-eval-fix.patch.0
deleted file mode 100644
index 616f3fb607ad..000000000000
--- a/external/curl/configure-eval-fix.patch.0
+++ /dev/null
@@ -1,146 +0,0 @@
---- configure
-+++ configure
-@@ -17942,7 +17942,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -18230,7 +18230,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -19676,7 +19676,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -22525,7 +22525,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -24251,7 +24251,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -34015,7 +34015,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -34479,7 +34479,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -37507,7 +37507,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39014,7 +39014,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39259,7 +39259,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39527,7 +39527,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39787,7 +39787,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -40833,7 +40833,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -41238,7 +41238,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -43189,7 +43189,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -43305,7 +43305,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
