summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-09-24 15:13:26 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2023-09-24 15:13:26 +0200
commit8348b18c096d60e5b5821157f7e8df781330fed4 (patch)
tree7f516750e533267d7bbf45d6f9dcebb1fc084bb7
parent8c66a65495aa851bfb1d5e3869f109efedf3f0ab (diff)
downloadnixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.tar
nixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.tar.gz
nixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.tar.bz2
nixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.tar.lz
nixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.tar.xz
nixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.tar.zst
nixpkgs-8348b18c096d60e5b5821157f7e8df781330fed4.zip
glibc: 2.38-0 -> 2.38-23
Fixes CVE-2023-4806 & CVE-2023-4527.
-rw-r--r--pkgs/development/libraries/glibc/2.38-master.patch.gzbin20 -> 32759 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.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz
index d4b9926df0b..4eb3c7b2cdb 100644
--- a/pkgs/development/libraries/glibc/2.38-master.patch.gz
+++ b/pkgs/development/libraries/glibc/2.38-master.patch.gz
Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d141af3a795..51d8a4dbe05 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -44,7 +44,7 @@
 
 let
   version = "2.38";
-  patchSuffix = "-0";
+  patchSuffix = "-23";
   sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I=";
 in
 
@@ -60,7 +60,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.38/master && git describe
-          glibc-2.38
+          glibc-2.38-23-g0e1ef6779a
           $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz
 
          To compare the archive contents zdiff can be used.