From 9a4e098cc43fccdb0d5fb301f4274d1ef13b34ab Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 6 Jan 2021 09:54:38 +0000 Subject: [PATCH] glibc: 2.32-24 -> 2.32-25 https://sourceware.org/bugzilla/show_bug.cgi?id=24973 --- .../{2.32-24.patch.gz => 2.32-25.patch.gz} | Bin 41579 -> 42959 bytes pkgs/development/libraries/glibc/common.nix | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/glibc/{2.32-24.patch.gz => 2.32-25.patch.gz} (93%) diff --git a/pkgs/development/libraries/glibc/2.32-24.patch.gz b/pkgs/development/libraries/glibc/2.32-25.patch.gz similarity index 93% rename from pkgs/development/libraries/glibc/2.32-24.patch.gz rename to pkgs/development/libraries/glibc/2.32-25.patch.gz index e63bd42ed980a33a292252e5ad0fd2879740043d..d26ba012df60003da98ddaf59bf08a18000134a4 100644 GIT binary patch delta 2955 zcmaETgz5ZwrVXic>X*o7=RY=k^SiF~qW4CL&b=z<9!IS?kXOE!@%G!WE!%5(|4g{8 z;9Ij{vgzIR^6`^YtutqfY0NqzrrA|BQN%Ut=m%@pc`kP+_p-g-)AO2HbmNli;fmRh z7<98z4Q1EvwpyC->BiL!eXo0GnQi0DjFXOaX?Z&6c>iwO0DwL;w{e?~IPF+npTb9Wh^=NR}K5?4kA1iEx-0QTc;?O@`&QOPt^5=gn9OuLuq^?-Ksa@??Xt>{El63oxgk9%am#}Ts{xI8rDO2VdjYY?L zmMzjQ*|nkm&^(r|qPy2?xm)>W`dj=delPOxP}7k)e%ssIJ3g&b+r0h6bpwAt17ijr z{n-k;Q}@+BnmZ@qUt_vQLF0ltJ?e(B7G!6FM(F4Vs)$|(EM z)D*Fi@0AYY@><8nO`Y$h9cFLYax1IDPIh)1Yte3Y)(axX?sMPCf5`3|&~9%l`F6&_ zM*{V)@=~7J+_x8Nxohdasm1M3i~FIHp0@eoy)4;#@+rR9_8)nR%bF3$4{t>JG$@|wBOqqO1GV4`}zS6fzd%qoc;CRqrvcTUN z>XR0~UJ%fA;+u0s(3U%Xn?46EYT0wNMaXvV?8y~+&R)Sf%rg6hoSSl8rPyCBNvSw$ z$n4Fs_SBo^S9a4lQ|@hJoSULu7CL(o$GhYk$9OMfO+Q}$Vt;Q=Z*l86C+|~Ey*@j{ z?!M;yyDt5_)UCXVzb=BOOXi>Eh(B*S&-oE|o9(HPpqi&5{Et|)%QuCqT+sUw=@k@Y zV)NOEO^9oil+cspy67gpZO?DcajW~e{uX!W%CmD8%Lf-l2_{q|%k!~6I{1Fcl#4M> zLkzRF-XWp&(?zwQPPT$x^p zZ@wtUo^SXzS7Ji>`XdiEe3)u+Yfg=vpjz@*JxyIP-FwA5w|Z=p__^=MpLH73`WCvz z+;%+r=hMs2)A{$`Wib`4>3)2O`_!94+4W*MUu9iuEG#5np9%dfB6DMDy?tD)pj%8) zvww;C@7M9gvtEVYmttPA*JiG~mOy^_vVaJgBa1h7xD*LYb^CIOFY8*uFV`d6%tJ~z zc5O7-Kh^l0Rh>-px8=8!7UtdRPY5}q;-4EwmPx?_|s|hidtkn!7T8 zP!QVwd|@ubKb}kbTCAO{#koSdx0e6>e*8gyw&B#t?9W%7aESZ5>ty}C-4}o4i2YnQ zUG!PK!*{mbbJncZncB5DTRME1hdS#=E)G5Bk8-K$N*UAlX?7|}-;6oQJkRfqqtd+9 zxmNMhj{Uy!r0%Ig89(dt9gB7eQwwC3i{=SKC9Po9}s++hES>tB-5zYpFo ztmb~-QnW|Y@tEU}wku}IyYGLsdGDC(vUab6qs;ot=jIA+OaB!ZVj#xSIsFGGyDZPO zcc*V?PqtWbO)xnpcT&ZbsQGO-^O>LSN{VE8d_v#sXu*sldz!RZ!lF;_TGV()T4}rx3C@hd)#1y&k0oz9_cR$cXb=yi8+*WFIXq$@PZ>N z;%>tG*N-k1Cm+A;Xw>>6WqlZ9xAYhO6}zLG=P6v`_|=pAbw%{|sMenstV$HPw*2(o zwM?w_L(&7gs_BK9zB)5F6DIZ+9NaC^Q@=<_ZIRObW0s4wdmOp_8;txeos_tg5zt%` zHkC`vo!7k}kMV&+PC#IXjdr7NmVYXfqle|PuTO1r{@t6J;Gw>wXHiyWd2qPe_S}VM zvi832S9#1B$QG6vCU%%pD>@{J4;cr#hLn)1Nz51Cxmbw zaIWWyPF-5*5w|c*swJ^dWaaeZ&OJ<;y=C7E6s9HczTKm``x8{o`eR|Hk z%#{yjBhN->!C)<}5pNQO%!5OnUf<5e-+BC*& zsV_1Nmg|`AXu41JIA^fwSx|$F$BdaliM){)`0avuQ}|v8=ucrbQd~a6Dacl3ZgxYE zt;$B{N!!_0Ogp+JMsaR=LVfcEYl$247=Los{L~Q-l53f}iqR)eVV~Zan-lJE=3Gej zXvllW6vfW~DrB0M%J5Vc7%}f^<9^xVoe;$L_4BvS{NKCHS=^>Z+HANf!SZQ`Ufc1~ zK-+bvS@rffKHrm-A)4(beJo0OPJYX~I^{WX28TX4N*U_0Fyve8dcLKHiID*S?tir9 delta 1564 zcmX?qp6T@wrVXic>X*je&A;U#P``ga)6)(Z@jo ztIWdI&}pA8R%HZhEt?i&y5>>U;Y)7w9X=nsskAC5e2G!T+&f)?@;{{OKTTTC$q>h| z`kBf;3GGX1=dT~#Q{idkb#=o{hQK(b%g66uC_KCLa9o^kmcXSHNj{FS8DdiWb2K$K znpr5!?mgFb?f-M!5^=F%2zLIvd?{-4dRfGJvq#g-Qc~?-g|gJxcORYnewzK3 z*gmfM`uv@GiHDDN8*RStx319G7ccq#4WkKCfJvm=5rWlz-25r8&|Lwb*^(X4*Znc{kqjT)<_r)qRXO_6l5T80b zU`jp9O8u-xn{Fk8N0+&N9X>8v{qFhHvh8f4xN)yIQ8lx}2BbAERw zVa+zD-OisTrwB=&x*GA_M#L<|?s3PusOMkwPez{2EZ=3}a;02!=H07F&aa>F%w)`{ z`pNRswtLa$Yd0l7@!L2%ak#v-Zgtgo=_SRu=*XMxu3bC+Elq9n4P@}GUvPKgg*RUq zTy^dr37yvPdETOiJRw)U3+lSs?c`eQE&MmNq#yD~JM=@SZ@&0hmi&G4GdUea^PT>5?dj19nY&HpqQ*jI zxhs0Ri&m`(__%!i|9eU6Vq6MCowDl}FuL{5V$FJVO6$<4oa%>mO@5Lw$_oX3Wh3t} zWIg(K`k3_GBC$o1wjB);=?7zh2 zdSeh*O1q+sZq$CiPoIOFobM?vbh++T9Cp6cE3&J!>G4EKq4!?fED|PfdMsMpwvFT7 z)Tew|5o@?l?9F9jI~n$8*|ti#`^#01$zG`1?@?G^FP-Bn&NjXEodvh)j1RuK>($@v zUbjCh;?9YGoT8_B<4<&)SZ5mPTqVwE3Rbx4N#)`wjILc%_v=17`+La#s3#FUpY|U4;y&*_YoFNOTYhTK zruWa^U-RR&*}4@I)?2KLE;Ovav*h*EiduGOOBtEiTW3Psd1NMCs;|Fy$G|OT=STN{ zX1`zC2gkiKzn?9MKvVPFRo%@000i*2Ri@& diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 41ec4f05cf32..6b17e463d76a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-24"; + patchSuffix = "-25"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -63,10 +63,10 @@ stdenv.mkDerivation ({ and using git or something would complicate bootstrapping. Fortunately it's not too big. $ git checkout release/2.32/master; git describe - glibc-2.32-24-g1d49bede4d - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-24.patch.gz + glibc-2.32-25-g0d9793e82a + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-25.patch.gz */ - ./2.32-24.patch.gz + ./2.32-25.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch