From c2d4ce2808616d558b6cef8a6d270c4930b06c18 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 17 Jul 2021 00:07:54 +0000 Subject: [PATCH] Pick #130412: glibc: 2.33-45 -> 2.33-47 (security) Includes CVE-2021-35942. https://sourceware.org/bugzilla/show_bug.cgi?id=28011 --- .../libraries/glibc/2.33-master.patch.gz | Bin 55158 -> 56984 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 610f49d225928a4c7aa6c64cf234b74400f4fe0d..59230761cd432b3ae6e9a6bad5b7367b138426ab 100644 GIT binary patch delta 1884 zcmV-i2c!7*t^=681F%%rf5O)5AbTw=ieUs7wW6q2LR!a)R=SdTQy6U6JT)aP#n8~u z(mXXe&DhMyGASv^B+1My+0??&Bqh-R*zhz=G*7ckBX<#-TTv!>Ty}mxJzk+4yX%3 z*2DGYNSS1($&7sW-5p8Ec5F8&wqZaL#}ePXJ05w*-x2n9!h%^gDR0r26^IBVzzcM3 z<9SYNb`V7{EQw={e_XfewOkWndyL3yHXYcEdx-@@*tEm-qgm|A{l4fdZK7#;+w@r4 z7u(IiZaI+~!xkV)3@d`^X|8TpH)iKc+QwIOP9T68;KN-GQ3NS`w1WHmfiTiAg98`? zWomap4r+x#KMV2n5f-DtHGDixKU9aqbg1$yCT770>drhnf69OTq&*AMYPM|0_1ebr ze~-HwsmK7-1B%E@;A~SoFMNO*zN7ON0!*IFY87Z-!UHQC`7^b!>_{=RC}c1n3lBqe=}!cp9I;+BWlj!AQ5v=i4dchJXX z(kPwE+H~qCe?AFL_^z0bidjcm3@Io8x*^=4$9ct(M>3R@bQPNv(FFTagCaf|pX=+0 z-gruY;WCIVF;QizErZI?A|hgH5IbW!Imo6_FM$*I);?v2Xh0_OWRQakwHxC|u9%tDY_P-k}hEwJ-v(>Sjj%7(CURR2}d(ZKmR)<}2uiAOa&tc^SYQ#DY z%lKCn$j4U-fISJuDXapp@RlM=E~BfKrhO2Se}TRd?8EZ@)rW75a6CDhLa%DQ_WZYZ`4r#vfH#ui~;f)P1l>nHv$rnm(Y~)5+u6W9p~eDFq%G) zZyp&oKr>jXifobO_`-0#qWA}>s3<(rN{;@r7>@?6C47Vk#(CJ!E%VzMKX1KVvGbjRbfj26*<65B z>UvCQ90CZN`bwv|g^V{=oz@aUBOlyR4C>V+%Ny*Z+hufhgPc`QEgVsp2U1fxO1a3bx>^_@o_n2_rsy)bBoHw>#FO)c6q5uEV;0}f@KZ#L#M*Lt zK#T;ULDBg$sO-fw4*qqDtuuUEC~Hs{&4V0 zTXeg67(OzMBjCfQ0MBQdfLCHVe~LM%n$A!7H;gOCv^4XJ;+APot7Ljs_H((zCQQvM zKIaRDMj6JZ9h5CT^FwvZ+z){?sLh~~!Tj(!2JWRo#H%{9#AEo*EkFm_(emtkgTRK` z5fGpBr>28^dqUb8u=AsA#PX+FuFNen&DgE8a=-O8Cee6e@}{z51-8= z+)B`?CS|3XHQs=-wkG3Tz*xn?Tax~;#?BZD$WKyXHGvUTCC5p3hHQoVxay!n1-ug~ zv*l3Wud>v0iEn**>SNgL)2@Gf-t*s`_ImwuWhVC9&PaL%P=#9pfL9!%;dFH{+qa)#)gf z=b~JHF;En)*qD=N|1K3x{Oz0F*-$39Vg{~JLIefn^P zw@uE@fKqG!y|g{P_Rsp)*T*M)|NX^@Kj_u}eTntC{+)6IM(gbQQiMZU)jmB(YVfKm zQGtYdN+2cy_o{-;VnH$F&?vwI4vInud4z6y3e~@$JH06{M4sKCVoSO(`my4LTLoL$ W>kmLw)i#Nty7D)l;|z6PG6MiIpRNl4 delta 44 zcmV+{0Mq}Ny#w~H1F%%rBE#0}AbTw=ieUs7wW6q2LR!a)R=SdTQy2j8`yzC|9|Hi| CEfb~y diff --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.