diff --git a/SOURCES/0029-lscpu-use-the-first-VM-from-proc-sysinfo.patch b/SOURCES/0029-lscpu-use-the-first-VM-from-proc-sysinfo.patch new file mode 100644 index 0000000..9552768 --- /dev/null +++ b/SOURCES/0029-lscpu-use-the-first-VM-from-proc-sysinfo.patch @@ -0,0 +1,28 @@ +From 6f16035b81cd7feca02d6df8eff1bb954ed7e58d Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 4 Sep 2018 14:30:37 +0200 +Subject: [PATCH 29/32] lscpu: use the first VM from /proc/sysinfo + +Addresses: https://github.com/karelzak/util-linux/issues/685 +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1739443 +Upstream: http://github.com/karelzak/util-linux/commit/350f5c8df2cb6edbfb5bae95f00a9fff446d236c +Signed-off-by: Karel Zak +--- + sys-utils/lscpu.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c +index fd6d63bbf..1aa7bff4d 100644 +--- a/sys-utils/lscpu.c ++++ b/sys-utils/lscpu.c +@@ -866,6 +866,7 @@ read_hypervisor(struct lscpu_desc *desc, struct lscpu_modifier *mod) + *(str--) = '\0'; + while ((str = strstr(desc->hypervisor, " "))) + memmove(str, str + 1, strlen(str)); ++ break; + } + fclose(fd); + } +-- +2.21.0 + diff --git a/SOURCES/0030-tests-lscpu-s390-nested-virtualization.patch b/SOURCES/0030-tests-lscpu-s390-nested-virtualization.patch new file mode 100644 index 0000000..fa71cbc --- /dev/null +++ b/SOURCES/0030-tests-lscpu-s390-nested-virtualization.patch @@ -0,0 +1,206 @@ +From e10bdfc6cd623f02740cf2bcfd9867c56534c5e5 Mon Sep 17 00:00:00 2001 +From: Radka Skvarilova +Date: Sun, 22 Sep 2019 13:49:45 +0200 +Subject: [PATCH 30/32] tests: lscpu s390 nested virtualization + +Signed-off-by: Radka Skvarilova +Addresses:https://bugzilla.redhat.com/show_bug.cgi?id=1739443 +Upstream: http://github.com/karelzak/util-linux/commit/2062164894fffa314ecb7ac99dc6c98062484389 +--- + tests/expected/lscpu/lscpu-s390-nested-virt | 45 +++++++++++++++++++ + tests/ts/lscpu/dumps/s390-nested-virt.tar.gz | Bin 0 -> 7199 bytes + 2 files changed, 45 insertions(+) + create mode 100644 tests/expected/lscpu/lscpu-s390-nested-virt + create mode 100644 tests/ts/lscpu/dumps/s390-nested-virt.tar.gz + +diff --git a/tests/expected/lscpu/lscpu-s390-nested-virt b/tests/expected/lscpu/lscpu-s390-nested-virt +new file mode 100644 +index 000000000..2665fd8dc +--- /dev/null ++++ b/tests/expected/lscpu/lscpu-s390-nested-virt +@@ -0,0 +1,45 @@ ++CPU op-mode(s): 32-bit, 64-bit ++CPU(s): 2 ++On-line CPU(s) list: 0,1 ++Thread(s) per core: 1 ++Core(s) per socket: 1 ++Socket(s) per book: 1 ++Book(s) per drawer: 1 ++Drawer(s): 2 ++NUMA node(s): 1 ++Vendor ID: IBM/S390 ++Machine type: 2964 ++CPU dynamic MHz: 5000 ++CPU static MHz: 5000 ++BogoMIPS: 3033.00 ++Hypervisor: KVM/Linux ++Hypervisor vendor: KVM ++Virtualization type: full ++Dispatching mode: horizontal ++L1d cache: 256 KiB ++L1i cache: 192 KiB ++L2d cache: 4 MiB ++L2i cache: 4 MiB ++L3 cache: 64 MiB ++L4 cache: 480 MiB ++NUMA node0 CPU(s): 0,1 ++Vulnerability L1tf: Not affected ++Vulnerability Meltdown: Not affected ++Vulnerability Spec store bypass: Not affected ++Vulnerability Spectre v1: Mitigation; __user pointer sanitization ++Vulnerability Spectre v2: Mitigation; execute trampolines ++Flags: esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx ++ ++# The following is the parsable format, which can be fed to other ++# programs. Each different item in every column has an unique ID ++# starting from zero. ++# CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i ++0,0,0,0,,0,0,0,0 ++1,1,1,0,,1,1,1,1 ++ ++# The following is the parsable format, which can be fed to other ++# programs. Each different item in every column has an unique ID ++# starting from zero. ++# CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i ++0,0,0,0,,0,0,0,0 ++1,1,1,0,,1,1,1,1 +diff --git a/tests/ts/lscpu/dumps/s390-nested-virt.tar.gz b/tests/ts/lscpu/dumps/s390-nested-virt.tar.gz +new file mode 100644 +index 0000000000000000000000000000000000000000..7992699925395ed8d33b1e1466b74fc1aa235268 +GIT binary patch +literal 7199 +zcmb7|dpK14zsFsYO}nPFYuZ%PMd^Z336(4*TcRer3sNpgD3MZbv80PMNo`w{G9oG0 +zqzEx26v{10($JJUV=(5n*7}?^*}wgq^E~G{&vW`mYx%D4_jCJx-mecD^A|aJ^PPv} +z6bJ7eib<%-zkE8l+t#n8FlzI-@}kEz)axa}w(L)lt9PBsIIOAv%}zn7;nQdi5~WYu +zJ{neZKDMS$*w*%R=W)|!D?0w%vFL^?&s?4AW{mpAeg7e#;9SqG91c9*fS(3`-H^qX +z)Y3P;zr?$Q=%Hctr>gQ-q}_}aRkprjf_!Sec}n^BcIEO=O+sXSYPld#Gv=x#>uuQE8!Mw%zW>{Khm+}=AL~*n*W=aKaa>K@OPx!P +zguV%1Gi}4PWz*(N3z^$bNkO8j|F|199x+Se`nIt}`;Lxl^yalL86sWBl5d$`PJFZV +zNm+ZiQo9+&DG_(p0SmlkLwX; +zO@+n&> +zb%o^pf&LUq1pBnAcfeJ))LRVEyaF(6Pp&pe3IqnMY=o3fvB>ABC4(bBCXz0skmYlS +zi$wF(I?npN{KE=h6QA-xwGq-frF{BXr4A8&CUy|cZ^c%MW~Mr9ewKdOQ~W)bmQfv+ +z`M!l$v}uz|+Fw*Es7>W1S^T-8fkg)C5>7EnE3PN@{FKlTbixS +zfy8@Xn-%}6h;2*oNQt=oW4LRxyKSgZM@z+~wgEAe9^o~KYx~^;O1{4vT_)AJepS20 +z{5hB1V{<^0-xU)e?Qck_kM=cbu1;>R=wTzei5qlT8?qBO46|tLpfP@QIGz~WXcMJ8 +zx_e}~74>b_j2~F(hfVWg?;m~GQQ`PfVKvHR8nJ`V37aE{p2`RgrzGppx2|nz)#B2t +z-sv~R*+k?6;@Cm_udEpTjoW(rbfn1)zP445P3fjpdtH4~T~n47eq`s*7-iBMyPlmN +z!TC0~&#fA(+IUg0R$$j1jW_Z);Au~9@**tU%J^C<+yq_)|)qy7SwoQFR$0X^XdL>exr?jmgB`g3E2;khu^{d +z8B|@1YPMOHKR?l>U_R-S$N7?o7G%w#qhVs +zjvqW;NB3JlI&hmFU5g#K{Y!MH|Ev!+yZR3pw=h*JMtc3JDF<%nT<^EOcHC|Bh2xPd +z$F0K)Lh3brR?MF6_Vm8>`oG1~-L{z7f7)$uY=s8m^iaLueEkRJu}9RF-SqVPj(g2Y +z9$gNynJ!44`~_z>J=Cm3G+pq`@B{OId6+U?pr-%9s$n<1+_U6h35XJ))*!N6w91iJ7lD;tI7KRQ_WvxKq> +z2ey?NHL!93#p3&%TbEh}`{2!3Y}K +z5K^4C@ogOc*m!uJSuXLT#@Hb@I`C|Q#ej-bTu*7`#rR1D#85=Ry?qOEg04iYySqQ} +z(Sn@TLwG<*e}B)0>>`|xhUjqpvR$!}gfE~F(S#62{my+E!Q8eLw+!i9O}goSfAD|n +zJ1>%YemGg=yZ%^Fq;OwFeMWaH0|JFSPRQ96CK-2pTG3&txZFz6RGgz8>bU;T8tLr2 +zAFrj8XIbMS`*$O}mO9Sn8K+|N`0Rxe;XTE}CZLr%vIZ>5{kbSI)Y>X6J4_&Z-@xMg +zYX}L??d34GUXO|7bfe~v$V;so30`?a;|uhn(OxAxSlZPj8i3$@CxtO7I&a5y(H`gD +z;KaE!3#F>oPxMj!Oz?etol7^O7-z!nk*?N)91c4e@7ot!XS+;iXQ}UoLdKT_%e3TaypeAq>>)@BUlb5t~uq@!2HVnAbrp>EvGRZ7pacX-)#p1l+c2)g +z@G2~qs`Yf|g-JyTb)YgVbH02DAvVy7Ib)pl(!Sklxx&O|?BN89H36~IMZmgv;((W7 +zf_5w4f>E|bdmP#HVAi3~s0o6NZiF<2I=DIWMD4Gy{Nr?oApg_g?BCN`5RL4{&jc$9 +zLO4AQh*G@JKVgO>`l#C}YC$9@uf~J_G=<+x!Q1sdq}K*;CKx^ZRiAgZzRQyv!l7AA +zbJ{EBG{A`6YcwyBh@I1Hteamn$IjgC?)$UNmv1Lch*)1iakv~93d7_k4?sVmdTw&& +zZ{GRD(!erWE1I71*|BIrwZP{Vj5+hy6<-$PEM*VyER(R?=k+0X>d)lVi+r8Cxv1_F +z!a`Akdb=7C4(5TQCm_@A!trPQtlDM)(q{&m+UpiHXzQfR@t&f4_yHU#y_%Nib-Y*J +z%LgtrPawbM5{#|Awv=#bF`^_Y)@y~(Azt!JwzAh}ltR$dL@R#9oxew!eVKCb^>(Pu +z{F0ep@bLFesn{tG^Qq)x6t&E6PHv$Zb@By5*fqw!^ydqRDXZ?q3$Miz&kuWZYg?Ys +zx_*BLSHoO!)|5IZii#zuHiwxdk%22jT~uPMs%cDh=%R +zPkr#DQTlAV_kPQu_WZdX+31`_5Ha;v`0|j7Gi)sz7tLT2=$l3&CTxOpV&gc_z3{Bh +z=;INLq1HeY@1#h4JY_E;F(-BMIqDwa^K@{mYz%z^i{vG;LZIbCG#^pv1=(WSLx}D{ +zZ^-r<97pO?=)R$Szmz3I&N&gXJ&fph7(*x@1j-shOCCoH`piKw6Q+HKpC8mE!td{H +z@f)OU-z=2=YZojc3%OmSYY?QccaC#j4|`g9E@2gJjz#&O*KYMtzdpk7aGy$RqRtgiSU&8PZD%HKwJ%-39g4vXA^vlCM +zg8oUVX)7!oMLbCJst&-^V$(bIptR&7FsCp@T15rImUZ!R&u+uC5zI+#kc*1fh7}U2 +zqk3Qw9)i_&biZ;pCDZ-B8+|D!MAg3j;dW6ssrb_Xn#zN?%}O87VOp0W1Wsx<$ox!5 +z=(lVZ)~6LY7hN~l*{avd=DC2fdeYBG=u9=8hEKaBpsDG>0J)UqR%;a9+_tM0$x56$ +zK2+Ejb{1!Kqe^#EaIGyO`C+*kt~o$&%#J_G^xXSfn|5T)ciol#oRZ6dQktj%nZEQ9 +z$8%7?@@_Tsb?lJ8`ohav&Zian2!@HU6P7OC{X+hQbp#*A77(*P3(!)c#}#O5FXrLb +zHiePq!zm5t)RTD_ZDrsUjHX&t1!@}3131(Hb^CcKqA~)7J8f~N!-|=j-rcZgu?5+- +zWbb^2&$aTonPZMq#g0_*=ApR(Y!BamzKh^6ub +ztsu7*$_V5d{46diPU(UQ30)-~&S(VVltD0)G88bfALPJ!9Bn{Uc9S<^0JQ^J^%(gH +z)SuXR4T8tvUJjIlMTJoqUhg(2Kr(^h42W7$6{-icMA#|Yf;9Sq7)CHHwN5yl@bxp4 +z;^ZAzB0s?PZjK{@g|HYdOzGvEDC$R70Br(IE;k?!djKn1jHnKBktaaGQL=oH5dw{e +zW%5!ej4C0NC%^@>2oDq8t8yd_hjTJVNUMSxVJ1PE@mHAGN#^1c0y#gynj(TPlk1XD +z^(Vk0U12kT(}%I^HzdM#1>uzWVKbUtFir~4jfCKW$4%*4=_S{zHzA?bKsANj?nBOFBK5FtR+CJmGY0}+Aj22SSTK89kQP$7zzc|-OfVL!AF +zIF*5wVmI1BdS@p7xxv5QPChH+F>*g0{%5}%VE!{HE*NqHcu&aUC7qoN4_O5u8e>LKRqWtQLg_e%1wK5OwfJAJNk_ZHh~~W4EDby2 +zx?Uo1T~?4#5^jUh3$O)^4^dr44;V#2++_;8Gz2F)1{gVhVOp`NKBG~!Z1$&?l=yOL|^alV4lq9Adf>SiV?_lJb_!zTCcL;K$iyMymO +z7e+W|NH5zJ~z2U2q$vu}`kyw-H;qgql2tyX75 +z@YjE?hO{B1M~$quPVm$C9~jZ#OfZIept3fuH5xj+nEhtsj`G(BI4g*_G;Bd`G~0%t +z2}dxxy7o8JvW7EDy0FxSV2y5-HE0Ye$ZddSD^ZJQLST%+MOCr`DvXjjw32dejQVdo +zE=389%BhwhDwBlZvqQY;)mBJ+J?3O7>#bWM?g1IIuYlYG{v}hgVa(-oGSg7EO8sbN +zmbcP=n?m##y9(>w!B~AFRPZr>^^@RFdXUy;oIlfz>_!6G+YF2+6|nl#^W(g$eer}J +zaHMZZVMq7nm2%xebYT*nCO`0#Av{c4OH5L}a8$?m2-OZ!NUhSS;B!{h#Q4}eceqi$ +z{(zwVN1ud6l9<}9+cP|F-D*@dRG_YDLf1M~HrwZ~AD7E7fV6t_yUP^;suu2CSAC;2 +zFMa@JPx#w>TD8GpUp;C;2uJKH +z*)^C!yrMS`?scQnF5zsCPFI>?Xhd!kdw<=DbA{>?OO4mz$_f%KnUSk;dh+Ws!uLE; +zUxjX63^5l;A~^N`B!cQOB(iMirv}%K&VARqrj`9&0Y}tGrO9nZ3+uQZCOUs5?EC9$ +zewNam0Vkz5aDR&_>}qBbX&DbZW=5C;^4$Y0O{F}81rng<6Z?nQdjkk96%XimsEijp +zlfBqR(5I8nRlC5@ej>0_j2OdtSqI$Mi+&=IDj<=BXRx^!jVF*q*rM=Rb~YGCm%bLK +zE|p^vY}FfNXC3Dm+#5$aCFqrZ7=kXLIpa=C$k;w36FGs^d*okRIf0J7O2;F>H9-3t +zJBoKWMay)byg@KgJahg4Ths0}CxE*BG|t2cwv02YInLBK9|=wy5p7aU(Dj|cq9FI9 +zj1q>1NCAv)iu>7tk)oZ#33do|`&egP_3u?#;SUWU7#yvI7Ac8b|#&x27nxzo7S4;LbOic}O={O(eHm@L`vAV7W? +zG+##5{Bp?DpX}m0I6x0p%@m6msua@fMNoZWP~fDUVw}i0Q|`Cm#GP!HY?M<$Q1ll; +zE2#k}Q@&v)`Pasb?hQS|n)^LXIf)4~JX*n%ur14lY13a(PAZ?A7fcQi +zXDjs`tW%QT9JSoL+~2ZLI=sHF9m*mI&$4`$ObPvpOC!hnXY79M=Bf}-OfZD#=!OW0 +zzG&JtwR7!)Dya7tG02U@5>_;hZtpxizHV4<_;3!?o(PM5^==e>@Y{Sb@|#~2EHfzk +zD23ZVzo9^qk4zS`CG6Kz?JU34LE6^q*yKA>DyM2B@v)pQ9J2ltI>A@gXpboBe`Nn+ +z9!5g541dzW$}8;Ww7}Z!0=DX2-1>+Kvh|`eO>rjWN+vFB3*fY2IpgGz^4Ey2PR+TD +zO+5RniAfhoNhjA-p=3zOnit5#mW%u}$Z;IG2(n-&;r{;@5s;rJlI={U^FQ^IcMd1z +zQoTxk5Y?T8hfidLviY<+i0DCoYLQ?X*XkDMwKvVsY=52==HQogHCNSaU{fqX}A +zkOf3i5~Z8ec8W?qpK2zBt#x4IOq1bAFT}|HBZLZ!uJVag{r_gU@1(IZnIvx%i34&3 +zG6WQOlW$ucn5{ +zu#r4nZ8C?>1TsF!93;4qT#yLcen!DT$|(Sf*omYBu8iP(!0F1rxhlud078RwD2^1{ +zbScsem#hC9xGC}=LhSS(0Fc3!Ozlw_yZi%gRPywPbX+(LW`weA +zEFzOfdOir-UZwI`T9wOJxz}oztS|i|7-R6@;6*#ok{6-{g?s;*@}_2Uv{qe8cn86y +zqicY1-V@6RBwnm(=ia?VusaD)Ebt1>_H?dGc;c1&=u|+?JnroMx?@Ins4+Vi`Xs;H +zxMI22>>g&?(t}_vaI<_mps%ZS8V?QG4PLpQzZzqE;6qRdzKl^LT7D-a)JR(x!TZ=k +z?dytfLT>BSXu?3(n}Ap2?1u?n&x;Vv@%29Y+Xlx3e1}V=y9CQhziKBB^>_Wf)#PO` +zF8U)R*4#HF?~wL4tSdeTeQs=78xgG)j#oQW57^&E95>#5vhURCtkw5VZK`Xk&bT&1 +zDNvtLYBFDgSN|l^TaXlxioC*oA0zDS%pDFCi}6bK5pfSYpKlPFe(-V51UhuD!#hE5 +z-ev!n8NEtgs#6s#-+x@-qa1s7{)Y0t2GQ)ZpC8&H37Qux_v9XW*HR;$Z`9--UOvG@ +zN8Cg6k1gt$p}P1M+T)hj;ii~S$KNj~R9+sdq15rK_Gmt@l!%YKHC^p?26q4MyKOpS +zFG^{559{WcKJ%+R>R(W^BjNp>vju{>TJBCkgx1>1=E{XW#~1rp9c@0gbW9M+*?z&; +zC2`K+e0u%1gndpubJxx;oNs$%b?Uaopn0OU+}vH+ZRx5!#)gwmw|x(In7(ONilSDEPQvdhzHIdew_fehzWdhp?ygHR<_H*HnYnEbAHb?&~xyc{O3f+*9uFTKMvF +zOWY$j`sKWp_@3SpdrSPL!EwhA;W@>7LNsed2X9orUF3O_dQMXBfb^7c)|`OTj?||= +z>JK)}W5Ln`KsT52lzut=IldpL$5-#qw2~ZQRlOi`T4AOL4LrQ7Q+}hHwZQ4)?>eWB +zZ5Tz?K12n%7Fl?;6s7wqJ~XS?Uw`UIsq5ZBhkVI{9p*~glkC5Jm0?<7`R3sCj!O{rZCCd0~ +zIIr9HSXh2}4>6kYz*oeOv?y08gcqc}7m0WhoN;$*01PN)0?WW#g1&9vQ@sVI5Kf_C +zL>l?0hn+7spQ(~U>losD5eLlqAfdy(%#t?GLy6<$L^6L29Lq3xwx$K4U*Zn3D=@?| +zMzb7aQ@m<8CnoBXaIMdn(-j^nxu34&C}%xS1E*Qw6P}-@p$O&tK5Aoc8 +zfs~KVRBB*Tt!u%>X>Vp~!pk@2x+z{wPlh4FCEgkQ=`U`fZ&mLb*y~xkKEqoj;5%~* +zIEoyZ8b$57IueL^y$@dA-1pFJKzVIq)g$6L&iXc!0}~a7_IHKP+K+Z0E%|!-<5&GN +zjw<3>&t*$l#oLY5zpl*rh#JY3yY@oXynfc^+#yH3=Th6Y4>g=J8YcKlFT!$u~ +zU}h$^s+Aj*!kGRmg5qdO&I&L3*^3Ul-?>~uq%5kE(CDVnT(u4M-CNUBNu%BUi2BJ! +zPh2=Jj;*RtaKQNx;WG2G9dMOuN8=8i|I6T(=e2y0NWti}1f_5D7?+p(_g_E(Hg(Yb +L#Syu9MY;b1+Xr6l + +literal 0 +HcmV?d00001 + +-- +2.21.0 + diff --git a/SOURCES/0031-chfn-don-t-append-extra-tailing-commas.patch b/SOURCES/0031-chfn-don-t-append-extra-tailing-commas.patch new file mode 100644 index 0000000..256b95f --- /dev/null +++ b/SOURCES/0031-chfn-don-t-append-extra-tailing-commas.patch @@ -0,0 +1,43 @@ +From 90d4faece26c328c40336a0e02b875515c503e30 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 19 Aug 2019 14:03:07 +0200 +Subject: [PATCH 31/32] chfn: don't append extra tailing commas + + # grep kzak /etc/passwd + kzak:x:1000:1000::/home/kzak:/bin/bash + + # chfn kzak + ... + grep kzak /etc/passwd + +old version: + kzak:x:1000:1000:Karel Zak,,,,:/home/kzak:/bin/bash + +fixed version: + kzak:x:1000:1000:Karel Zak:/home/kzak:/bin/bash + +Reported-by: Filip Dvorak +References: f723cbf544a7eac2927634f2cb6d802437a2d519 +Upstream: http://github.com/karelzak/util-linux/commit/9210c0d225fd808da451d86055bf243a8b47a525 +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1743555 +Signed-off-by: Karel Zak +--- + login-utils/chfn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/login-utils/chfn.c b/login-utils/chfn.c +index c5312fa0c..4f32604c5 100644 +--- a/login-utils/chfn.c ++++ b/login-utils/chfn.c +@@ -377,7 +377,7 @@ static int save_new_data(struct chfn_control *ctl) + ctl->newf.other); + + /* remove trailing empty fields (but not subfields of ctl->newf.other) */ +- if (!ctl->newf.other) { ++ if (!ctl->newf.other || !*ctl->newf.other) { + while (len > 0 && gecos[len - 1] == ',') + len--; + gecos[len] = 0; +-- +2.21.0 + diff --git a/SOURCES/0032-tests-add-new-test-for-chfn-gecos.patch b/SOURCES/0032-tests-add-new-test-for-chfn-gecos.patch new file mode 100644 index 0000000..646efc0 --- /dev/null +++ b/SOURCES/0032-tests-add-new-test-for-chfn-gecos.patch @@ -0,0 +1,83 @@ +From 447b7d7222bf8cb3591d611aa51917bd4453f8d6 Mon Sep 17 00:00:00 2001 +From: Radka Skvarilova +Date: Mon, 16 Dec 2019 10:57:32 +0100 +Subject: [PATCH 32/32] tests: add new test for chfn gecos + +Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=1743555 +Upstream: http://github.com/karelzak/util-linux/commit/02238bff663ce5fe823980d8119f3871cc348764 +Upstream: http://github.com/karelzak/util-linux/commit/b2ef43864f24b1a9c0c67fe2a7177a5110da1b6e +Signed-off-by: Karel Zak +--- + tests/commands.sh | 1 + + tests/expected/chfn/gecos | 6 ++++++ + tests/ts/chfn/gecos | 36 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 43 insertions(+) + create mode 100644 tests/expected/chfn/gecos + create mode 100755 tests/ts/chfn/gecos + +diff --git a/tests/commands.sh b/tests/commands.sh +index 93100caf6..b56381c9e 100644 +--- a/tests/commands.sh ++++ b/tests/commands.sh +@@ -104,3 +104,4 @@ TS_CMD_UUIDPARSE=${TS_CMD_UUIDPARSE-"${ts_commandsdir}uuidparse"} + TS_CMD_WHEREIS=${TS_CMD_WHEREIS-"${ts_commandsdir}whereis"} + TS_CMD_WIPEFS=${TS_CMD_WIPEFS-"${ts_commandsdir}wipefs"} + TS_CMD_CHRT=${TS_CMD_CHRT-"${ts_commandsdir}chrt"} ++TS_CMD_CHFN=${TS_CMD_CHFN-"${ts_commandsdir}chfn"} +diff --git a/tests/expected/chfn/gecos b/tests/expected/chfn/gecos +new file mode 100644 +index 000000000..af7b81b6c +--- /dev/null ++++ b/tests/expected/chfn/gecos +@@ -0,0 +1,6 @@ ++Initialize user ++testuser_chfn_test:x:9899:9899::/home/testuser_chfn_test:/bin/bash ++Changing finger information for testuser_chfn_test. ++ ++Finger information changed. ++testuser_chfn_test:x:9899:9899:test_gecos:/home/testuser_chfn_test:/bin/bash +diff --git a/tests/ts/chfn/gecos b/tests/ts/chfn/gecos +new file mode 100755 +index 000000000..aad27d40a +--- /dev/null ++++ b/tests/ts/chfn/gecos +@@ -0,0 +1,36 @@ ++#!/bin/bash ++ ++# ++# Copyright (C) 2019 Radka Skvarilova ++# ++# This file is part of util-linux. ++# ++# This file is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This file is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++ ++TS_TOPDIR="${0%/*}/../.." ++TS_DESC="gecos" ++ ++. $TS_TOPDIR/functions.sh ++ts_init "$*" ++ ++ts_skip_nonroot ++ts_check_test_command "$TS_CMD_CHFN" ++ts_check_prog "useradd" ++ts_check_prog "userdel" ++ ++ts_log "Initialize user" ++useradd -u 9899 --shell /bin/bash testuser_chfn_test ++grep testuser /etc/passwd >> $TS_OUTPUT ++$TS_CMD_CHFN -f test_gecos testuser_chfn_test >>$TS_OUTPUT ++grep testuser /etc/passwd >> $TS_OUTPUT ++userdel --remove testuser_chfn_test &> /dev/null ++ts_finalize +-- +2.21.0 + diff --git a/SOURCES/0033-tests-update-lscpu-test-for-RHEL8.patch b/SOURCES/0033-tests-update-lscpu-test-for-RHEL8.patch new file mode 100644 index 0000000..8ba4702 --- /dev/null +++ b/SOURCES/0033-tests-update-lscpu-test-for-RHEL8.patch @@ -0,0 +1,83 @@ +From b30f84e240bd60a23508797e33a4777cbaa50949 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 17 Dec 2019 10:53:47 +0100 +Subject: [PATCH] tests: update lscpu test for RHEL8 + +The test is originally from upstream (~v2.35), but RHEL-8 uses older +version with a little different output -- RHEL-8 has no vulnerability +fields and it counts cache sizes in different way. + +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1739443 +Signed-off-by: Karel Zak +--- + tests/expected/lscpu/lscpu-s390-nested-virt | 57 ++++++++++----------- + 1 file changed, 26 insertions(+), 31 deletions(-) + +diff --git a/tests/expected/lscpu/lscpu-s390-nested-virt b/tests/expected/lscpu/lscpu-s390-nested-virt +index 2665fd8dc..a6ab04f0b 100644 +--- a/tests/expected/lscpu/lscpu-s390-nested-virt ++++ b/tests/expected/lscpu/lscpu-s390-nested-virt +@@ -1,34 +1,29 @@ +-CPU op-mode(s): 32-bit, 64-bit +-CPU(s): 2 +-On-line CPU(s) list: 0,1 +-Thread(s) per core: 1 +-Core(s) per socket: 1 +-Socket(s) per book: 1 +-Book(s) per drawer: 1 +-Drawer(s): 2 +-NUMA node(s): 1 +-Vendor ID: IBM/S390 +-Machine type: 2964 +-CPU dynamic MHz: 5000 +-CPU static MHz: 5000 +-BogoMIPS: 3033.00 +-Hypervisor: KVM/Linux +-Hypervisor vendor: KVM +-Virtualization type: full +-Dispatching mode: horizontal +-L1d cache: 256 KiB +-L1i cache: 192 KiB +-L2d cache: 4 MiB +-L2i cache: 4 MiB +-L3 cache: 64 MiB +-L4 cache: 480 MiB +-NUMA node0 CPU(s): 0,1 +-Vulnerability L1tf: Not affected +-Vulnerability Meltdown: Not affected +-Vulnerability Spec store bypass: Not affected +-Vulnerability Spectre v1: Mitigation; __user pointer sanitization +-Vulnerability Spectre v2: Mitigation; execute trampolines +-Flags: esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx ++CPU op-mode(s): 32-bit, 64-bit ++CPU(s): 2 ++On-line CPU(s) list: 0,1 ++Thread(s) per core: 1 ++Core(s) per socket: 1 ++Socket(s) per book: 1 ++Book(s) per drawer: 1 ++Drawer(s): 2 ++NUMA node(s): 1 ++Vendor ID: IBM/S390 ++Machine type: 2964 ++CPU dynamic MHz: 5000 ++CPU static MHz: 5000 ++BogoMIPS: 3033.00 ++Hypervisor: KVM/Linux ++Hypervisor vendor: KVM ++Virtualization type: full ++Dispatching mode: horizontal ++L1d cache: 128K ++L1i cache: 96K ++L2d cache: 2048K ++L2i cache: 2048K ++L3 cache: 65536K ++L4 cache: 491520K ++NUMA node0 CPU(s): 0,1 ++Flags: esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx + + # The following is the parsable format, which can be fed to other + # programs. Each different item in every column has an unique ID +-- +2.21.0 + diff --git a/SOURCES/0034-tests-fdisk-make-sure-we-use-the-same-sizes-for-MD-d.patch b/SOURCES/0034-tests-fdisk-make-sure-we-use-the-same-sizes-for-MD-d.patch new file mode 100644 index 0000000..99cdd50 --- /dev/null +++ b/SOURCES/0034-tests-fdisk-make-sure-we-use-the-same-sizes-for-MD-d.patch @@ -0,0 +1,91 @@ +From 60f97394878d8b540ee6a4fb9c9edaae2f90d0d0 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 17 Dec 2019 18:10:31 +0100 +Subject: [PATCH] tests: (fdisk) make sure we use the same sizes for MD devices + +It seems on some kernels MD can return error if the devices in RAID +have different size + + # mdadm -q --create /dev/md8 --chunk=64 --level=0 --raid-devices=2 /dev/sda1 /dev/sda2 + mdadm: RUN_ARRAY failed: Unknown error 524 + + # dmesg + ... + [ 1485.148435] md/raid0:md8: cannot assemble multi-zone RAID0 with default_layout setting + [ 1485.152306] md/raid0: please set raid.default_layout to 1 or 2 + [ 1485.154050] md: pers->run() failed ... + [ 1485.154104] md: md8 stopped. + +Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1784534 +Signed-off-by: Karel Zak +--- + tests/expected/fdisk/align-512-4K-md | 12 ++++++------ + tests/ts/fdisk/align-512-4K-md | 4 ++-- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md +index caca03154..3690c04c2 100644 +--- a/tests/expected/fdisk/align-512-4K-md ++++ b/tests/expected/fdisk/align-512-4K-md +@@ -16,7 +16,7 @@ Created a new . + Command (m for help): Partition type + p primary (1 primary, 0 extended, 3 free) + e extended (container for logical partitions) +-Select (default p): Partition number (2-4, default 2): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): ++Select (default p): Partition number (2-4, default 2): First sector (51199-102399, default 51200): Last sector, +sectors or +size{K,M,G,T,P} (51200-102399, default 102399): + Created a new . + + Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors +@@ -27,8 +27,8 @@ Disklabel type: dos + Disk identifier: + + Device Boot Start End Sectors Size Id Type +-1 2048 43007 40960 20M 83 Linux +-2 43008 102399 59392 29M 83 Linux ++1 2048 51198 49151 24M 83 Linux ++2 51200 100350 49151 24M 83 Linux + + Command (m for help): The partition table has been altered. + Calling ioctl() to re-read partition table. +@@ -49,16 +49,16 @@ Created a new . + Command (m for help): Partition type + p primary (0 primary, 0 extended, 4 free) + e extended (container for logical partitions) +-Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-100095, default 100095): ++Select (default p): Partition number (1-4, default 1): First sector (2048-97791, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-97791, default 97791): + Created a new . + + Command (m for help): Partition type + p primary (1 primary, 0 extended, 3 free) + e extended (container for logical partitions) +-Select (default p): Partition number (2-4, default 2): First sector (22528-100095, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-100095, default 100095): ++Select (default p): Partition number (2-4, default 2): First sector (22528-97791, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-97791, default 97791): + Created a new . + +-Command (m for help): Disk : 48.9 MiB, 51249152 bytes, 100096 sectors ++Command (m for help): Disk : 47.8 MiB, 50069504 bytes, 97792 sectors + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 4096 bytes + I/O size (minimum/optimal): 65536 bytes / bytes +diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md +index 7f60a654f..68aaff0b7 100755 +--- a/tests/ts/fdisk/align-512-4K-md ++++ b/tests/ts/fdisk/align-512-4K-md +@@ -41,12 +41,12 @@ n + p + 1 + +-+20M +++49150 + n + p + 2 + +- +++49150 + p + w + q +-- +2.21.0 + diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec index cf2d224..22178a1 100644 --- a/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.32.1 -Release: 17%{?dist} +Release: 22%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -44,6 +44,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: bison +BuildRequires: git-core ### Sources Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz @@ -148,6 +149,18 @@ Patch26: 0026-partx-document-d-vs.-nr-and-fix-test.patch Patch27: 0027-libmount-improve-mountinfo-reliability.patch Patch28: 0028-libmount-use-fmemopen-in-more-robust-way-coverity-sc.patch +### RHEL-8.2 +### +# 1739443 - lscpu reports wrong hypervisor in nested virt on s390x +Patch29: 0029-lscpu-use-the-first-VM-from-proc-sysinfo.patch +Patch30: 0030-tests-lscpu-s390-nested-virtualization.patch +# 1743555 - command chfn adds some useless commas with GECOS information into /etc/password +Patch31: 0031-chfn-don-t-append-extra-tailing-commas.patch +Patch32: 0032-tests-add-new-test-for-chfn-gecos.patch +# 1739443 - lscpu reports wrong hypervisor in nested virt on s390x +Patch33: 0033-tests-update-lscpu-test-for-RHEL8.patch +# CI fix +Patch34: 0034-tests-fdisk-make-sure-we-use-the-same-sizes-for-MD-d.patch %description The util-linux package contains a large variety of low-level system @@ -329,7 +342,7 @@ chfn and chsh utilities with dependence on libuser %prep -%autosetup -p1 -n %{name}-%{upstream_version} +%autosetup -p1 -Sgit -n %{name}-%{upstream_version} %build unset LINGUAS || : @@ -1013,6 +1026,22 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Tue Dec 17 2019 Karel Zak 2.32.1-22 +- improve CI tests portability to rhel-8 kernel + +* Tue Dec 17 2019 Karel Zak 2.32.1-21 +- add git to BuildRequires due to autosetup -Sgit + +* Tue Dec 17 2019 Karel Zak 2.32.1-20 +- fix spec file typo + +* Tue Dec 17 2019 Karel Zak 2.32.1-19 +- fix test for #1739443 + +* Mon Dec 16 2019 Karel Zak 2.32.1-18 +- fix #1739443 - lscpu reports wrong hypervisor in nested virt on s390x +- fix #1743555 - command chfn adds some useless commas with GECOS information into /etc/password + * Sat Sep 21 2019 Karel Zak 2.32.1-17 - fix error path in mountinfo patch (#1751447)