You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2020/08/27 19:36:44 UTC
[openoffice] branch trunk updated: Upgrade to curl-7.72.0
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new bc61438 Upgrade to curl-7.72.0
bc61438 is described below
commit bc614383ed48d84f9d3ab126d6cfbe0c303e3c73
Author: Don Lewis <tr...@apache.org>
AuthorDate: Wed Aug 26 20:53:16 2020 -0700
Upgrade to curl-7.72.0
Curl 7.27.0 fixes a number of bugs and a couple CVEs that probably do not
affect us.
---
main/curl/buildssh.patch | 4 ++--
main/curl/makefile.mk | 12 ++++++------
main/external_deps.lst | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/main/curl/buildssh.patch b/main/curl/buildssh.patch
index 92686a1..55254a0 100644
--- a/main/curl/buildssh.patch
+++ b/main/curl/buildssh.patch
@@ -1,5 +1,5 @@
---- misc/curl-7.66.0/winbuild/MakefileBuild.vc 2019-09-09 05:03:16.000000000 -0700
-+++ misc/build/curl-7.66.0/winbuild/MakefileBuild.vc 2019-10-08 23:35:42.129882800 -0700
+--- misc/curl-7.72.0/winbuild/MakefileBuild.vc 2019-09-09 05:03:16.000000000 -0700
++++ misc/build/curl-7.72.0/winbuild/MakefileBuild.vc 2019-10-08 23:35:42.129882800 -0700
@@ -560,6 +560,7 @@
@if not exist "$(LIB_DIROBJ)\vauth" mkdir $(LIB_DIROBJ)\vauth
@if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls
diff --git a/main/curl/makefile.mk b/main/curl/makefile.mk
index 3751501..533495b 100644
--- a/main/curl/makefile.mk
+++ b/main/curl/makefile.mk
@@ -37,8 +37,8 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=curl-7.66.0
-TARFILE_MD5=8cb2898a9adc106075ac3cdc2b965bf6
+TARFILE_NAME=curl-7.72.0
+TARFILE_MD5=7422feb126df677d2d33294a1fd079ea
PATCH_FILES=buildssh.patch
#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
@@ -110,11 +110,11 @@ BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 DEBUG=yes EXCFLAGS=$
.ENDIF
.IF "$(CPUNAME)"=="INTEL"
-OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
-OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-schannel/bin/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-schannel/lib/libcurl.lib
.ELIF "$(CPUNAME)"=="X86_64"
-OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
-OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ipv6-sspi-schannel/bin/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ipv6-sspi-schannel/lib/libcurl.lib
.ENDIF
.ENDIF
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 9b0fdfc..0621c53 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -223,8 +223,8 @@ if (SYSTEM_EXPAT != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
- MD5 = 8cb2898a9adc106075ac3cdc2b965bf6
- name = curl-7.66.0.tar.gz
+ MD5 = 7422feb126df677d2d33294a1fd079ea
+ name = curl-7.72.0.tar.gz
URL1 = https://curl.haxx.se/download/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)