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 zcmeyij(Nsj<_#g&>knOftx&D2)0M~~zID-xFsG>FU17T>RR&As+^{iK)jfLQ!i7sV zrj}=KoH=2nsd-Z6S!{|F)UH|J}bt<}6tEP0Dgoj_n(>lT7xPa?Ub) zHuA0DcD#1@>obp;Da%jx)O^1y>v^&)$6RAuqJz+Jq5FHRtnXR+!`aCSlx3X+f4RGPjx4&^NlTszb=k^bL#KD z7dp9%GAnO?iMSsWY+pF)G=gTt|Wfh?Le zTbh3VX*9TG(9A5soSIec$d}dXXwUuei=f!zgQhh$zV;#Qhf7v`(osu0$o}e_jdlI0 z`oBwTxi4pJ%Q^n_*0E3Z{kx@Bo?y7b+;zg|K~AuZeoceqzQv!#n0)4)$&y*&SJe>q zqEE(iA%ottck-*(o)XA^rOmb#Nn-7}ad?@xsNYwb>zO1WdUX@-dsfCeT0RIJ<`5%v%^UKxArQekJwqIJOE%=$?=Bpd$ z^rd>L#D#b5tv>&8ZdiM4;rd&Zr_LunWz9Nb#drEgxaf)F;am;2oX0fRFm3oSP03qt z@#<;IY6T|MH|`U9bNJK0tL^!{1vZwmT-c|*tP<<~^yb^NKlKqeru<$Lk{WzA{9pc+ zfd89rZ}IA3{3PjnefCjvCZP$_FHHF;q_XR#?DNN!2D9uYdKk;=c}}Rmo}Iyw%#)9`W|_`^X)%Xw=Yfqr zEtz5d4OZVi=1-4TS^7Z!(ASk$cI)l7+9_CE@^s~a{nN_yS|9JasBw?Q_`##x`m(d- zz420S{>q4Ky}!ISa++^<>W7#4Yo@6gOuo9w!Nh%IX7$F)-zKG`sJuPk_h?7vthhUU zwx{nsTYY$E%Kke~^ej)U*&k#i(e%_;;T_M@^6T4F|5V-H{5I@KRovo-w-Rr6$|y&b zU#|@MwyOW!%XsZTk`O*Mg7ihXVI;83KNy)?L9bC zsVvg7&_UqINtW8Y6wOt~JkPQR1zURUJhAriuf?pb^6l|P9_;_`9+AyuobT|paMnwy zs`feYHf1|JCU(zgxE(Xe!YMZ7=EMGNi%uK;71?qrJ=Mh~;LMvn2WL#UP?GB?WVz?_ za)}y;vInL0&jVYIF45b-SC+JMSCoXpyz05rm%T9Bp(0>tePr_I7Li#^duy%V#Pf*! zbxjt#fBr+TOV5#8MO6+xEQ=g3{xn|k=BNqZznYCYdY>M|U0kVhEM@Y-g?9Iywzg74JN(=5tot?m2gxo8+JK0BA5zQf;Wvf}K5NeBOYuw;9; z)al4-tIbD}f1J~GV83*+18uhi1(t_B3rjV<(*Md*#b|-x7v+^Zq<)GfDdt6R z8tk%+ob@pJft2ljM#)INTlM~3ef;y!D&O(Cuu?5`=`7QG4V$*9J&rjLar991q<6tCUx`^y!`N@X^twhZqFWhtWrN*@9i(={x14P!{m@zs1zn-Y? zllp5$1$VygK7O~nR=#fc{%d7julAme*>c=2u=c;SBX{kug4XT6=gu_*W&hv1#dhDf z^S`cNKdxT;|L@UG`xjUL*LHs0`EPC!v)k)8zk*tvBd^-ox@Ub@r4`uNQst$f#`t|z z)7d0P!zULs4lwg|IdN3BFU17T>RR&8ieEh9cvR|H=0RY-9 B6Q%$F diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3a5da0afc744..e651a8effac9 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.