Unverified Commit d4f49567 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

curl: 8.5.0 -> 8.6.0 

https://curl.se/changes.html#8_6_0
https://curl.se/docs/CVE-2024-0853.html

Fixes: CVE-2024-0853
parent 996b4ebc

pkgs/tools/networking/curl/configure-ipv6-autodetect.diff

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
diff --git a/configure b/configure

index 04d1de1..5de1b41 100755

--- a/configure

+++ b/configure

@@ -24949,15 +24949,12 @@ else $as_nop

 # include <netinet/in6.h>

 #endif

 #endif

-#include <stdlib.h> /* for exit() */

-main()

+

+int main(void)

 {

  struct sockaddr_in6 s;

  (void)s;

- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)

-   exit(1);

- else

-   exit(0);

+ return socket(AF_INET6, SOCK_STREAM, 0) < 0;

 }

 

 

diff --git a/configure.ac b/configure.ac

index 2d71c83..bd38dd9 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1679,15 +1679,12 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),

 # include <netinet/in6.h>

 #endif

 #endif

-#include <stdlib.h> /* for exit() */

-main()

+

+int main(void)

 {

  struct sockaddr_in6 s;

  (void)s;

- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)

-   exit(1);

- else

-   exit(0);

+ return socket(AF_INET6, SOCK_STREAM, 0) < 0;

 }

 ]])

 ],

pkgs/tools/networking/curl/default.nix

+5 −7
Original line number Diff line number Diff line
@@ -48,21 +48,19 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS 


stdenv.mkDerivation (finalAttrs: {

  pname = "curl";

  version = "8.5.0";

  version = "8.6.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-QquNueINgpCjtjPn+7POwV2zTfZf0QFe+KweRyN1Dus=";

    hash = "sha256-PM1V2Rr5UWU534BiX4GMc03G8uz5utozx2dl6ZEh2xU=";

  };



  patches = [

    # fix ipv6 autodetect compile error in configure script

    # remove once https://github.com/curl/curl/pull/12607 released (8.6.0)

    ./configure-ipv6-autodetect.diff

  ];

  postPatch = ''

    patchShebangs scripts

  '';



  outputs = [ "bin" "dev" "out" "man" "devdoc" ];

  separateDebugInfo = stdenv.isLinux;