From 96b2dec03367f34e2041c0b4702364aaf486ee0d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Jan 2022 13:36:53 +0100 Subject: [PATCH] Merge #154984: glibc: 2.33-62 -> 2.33-71 (cherry picked from commit ae543ed85540627600ffecdeca215d4115193ce6) --- .../libraries/glibc/2.33-master.patch.gz | Bin 69704 -> 78002 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 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 aecf1550feffdb6cce55dad4088b4f6f0fe6dbae..fd78d3a5e8a86a00658b8049fb2ec5bf76a09e0f 100644 GIT binary patch delta 8877 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 delta 513 zcmdn=kmbYzmWC~iVSM$yv9a0B1|qfZ_MZsOTqt~*b?pZ8@EbSSTz603J0;?5*o$3@ zw449_y4x?Id+yryTSr#^JaA`rbrIjZMf>%)IdN$Q8an>G?(mi`@Zd_PXPgOJ4onZO z`g+Ou>pZunYh6DNz0t7X4#_UQu;#@qm;X%LA9}L)1ufVkbv^n<-s4#lpRcVyvX{NC zEp_1=hWT^OgzcSHWOn!1y`J{tQ>QObI)C!aUi+Gr3!ap0=~w>d*r8pvbL)Y9Oj=V6 z^&eX&{av_M^jq(1k1A8K1dFM)y4#Dqd&^F)ySjVF%8$VXXI$C}7MW~u77;BzG-J!9 zHCZvz*BbuyEc>iA)pvg&*QG+q8NxfZ=1#0{Ha$Jn^z95&-bb66-wEwm%sKzJ{gb?O zCbz;{#i#5q9_NpJbF{nSwyc)K)!m<_*ZnzuvRrrJ(r%8UE@xsgm!_(nwF%hyWhvj% zdG6h3W<ja~)!K!gzW37)zmD>^b^rL_LPPSq%AN8ei4r+mrHSp z!H^@h@=>M#5|kR7KXku7u%pLL@L{wbhq0FuL%*g)|Kv~A{EX)-c=joKGaSg;7j?Ap zR?afrM1~*Nd+nwyIQSz`(*9w{?Ir8Am$Znds?;#wKg~TsOGCD$lIi!_lRV{LojR&? d@0Iwfoi?2*yx7O%v5Vk8hQL~(Y>peu3;>ja1Zn^P diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1bc5bf08ee46..7cf5f8c536bc 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-62"; + patchSuffix = "-71"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,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-62-gc493f6a0e4 + glibc-2.33-71-gac148bdd88 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used.