changeset 6497:c5a38140ad2a

curl: update to v7.86.0 * src/curl.mk: update version, checksum * src/curl-1-fixes.patch: new file * dist-files.mk: add ref to new file
author John Donoghue <john.donoghue@ieee.org>
date Mon, 31 Oct 2022 14:18:41 -0400
parents 710268f976b3
children e7a2c2d2b163
files dist-files.mk src/curl-1-fixes.patch src/curl.mk
diffstat 3 files changed, 28 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Oct 30 20:02:20 2022 -0400
+++ b/dist-files.mk	Mon Oct 31 14:18:41 2022 -0400
@@ -69,6 +69,7 @@
   cminpack.mk \
   cppunit.mk \
   cunit.mk \
+  curl-1-fixes.patch \
   curl-test.c \
   curl.mk \
   damageproto.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/curl-1-fixes.patch	Mon Oct 31 14:18:41 2022 -0400
@@ -0,0 +1,25 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Mon, 31 Oct 2022 18:57:29 +1100
+Subject: [PATCH 1/1] fix shared build with windres
+
+taken from:
+https://github.com/curl/curl/commit/b7260c4fda95196b2fa16f32b5913f25323e5098
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 1111111..2222222 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2000,7 +2000,7 @@ listhelp:
+ 
+ # Warning is "normal": libtool:   error: ignoring unknown tag RC
+ @OS_WINDOWS_TRUE@.rc.o:
+-@OS_WINDOWS_TRUE@	$(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@
++@OS_WINDOWS_TRUE@	$(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/src/curl.mk	Sun Oct 30 20:02:20 2022 -0400
+++ b/src/curl.mk	Mon Oct 31 14:18:41 2022 -0400
@@ -3,8 +3,8 @@
 
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.85.0
-$(PKG)_CHECKSUM := 5c1940ff51f6b2137b91ffe672b70d4491a23ea6
+$(PKG)_VERSION  := 7.86.0
+$(PKG)_CHECKSUM := 289a3aaec47f98a52474cd34243d6b7f51f8e525
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://curl.haxx.se/download/$($(PKG)_FILE)
@@ -28,7 +28,6 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_CONFIGURE_OPTS) \
-        --without-ssl \
         --with-gnutls \
         --with-libidn2 \
         --enable-sspi \