This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4db815500aa1388fee2404bfe75ec26d4c25760b
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Mon Apr 22 19:23:06 2024 +0200
Upgrade Curl to version 8.7.1.
Patch by: me
(cherry picked from commit e469ab6aed23a1b38f105a944997af16e61071d0)
---
main/curl/curl-bundled_openssl.patch | 35 ++++++++++++++++++-----------------
main/curl/curl-wnt.patch | 26 ++++----------------------
main/curl/makefile.mk | 17 ++++++++++-------
main/curl/prj/d.lst | 10 +---------
main/external_deps.lst | 4 ++--
5 files changed, 35 insertions(+), 57 deletions(-)
diff --git a/main/curl/curl-bundled_openssl.patch
b/main/curl/curl-bundled_openssl.patch
index a3599097ac..02398175f9 100644
--- a/main/curl/curl-bundled_openssl.patch
+++ b/main/curl/curl-bundled_openssl.patch
@@ -1,28 +1,29 @@
---- misc/curl-7.72.0/configure 2020-08-17 00:34:29.000000000 +0200
-+++ misc/build/curl-7.72.0/configure 2022-05-05 19:03:39.766880970 +0200
-@@ -23617,14 +23617,14 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set
to \"$OPENSSL_PCDIR\"" >&5
- $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
- PKGTEST="yes"
-- elif test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then
-+ elif test ! -f "$PREFIX_OPENSSL/inc/external/openssl/ssl.h"; then
- as_fn_error $? "$PREFIX_OPENSSL is a bad --with-ssl prefix!" "$LINENO" 5
+--- misc/build/curl-8.7.1/configure 2024-04-21 19:20:02.487331000 +0200
++++ misc/build/curl-8.7.1/configure 2024-04-21 19:20:26.529989000 +0200
+@@ -26416,7 +26416,7 @@
fi
+ if test "$PKGTEST" != "yes"; then
+- if test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then
++ if test ! -f "$PREFIX_OPENSSL/inc/external/openssl/ssl.h"; then
+ as_fn_error $? "$PREFIX_OPENSSL is a bad --with-openssl prefix!"
"$LINENO" 5
+ fi
+ fi
+@@ -26424,7 +26424,7 @@
LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
if test "$PREFIX_OPENSSL" != "/usr" ; then
SSL_LDFLAGS="-L$LIB_OPENSSL"
- SSL_CPPFLAGS="-I$PREFIX_OPENSSL/include"
+ SSL_CPPFLAGS="-I$PREFIX_OPENSSL/inc/external"
fi
- SSL_CPPFLAGS="$SSL_CPPFLAGS -I$PREFIX_OPENSSL/include/openssl"
;;
-@@ -23841,7 +23841,7 @@
- LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
- if test "$PKGCONFIG" = "no" ; then
+ esac
+@@ -26655,7 +26655,7 @@
+ fi
+ if test "$PKGCONFIG" = "no" -a -n "$PREFIX_OPENSSL" ; then
# only set this if pkg-config wasn't used
-- CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl
-I$PREFIX_OPENSSL/include"
-+ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/inc/external/openssl
-I$PREFIX_OPENSSL/inc/external"
+- CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include"
++ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/inc/external"
fi
- # Linking previously failed, try extra paths from --with-ssl or
pkg-config.
- # Use a different function name to avoid reusing the earlier cached
result.
+ # Linking previously failed, try extra paths from --with-openssl or
+ # pkg-config. Use a different function name to avoid reusing the earlier
diff --git a/main/curl/curl-wnt.patch b/main/curl/curl-wnt.patch
index b38ad3c4c0..e54176f2ef 100644
--- a/main/curl/curl-wnt.patch
+++ b/main/curl/curl-wnt.patch
@@ -1,6 +1,6 @@
---- misc/build/curl-7.72.0/winbuild/MakefileBuild.vc 2020-08-17
00:28:40.000000000 +0200
-+++ misc/build/curl-7.72.0/winbuild/MakefileBuild.vc 2022-04-23
19:57:39.594763000 +0200
-@@ -115,7 +115,7 @@
+--- misc/build/curl-8.7.1/winbuild/MakefileBuild.vc 2024-03-06
23:16:03.000000000 +0200
++++ misc/build/curl-8.7.1/winbuild/MakefileBuild.vc 2024-04-21
19:13:08.380236000 +0200
+@@ -102,7 +102,7 @@
!IFNDEF WITH_DEVEL
WITH_DEVEL = ../../deps
!ENDIF
@@ -9,7 +9,7 @@
DEVEL_LIB = $(WITH_DEVEL)/lib
!IF EXISTS("$(DEVEL_INCLUDE)")
-@@ -233,7 +233,7 @@
+@@ -241,7 +241,7 @@
ZLIB_LIB_DIR = $(ZLIB_PATH)\lib
ZLIB_LFLAGS = $(ZLIB_LFLAGS) "/LIBPATH:$(ZLIB_LIB_DIR)"
!ELSE
@@ -18,21 +18,3 @@
ZLIB_LIB_DIR = $(DEVEL_LIB)
!ENDIF
-@@ -568,6 +568,7 @@
- @if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls
- @if not exist "$(LIB_DIROBJ)\vssh" mkdir $(LIB_DIROBJ)\vssh
- @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)
-@@ -590,6 +591,9 @@
- $(CURL_CC) $(CFLAGS) /Fo"$@" $<
-
- {$(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
diff --git a/main/curl/makefile.mk b/main/curl/makefile.mk
index b801cb75bf..f17ba876d9 100644
--- a/main/curl/makefile.mk
+++ b/main/curl/makefile.mk
@@ -37,8 +37,8 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=curl-7.72.0
-TARFILE_MD5=7422feb126df677d2d33294a1fd079ea
+TARFILE_NAME=curl-8.7.1
+TARFILE_MD5=92f7a11836678b725e2cb59fef10c273
PATCH_FILES=curl-wnt.patch
#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
@@ -146,15 +146,18 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib
.ENDIF # "$(GUI)"=="OS2"
OUT2INC= \
- include$/curl$/easy.h \
- include$/curl$/multi.h \
include$/curl$/curl.h \
include$/curl$/curlver.h \
- include$/curl$/typecheck-gcc.h \
- include$/curl$/stdcheaders.h \
+ include$/curl$/easy.h \
+ include$/curl$/header.h \
include$/curl$/mprintf.h \
+ include$/curl$/multi.h \
+ include$/curl$/options.h \
+ include$/curl$/stdcheaders.h \
include$/curl$/system.h \
- include$/curl$/urlapi.h
+ include$/curl$/typecheck-gcc.h \
+ include$/curl$/urlapi.h \
+ include$/curl$/websockets.h
# --- Targets ------------------------------------------------------
diff --git a/main/curl/prj/d.lst b/main/curl/prj/d.lst
index 1458a6b968..a5bb6b4e79 100644
--- a/main/curl/prj/d.lst
+++ b/main/curl/prj/d.lst
@@ -1,13 +1,5 @@
mkdir: %_DEST%\inc%_EXT%\external\curl
-..\%__SRC%\inc\easy.h %_DEST%\inc%_EXT%\external\curl\easy.h
-..\%__SRC%\inc\curlver.h %_DEST%\inc%_EXT%\external\curl\curlver.h
-..\%__SRC%\inc\curl.h %_DEST%\inc%_EXT%\external\curl\curl.h
-..\%__SRC%\inc\mprintf.h %_DEST%\inc%_EXT%\external\curl\mprintf.h
-..\%__SRC%\inc\multi.h %_DEST%\inc%_EXT%\external\curl\multi.h
-..\%__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%\inc\*.h %_DEST%\inc%_EXT%\external\curl\
..\%__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 237b599761..f5d7f4b561 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -218,8 +218,8 @@ if (SYSTEM_EXPAT != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
- MD5 = 7422feb126df677d2d33294a1fd079ea
- name = curl-7.72.0.tar.gz
+ MD5 = 92f7a11836678b725e2cb59fef10c273
+ name = curl-8.7.1.tar.gz
URL1 = https://curl.haxx.se/download/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
