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 2019/10/16 03:51:47 UTC
[openoffice] branch trunk updated: Upgrade curl to version 7.66.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 49c55ee Upgrade curl to version 7.66.0.
49c55ee is described below
commit 49c55ee517f683791571ef0777da22996cd40e01
Author: Don Lewis <dl...@debian.catspoiler.org>
AuthorDate: Tue Oct 15 21:00:42 2019 -0700
Upgrade curl to version 7.66.0.
A new patch is needed to successfully build on Windows.
---
main/curl/buildssh.patch | 20 ++++++++++++++++++++
main/curl/makefile.mk | 9 +++++----
main/curl/prj/d.lst | 1 +
main/external_deps.lst | 4 ++--
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/main/curl/buildssh.patch b/main/curl/buildssh.patch
new file mode 100644
index 0000000..92686a1
--- /dev/null
+++ b/main/curl/buildssh.patch
@@ -0,0 +1,20 @@
+--- 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
+@@ -560,6 +560,7 @@
+ @if not exist "$(LIB_DIROBJ)\vauth" mkdir $(LIB_DIROBJ)\vauth
+ @if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls
+ @if not exist "$(LIB_DIROBJ)\vquic" mkdir $(LIB_DIROBJ)\vquic
++ @if not exist "$(LIB_DIROBJ)\vssh" mkdir $(LIB_DIROBJ)\vssh
+
+ $(CURL_DIROBJ):
+ @if not exist "$(CURL_DIROBJ)" mkdir $(CURL_DIROBJ)
+@@ -581,6 +582,9 @@
+ {$(LIBCURL_SRC_DIR)\vquic\}.c{$(LIB_DIROBJ)\vquic\}.obj:
+ $(CURL_CC) $(CFLAGS) /Fo"$@" $<
+
++{$(LIBCURL_SRC_DIR)\vssh\}.c{$(LIB_DIROBJ)\vssh\}.obj:
++ $(CURL_CC) $(CFLAGS) /Fo"$@" $<
++
+ $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc
+ $(RC) $(RC_FLAGS)
+
diff --git a/main/curl/makefile.mk b/main/curl/makefile.mk
index 50c0553..3751501 100644
--- a/main/curl/makefile.mk
+++ b/main/curl/makefile.mk
@@ -37,9 +37,9 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=curl-7.61.1
-TARFILE_MD5=4762f41ef0dba751d1c7a3060a1c6ec6
-PATCH_FILES=
+TARFILE_NAME=curl-7.66.0
+TARFILE_MD5=8cb2898a9adc106075ac3cdc2b965bf6
+PATCH_FILES=buildssh.patch
#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
@@ -144,7 +144,8 @@ OUT2INC= \
include$/curl$/typecheck-gcc.h \
include$/curl$/stdcheaders.h \
include$/curl$/mprintf.h \
- include$/curl$/system.h
+ include$/curl$/system.h \
+ include$/curl$/urlapi.h
# --- Targets ------------------------------------------------------
diff --git a/main/curl/prj/d.lst b/main/curl/prj/d.lst
index 075b312..1458a6b 100644
--- a/main/curl/prj/d.lst
+++ b/main/curl/prj/d.lst
@@ -7,6 +7,7 @@ mkdir: %_DEST%\inc%_EXT%\external\curl
..\%__SRC%\inc\stdcheaders.h %_DEST%\inc%_EXT%\external\curl\stdcheaders.h
..\%__SRC%\inc\typecheck-gcc.h %_DEST%\inc%_EXT%\external\curl\typecheck-gcc.h
..\%__SRC%\inc\system.h %_DEST%\inc%_EXT%\external\curl\system.h
+..\%__SRC%\inc\urlapi.h %_DEST%\inc%_EXT%\external\curl\urlapi.h
..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.*
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 98398ce..1ad42e6 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 = 4762f41ef0dba751d1c7a3060a1c6ec6
- name = curl-7.61.1.tar.gz
+ MD5 = 8cb2898a9adc106075ac3cdc2b965bf6
+ name = curl-7.66.0.tar.gz
URL1 = https://curl.haxx.se/download/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)