curl: 8.2.1 -> 8.3.0
- https://curl.se/changes.html#8_3_0 - https://curl.se/docs/CVE-2023-38039.html Fixes CVE-2023-38039
This commit is contained in:
parent
0d2fb00624
commit
a68ceade95
2 changed files with 9 additions and 8 deletions
|
@ -27,13 +27,13 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac.
|
|||
|
||||
curl_includes_winsock2="\
|
||||
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
|
||||
index 727d123e5..f78d8be4a 100644
|
||||
index b43714da7..7674778b7 100644
|
||||
--- a/lib/curl_setup.h
|
||||
+++ b/lib/curl_setup.h
|
||||
@@ -250,19 +250,6 @@
|
||||
|
||||
@@ -250,20 +250,6 @@
|
||||
|
||||
#include <curl/system.h>
|
||||
|
||||
|
||||
-/*
|
||||
- * Use getaddrinfo to resolve the IPv4 address literal. If the current network
|
||||
- * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64,
|
||||
|
@ -42,8 +42,9 @@ index 727d123e5..f78d8be4a 100644
|
|||
-#if defined(__APPLE__) && !defined(USE_ARES)
|
||||
-#include <TargetConditionals.h>
|
||||
-#define USE_RESOLVE_ON_IPS 1
|
||||
-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
|
||||
-# define CURL_OSX_CALL_COPYPROXIES 1
|
||||
-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
|
||||
- defined(ENABLE_IPV6)
|
||||
-# define CURL_MACOS_CALL_COPYPROXIES 1
|
||||
-# endif
|
||||
-#endif
|
||||
-
|
||||
|
|
|
@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "curl";
|
||||
version = "8.2.1";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz"
|
||||
"https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-3TIva9CiDmzr39OI9p6Yw9GDvteSz0cTyKfvSYy6SJQ=";
|
||||
hash = "sha256-N21id2fWxPBRBattSXsNmrpxEXcN2dmVIlR4IJw36mM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
Loading…
Reference in a new issue