public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110570 from TredwellGit/glibc

Browse Source 
glibc: 2.32-35 -> 2.32-37 (CVE-2021-3326)
This commit is contained in:
Maximilian Bosch 2021-02-06 22:18:54 +01:00 committed by GitHub
commit 348f205331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkgs/development/libraries/glibc/2.32-35.patch.gz → pkgs/development/libraries/glibc/2.32-master.patch.gz
View File

Binary file not shown.

8
pkgs/development/libraries/glibc/common.nix
View File

@ -42,7 +42,7 @@
let let
version = "2.32"; version = "2.32";
patchSuffix = "-35"; patchSuffix = "-37";
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
in in
@ -63,10 +63,10 @@ stdenv.mkDerivation ({
and using git or something would complicate bootstrapping. and using git or something would complicate bootstrapping.
Fortunately it's not too big. Fortunately it's not too big.
$ git checkout origin/release/2.32/master; git describe $ git checkout origin/release/2.32/master; git describe
glibc-2.32-35-g082798622d glibc-2.32-37-g760e1d2878
$ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz
*/ */
./2.32-35.patch.gz ./2.32-master.patch.gz
/* Allow NixOS and Nix to handle the locale-archive. */ /* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch ./nix-locale-archive.patch