diff options
| author | TredwellGit <tredwell@tutanota.com> | 2021-06-10 23:22:45 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-11 12:42:27 +0000 |
| commit | d7dce44057ab4205f837587c7acae1b42d9d8603 (patch) | |
| tree | 0d966600995c3b2be57da4f4e6a11a128b32f36d | |
| parent | Merge branch 'staging-next-21.05' into staging-21.05 (diff) | |
| download | nixpkgs-d7dce44057ab4205f837587c7acae1b42d9d8603.tar.gz | |
glibc: 2.32-46 -> 2.32-48
https://sourceware.org/bugzilla/show_bug.cgi?id=27896
https://nvd.nist.gov/vuln/detail/CVE-2021-33574
(cherry picked from commit e58564267b173d51157847eb5453bfa735268604)
| -rw-r--r-- | pkgs/development/libraries/glibc/2.32-master.patch.gz | bin | 65492 -> 66850 bytes | |||
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz Binary files differindex 2fda4294130a..8ea998b5bea2 100644 --- a/pkgs/development/libraries/glibc/2.32-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.32-master.patch.gz diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3597dd70f2c9..049688cf74d3 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-46"; + patchSuffix = "-48"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; 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.32/master && git describe - glibc-2.32-46-g1799ac8eab + glibc-2.32-48-g16949aeaa0 $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz To compare the archive contents zdiff can be used. |