Unverified Commit fc44565b authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'staging-24.11' into staging-next-24.11

parents 4f44a5cb 52b514cc

pkgs/by-name/cp/cpptoml/add-limits-include.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
From c55a516e90133d89d67285429c6474241346d27a Mon Sep 17 00:00:00 2001

From: Dirk Eddelbuettel <edd@debian.org>

Date: Mon, 30 Nov 2020 09:41:49 -0600

Subject: [PATCH] g++-11 requires limits header



---

 include/cpptoml.h | 1 +

 1 file changed, 1 insertion(+)



diff --git a/include/cpptoml.h b/include/cpptoml.h

index 5a00da3..1dc9fd1 100644

--- a/include/cpptoml.h

+++ b/include/cpptoml.h

@@ -14,6 +14,7 @@

 #include <cstring>

 #include <fstream>

 #include <iomanip>

+#include <limits>

 #include <map>

 #include <memory>

 #include <sstream>

pkgs/by-name/cp/cpptoml/package.nix

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec { 
    sha256 = "0zlgdlk9nsskmr8xc2ajm6mn1x5wz82ssx9w88s02icz71mcihrx";

  };



  patches = [

    # Fix compilation with GCC 11.

    # <https://github.com/skystrife/cpptoml/pull/123>

    ./add-limits-include.patch

  ];



  nativeBuildInputs = [ cmake ];



  cmakeFlags = [

pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch

0 → 100644
+31 −0
Original line number Diff line number Diff line 
From 0cdde0fdfbeb8c35420f6d03fa4b77ed73497694 Mon Sep 17 00:00:00 2001

From: Daniel Stenberg <daniel@haxx.se>

Date: Thu, 7 Nov 2024 17:03:54 +0100

Subject: [PATCH] netrc: support large file, longer lines, longer tokens



Regression from 3b43a05e000aa8f6 (shipped in 8.11.0)



Reported-by: Moritz

Fixes #15513

Closes #15514

---

 lib/netrc.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/lib/netrc.c b/lib/netrc.c

index c23f927cef32d35059360f04be3c7833589f5df5..034c0307a43e3b86c9c004387cedf273588370e1 100644

--- a/lib/netrc.c

+++ b/lib/netrc.c

@@ -58,9 +58,9 @@ enum found_state {

 #define NETRC_FAILED -1

 #define NETRC_SUCCESS 0

 

-#define MAX_NETRC_LINE 4096

-#define MAX_NETRC_FILE (64*1024)

-#define MAX_NETRC_TOKEN 128

+#define MAX_NETRC_LINE 16384

+#define MAX_NETRC_FILE (128*1024)

+#define MAX_NETRC_TOKEN 4096

 

 static CURLcode file2memory(const char *filename, struct dynbuf *filebuf)

 {

pkgs/by-name/cu/curlMinimal/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ stdenv.mkDerivation (finalAttrs: { 
    # https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88

    # TODO: Remove this patch when 8.11.1/8.12.0 releases

    ./fix-netrc-regression.patch



    # https://github.com/curl/curl/issues/15513

    # https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694

    ./fix-netrc-regression-2.patch

  ];



  # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion