From d7dce44057ab4205f837587c7acae1b42d9d8603 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 10 Jun 2021 23:22:45 +0000 Subject: [PATCH] glibc: 2.32-46 -> 2.32-48 https://sourceware.org/bugzilla/show_bug.cgi?id=27896 https://nvd.nist.gov/vuln/detail/CVE-2021-33574 (cherry picked from commit e58564267b173d51157847eb5453bfa735268604) --- .../libraries/glibc/2.32-master.patch.gz | Bin 65492 -> 66850 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz index 2fda4294130a8676fc706ce7adb4b8cbe8878aab..8ea998b5bea2cb66113573133190ff3a75fd51d6 100644 GIT binary patch delta 1406 zcmccepLtOi%Z45Q>y-*Tgi_QP{%d-EcwOk2s+gi681{Af(wVcRqNSEBn;8`)At@at zB|Te8ZP~2Z%(oYxJT~pw$z^N@)M_SaGB7aw|Gy?SH~+Soz`r?vxD@A4J6NXi`m9k~ zV&p@Ii`3VoAq?MN0@N^iTe9@Cr;8-b)K}=LCA2LPvDdKy)WNAyt^dy z?{sO#qIE@LH$U|)Kd`Oj535N*t$j@U|-0>bM{Roi3Urdlqsol+Tk^;4?XeR*#Ej=c@6dfX8+ z{FJ8eoY|#R;inopZIw<}$9uk>%@69XQol7hIZa?wTG-&E= zs9%w~Zo?v@Lu^Jj!@B1E|F!#dt6k`)rDh*C=J}{C6WrX$d~AB&@goTi{RwO#Me)4` zizhtZ^V3FJNs*`Vky5?a@BF^icc=BZ{b}49vNu&JMP;4Hudn86yKRy<1b7!H|2g+> zgYxA(!~eP8W^SvB$=ah-ZZb7N-Q8(nqIwP5#reW=1s^$m zyz|SA*{5OU_M_X=vNYouxf$*#EuS@g|1n{)|4$QMHajJ)Y+gBe?WL4|gv@l{s&%M+pFc?{%>sN+peFwadK+XjcXj$0>^siM{9?8do9_cQ~aaN zbHlRgd^^{Rm7gwLTczc&??PPGj1Pe)-|vfy{cl+RJN?tMU%&p=Oskm@dvJGyw_b7a zv&%f$w~~)Z@Xj;s4816{&}6l?h{evEd}$}=?z@p0^l{FN+M5;(HuaTtJeTYH|8Z7j zcKbIvHosk1f4r=|;`!zF;|f_dZK z{1bVlbz5d`Og^@KvBfopBEL0X+;c;i@3C!~``4hEubsbs+3cB)s>e@mz$?S9-o))apPIyx%*l#Aw-5VBA4yi;{r~=#dD~7j)Z`1? zV&418qG{Qyt^<~Lr?rcPEpop1M9aq@{2-U`-v`~(9Njh-H+R=HHCP>ZB0eEeJ=pR8 z5$E*pjdBcuNv~IPB-=lmR4nFuNujUyU8P({sNhEfVaFp(f*#?nYY%?fc4M05eT(|| zlznWXUncKb?8cs(y4dIbRq5ld?~@+*)qbD2u}LAA`RJc~v(v%%ozj)`#9l7F7UjH@ z*@{0STtCh^<5sX!OTcusDLn`LE*MWcYV?0PqtksML#d2twAu?uemNr#?fl*%jhwBv%8)l`R)qe|k{{)`C zP$lr?QpkGKZCfsueT%yM=}g&|5{K&bMU}SfcZwIAh}^W8x5IHp*OX2H4XZYJf457_ zv-qYYZTx-0_siU=|LvVaepFR?F6*4ecI@P_PPZ-V{wRua?yzIL|HbJ)S8LQ#+hb`w zOl-~JVg-jv@_N)ya&3`Sy=swNJmG!A**6s@6ulLEXPr3xOCh{k;p)#NS3=q*%9QTt}`|aqY;mWq7#n?W7O4m>B@qw6K5x delta 38 ucmZ3~#d768^M)P&Wt0m%gi_QP{%d-EcwOk2s+gi6$PnoIyfFPVGXnrcv=2Q1 diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3597dd70f2c..049688cf74d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-46"; + patchSuffix = "-48"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; 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.32/master && git describe - glibc-2.32-46-g1799ac8eab + glibc-2.32-48-g16949aeaa0 $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz To compare the archive contents zdiff can be used.