summary refs log tree commit diff
path: root/pkgs/development/libraries/glibc
diff options
context:
space:
mode:
authorTredwellGit <tredwell@tutanota.com>2021-07-17 00:07:54 +0000
committerVladimír Čunát <v@cunat.cz>2021-07-17 21:01:27 +0200
commitc2d4ce2808616d558b6cef8a6d270c4930b06c18 (patch)
tree861a0932369b768d7bc190689065685088024fa8 /pkgs/development/libraries/glibc
parent4bd38c330fc6dace1f45a29bbc7f5c64b22fffdb (diff)
downloadnixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.tar
nixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.tar.gz
nixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.tar.bz2
nixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.tar.lz
nixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.tar.xz
nixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.tar.zst
nixpkgs-c2d4ce2808616d558b6cef8a6d270c4930b06c18.zip
Pick #130412: glibc: 2.33-45 -> 2.33-47 (security)
Includes CVE-2021-35942.
https://sourceware.org/bugzilla/show_bug.cgi?id=28011
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r--pkgs/development/libraries/glibc/2.33-master.patch.gzbin55158 -> 56984 bytes
-rw-r--r--pkgs/development/libraries/glibc/common.nix4
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz
index 610f49d2259..59230761cd4 100644
--- a/pkgs/development/libraries/glibc/2.33-master.patch.gz
+++ b/pkgs/development/libraries/glibc/2.33-master.patch.gz
Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3a5da0afc74..e651a8effac 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
 
 let
   version = "2.33";
-  patchSuffix = "-45";
+  patchSuffix = "-47";
   sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
 in
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation ({
     [
       /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
           $ git fetch --all -p && git checkout origin/release/2.33/master && git describe
-          glibc-2.33-45-g58b90461ae
+          glibc-2.33-47-gb5711025bc
           $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
 
          To compare the archive contents zdiff can be used.