From e822b46ea1ffe2cfb323ff3dfbca506d0eeca6f2 Mon Sep 17 00:00:00 2001 From: Petr Vokac Date: Apr 04 2021 13:41:54 +0000 Subject: Update build dependencies for concurrent build --- diff --git a/dmlite-LCGDM-2945-puppet_fetchcrl_warning.patch b/dmlite-LCGDM-2945-puppet_fetchcrl_warning.patch deleted file mode 100644 index 193e590..0000000 --- a/dmlite-LCGDM-2945-puppet_fetchcrl_warning.patch +++ /dev/null @@ -1,892 +0,0 @@ -commit 683800a5726c2d467b4efe334cb86eefd9a638b8 -Author: Petr Vokac -Date: Tue Sep 15 14:58:47 2020 +0200 - - LCGDM-2945 update puppet/fetchcrl to 4.1.0 (puppet/stdlib > 6.x) - Cleanup one of two warning described in LCGDM-2945 - -diff --git a/src/puppet/Puppetfile b/src/puppet/Puppetfile -index 48c9eec2..4df847e6 100644 ---- a/src/puppet/Puppetfile -+++ b/src/puppet/Puppetfile -@@ -1,5 +1,5 @@ - mod 'CERNOps/bdii', '1.2.2' --mod 'puppet/fetchcrl', '4.0.0' -+mod 'puppet/fetchcrl', '4.1.0' - mod 'puppetlabs/concat', '6.2.0' - mod 'puppetlabs/firewall', '2.3.0' - mod 'puppetlabs/mysql', '10.4.0' -diff --git a/src/puppet/puppet-fetchcrl-4.0.0.tar.gz b/src/puppet/puppet-fetchcrl-4.0.0.tar.gz -deleted file mode 100644 -index a086b0a88f666b954478dc3c546223080412e7e0..0000000000000000000000000000000000000000 -GIT binary patch -literal 0 -HcmV?d00001 - -literal 22387 -zcmV(>K-j+@iwFRc1?gP?1ME9_U)xBs^S3@lZ!+@(5-jU%Nq)o38ee@a(H>2LiXkhqQvK;s -zhXTX0Oz~g0G-dw(bo`|1rlo0$hBfUcMKv@{{|T9o%f{^^PcxDr^i!6Qp`YHp?!No~ -zp(DOk|Fp+xKg|cJe40k#ze__X7-Qou{TsSrUDLm%s-S=6F*bPL_8hU{(jd`YNsHSIH4kn69G)1S}z=RMNvlq((s?7(UA8-Mnanr*b>lPup -zZ4qiwOLIKM@?6)jm|{-=);Bu)J9{6eM07=?+;Uadu@y!<&Z%N60EJ!KvWPK(+1zL} -zw>wP%V5nTNUEAfh#|`ROwyB%0M_jNQ?CF|00oZHS*S4A^4azhRtHj1w(=|+0l{;W> -zhND`JuGt(TN>rqd}D>GSFST}#!m?O4pj -zj9`YbgRyN8)w5j2HC*mRtWK-#-FD?|^JArX&`x}|yH&63?QT_cfd)kEnVR8XV2?P2 -z>z>WH>guY);n#B~Xae7@dW2>?sZyR~ewyYykrTJru&(ROA|?ezVN1cLp6tCF;wRURX_Bz -z5|rAm339TTNfpfk1v^Y7jzPGERh4jl6BHai2uf(qJ)2;S+pg+S#nW`vA|M&X)-8%n -z2VaLyc{21VpR$dy=W(iIgL~Mu90$9esbgm9mZIwVlx?07Mlw>wQURt=P_M2#7KA~I -zxhl|Pz=aEz3bD|2CSYmIX_ZjQ+{Q&I#fOPpu#s_ggGM>s~ -zGC^&s*mI~sbwdGV=tPCn#Zf4CxJt00(+8kVdOWCD`n))}Wq>OYmAW?PMAtw#w&f6$ -zSzzFf%N~F=1;?+bS{h%Gvt}xogABm4!ADhH13%O)R~R$qn)(pLxtoVsUI76c^O$Xm -zd(5#sPjwYb2YCn!(HvrX9yN*e5J8;#A&bt_LVFdLr2L9V9OfE~shDDgnwo3qI(7_I -zSEy#%I#K5E(}1KYpSbM2=|W^+4ri)u17i@!HP2IAOII*_V&F@2C>X@qkc(I|kHEG- -ze41{0x(lBaS0PlhU}ks*II=Zw`<_3_@Oc$rq~dyUFIxO1ak!NjJNXj-Mu$8yXE -z0x=vux@&rlY3hn;+J>b=OmToI0&dP#d^h4ob8ovMqI#n~MaDGE;*O^&o?>ze;mNa2 -zh)!@YIVQu3HHS?6IRW#FXVF~M4cp;{rYfFp!r6!w6PST$1)>Mh-2r@ZsnQY;c6G~v -zV^48R;!*<1mu0~Ob6263&d3~|9Mp8~ioro_6hrQz5L@Lhq_2Nm}AsED!JY;SC%-S#fpJy?Z`3xU?r>gG=4ZE;&VT5NA0R5wM6wDpJ*me?KU>RoM~2}Y?ifw|Vvu*K)!N0Q -zi|YER-Z@JS-e!(HylAP-Em!xAgRRESs_(r%-NJ{hj)o|x-rtUQwVr`D``f$j -z-fp+vN=o4Bj~xSd2v{X#$8iO;qqW7B!P^ENfl -zoP%`r{P06+9-VT(>L=aN_UZceQDZl%9vYq%X^r&}vF#)@+QT&Svd&w)!}(aUcgdkX -zWUkpTJ9`~>uR9z?2Rjkw?Zef0XuF5;+d;LOZTI)xX#Fs4*5AHUlaCjp>cDnL0#_d7>X!VU@Ic7w&<6-rDTZjgTd~B=;`N&bZq7*xMl; -zN80PI>$vTvgPk+{ChfDV6R&QbDHgU@4+hC8jneM>K;LV|TlFJq42PL(n(y~Mrpb0E -zIU9U9lB%cco2T#kt@Re$aW|TDI0{~mH#W`>Mq_uYKV+lbqfr>QPg`2Ii|f&@mAo_e -z4iDGqAm|@7)m3SuxffG?Z%p35QCT|}y8h}udCzk4-V8UIS-?B>i;cBW><*5G@7jmz -zk^Uw=T3^jRcFZ9i(ASdR>NlICW~08^Z`J#SMK&AfbgkaqI)vY~R(E5y-ZS8r*X#A@ -zO>=828_=$;S)-A;`>rlUJKI`wU14Y5`Sxi$QQJX#oT-uNzVBbu-zXoAcRRc9Nn_(p -ztG*fq`3DnF-2ow{^(l_H+5?nN(G)0YQ$P=jiFHz9q -zN)V*7A5{|`M`^X|XT99L8(kGjjV_nd;oXc~!FnIQg1w2nPzyFP$DKdu%4yH%0V^;~ -z06np$IxJ_iu8v@6j)h{CJXsSEH-&mvWG!LSo$C?SoVY1;312Wln;2A -zJ%|zhgZM~k1l9S2SnwW&1!=$MrwD$s9(YoDdFokyh9+H4(K0}@S{4l_=@rt^d54eS2vEYa#0P|^ -zXcc=tg*sYF_%MPGf@a{SS&9|`GF>WMpP&>37IAB!Jy$@3$&xHWqsgy=ZbnE`?GGA#&3w;84t?;|5Q{ojAQbd{kMLmD@#Lh+Fhm -z0AOC;FJGeOhzw%Ef%L~8e@s?OMc3)`!gS$6O+rYZJ&BWOG)8k{&2|vp@2vh*;xWNBa -zlBTTIYLt9lXs)#@`*{{6J_#y~y5OI5{ji&X>_pV!0$Rm3K*FXAF|-KHKnDBg5u%{4 -zXn;f;Cq=+GXoChh;|z51>hhVvD`6dZ5>Bjja!qKSAYoGT7J~v|FQ9djNmXF9u(?Xg -zX`XTt=yw -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 -z^{ij^KM!zzT%Wz3kN-Fl7{NL|#-JJh8mO*JW -z=4W8Spu_5lW9s@m&#Wb$1VE&K#DE4kEGuHD9V@|L8D%XFII%LC&yu5J^VG3nXj7@) -zY>pb+rFUqVU5pqG!=*TNn2n&3%z-r{xjJN$!+2bY3AOLeYQoZ=t^#_vuH$0AOgRBC -z1+zj~gK*D~I2H}U1v|Cp%`I`1(?J}R*McasNxRJ`iRljNwQQCJF0L3v$88+eQy_5J -z@enN7z@KYV0>hVl7`jyDFy_1AL|tqa-N<#;qPv<9XGSf%l69ME4CIzOK&_4 -zTZB^`hKpTw#bPxb2YxKfq|7}8+Hgwt)BY;q>vDOsku$v9#j_qO3&BDhEy{t^oe$N~ -zJVT)fuD0ZZcl(G`4wy@W|X(F!4`LV{4+hwa;^&3Opmw|1p -zCpBf+mO`Q*VPjgPw?}!vB}b!e$M{lYn?j58*cBVM_~D_W%*&(wI4cKy*mRlcMwN+C -zf85KabW65Y5|(TjHPDg%NQ?j``)2U%^TrXPIUa%eOST38^(U?VX}9&LyN4HHzX;v6_-}KeG&c# -zGNX)de6inirdYEHJ=54O_xusjwd;Fdpv%g<-&skmJ>MBjM-80LCPQ}1=;cF$cf+PY -zElr7QuHo!g>(;SV$BTC5hQ6FzX1_k!QfqxUr|@*A*GvT;YuiI}snP9rhZP6bVlX-C -zyH2fFYZMeyOKi@OIU^vq-o8wNGwkyJ}&1H=$H62(Wm@lh*qnaKLX|SgPvOIIL -z8fe6w$)PitRqEJc>@Mqjs~K|Ul8i~2tXYFYdCwfB5m=6?MKdkSgTwr&4$akixg_*j -zB9B{yF^)O8&U-Az9^@+3Te2=m8J&K&#>>YsO*lJ`PWIuDTZ3|$sFIUaPO>oTgL>je -z&B10`Z}ULB>MmbSyk#i&2EL#& -z#@Y*NX}#eZk%|dgsu*5d+)z$<#Pyj|TL?~XY-HP=HX!`TaZih?HmnM~TtMono++@`so47*dBm*+mTaNf@EFYNtr -zqx6ME&!1sHAK(n_alSZgb)=AV>-$VB59DFT;%3#Ouj<|X!I&`fj(1!oHGE=o$9Bz; -z#m#`K0N=;xk;A8eGa<=xCu+wmzbd#Gag2x3<%59+E&k5=5&ZCltAvH9TUx3XENC(9_p#fBM_? -zXw+w?oB#E6_jkaD2i4Yt}zG|AT1!`2PESt{eXkGI+vwc?v4z#rG4; -z6-AMF(*`MYOKe_LRA)0vL2(_yfV91hQ-z*R@kUz137 -ztWXMJAG$Pmo9O*S-ZE{{}+q{eQL6xQC4J-3{jg}ZVNK*jnJVmDfRS==S2OVo# -z?kMXFH{zhGsi0nw!ns96nk(^GZ?m*4Z`Sr?c|UaK#M+7)MsL82`T|Ub5$+Ri%Inm8 -z)|SUpV$u^29N%j%!B9xdM%WRtfDuV6ZH31~_wkhN)X2K2RK+o4>a~hQR$4=kZL8|O -zx7qF`b;eF`$`;ClZg=VmHM~J%-MJ?kJ9SUAdMil_j?`hjDBG$W2dNs!V@qkaj4)`9 -zTE}vwc9;#ER4>=nGCoi1d(P<_nCakjy!G~-{bE|hr-N35kakkjZ!{CBr!XW@-fJA$ -z?q2h>fmI*k -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 -z;LQnQZt5zY;4?4n}Be|d;eH8I6O6Q{-e0MT6% -zyWO7drBI94Jx9UWv7_=tm^rYO8)r5{tJKk?a5a78#TYCvYPzYkX@wL1_6F~{NGqKncC?8 -zb(9yN^S~?UpFsbw4gEj9yn_Bl7u}8aLJ!F}dLl2MW10Pj#P-F1rt5!W|9yPH -zuopi)2Eb?Nk`vjdBwiu^7YVoZj-7XefklnM++~fF3LFs(Nd${S24f65+7>L>R5*+& -zN!fYRPl5$RY@fuIqPHR{Z(8s-b$aXSqo$=tCSG%t-NUK~10NjM>a{GGBp&9^QcK0q -z;a#$}K@=ivK>E{h(#sN$dmgQsOaXNQ7hskm%|k@f>U%h^64tF|*IW>gop6i_M-iwn>9YbttYw -z_*bBCT-`tXhE>d|g}qW1>YIp?ELkW3Cs?F8hbR^U;c(cO?1n!6+3R~*d4>ERv<8|r -z2*r}o_-Z;}sr*m)_y6%E=Kt8p|Bo*l`TsKc?_>Veb%5J33_W>O{6JOUg>j<}o>vD9 -zPrtS@c!m5of!RYb&g^q5ZUL6de}DXsc!JyHe_2b}$p4qg|7qr5UHseqK6)460dFJu -zHyeTFumE6IO=k8(XJBikdE -zXcA#^c2Fu4LD4lS?9~!;mdMN01xjw+3?)BWU(5q^qd0yc#qkRHKaw?3ADNV2LM`5u -zmTd!;+W#s4`9D0_AVB|VL -z^~{#QE0dW#VxrYiB3Y0>Xrs#^z8!4~Q6b728B#~a5D7k+j!|btasU#sqycXFhHOeU -zkg4$A^PtW9bi5cGDJ~@Uq;zWuIJNUy$p*j!Q4NR$n2m9ycEUXm)iXy~ivbhjTtbTT -z%K$s4C;u)a_)UhC>$T^BdG3?SVrbe@JemeVFM+0l%FWc<7P(|<+W`#ugyebZ?6z2= -zFNPzXhUE~IQVZbt*>Y%8eolFz{^t#$Ys;{AyZ;r9$7jC(?4>sG-`7(968pc&x!E*( -zt-i1Fb)>Z|{lQZ)VcnTc*O2cRyk^Z<|83ng|L%fu!TKM-cIxfHU;gV=@n2$l@y-3; -zb(CfF#~>MCX1{5USNQ+MqnrERYbh(z-!cGClK8q%Kuh$0Jf85!f9Fz(js9OtSsMSx -zrM&Hd*OEZvO5{(nPdOtjC=%e0`tnUX1Zq0^!I4S!4##hddYCgmu`PQLZ9`_~nnR#u2e*PW -zmkdTeD3s2sp>KvP7II-2ndNY!hm(q;kG6`kL4h77Jf-GWu^fxQy>)4d#H+kmp!xxaC|2 -zX6Q1e%bgWMb;+~}xloc%3j)t^p`JAUbs2CGLOy~S7ZSkx4nWMe^5p^^;|XIg{Di@4 -zKb6}yvXZf?`xhZ^;-cM`4CF_w+xM@*`@e(&_`ABH&$s{2O8cd=QngSDtK!?|SZx2t -zqEWy9Pb?YT*#GM(_|1rZ?h>TH|NJ8qBE@4;J+6~d@vxp{=YmdpLNek_CxfgclGd28 -z9I>Qk85od@ghIau0-ryVI!%12w@HD8hA;zxFJB5Qo7k5xfk5+Q&{AZ9*pHe}O>TZT -zEcoMg>$CIsc9v9lStB%l$gZRBOyWkPpt{kG9wLHR2nU?Q$C2EV!xS;Lf4207y?GV>&R7|(weHRS1 -zL0^bw9v<`&ZABV{SEMJB6nS1$VN6ypx_%@11SWrd#)=Y)$Hkh#??B+kj~`5E1Xxs;Nmv*>IYs1Srp|{k@szK>+d<@jEGBF? -zMQ@z1Y#O8h)rbO*Nrs89xSb<3AEh@!82rW_cIUZSOrY~#l8*m`pxdu?;zsQY1nOOh -zv~^Tr7`w$2&kw%_^Fv-%C_mfbTPA$UxH9Zu<_AmS0y7kOi?@%Ef8-2$5k~(ro00R%K-pQBKz@n{ycvl_ -zK%e6W^GMKzihV<9&IK;dB2~iET2~(^q5}q*OokD4CaZcDydM~{=Z6pT%^?sCfSSPt -z;vODeut9ds6(YWHerw;;tq2z%k42NfDwUbxNZowQnYys&F<)3%6N%!?lK1Xj4zAV -zfmU3`lc-qk1a|(CWioFvI*2;NB@H!3Er2_{wUq1ZOeim(#lk?r7L^#`05$Jig@;(w -zH4q1;+|lUXNMk%Sg9$T0?_JtUW&nc41|9FEOyoJ5GR#c^s9;H|NT)THFV{(mm}M`B -z8d(C-JSIt&pNWCt)gHt?OJRcoW!t6%R^lZ-b<$Q7mav+n3B0Z*jU;w6Yy!tLmH0T)$CH4 -z4iDJw%x2Pk?lt!we{YkI?QO5; -z^x0Z}N~!?zSV<7nr9N{eyfIIRZ2zO!0wBDvqIiXHS_6D$^d9nM3wP0sYO3jSob7N1 -z0|s+lHc=9vA0FIB4X;q|swri|tl!XLHCZ%mKvbO)d3iG#ZM@WIThx-6Y+>Ki=_p`#Qjp#3E -z{!70%a9)nX(QM=?PydtJ8o{AYs0Bfs%^u!_-FRGUwLLN&rTu1|{B -z>S4v1os>1${}zfMQXTk_`;or4HNNZS?Fql%YY;ew|TZb*hHLo;=h=mkgFZzkkE7Y(%6lS?y|e0?#Vd+)h;_{vlA(h*ZH%+qAxUI= -z=9$`4aEfYhIFB0Ta}bc9Q#-N_0>OZck0S=1Lt-{o%OCiIoPvdV{y{cw=0|IEu!4Q<4gBv02G*q`|uPQXTCihj$VY$5^VG -z0oP+xQBW$}mBiZ$x20-CdZFq`cp6ARpW}BGCS2ENOX*7Uy?kN{#3~%ab|bZ$%(_TU`#~lVtFP7-NDli`TJ;A@wTWge#Mn-chq@HS}*((_GW+; -zdoF({0KpAm8?voUc(d6JhG#yLNx;LBW3_W?txHo7r+c!THsQPlvBZQ%JOfAmXEZU2 -zdS*{gq6at}cZV}31xz}`qle)rMC&w;ICXgq_DZ-xzT~57<{kr5V5C4bwc#Kg#Z;)D -zUj9L>kVoAg&*dEr$85;+gFS>%fQv{7Ydt}TE5->*`kJBm%~1W>C%aR~!{Dmv4k{R# -zZmRoB$$etvR5$JVV5-Be^rD_BbA`i1GIvKoFO(pY)9v5Mbj}F{wx@wH%OP-@odV%l -zcf(8oA)V^h$nUwaSegHhT&hBvf&sgFJBn}Qf|hPXhLEpn5%DIJlJ!uCmFX0^g(;n! -zMN||F!$tw=lPh%ky$x`fLDcNN1=b&Z5l$6V6 -zCPVVY5>6hjHF!GBiiQjRVo+DzWbPeIis!H67XYyB&pzC5%+!T1+|&mcU2&X*Ll=L) -z^D7e`Grg1-lz#Jjew$<_y7L|O7$B#azAq|L6|iOnobV%-j5|YZiP*U -zTg1$z;;cL2SQpe!6zn=ApwCnfQ*A}U`opQPGe<8#Z#r5jYWv4ZWGPVL9gax}My6H~ -zv3Q(q6F)rdL`UD+I%^FbzP0;-NV_ge?q5NXIOk-x91)SK3E?y^r=HS%v)_n`Tnv4# -zCjGsBYo_WA44|N6vaLn!1)y#Nro~aUjcs;`074=05Pe;@Z}DHxs}B^p!_)@OxpP^B -z{0Vy_k3QFWm#Wtx{apwM#2JahG9HV6`!R#qEWzi{p*yv3fbx0O%lKDc25Yja%-E=Q -zx%S1xXez;F+A7;mfpO&6exS8HxZtp*7B~GC#|N-5p?7^wc!AL3m`geFRXb -zm3#?Fswwb88s*4+9z5=fSCHrm*({`Pt&iL -zLpz1STi_;s_9yj#k)HE_Yr4hGlXG2;tMxnT$sc4m3*wVxltrzAGOodx8=(=iDFfm) -zeH7wFxHdMVP1&>W|2*IMC3;o2qrE+6b#=4gl=tCS=#ZCY4p23!@caNm-_=bK~uh3NkxDFOI^qidII+RGFb?0i2`QnNG?yQLTWB!aroyNw$i$-hpc1XV=Bso}Z(o2@nXff$HTs4Gc!B9X+u^ne|ZDtW! -zS8YeGL!g-umz%6V-{ad2ETI|41(WTeN@0Fk3=B5LE^FsBN*L6vcFx;V{KP{eBJaLgjcg7CrJ -zl8!TrXO<;NQmClI;Kl7fU`+2HkJ2}wZ*}Zm -z&>St&6D#@LHMYBox0^?|5$>)cbGD8NRxRd)2u%XW$MSdK!O-V6Hv#t+m9vxKE1yh6 -z6#wTX9&BanZfp@_aYH_I8P0n&{6m!J=HTz*i(h(%l&&`(jo!`rbC%7dWZ!fOO_gJCu -zVmFsV@bjz}g@R1n@#=havJQedwZ5WcZkwfwJpU@Eg~P2ds`kZ -z$P8m_Gnx4rBHf -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 -zyo-?I=*~H(y2WNRstRseMEAit5cdE`;2 -zTGAP^HP>fmXVlqx#RM?IGoP^6x=>Sd=!ALQBesg>PT-+UpkvKML>u^Q!{nvcbOaGP -zmbQdITVCE|dRywpOncsT6{!8f@cogASgcP}pZohQqb}}NyP@s34=}?M=zQzSh1N{# -zYdHXLz8U9~HHF^J5}t%n>3dtZ#Kf6T -zsHTyOFJFygiXD?WwYIot#Bef}M3t|LTOC3+NIbF&E|p15&mIZ(35@%E{JQAlz_DaOZ(0!h83D<sV(F>(C#36p-*eSJK7gP_#OvU&W4-9>frXk?Awx}v-mZUpi%Q&mJHtn7R -zU)N_QA+R+YUlk*w3>51%KLuw|_htS?*j6_$Pdy+4@t!Ic5YpTJ+q53*4itDIBKXY9 -zt=3|?JKP%a0FD`PoT45sCCI7A)r*ot8h{2yhp~JhQFI&>ae6oAAgsm&{iR-qG58Z$ -zpu=(PZos$68uWv6QDaE;;H()gb*L20s-J@v6x>J8hnBFOd%c6>c?HhObyxqfaEf(~ -z?BJyo8|o+i?F+T#1|dHY^Vg}3$2s)VfbKe~mEV3hM_FQD|KgC07fJ=RG-`X=&%rL1 -zsZ$HF+GwgKYkay1LPKZlHwcLX#Mh5oDg)`2y452s=zo%R#1ZnC~N!yJ0#J?h1E -zb@K=nnZcx=@K%*rUd)?f-(E1nsh9?f(c%M8gZA8N<#5tQY1((Xk2G(yo0}8%Fz-@D -zdiHSaL@(l6TYk*j3oyAxP{ec3l6R+o|9FlpN6Z#^yF*lkR2z~v3$My)HLew!WE4C@ -zc_z-b@;!vp%HIGWcddVM*1{$?!R@ED?-ICORvkY>TS-NeA6FYM*j>Qw>2G(-yH(b^ -zb^*fj%4`J2K)TrYAz8;f&$w&jnZ2Fog%gI$b1?I!Y3vY}4MCj^m&BBodcAA7aXZq? -zr_aW|%iBw!YZFD*!J+P5IT8mM_;4{Z!>XC9?M17wrvP=$aGuFLKjhoeI=p9UyhDr1 -zh%s8{siEqoIQg^;EOx%=nr-5HR+Z>@ea_jK=|I0i?ZX@xxlE|Hs<|Xv2DhfwOHXGt -zddZphPKhT~GvaPr*0DRAmN5LS{iJNAM-W2`?NoB!`ERHng(Q5=Y?8{Z-U=_kyJWC=l+{Xzxk=l`w{s&P;SF8X4 - -diff --git a/src/puppet/puppet-fetchcrl-4.1.0.tar.gz b/src/puppet/puppet-fetchcrl-4.1.0.tar.gz -new file mode 100644 -index 0000000000000000000000000000000000000000..5f96daf5a76499c5176b01cd6b9c3ecc92ea1369 -GIT binary patch -literal 22042 -zcmV(qS$l`hR-LHFQ00JN>O0?q5Zj4kcY0%Tt)6@Oyp2h(4YCh-XFydu64fAAZ -zjr5T={^~(54KCNU@u%q;TKi{xeWgQ->$tk9n_p?VWtjF?#C}*Y)?Zao(wva5%A8)s -z#b&x~_y0w&`P%glr#!qYs#!65Uu5a0j)4p8IM$~1w@l0Jt-q@qu>RUZOmN%vCtv@M -zdxY$tes}WYi?i>4dNG=@{bRBpMUkOJx)xcs#Ug`+mfd!;26}Up6u}5%hzvydiARs#4$A^eEMIqh)9|=ccX@vH>g>nUx>vv$^CLen84p8d`ku~BC!#p0 -zt}#YcFM7%A`TJUAbIppv$cM2&XCa8{^Uz?F8@lGp9!On`U;O-H__woPhiAXM$Yb{N -z4=2M{KmRZ^k&PMh$TlqB0r99$xfywk>w&5J9R802$tH<|aYVzC=i`v)Wn2^$&qsM6 -zCTyA}bEzFtN*z~oY)f-2L(@WVxxlg96%J(%4!~JRYX-i~V3MJ4xs>}fvb_lYG9uUV -zOg#)0gBeZZh!OP=W3l)V8=51)k=ap6UCPIe|k%9Sq1eS2|{C6i-xVlUWwC -zY}3_!Ees7e04t-+a(s=#S~*s~bDYMd>S}>D(|v -z7k+UKz3$CR%4kUimWtV$z&qfM=hhrLsd|uKtxFO#rGjfk-biyx6KAR`BC2O#_tUxjwa->%njVy93t(9Dk@A#k`|u!`2)QIsnfG -zAJt6*{LplR$n%&3uyGg0RZyj6H3S7)ZO)#{!7|+_(gV#kK_8YE0ftjAib9*ZcTvQL -zIAz&~Lag2}pat)!#AkuUnC^s*7TQK&nI;&sZfYU8j!Cr^|1hCN!KKT#P1g!-=5wZd -z9tZ|FZbT6{u&Ful8w=dF6EMKplq1%(8F((J5Awvw4B$5{&?o>0{AER!78$PDVi3jG -zWtAfbz{_HM^6GT>2Hg4dWav=vbZQvGOTHM*`3xCD@G%2B@@?DHY}>P3fHH^&ET9&T -zxbAFbe0uik$04Hn=}FCu8HUS!45ymSLx?|-XZsd~z~tM^(cBg@{O1D9Z{DCebpSvu -z)7KExm=EF0v3=h%Ir9xbJZF99i{+9kJ}lq?qmCZA;J=Qc+rWzYAX&h`+H~IHQ^7K= -z#D@@2Sd#%s^ -zml}VFG48+r1HU%E?EgN;wQc=3y6-*4*s}lA4b5uS-!P#akjZtw?EgN;_08AhAAqs1 -z%REje=lWanNUn2AXB@%zr+FD?DNW8_rX`>790?{sT4o8)F~pFkq)GvMk@&9}w9=G3 -zO0y3%Pl2rHHS;{r@?rzyX<0(!jAvEZ=6aInbaDQ=WUy^HKK>4fsyqR5%!T2%qrHES -z;n&ah4#+oOKW&STt-@RhZoG&}{5c~Z;&Mu);g9zA&ewE%y9auSqm{XS6eF!DKyv7| -z0v+(U5gin>rB)Q9Wy2a;sj7xj{<%We)|n*jYEg*RZdxOkQsgM%Fo7v~_LS&~SA9pX -zIn@pCvp9V`_{-q1!w=Sgr;KFL=A|I8mxAP-kzmm*!9Uvv{>;~%@qZWKSJyWDw=KPg -z|GJIw{|o;A{+Ggk1;Tw4>!Ei6+rK!y?1TEMLw+Mp3%NS&bDATT -zCvh>u_OrB_oex-?^ROHo4SuU=5=Sv-@OwzZDTklMqDZpI0EUDgGuY{F2ttDX0*t-P -zv*aS@zg4hPY-A%4Y(%W-`o*mg=HPbhY=K8D+%oPoE7^n{)zY58_5jsd -z-I}7^1Qcow>$~-zt(dlU8OcWx)ix}#jBsmju8(q!5t#q7!EHVMw;u?6`WUz4ziwHY -z)5U+?(QN$-{(p|^fSgWgI^p0!dwVBILei|H0f1R3nhR29q@2bD0Y82Z=nBvVL;)u( -z3#%Ci*kpivk_16;w08y$L{k2NImOT&2V?#5vq2>>D>kzgH&nuXCqpW)} -zhP!}Zg0}|$jYevay}c(-UP7+Ll`45UMZm|uisL6w_V$Jl+r)Y-i+TiA2HMVYatd@m -zy(S(x|NDVs-cu%MOva806FmpxUO@Iw%Pe2Zq;>!B5M%;F$v!BEOK4Dx3lZ3fGrAU{ -z7(0n#peSsb!M(Np<*h@Zv>$kmK#LuT0_j>|En_lK+vGo$q(g{~C8_2NjZVnv>?Egy -zat5?0c@pKEUan=*x-V4r3)phQc-UG^l*8Uh4jbj*m)SH~+g;p2Z7Fxqc6J9%xq}YA -zU<@_;;oQMox`U?N;jgGNNKI-4T3uCR<+ -z+xj+qc@bZ6!mlZ=enF<3GLc#1nEpXjAWhA)&>jQ>Cji%T;ADA?SV6 -zErl>8Pmz<1Z~F$AEPJLM$i -zE;&i#7Q11#(d^s6Ej0UqF_4_C;rhL8Sw(d7N71HmdQ_-{5sRp?mTG$(`SjBY}3hbvYSBcvF&w`Oz -z8`Xd8JrNuDY!2yIiRu0V7JW9O@9SP-+kv|j*bZPm)1$1({tJeg@M~a)>Mi({NbhDe -zzhv2mRAnM?7ZPbQgTF8(3@Dql8q;`I&1xGL1?o5#S(m5?Nx_B6#K}F)8yY47)R*I9 -z;;CabVqSo5=uB=E@Z8!@^PkDZRx_1J7}n+_aG;xP2FcvdI1JlMVP`=NmNtk -zIo73U4QcAp42dITiL+%R@@C2xq$rX6LzZ8{3Ng9>By4c6Da_^~z%$X8BHO6KGl~SO -zUL(=w&6n -zT*sl!0DT5FJ2|FK^?7c=LarJ7Hrd9aF=z%bo}eO%#f-@3sYLAG$blhddSJ?}G~{it -zZrGCY58y`_=Ad6Qjwv>#dS{%aBcfglvV228Fk0%lUY4$*3Zj-TEWNmBOgNNfqGTaW -zvz7)$85$_fYYwi?T0+6}_u%^b6Y@mBZWGDC)`4$TW;4J_`HWy9w!A85I+rMa5!M|p -z)a?x!kNkDmkPjR3TW%db`J+Fi`yH?K&;L5FEPV19Th4zNnr-&af4aK%<@w*|xWxNk -zcti^iQumBOp1xK{AkOTgamZG1+G&XB?9 -zj`5W7G>oC;n4F6U{89Y7qIoP<3}vxGbQUCQGCl0^>?!VV%#lvMAui@i`=Y}Q{QFi8 -z4E~Gh%T>%cE>sHXcWYvwIH@AcW0C2}br#k6+t(R_?NR~zlRRc>j{7wU{CaI`{(dus -z)|9vE?k)-e(P{(Fs&D%!jG69>tE<7-3wZ(ewOh%t6~|HE*;y#Mhzu5Ift-tYayF}CG@wqx|p -zf4RE-<^BK9avhNWQ3>1L0U@V37iVK2e2~+VCYH-5j^dO89%qF<>hU*u9g81l@=s*3 -ztR95)N* -zS(&M`mW1}D%<@s2$?_$HPiECRH4Cg>%Y$jn$=ZNpDJJIyK2j9b1+mpV>9J79X_pMt -zbe)>30>ep*@(sozQGFPM_6r$ODw>E9tunwMU_fQ*kP(( -z13_*lB#8_02=|v)--|;oSjkK>%0QAr)EA+re1*4T9OUt)_l`*WdP*LZahddwqBm+M -zJ?e-iMW0xyxPP^Xx4exch?~>t_j)I4%iBwW^EqUoha$mKPn*f0*3@7RTE*$|k7R!g -zjpIijTLrqy2`cPn#GrYpz#DNKdH-0XZ?L(-Y#f~o`N%v^oR%h{aiBStHIU7)a^U%* -zInT0EHcs-an)e&An2R-MXyo(x<3`@iFANTjJ~k=lU@7Z>C^>pBp4EgM#SSFl$~y{* -zcxe_(uHDxY8bWCjgW3|FbzfLeWGxdI)MULk5)`Fc&6=N}Y~D{3N%SH9y!peW(c9wx -z@^cxxkFhQO8r4Fq99K8~zpRhhHC`-HpUz`^N^u3r0W^qDI<&A{*@yu2 -zM+%Z!@Vx?8=n0Qx-I=VVllK%EK3v&EhW7-SjNlhFb%(5TuQhg4<6bj%eeXz3si9pn -zrTU(NaQxgwUS245Jw8MLKM+B;Q7W0!@RCl%;~4cTz5y`2qBAVCKUm2EL76WO_ZzZjxS%ld5(GCE1)Q1NKF@wl=2u16Lfmr -zh~GXDfm&dCV?;vC`9ypvtwRrumwcfHLsg=}?z$RFeTmwYVDcPzoZo#x-*%Kz+j`CL -zDfv~Z>AY4F7I|(6hec5)wAw`^GkdZUBuyFghtCK$7_wxrl72i|^{wShTlZDdA2VS7 -zn_b)D|MG)ZyN|K${a?#ijsIW1|Mz*W-u_=6(P+hgc`z3X`>3a~n%^ZMP)5^D2sUN{ -zd6kM&>m35sSQ7{-`UKc`bW79?@#%AWP@cybi^B_mu4%>;+zpV;;JB%;*TTbo>(R%0 -zgEd59_Um}EL^YM_x1?=HlFj$0Aa6;_su1_fyyBgEupvin_wU`@Dk9F~RuQGXHjCK3 -z|0yEMe+Rfv%D1U@B&b#ezfI^h_u2!icL-r%QQvqx=&w8;>=q`4MH3wUzXyk+@1HK- -zY_0#+pK1JrF}C2p>9|fG|250`g8!f6lAtf2*xqy7Crv|we6Rkct`1)Z39?Qy4`=bS$=$9l-k5-{@Q;$~BsPi?04PAO)xOmihk7iSs -zC5h-!e-z=CnYTWL(cieQm8r9TU;hz>&Q^L2$!!6pX!ht=3!5!7?04u{sOq3h -zswcka(6Tl~yw*YnYA?9fc(9wSrG9b|`$kq~{>J%SJPVSakIC|d*z&X9!yt~QM@P39 -zDOz$dowykD1ukr~ey?iXnM1iK;2;)|H!P|{$y07t_EHce1d*ee -z)s&}5l%z#-Q=rRrDcQ(xc&}qN1_a6%|mPFrY{R&Nc?x`w6voA%@^SvX1 -z*mtqFJ#{4{gg^@=0YccG-~KW(wXsxnd##yEye~%{MzzY~>=x6vl{4sFu{8_5%m;L{^()K?z#uxOzLOPwjj{oPg -z-|N48lg|%PFU3YD&C+D|ET)UBE@)a_bcB@8VI -z>3+#7v@H+Y*)Qb~;6Z;4`Q6JJctbV&E7{gQp;7JEgDNGwjuWP(e0oL%hS(9ezltSX -zw@)VBgC1?1^gPO8`@1R+YM(9mqg*5~5Pv3itS~e={O7w#airW2u3ff)A)!s^poY*o -zMA)GhulYrri$FjmwZM1DT47J399gu)EwDi_1NAcTVjk~|91VY5wzw1QcsDDdd(cI+ -zJEE2#@oXy)n&9d2a10?lBmg7|ZXQ4Bz{_2*K_ApyZ2n&*U<6gt(4dm(xdI^V -z1>6%V+6@f?iT~c4`5RtiM3B;9>4W!9!pPP8{!cdv9)!f9Mcd1)fTuJed`Pl*HzfoR -z=I4XJZpc-7$|QQoK{o4 -zA|tk{piNL+3f{@O8>sQ3?$@Y4Z)M?JngSG-Z$P#;tH!L(O`uA=D#a(&v?Ixg$BDZ(BAbyqGxg-+KYcv(rbw+ZxWrAr80kfg&JJ#558) -zvkAULTt^3gtB*!~{{U;^##e!T6n-L(mvHpUO$a*J5NL>vT_4saakZ;Fo}2h|q!WKr -z359P0^_7qhN!v*hApnL&5{a*5I_dFS^5G(N=_;&!XB1z%C-b@qZQlh9vdqv}57Bm4 -zG43z6d!u0Jy>^-08)Zb_8pxm1m(#u8Yw||YSJ31(QS82p<=!w~SJ0Hc$Qrv>)AWsD -zvZ=RiIOfBp85LsD3+MbH%zF`@x7*xc{%b3? -zdhVtl=mwD+zD)Mr|DI$cQ3xWp|AyUR*H$hvf#F2u=Lge%_~rA1ccudVsS6v^LOA`K -zA5kh`7X~qkiNW?zym{mWDez+wC<&}|m; -z>J3$UBEds1_xnHTK?FfB)t4fBf*vk54~5CVqTMV#)bA+B#1EN`FFc;z)2h -zPJa@?yRgPzGw5q1X&4)m^zXkUaGA5^9(5*b_T`{B3;XBf&&kMe4}blMPCej(cEWz` -zCt4@u(+)A}3p{)L*YwlB*b@uW!C-NEG~`NT~M{u2v_R=of@j`XST?;0G|) -zk)efT8v565kA9=2iPam;hPSRhZ#J@VpanGrM;lZoj5NM&6a`sA+LUJQuqqTnPFUg& -z1n>Q5xR;o3TvInmJ;dvNR3X_tNuW0?B83Z -zut?^YJM(wMu%EXJ8r|(J9K9wNy1jC@ryZ!{bGoosKdkXAujzkywf!Y5bZlG0GzU=dbj$|G+00+MXP -z4f#f|i(MCZDAM2|e%UgyH(%^KTn?CrMI^y{%(TByas=|AyRU2tfMXc@<9?qTh43Yi -zp!^&CH&5RQCj@e!faE|>?)+-5H~qj&s0daOY!?l`7F6m7`l#xkkP>C=h0{+U{l7bR -z{+E94>woP=nd|c0pESn%`dcilV>t -zA;r4rHYwlr-ur%508(n=bW=bB;c2E@ -zq07B)r7=P>kf*D?AwA}~I6dV0!(L@vhR1RIR;9s@h7EQMPjCn61YLo$1o*}RWVCtE -zeDG%UfwtFhs#S*w1-P=1wAX`LX5^j&atqG^;5fpl`e(luPBbpzNkSVNLwh(Lm!9a-e0N}GDd<9Yqu -zYk{NKXix3kOf(M|AZ-GKX -zd;Y69HiW$|8U{KJvw^1&&9P`u=}aS%m{i76kO32P)gofTv>9kLnX?YC3RH0STu85a7>&f5*Xvw-m6aZ0*xM`AH=qB@(s8$}$?)J|NYL -z02Zg6wT!0^^}u0V0rwrnjH3cIp8 -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 -z;PKsxQ) -zo*o% -zPuU132$<_uU|+qL2KNWDb?@hY4mqaM;r^uKzhAEZTDY$N -zmCt`a|NCt|KhS3-%zX2daAIdDe|c!&_nTagVDeHzU&@!!lT31%Q7dPkXYekqVt -zlw!znPtb4n6fS-WFMPD2$Sk6?!5}q+QmoG(c1qQ9E<*u4u%8QF;wHi -zgJ~M^mPAJLvcW9u!GqYN?E^pwd-@IlKf=fu3;uBgD!fY^KMyiuD2m?$Ka9}$nv6^n -z8@?v?XTD|nu#oYb-9)I -zc9@xELxAS*SGSX|-`;Qj{^uUWdPDycw(_5M0Q^h(Uom@g{->D!UjOx*eEb7};rY!Z -z90E+@)3$ID5Z~k(R36z2;DREaQ%uxQ1d&9nf=q2B0N@ZJIRfjyMlwyk9fcAhGlU8+ -ze~OImHNXJ8;Nc$7eq}EYGTla?a8T8a9Hs={Ed614Fd#9~pdaw@X$+z7js=I5E?W?w -zC+-sx=J(aR4-|eG+P#4N`x5-}$v+E8PVS-^Ra7g1W!m2!Z;pvSBoawY6(8dC%S*M< -z=3ZW&Na9W~y`W<}tt1TlfZr$wBYpy&8=)T(hV0rLx -z1*cAM4t;k((|h2z>TU|Thrw|IK0Q?gCl){xoKwe$eW-bHQ+mi% -zxgpmrgFW~_Q1%HQ!2s7@9AQe5#e)LJjD_VEoP08%js6YtwJgQ{je@(u_DID>lK&_A -z0fvfB%{%)0$&b^9eFxKg^xKmjy%B%$zlGyIkqO+8*W0JAgSDus`}#pF`)}0z7cLiu -z{uK0q=ScLq-|zy2$8#Uq;PCXPPXyoC?T;aBgy -z-#-BP1${#~gP*0?&k6KD`17yHXh&;V0ADTY0Bu-4pg$Ww8w|;!C%Fq=QF0vYB8MAr -zeve-T#*f8EB6t}3pA8QDC4dDV(!INbgDb%Pnr()u8l>_QE_C2s73dmEzv7*ZdK#@| -z)Z8XjPH}0})e7f7g4*nP4F%tM2M5!xNdSH@!%&V27HYZETW6?@`6_4 -zfC{4br_zpww1TMqs# -z9RrlSVln@g{s*5x|I4Pcp#NpF#s5R+|11FB`}}{d|Gl^VZ`?5YhsXHR{f|i7zrOz~ -zU;KXm*Ejimgb&Nr8eO_y>(l))+isL;wCXh5?v-2kXUaRk|B0>{hklL5RUgyzW34+* -zwn2nHQItNYsVvtXsqTEpGL>h=>}QTsX_YI;NqfIIo|P@DG#k}XXIp<=^mgr6t=t+7 -zYpdL(K4$newU&hKzOwJ1a=F!{m*cW${h%z1)qdf0PS!VB{?!_{_NC|JxtiuWVph$K -zJLMj$u40=`VN&I(ZoZpUD%@e)-Sso;T%o<~_QhdeVK{lLj~8xkJ9635shpfJMJa7p -zPX)WV*p=(5Q&x(V?u-&Qx#?k>7h_e|E%%gCEOrt^bIUPJXP=9yZe^A|%oo=7ye_SK -zGsO~F)vY1n%bc^D-tM(S<=UlKuVv?7OJkdLCNn#~*vM*9wUkqLQ|~UyeKR@9t%_!* -zTt5lV&z6y^9qs*U&$kLaS$3)CzA(uiB{5&l^Fv-7D#w#K?wJL-Heq+iXK}J?>B;22 -zyB&#UePVM=Ymm0)=TlODE(ztuhMJU}Jd;cp;oP>my!EQj7F2RmZ*KC|7Gj9qP0%_vHNG5bYpkRMJa^`)+D$6T7F8r*QV%nn^)+DuC|?I^13NSI0oVVXA@ -z++LG;=G>^9cA~yG4r-J1BHP?8>g;~b=Z{N$8Kczdmg7!bnPIn8W{WA3D?7^yqjV+Q|7QkifZzB3Z}GX~ -zfeY9A4H9^us34B@BFe%R8OY!a0pku_A)cS_#VfV{2+xrLChue|C=T~TdnMdnOv8V{ -zv=i8XeZp7Dm67Sw;~%hT^Uuc8|K86#{J&C9;FkKw?Z7`S|BIbv~^7N4(Ke+bR} -zBUJE**B_#8-`D?}e7=7DAt3q@906qpqOE^mj4$2)m`mrc_y2q<|9$`e7N3ayj}~~; -zs5Z*Xh$ALSr_pFin{t^=7Zk=pR+G|b%@^y}zQd5und!31_I15gYb7VeGJ{l=sj#ii -zz;?=md4-w`1~txUZiEWg?J#zYNsqbmy2A}p6MnSe>`vLl&zMtZgP*A^FJ?-q2G`Y= -z#&Ab1bZs-A4R>NDrwnG3lu#?V!fcptR2oiwz3g^I9j9AqxSbJq>QuPQ6rOE@XD)>w -zZrEvO*l;*z-YPE|y1MAQ?b?8?4d>-~Mmbe049_ZNbE^u?ZL(o67;aHjhMUE#d7wJH -z>9m-61x=;Gxz);W((E-j37Mw@WssS;$VAnJX?N|Js;o2{nj$hurTW%Ul!i)mm{hII -zzt;GMn5_&rgrqUUf+YL4#_)u4H*T -zdEWB;vA3RPcCwjYw!4j%IAcaVGp%J*ry-W7lV^T7&WzfvQ@zoCUNODqLCPDY7Nv77 -zR(6WU`5t`_ -zRj1q5a=$ocipaDV^mF;No5hp`Z|lxN=ZEsVP+S^%p8=oMSVwqfloHjh$OAotZ&0o2?zR^6PU= -z+!WnyU!qFPayVh-Cc{~LD`s};qxD{DSBm<2v|Xr2VJmdyTrbV7`_+2NnmUtQzESNK -z)g9Mn@~@Q>C2gd$S!nLt%|S=tC&|$yCg|KMQx;lUC8emZwe@Djch%l3UoY#s*GW3J -z6}4D#ur>?scHvTDx>DP%iYd3zHfAwqyq9*;vv$x%hqSAtStY-$4(#o?vCYTqoMD&K -zlbtSiPjf-8a?AN*L-p4gU8)q%ZS(oL)Y(^y+r_aMD>MtcT$gQUSA$Z|eon5RXA^Bz -z5%yu|~^Hz(Ia)#3ssjblzT753nKDW=4Rg-m$%IQ^pUW3u|=~~mso)>Rok(}el}{A -z-I*4fwX3!~AD9F2V7086JX#KAiE6c*-A!&ktfq^lQomOyIgJW4U|2KP;KmgsCpZU~ -ztl4trEX&l&-P0KT-9hBdICU%!hN&LQ&bex9swAh2c~Uea`A~C>MQoFjCxcpZWFVo# -zw$aPzU4=#eZlaDE9(aXYQix40R^d2i%CuO9W8vjWrOY0cc>|9+7}t@Mauku16(PqA -z9Jb0-8_Y;y6oy+e)KX!0Ol`n47`DRH#tizNVrpAvfuDDn`G9;E9rnPK8D=nG(@cH9 -z2n>5<>J5ex;D!433muH%_W@ITW<-WOmj?)f8plwg!ftWT4y!?r5`JOMppG~20{X7O -z?_-8_;rrYn1I!)roEqZ?-ix&qvlt*y>jQ@$L~+1P`_pwwsxyVQTiVR0i=9}ToZEU= -zqn3K^faKnBo~a_yb<&pTg=IOtS=Kw~*~Asqv;pq8HWF*-j{|>}Zr)kc=1y%eZ&Km< -z4$3U!$Yq5cG4(MsR}fA(&M7;1`T9uKRT!m)X8#OgUg8{%O*(@rl8GIbSv@;-^5TYN -z6{l)4M7{^ -z(L~={xdkuOhpA=7Jhn64HQGPy#jJB6)5>pzGQkCfk&)@TV!4DxdUMop#(L=}mB((! -z+kGONkJi~-h<1(YY#0||(-j*6o35R<^BG|J`8Y`BN@OcT9aWo0F*|_96||Y81T->2 -zI{LeGpkT!4mImKD>Zvl?q%lNeZr>blOZ`a&4a9YO{c)EYm+|idY1*_YVcLP7+l$#2 -z{vM$bGH544%ZXpQ{$3F?d9>V8dZ~L5w7FrW4=?CBd&qT4h$fQri!E)!FJ_CQ5Avv{ -zoux`iozJ>jKT}dEL7!|Su4|(QXVeitx^~@a>`|EJQ?OD)CPJM9jzcS!0R@9apc|~B -z09#kt!O~&Oh4?i~2rEdT7otlAr2L1Llk(ToUrq@LlT$>PbeL965fKEns?$@SkL?s* -ziRyTZJK-r%SMXBa=mIcu72#ohM9h?udGx)~urYm%H5M=FgiTX({j{6A@G|(efoK3+ -zAQVKQ_@%4wsaigcORgp_7X0gq+YYtj -zv{l+$!}+ZKx_zDShVFEmU0asaSJh -zV{2GkytdSAIhE;V^sTB&y_B96=f&Kvg4s42)SO?eoNBjOY;Z@OujX_P -zk-9u+#F*G~F(%1ke%2e!WcgW5FUD>o^;}j8`@`aSTIfp0d2vt0@@n@q)ECV{g`GIo -zadz0BQ%(MLtFdJ#Qz)7?x0|I9HSz7zip#h)ZOYD`r>jbv&1JO-N1c=PesMc+=A3S? -zjMXUPj@svKr)kxBd6-(bx}G%Ite`K>YD+%lwzX|6c`Uk<^p2mmnoF4~4Jr#R)}E_o -z(vZ%nv@LHseg3()v*yiLqtVE(EA#P2DOJ;DQ;;|7O;6kD<#95da$IiGO;N_0@0X^_ -z{5ciV*5`4)oMuW^TA2+xhu1Qbk&ESH-Z{pslElZ-nX%^PGaE;ruby?iP){x9RC_TH -zj~&6S%VH%rEgNjH-j#NliI6+zn^ybi)UwSqH(QN1Q??tX0S=eXX^|nK) -zY-u>_XjQX%7VQI<%q?eJa7q9I9TrO4oZvTIaPsIKo@(kS{HYSK2AXpjr -z0Jz-%+5Sum>G2$sXHKhR%Mi{RDS?(G~ -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 -z8>#W7%M$v(CnD3+=#L -zHhpv8n}Z2u3H?9mHD}V8qyOW0*x#f7Q)yrSucZ7VbU!F$a_eNKkC9@4}nO~>fb -z>1(6{LstfkSW=*GI+~=57L%E9VmfP+J{`|yM@;hRgqW?*VW)aoEm;h>II6-RLC?nG -zqY6Z|Gaj%(HF%uM^FGMk%*n2cs&pyzONg2qi( -z8wR;%X4_^A<%H~V^c3T4i$0r=Y!;?NRLsoa<5%k;zx{Ifv9nmLhkNqe3k|6GERlY-ND#6o5vloJ%z5t -z`6zl#)D*HqMnUp+!i)7F&3J*4YM!K*EYO~APRg>{TQ5o)Wl|G)QR<58xu&evH^K-B -zz+(nvRg;<$a5Yv5369r7>ho$%A%&e_Me5Cr0;J4S5-gl?-3g4ln_Ju42{sP -z7>92<+RZDD)Oe)g`(-FtINd=a1c{J>LmQ-qo7H6EFOP!70B~+I(HfMAi94 -z$cLn8>pcy5JJzZD&yfA!!T|ichJnxU{{^ujDZeWJL)6dzu#&RC_%FBUbCo&kzf}A! -z{#z>H=YLp9nY;dTr6;hLfU;ZSAC#B(EL=P$Uds^7NA -zYcODIa*7gTNCub=1d3@7s855)Gi*({`V1435h~jqbbTlcCAuAg*wG!(kma&VEDBDl -zs$n5A>K6;6^pl!-0|@>1-RPOW?_WQaju%pu1JA8#sIsWxlYe|IF-7fhnt}i|Ury*P -zQ0y0w!A~rRjtbYmm=fZCnVRgT@)j-Mf)dt0gc@v*&_wWG52&!~-UrctKP*Hm6Qfz_ -z3Y-D>0IvP0|K9@CkE7nNr1w|V^&jf@Pe>E-o{k^C=TZWb(n^dg*c{o;X40O-6Krnh -zV0naXWoC`5{9NzH;VY{CmS#B?&P~;5GI$8FZ*EDW$$L7sl?EW5Z!yt83 -zm=ObFWxryPIZTqExgvvWXISdc#9ff*LaateY)THr=4SeJCv-tvF~8&6;}o*eO~sQRESOUkoX)JJ0~s1!AW -zr0~gV>j=pugT -z!HEp&4*zXY?TryimiJSx)y|1Uc8+fHIF@KR*I{Vq~A$>z4xcXq^DO&mlTUIRHf_0$>C=$Lxr-`>WRBhA%@ZD0i -zIcjT(=Dp+j2mN68F1u+>K>InGGQmVI2Xz38#02RtNe1c?>cR;kDm6}Fy|D-@){fnj70VkJB~N6_ -zNkPwqrQTvrBt3`Q(A4&X#S7N_)q5X)nYRB2WBe(RKdij}{7(v=@X!COqD&wE&xrhC -zWr_1&@npsy|5cQ^zT?AK0*`?$N#{^vT`i|z@yBP{=Bc$5oM?TCu5%fUdvI=;&Z -z!n!Nk$ogUqi!YjZ%ldrIX&TufckIJ6Cga4D-HV^;c21AMpLXKPx(Ke9^Z6620fjT* -zu3A0L<-Vt)+qvB6w6GY4^`0xSCN$)na|Z{EcO8vT#J=(70D*4SpF|!>Af>SNCnn0| -ztS8n8b+xcVIsBoMyTa+#9`y^iV%zs*i^!agNyV%!4Rp}9U^&|n8>S44)1K(G#ADb1 -zU42rdr2ioY!8XCv%vMUWHuN_7#~gvhOG~BufUb9S+CgWw14{^ll2nM+;N!{UHePSz -zE&=$v2S_Xkey^mkPcT-WG%x_ce$6)5AwS5^{uUW*k%!?=@@?%$|8-~W$KdrFd4(Ru -zZB#2!X>iL)9R~dn?wERO9ax7$FBm>eY{^wRO~ODG|#Ckv=GS^0%$HL!jX1u;qGKQE{~&vh{k%>W&a@v8Ww`RQ3w-cq;MJ -zsX-{|rY3f*uKUTZ@Ysy7LqZJ_55=Rw4gb80U;N@1zxc&3e({T6{NfkC_~p~e{{tUk -JnqdHt0RVBZrhNba - -literal 0 -HcmV?d00001 - diff --git a/dmlite-LCGDM-2950-iam-normalize-groups.patch b/dmlite-LCGDM-2950-iam-normalize-groups.patch deleted file mode 100644 index a880ecb..0000000 --- a/dmlite-LCGDM-2950-iam-normalize-groups.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff --git a/src/dome/DomeMysql_authn.cpp b/src/dome/DomeMysql_authn.cpp -index e9f33dd9..ec0a71e3 100644 ---- a/src/dome/DomeMysql_authn.cpp -+++ b/src/dome/DomeMysql_authn.cpp -@@ -464,7 +464,7 @@ int DomeMySql::getGroups(DomeStatus &st) - try { - Statement stmt(*conn_, DomeMySql::cnsdb, - "SELECT gid, groupname, banned, xattr\ -- FROM Cns_groupinfo" -+ FROM Cns_groupinfo ORDER BY rowid ASC" - ); - stmt.execute(); - -diff --git a/src/dome/DomeStatus.cpp b/src/dome/DomeStatus.cpp -index cd174900..474c31e6 100644 ---- a/src/dome/DomeStatus.cpp -+++ b/src/dome/DomeStatus.cpp -@@ -65,6 +65,7 @@ bool DomeFsInfo::canPullFile(DomeStatus &st) { - - DomeStatus::DomeStatus() { - davixPool = NULL; -+ iamnormalize = false; - lastreloadusersgroups = lastfscheck = lastreload = 0; - - -@@ -109,6 +110,11 @@ int DomeStatus::Init() { - // Ugly hack to make this information available to excessively isolated classes - CFG->SetString("glb.restclient.present-as", (char *)myhostname.c_str()); - -+ iamnormalize = CFG->GetBool("head.iam-normalize", false); -+ if (iamnormalize) { -+ Log(Logger::Lvl0, domelogmask, domelogname, "Normalize group names for IAM and VOMS compatibility"); -+ } -+ - // Set root user and group - rootUserInfo.userid = 0; - rootUserInfo.username = "root"; -@@ -1329,6 +1335,10 @@ int DomeStatus::getGroup(std::string groupname, DomeGroupInfo &gi) { - return 1; - } - -+ if (iamnormalize) { -+ groupname = normalizeGroup(groupname); -+ } -+ - // lock status - boost::unique_lock l(*this); - -@@ -1342,6 +1352,30 @@ int DomeStatus::getGroup(std::string groupname, DomeGroupInfo &gi) { - return 1; - } - -+/// Normalize group name for IAM and VOMS compatibility -+std::string DomeStatus::normalizeGroup(const std::string &groupname) { -+ std::string ret(groupname); -+ -+ // remove "Role=" substring -+ size_t role_start = groupname.find("/Role="); -+ if (role_start != std::string::npos) { -+ ret = groupname.substr(0, role_start+1) + groupname.substr(role_start+6); -+ } -+ -+ // remove whole "Capability=*" substring -+ size_t cap_start = ret.find("/Capability="); -+ if (cap_start != std::string::npos) { -+ size_t cap_end = ret.find("/", cap_start+12); -+ if (cap_end != std::string::npos) { -+ return ret.substr(0, cap_start) + ret.substr(cap_end); -+ } else { -+ return ret.substr(0, cap_start); -+ } -+ } -+ -+ return ret; -+} -+ - /// Inserts/overwrites an user - int DomeStatus::insertUser(DomeUserInfo &ui) { - // lock status -@@ -1354,11 +1388,31 @@ int DomeStatus::insertUser(DomeUserInfo &ui) { - } - /// Inserts/overwrites a group - int DomeStatus::insertGroup(DomeGroupInfo &gi) { -+ std::string groupname(gi.groupname); -+ bool normalized = false; -+ if (iamnormalize) { -+ groupname = normalizeGroup(gi.groupname); -+ normalized = groupname != gi.groupname; -+ } -+ - // lock status - boost::unique_lock l(*this); - -- groupsbygid[gi.groupid] = gi; -- groupsbyname[gi.groupname] = gi; -+ if (!normalized) { -+ groupsbygid[gi.groupid] = gi; -+ groupsbyname[gi.groupname] = gi; -+ } else { -+ // for normalized groupname that already exists use first -+ // inserted group data for all additional duplicate groups -+ if (groupsbyname.find(groupname) != groupsbyname.end()) { -+ Log(Logger::Lvl3, domelogmask, domelogname, "duplicate normalized group: '" << -+ gi.groupname << "' normalized: '" << groupname << "' gid: " << gi.groupid); -+ groupsbygid[gi.groupid] = groupsbyname[groupname]; -+ } else { -+ groupsbygid[gi.groupid] = gi; -+ groupsbyname[groupname] = gi; -+ } -+ } - - return 0; - } -diff --git a/src/dome/DomeStatus.h b/src/dome/DomeStatus.h -index 13497183..7af7affe 100644 ---- a/src/dome/DomeStatus.h -+++ b/src/dome/DomeStatus.h -@@ -346,6 +346,8 @@ public: - int getGroup(int gid, DomeGroupInfo &gi); - /// Gets group info from name. Returns 0 on failure - int getGroup(std::string groupname, DomeGroupInfo &gi); -+ /// Normalize group name for IAM and VOMS compatibility -+ std::string normalizeGroup(const std::string &groupname); - - /// A quick rendition of the grid mapfile, translating from user DN to VOMS group - /// The implementation of getIdMap may use this -@@ -456,6 +458,8 @@ public: - /// neededops can be "r" "w" - dmlite::DmStatus oidc_auth(const std::string &lfnorpath, DomeReq &dreq, std::string neededops); - private: -+ bool iamnormalize; -+ - DomeUserInfo rootUserInfo; - DomeGroupInfo rootGroupInfo; - -diff --git a/doc/dome/dome.tex b/doc/dome/dome.tex -index 5fbdc06c..a23665c3 100644 ---- a/doc/dome/dome.tex -+++ b/doc/dome/dome.tex -@@ -2270,7 +2270,7 @@ Absolute path to an executable that can produce stat information for a logical f - will be invoked passing the LFN as the only parameter.\\ - The stat information has to be produced as a text line in the standard output, prefixed by the string \lstinline">>>>>" \\ - Example:\\ --\lstinline"glb.filepuller.stathook: /usr/bin/externalstat.py"\\ -+\lstinline"head.filepuller.stathook: /usr/bin/externalstat.py"\\ - Example output:\\ - \lstinline">>>>> Size:898945" - -@@ -2355,9 +2355,10 @@ Default: 7200 - - - -+\subsubsection{head.iam-normalize} -+Get compatible group names between legacy VOMS and new IAM. IAM dropped Role and Capability from group names and by enabling this configuration option it is possible to use X.509 proxies from old legacy VOMS and new IAM at the same time. All existing ACLs will work fine, because internally Role= substring is stripped and whole Capability=* removed from group name. Database groupinfo entries are not modified and normalized names are stored only in memory and used for group lookups. Normalization can lead to duplicate names (e.g. /dteam/Role=test and /dteam/test) and in such situation it is used first normalized(groupname) to gid mapping from database (DB groupinfo is processed in rowid ascending order). - -- -- -+Default: false - - - -diff --git a/etc/domehead.conf.example b/etc/domehead.conf.example -index 4ae60c2f..d3771630 100644 ---- a/etc/domehead.conf.example -+++ b/etc/domehead.conf.example -@@ -27,6 +27,9 @@ head.db.poolsz: 128 - head.db.cnsdbname: cns_db - head.db.dpmdbname: dpm_db - -+# VOMS & IAM -+#head.iam-normalize: false -+ - # OIDC - #head.oidc.allowissuer[]: "/dpm" "https://wlcg.cloud.cnaf.infn.it/" dteam - #head.oidc.allowissuer[]: "/dpm" "https://wlcg.cloud.cnaf.infn.it/" wlcg -diff --git a/src/puppet/dmlite/manifests/dome/config.pp b/src/puppet/dmlite/manifests/dome/config.pp -index f26a459b..394ddb4b 100644 ---- a/src/puppet/dmlite/manifests/dome/config.pp -+++ b/src/puppet/dmlite/manifests/dome/config.pp -@@ -31,6 +31,7 @@ class dmlite::dome::config ( - $headnode_domeurl = $dmlite::dome::params::headnode_domeurl, - $proxy_timeout = $dmlite::dome::params::proxy_timeout, - $restclient_cli_xrdhttpkey = $dmlite::dome::params::restclient_cli_xrdhttpkey, -+ $iam_normalize = $dmlite::dome::params::iam_normalize, - - $enable_ns_oidc = $dmlite::dome::params::enable_ns_oidc, - $ns_oidc_clientid = $dmlite::dome::params::ns_oidc_clientid, -diff --git a/src/puppet/dmlite/manifests/dome/params.pp b/src/puppet/dmlite/manifests/dome/params.pp -index b7b7d2b0..85c128d2 100644 ---- a/src/puppet/dmlite/manifests/dome/params.pp -+++ b/src/puppet/dmlite/manifests/dome/params.pp -@@ -32,6 +32,7 @@ class dmlite::dome::params ( - $headnode_domeurl = hiera('dmlite::dome::params::headnode_domeurl',undef) - $proxy_timeout = hiera('dmlite::dome::params::proxy_timeout',600) - $restclient_cli_xrdhttpkey = hiera('dmlite::dome::params::restclient_cli_xrdhttpkey',undef) -+ $iam_normalize = hiera('dmlite::dome::params::iam_normalize', undef) - - $enable_ns_oidc = hiera('dmlite::dav::params::enable_ns_oidc', false) - $ns_oidc_metadataurl = hiera('dmlite::dav::params::ns_oidc_metadataurl', 'https://wlcg.cloud.cnaf.infn.it/.well-known/openid-configuration') -diff --git a/src/puppet/dmlite/manifests/head.pp b/src/puppet/dmlite/manifests/head.pp -index 16d678ea..95bbbd52 100644 ---- a/src/puppet/dmlite/manifests/head.pp -+++ b/src/puppet/dmlite/manifests/head.pp -@@ -25,6 +25,7 @@ class dmlite::head ( - Boolean $enable_disknode = false, - Boolean $enable_domeadapter = false, - String $host_dn = '', -+ Optional[Boolean] $iam_normalize = undef, - Optional[String] $oidc_clientid = undef, - Array[String] $oidc_allowissuer = [], - Array[String] $oidc_allowaudience = [], -@@ -214,6 +215,7 @@ class dmlite::head ( - dpmdb_name => $dpm_db, - headnode_domeurl => "http://${dpmhost}:1094/domehead", - restclient_cli_xrdhttpkey => $token_password, -+ iam_normalize => $iam_normalize, - enable_ns_oidc => $oidc_clientid != undef, - ns_oidc_clientid => $oidc_clientid, - ns_oidc_allowissuer => $oidc_allowissuer, -diff --git a/src/puppet/dmlite/templates/dome/domehead.conf.erb b/src/puppet/dmlite/templates/dome/domehead.conf.erb -index 0f4ec667..331b9f67 100644 ---- a/src/puppet/dmlite/templates/dome/domehead.conf.erb -+++ b/src/puppet/dmlite/templates/dome/domehead.conf.erb -@@ -29,6 +29,9 @@ head.db.port: <%= @db_port %> - head.db.poolsz: <%= @db_pool_size %> - head.db.cnsdbname: <%= @cnsdb_name %> - head.db.dpmdbname: <%= @dpmdb_name %> -+<% if @iam_normalize -%> -+head.iam-normalize: true -+<% end -%> - <% if @enable_ns_oidc -%> - head.oidc.allowaudience[]: <%= @ns_oidc_clientid %> - <% @ns_oidc_allowaudience.each do |audience| -%> -diff --git a/src/puppet/dpm/manifests/head_disknode.pp b/src/puppet/dpm/manifests/head_disknode.pp -index 79c799ff..47b82d66 100644 ---- a/src/puppet/dpm/manifests/head_disknode.pp -+++ b/src/puppet/dpm/manifests/head_disknode.pp -@@ -43,6 +43,8 @@ class dpm::head_disknode ( - Boolean $xrootd_use_voms = $dpm::params::xrootd_use_voms, - Optional[String] $http_macaroon_secret = $dpm::params::http_macaroon_secret, - -+ Optional[Boolean] $iam_normalize = $dpm::params::iam_normalize, -+ - Optional[String] $oidc_clientid = $dpm::params::oidc_clientid, - Optional[String] $oidc_clientsecret = $dpm::params::oidc_clientsecret, - Optional[String] $oidc_passphrase = $dpm::params::oidc_passphrase, -@@ -243,6 +245,7 @@ class dpm::head_disknode ( - enable_domeadapter => $configure_domeadapter, - enable_disknode => true, - host_dn => $host_dn, -+ iam_normalize => $iam_normalize, - oidc_clientid => $oidc_clientid, - oidc_allowissuer => $oidc_allowissuer, - oidc_allowaudience => $oidc_allowaudience, -diff --git a/src/puppet/dpm/manifests/headnode.pp b/src/puppet/dpm/manifests/headnode.pp -index 93aba0e5..15abd9e9 100644 ---- a/src/puppet/dpm/manifests/headnode.pp -+++ b/src/puppet/dpm/manifests/headnode.pp -@@ -50,6 +50,8 @@ class dpm::headnode ( - Boolean $xrootd_use_voms = $dpm::params::xrootd_use_voms, - Optional[String] $http_macaroon_secret = $dpm::params::http_macaroon_secret, - -+ Optional[Boolean] $iam_normalize = $dpm::params::iam_normalize, -+ - Optional[String] $oidc_clientid = $dpm::params::oidc_clientid, - Optional[String] $oidc_clientsecret = $dpm::params::oidc_clientsecret, - Optional[String] $oidc_passphrase = $dpm::params::oidc_passphrase, -@@ -263,6 +265,7 @@ class dpm::headnode ( - enable_dome => $configure_dome, - enable_domeadapter => $configure_domeadapter, - host_dn => $host_dn, -+ iam_normalize => $iam_normalize, - oidc_clientid => $oidc_clientid, - oidc_allowissuer => $oidc_allowissuer, - oidc_allowaudience => $oidc_allowaudience, -diff --git a/src/puppet/dpm/manifests/params.pp b/src/puppet/dpm/manifests/params.pp -index a7861a22..f574d20c 100644 ---- a/src/puppet/dpm/manifests/params.pp -+++ b/src/puppet/dpm/manifests/params.pp -@@ -61,6 +61,8 @@ class dpm::params { - $xrootd_use_voms = hiera('dpm::params::xrootd_use_voms',true) - $http_macaroon_secret = hiera('dpm::params::http_macaroon_secret',undef) - -+ $iam_normalize = hiera('dpm::params::iam_normalize',undef) -+ - $oidc_clientid = hiera('dpm::params::oidc_clientid',undef) - $oidc_clientsecret = hiera('dpm::params::oidc_clientsecret',undef) - $oidc_passphrase = hiera('dpm::params::oidc_passphrase',undef) diff --git a/dmlite-complilation-dependencies.patch b/dmlite-complilation-dependencies.patch index 058c50c..d98cb92 100644 --- a/dmlite-complilation-dependencies.patch +++ b/dmlite-complilation-dependencies.patch @@ -32,3 +32,15 @@ index d6e6fd0c..1a99edc7 100644 set_target_properties(mod_lcgdm_disk PROPERTIES PREFIX "") target_link_libraries(mod_lcgdm_disk dmlite +diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_ns/CMakeLists.txt b/src/plugins/apache-httpd/src/mod_lcgdm_ns/CMakeLists.txt +index 54b98930..6626469c 100644 +--- a/src/plugins/apache-httpd/src/mod_lcgdm_ns/CMakeLists.txt ++++ b/src/plugins/apache-httpd/src/mod_lcgdm_ns/CMakeLists.txt +@@ -29,6 +29,7 @@ add_library(mod_lcgdm_ns MODULE + ../shared/utils.c + ) + ++add_dependencies (mod_lcgdm_ns lcgdmhtext) + set_target_properties(mod_lcgdm_ns PROPERTIES PREFIX "") + target_link_libraries(mod_lcgdm_ns dmlite ${JANSSON_LIBRARIES} ${APR_LIBRARIES} ${APRUTIL_LIBRARIES} dmlitemacaroons) + diff --git a/dmlite.spec b/dmlite.spec index acccf3a..40ba5d1 100644 --- a/dmlite.spec +++ b/dmlite.spec @@ -1128,7 +1128,7 @@ install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp * Thu Jan 14 2021 Adrian Reber - 1.14.2-3 - Rebuilt for protobuf 3.14 -* Sun Dec 29 2020 Petr Vokac - 1.14.2-2 +* Tue Dec 29 2020 Petr Vokac - 1.14.2-2 - Bugfixes: LCGDM-2948, LCGDM-2949, LCGDM-2950, LCGDM-2954, LCGDM-2953, LCGDM-2955, LCGDM-2957 * Mon Nov 02 2020 Oliver Keeble - 1.14.2-1