curl: update to 8.4.0

dosbox-staging · Oct 11, 2023 · 4540a2d · 4540a2d
1 parent 1665593
commit 4540a2d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/releases.json b/releases.json
@@ -412,6 +412,7 @@
       "libcurl"
     ],
     "versions": [
+      "8.4.0-1",
       "8.3.0-1",
       "8.0.1-1"
     ]

diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
@@ -1,9 +1,9 @@
 [wrap-file]
-directory = curl-8.3.0
-source_url = https://github.com/curl/curl/releases/download/curl-8_3_0/curl-8.3.0.tar.xz
-source_fallback_url = https://curl.se/download/curl-8.3.0.tar.xz
-source_filename = curl-8.3.0.tar.xz
-source_hash = 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63
+directory = curl-8.4.0
+source_url = https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.tar.xz
+source_fallback_url = https://curl.se/download/curl-8.4.0.tar.xz
+source_filename = curl-8.4.0.tar.xz
+source_hash = 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
 patch_directory = curl
 
 [provide]

diff --git a/subprojects/packagefiles/curl/meson.build b/subprojects/packagefiles/curl/meson.build
@@ -3,7 +3,7 @@
 project(
   'curl',
   'c',
-  version: '8.3.0',
+  version: '8.4.0',
   # Version gated use of `test(…, verbose: true)` needs `0.62.0`.
   meson_version: meson.version().version_compare('>=0.62.0') ? '>=0.62.0' : '>=0.60.0',
 )
@@ -132,7 +132,6 @@ _headerlist = {
     'inet_ntop',
     'inet_pton',
   ],
-  'arpa/tftp.h': [],
   'bsd/unistd.h': [
     'setmode',
   ],
@@ -192,6 +191,8 @@ _headerlist = {
   'stddef.h': [],
   'stdint.h': [],
   'stdio.h': [
+    '_fseeki64',
+    'fseeko',
     'snprintf',
   ],
   'stdlib.h': [
@@ -236,7 +237,6 @@ _headerlist = {
     'utimes',
   ],
   'sys/types.h': [],
-  'sys/uio.h': [],
   'sys/un.h': [],
   'sys/utime.h': [],
   'sys/utsname.h': [

diff --git a/subprojects/packagefiles/curl/meson/curl_config.h.meson b/subprojects/packagefiles/curl/meson/curl_config.h.meson
@@ -165,9 +165,6 @@
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #mesondefine HAVE_ARPA_INET_H
 
-/* Define to 1 if you have the <arpa/tftp.h> header file. */
-#mesondefine HAVE_ARPA_TFTP_H
-
 /* Define to 1 if you have _Atomic support. */
 #mesondefine HAVE_ATOMIC
 
@@ -226,6 +223,9 @@
 /* Define to 1 if you have the freeaddrinfo function. */
 #mesondefine HAVE_FREEADDRINFO
 
+/* Define to 1 if you have the `fseeko' function. */
+#mesondefine HAVE_FSEEKO
+
 /* Define to 1 if you have the fsetxattr function. */
 #mesondefine HAVE_FSETXATTR
 
@@ -350,18 +350,9 @@
 /* Define to 1 if you have the <io.h> header file. */
 #mesondefine HAVE_IO_H
 
-/* Define to 1 if you have the lber.h header file. */
-#mesondefine HAVE_LBER_H
-
 /* Use LDAPS implementation */
 #mesondefine HAVE_LDAP_SSL
 
-/* Define to 1 if you have the ldap_ssl.h header file. */
-#mesondefine HAVE_LDAP_SSL_H
-
-/* Define to 1 if you have the `ldap_url_parse' function. */
-#mesondefine HAVE_LDAP_URL_PARSE
-
 /* Define to 1 if you have the <libgen.h> header file. */
 #mesondefine HAVE_LIBGEN_H
 
@@ -490,9 +481,6 @@
 /* Define to 1 if you have the signal function. */
 #mesondefine HAVE_SIGNAL
 
-/* Define to 1 if you have the <signal.h> header file. */
-#mesondefine HAVE_SIGNAL_H
-
 /* Define to 1 if you have the sigsetjmp function or macro. */
 #mesondefine HAVE_SIGSETJMP
 
@@ -598,9 +586,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #mesondefine HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#mesondefine HAVE_SYS_UIO_H
-
 /* Define to 1 if you have the <sys/un.h> header file. */
 #mesondefine HAVE_SYS_UN_H
 
@@ -664,6 +649,9 @@
 /* if libzstd is in use */
 #mesondefine HAVE_ZSTD
 
+/* Define to 1 if you have the `_fseeki64' function. */
+#mesondefine HAVE__FSEEKI64
+
 /* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
 #mesondefine NEED_REENTRANT