-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #168140: staging-next 2022-04-10
- Loading branch information
Showing
16 changed files
with
132 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -127,6 +127,13 @@ stdenv.mkDerivation ({ | |
./nix-nss-open-files.patch | ||
|
||
./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch | ||
|
||
/* Fix segfault in getpwuid when stat fails | ||
https://sourceware.org/bugzilla/show_bug.cgi?id=28752 */ | ||
(fetchurl { | ||
url = "https://patchwork.sourceware.org/project/glibc/patch/[email protected]/raw/"; | ||
sha256 = "sq0BoPqXHQ69Vq4zJobCspe4XRfnAiuac/wqzVQJESc="; | ||
}) | ||
] | ||
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch | ||
++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
pkgs/development/libraries/zlib/fix-configure-issue-cross.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 | ||
From: Mark Adler <[email protected]> | ||
Date: Mon, 28 Mar 2022 18:34:10 -0700 | ||
Subject: [PATCH] Fix configure issue that discarded provided CC definition. | ||
|
||
--- | ||
configure | 3 +++ | ||
1 file changed, 3 insertions(+) | ||
|
||
diff --git a/configure b/configure | ||
index 52ff4a04e..3fa3e8618 100755 | ||
--- a/configure | ||
+++ b/configure | ||
@@ -174,7 +174,10 @@ if test -z "$CC"; then | ||
else | ||
cc=${CROSS_PREFIX}cc | ||
fi | ||
+else | ||
+ cc=${CC} | ||
fi | ||
+ | ||
cflags=${CFLAGS-"-O3"} | ||
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure | ||
case "$cc" in |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
pkgs/tools/networking/curl/7.82.0-openssl-fix-CN-check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001 | ||
From: Daniel Stenberg <[email protected]> | ||
Date: Tue, 8 Mar 2022 13:38:13 +0100 | ||
Subject: [PATCH] openssl: fix CN check error code | ||
|
||
Due to a missing 'else' this returns error too easily. | ||
|
||
Regressed in: d15692ebb | ||
|
||
Reported-by: Kristoffer Gleditsch | ||
Fixes #8559 | ||
Closes #8560 | ||
--- | ||
lib/vtls/openssl.c | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c | ||
index 0b79fc50a9c5..4618beeb3867 100644 | ||
--- a/lib/vtls/openssl.c | ||
+++ b/lib/vtls/openssl.c | ||
@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, | ||
memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen); | ||
peer_CN[peerlen] = '\0'; | ||
} | ||
- result = CURLE_OUT_OF_MEMORY; | ||
+ else | ||
+ result = CURLE_OUT_OF_MEMORY; | ||
} | ||
} | ||
else /* not a UTF8 name */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters