about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-10-04 18:39:01 +0300
committerGitHub <noreply@github.com>2023-10-04 18:39:01 +0300
commit1e41c3352bb8de154f85b85c21bfc911f010b777 (patch)
tree325314bca35bea2a9bc48c73f63d689b6ad80866
parent1550a58e1413fcc8ab4ef5ffa65affd50d311cc4 (diff)
parentcaa3d9d75d10e04acca17826624243cfaf922abb (diff)
downloadnixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.tar
nixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.tar.gz
nixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.tar.bz2
nixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.tar.lz
nixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.tar.xz
nixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.tar.zst
nixlib-1e41c3352bb8de154f85b85c21bfc911f010b777.zip
Merge pull request #258972 from edef1c/cve-2023-4911
glibc: 2.38-23 -> 2.38-27
-rw-r--r--pkgs/development/libraries/glibc/2.38-master.patch.gzbin32759 -> 35936 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 4eb3c7b2cdb3..6414956807f4 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 51d8a4dbe05c..646242de6119 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -44,7 +44,7 @@
 
 let
   version = "2.38";
-  patchSuffix = "-23";
+  patchSuffix = "-27";
   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-23-g0e1ef6779a
+          glibc-2.38-27-g750a45a783
           $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz
 
          To compare the archive contents zdiff can be used.