From 8cbaa2a560457d44072047d484370c377a1b3a8f6f2508ff2b76a1bbd33a20db Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 26 Jan 2015 19:44:12 +0000 Subject: [PATCH] Accepting request 282506 from home:AndreasStieger:branches:devel:tools patch 2.7.3 [boo#913678] [CVE-2015-1196] OBS-URL: https://build.opensuse.org/request/show/282506 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=44 --- error-report-crash.patch | 98 ------------------ patch-2.7.1.tar.bz2 | 3 - patch-2.7.3.tar.bz2 | 3 + patch-2.7.3.tar.bz2.sig | 17 +++ patch.changes | 26 +++++ patch.keyring | Bin 0 -> 21924 bytes patch.spec | 42 +++----- ...-print-function-01-drop-useless-test.patch | 22 ---- ...nt-function-02-handle-unified-format.patch | 51 --------- 9 files changed, 61 insertions(+), 201 deletions(-) delete mode 100644 error-report-crash.patch delete mode 100644 patch-2.7.1.tar.bz2 create mode 100644 patch-2.7.3.tar.bz2 create mode 100644 patch-2.7.3.tar.bz2.sig create mode 100644 patch.keyring delete mode 100644 reject-print-function-01-drop-useless-test.patch delete mode 100644 reject-print-function-02-handle-unified-format.patch diff --git a/error-report-crash.patch b/error-report-crash.patch deleted file mode 100644 index 9f5b057..0000000 --- a/error-report-crash.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Thu, 4 Oct 2012 12:33:09 +0200 -Subject: [PATCH] Initialize data structures early enough - -* src/patch.c (main): Initialize data structures early enough, before error -paths can access them. -* tests/bad-usage: Test bad command line usage. -* tests/Makefile.am (TESTS): Add bad-usage here. ---- - src/patch.c | 8 ++++---- - tests/Makefile.am | 1 + - tests/bad-usage | 18 ++++++++++++++++++ - 3 files changed, 23 insertions(+), 4 deletions(-) - create mode 100644 tests/bad-usage - -Index: patch-2.7.1/src/patch.c -=================================================================== ---- patch-2.7.1.orig/src/patch.c -+++ patch-2.7.1/src/patch.c -@@ -150,6 +150,10 @@ main (int argc, char **argv) - else if ((version_control = getenv ("VERSION_CONTROL"))) - version_control_context = "$VERSION_CONTROL"; - -+ init_backup_hash_table (); -+ init_files_to_delete (); -+ init_files_to_output (); -+ - /* parse switches */ - Argc = argc; - Argv = argv; -@@ -162,10 +166,6 @@ main (int argc, char **argv) - if (make_backups | backup_if_mismatch) - backup_type = get_version (version_control_context, version_control); - -- init_backup_hash_table (); -- init_files_to_delete (); -- init_files_to_output (); -- - init_output (&outstate); - if (outfile) - outstate.ofp = open_outfile (outfile); -Index: patch-2.7.1/tests/Makefile.am -=================================================================== ---- patch-2.7.1.orig/tests/Makefile.am -+++ patch-2.7.1/tests/Makefile.am -@@ -20,6 +20,7 @@ TESTS = \ - asymmetric-hunks \ - backup-prefix-suffix \ - bad-filenames \ -+ bad-usage \ - concat-git-diff \ - copy-rename \ - corrupt-reject-files \ -Index: patch-2.7.1/tests/Makefile.in -=================================================================== ---- patch-2.7.1.orig/tests/Makefile.in -+++ patch-2.7.1/tests/Makefile.in -@@ -1075,6 +1075,7 @@ TESTS = \ - asymmetric-hunks \ - backup-prefix-suffix \ - bad-filenames \ -+ bad-usage \ - concat-git-diff \ - copy-rename \ - corrupt-reject-files \ -@@ -1294,6 +1295,8 @@ backup-prefix-suffix.log: backup-prefix- - @p='backup-prefix-suffix'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) - bad-filenames.log: bad-filenames - @p='bad-filenames'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) -+bad-usage.log: bad-usage -+ @p='bad-usage'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) - concat-git-diff.log: concat-git-diff - @p='concat-git-diff'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) - copy-rename.log: copy-rename -Index: patch-2.7.1/tests/bad-usage -=================================================================== ---- /dev/null -+++ patch-2.7.1/tests/bad-usage -@@ -0,0 +1,18 @@ -+# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+. $srcdir/test-lib.sh -+ -+require_cat -+use_local_patch -+use_tmpdir -+ -+# ============================================================== -+ -+check 'patch -px || echo "status: $?"' <w&fQ`gY!R?QfrR ze$M&h>CxR!)u_5hbs8uFxDww~AqX;HJgdMC(?BZ;f_CU@SP+!U2~=gX8evZ5kb@8# zIede(MnpWl4szCF2Z4k1m6Xf&N3X9I0-(#k1wR5wOfm|KH~m)#8J%2*>k#|q%1^RB zy?iU_r4f)&PMePVPTbpAY99>eMr$TjhorUCn#4;_ML(AG>T<#YVaR3}F-|2|D_at9 z-rN6E5%<5 zLQYC$+yQ6Yew5pjD8?3(1WbH`W(-+R6iB}|_sQn^!*;T8&)G;#h>7LPX+P}|#L4;B zreiH~QSv6~!U3_bC4SL(IfdNAPw3{2wPCFE3ccxhCmillniY?tm33f=^q0nhKUHku zu+4mwatD4eBOjSBSLHtm6b+jj**xIdZ}KZp_d}7?25)7se&y>mX&4l;g&!*V_E|us zg{lNDC1lBECqaQ$hOOsVdRbAGJ6hcYlv2V6%g;Wum_wh!@+|dWazpm~C|i$fVmfZ) za|nO7cNZ@MUAa=T8M^ZDg}jIB2q}Y+?D=I$FM*^+6l`qyFJDzpqTJlLz>h4Ft`Liy zK%MSx9i=8PFEVD_dy^)Wm0B)?hkE9L+tnY;l(gfobB~hqACWk%M1|v@NBX_tATWIa zZk>XWS8jPncsoMrTzf5pn)m<|5CBL6tB{?Eld0inA_*rKQ#&I=V+&I!B0j^v|70-# z?>`02Z4E7L7>w<01;Rmvz|lZJ0kohWz#w2iHd*~4;b5Slz(64}ph00^;lMFL!9YL> zKtQqlAwZS*X6Qk2Kmf2X$bG|<<9Z)B78vG{0b_|s$>(`cxY?t8m6`qID`D+mfYy$= z!d4HoU)5qWQrxU%%ZoZrY~S_a#97h(X~~Yxe?%d(dlwJ9+7`;j`(HfQF~N$-d0qvDIzjHqv64Qk+nI9FW>2 zR@(!)wb#R#`mx{d_H*;`>SQa2CNW$J9em-WPpO6#@{46aXp6c)9|#Tz9w&E!H~vo# zFY#N88rg~B?MyIld7I@?Sd&lujg-rhyqJeShLB{%v&pKB zt;l|1Q5nXISgjWAOm{C#+Nq=qFG&#>T_%^Z_g)*b&_v^UBTLiFqlLL>g<{Gxp`5$* z6|T`0dh?ghgoC1eu7o*(cM=UMVvkr$$Q@LiUj&ce?T(~g2qYHh#1w)6n4N*!%H&~5 z4bf=Gs|P*1b>1UnR!ljfQewbsROCi#eC3^}N{8PCqKb5$Okk^e`khJ|$*7}wO6^Kw zlC8jNg2PU_a#~2j0~*K(@OYTpB}hsAAil~_IhDCG8y8RI58}wD1on#ae%r5Hx$kLZ z&A^i0H1{HmE$-)qSTx6^MJ<=)2r%pC z6y;p2vX=_06IC)N%$U7|bonKI0b3I$4vvfh3V?h!$ZX)dJ8t)#UYZ?MXWXm-Ia!n} zTpn37C?EL6Wz*3#OrU9~fK7B)F!<7)}~H& zrZx=rPUdf>75K}vRPR@uPWgYg?w^ir$wLNIz>4pmf)n_PRVnYfc&b1^)wkDSD9dME z8e58&$%pHbnry~@9;Wm4{z~qNKj&y3`m71HqfEPw>*OBcOXrw#m!7iY2fOrxghII# z7MY4P;s&GWw`-1avbmrsL7!Yn9PVjp_wEig$`R&-MRihg0q1HO@^Q;h?QnDo6a&58 z*X@z-%LH&?i35A=Zew$hUBBuM9|ptth0*j}aeq5hq-pD?fXw8s9Ipf@h^e|PtOl;v z33UyY1+wtXYY7=ANoqf@ggJFBOy!c`IX>gtv!2?si!V|>L$mL*z07!3BJ%W0uF0J@ zG2Us4X^LJE%BMpCL)V-$h9{d@EI}c$jSL-kJ*_rF&bZ48PG9ny?BSHAXKjXim~e))$tO{wYBJ z1@V#bLH6OQsL1Q;v?_i^P!OQEQwu?PQchF_`{6*XfwdEp!j&G8-80Lv0u>$c>Xbbq-ROeWV#Q?wZ&x&gpX;ex74A?r7(M)Gm*Qc{-S3m6MhLzE;_=|<6{m`cEZfsa??%$fD;Ao7~F=^ff zj>`z(^g5O|u=VP*Rtu2>Ru2Z!qWqr1`8U)Ln9bB1ZeX>%wrN4Wv2al!jn9lvi z%1*m%swV5ebap5H-2F6eQ2C+ojIbB5kqn^Qf-sN0$#DC?PwPyFV=kbe`K>q?_bCl_ z&VS9y1LGJJ3zPors@UgOV}3~{nI_lqH=FFI-Q)4X$5KU1p&|>+{zaV9CqE}N~CPeb&E}u>TNg_Ct{z{&;nu3##!DdmH4~^1ew|9R(0os^P@hvF&j?U0y z)%BHi79x@$4E?9RFYUR+(ha}sXV<2k4~GOqV+}IqG_2>dnYpQXJfdeE0;F(OO3i&- z1siq-r4WhVG-KJ8Ub!I7gNSW2sB>?IzaOt7d||lbnZ+exLb%#iAUU$mIBfcaKg&tS zNXhpdVZX5>z^Sgag+e;Do#A!loC1z&fiZBElGCaf>L|}ht5}8{wC0;ti9j4s-GktV zJ(n)g>^b+{-AG5~ELY#A^Y@x*VX!WT)Z+$3I2d6lPWhT=ZU;|x_bl#h_wUH^u7qlE z1d#c6_jh4m#oe&h(oEXIfD^-dwTDWxNUWwy@=K1k;O9JGQ@FQ_he1+yU~mH1>g?Yi%VkmRt>OB!R#ygse|I-k)`y ziCkPHwoXVNb<`$|zphrlK{d4C)(t=w8Fydn5|5<&L#O2_Z$9|JE?(uS18I;`X(iIx zC-)LFAcvU2D?0R>JkpCZ-v<@-j!HF1DrW!@=oj}L#TI|Da@vB-L+u*pjM(1&Hb?Pb zy3|h|U;^|mFwFgBIK!cMVFTg`c~M5nWeg5*?5t_2`-H>RRay~t>hn&~@-{zmI^d%= zHa=^mPu-p2ow17~XBq}O!v5{oOn!VM-zZ2S3%Q8Gt-cG=4f{^SdO2{Q4c(>L+c!Oa;NMvk=zRh>a# zRk_JJEIluTgH+I#aqg0Ar+GE?{fT}RgN6rfCl2F9B~c*=T@8$6O#@cXO})VX-LBi8 z0YK+4RH7NH=Xflk4tsm%`hyoM6EZ-~92D~s#n=iF+}fG1_iH1pCg%)fGwA>6acUQH zQSrHIS`G^7r<6p1+|kDUu~eOPbPZ)Q8W$g@zqp<)4alKG@mC98oU|FEL-qAATV|be0M2vZd<}k%oBJZM{oBXhkR0ODVXvk- zV(rC@IsZOe2Vy4yS&)Yq(wbbjZs16XkyCre4iJ!B^RUEuWV!%#qAn_RX0 z8!aEY;se8X|An-|F|9`9ewm2!jW%hUx^I6hn}#(W4g%3Ee-Og5`e!{**NE0L*yE&T9Tj}s0`4vziS zt{}Zvep7{@AK?FPTK+8Xn#Ygi zHg*qY`g}&&`JPN064~*2yO1bRsSV4ix3yKD3P*I71Y9_Uxqlq3aUR z6ItJqONmjH9Nn<6adX>vc=V!4W1>bQcjqkBjdMha61(ExjD)zSNGQPw4Z^gk~gxv`r*X_ zAt_ja2y+`?b40s-v3j?1_IFgza!Z{YscIY?2p4YZ8fxU?t%cjWTP>KpE&L{M3dSb2 z;3r=kZ`f6oPi?Nnh`_h60B|Y~7r0htQyc}7F?hirk)%MsJ2h#uf4L4|I@k1Fn9md1 zrDrX*L@y&fJG%Rl8Bhv0=Akgu$dA+olgN%C-RM_?d+lsvF7DM}LLa*#Q`_2R_EMoD zTFPU>N9}*Es*nsfRA!SjlhA}VJ4{-s^9wXElYch_^C{>r_AX4v!?ebf&%K4Oz_gr8hQG$L;)!4%354MfQ-p=+Y~1b>!>JZO}OeGTs>&GOfsJl^@0 z4@s)|agIRo8c5SuTcNWer$a&r^4bK6+BMT>04B?vDshABc0lR-T%W?GGA3iXkBEcf z((n_Uh_SgFHJI}u>6S;vR$LOd#&@J&UtaM9ntKLFPN0cSAnrEQq)%@l;{048hfO&C z-RoQ$ufG5I)mQzZq=K%0{QkKz2BwVyz?l@fM_(HZX-?6JyR+fRo&mdCW>UBPF&FSSqWPQ+(rX)9>^U%wdaOr76aN}jit z5*k1T`hgMRF9HIA0Sg2D##`R_2jCw7B8%m$`dx1+{nJk90_q{qn zY;__mm2Nbh(m`ClE7Y*cTJ7{~bZ{mOwO=Tuczk(PZz(XQp%!m)uUZt6OSsi=y_f%B z-EBS~qByQRkZAwYNkpqFO`nB&r3>><&Q?1B2}edHrQ;&9^=#w%QV|*h+X;o0A*ftK zt%%pd1IFNk1G9My37y&!yXI5PI_U8W^v}>OieYfuyg4|4qk{BdW2Z?Lnpcq(wJEmW zC#eTqmEKubr}!X>7(B#XI3XxkknJ-a{l~Aig*B9#36CV|4!Z}Qb{#Zpc%3`K&p1s} zFJ|q4E^O3w4z?i~2Go^KZ)JNcq`^B`=2m9B~y>=?cr{E=9vJQ22p$&xY z{OK4TCoRi4IyY^(%7YNFFqyPETXbXltMt1mGW-e8L)y(33*^Bw>TtZm!0EP@oPRHW z%J=<|&aB_V6Zi`;Sfp}%I_k$XvCN(;RFTLxVO-NMfD9Bo7j|m91w!vkBl;REVg*M1 zT)9HXNEuRM0%xwR4`WEfP!Oc^EqJtvQFEAUX7Y@!N^#v8LEzRHZ5`Q8K)(Z!H-mh8-;187 z*DGdNM{}ns06DqJ;7$$+ZCN9F3BRcHg?|RYLdgPhD)P&=dlM#Kp*TvWLOwW})3>LS z{CCwPi*=~fBQg07@55r@tHxF|jj^LZJ-Jz&1m>oda_Eb*h=oN_qSp zfm(FakjJJ}Jo_MjtOwWj`@0TYBYNSa-8|481&~u-22Y=(04c2^X>R)a)s`?o2IB;f z6R_H@zf6$Zg(QAKfxIe;#TmJ<9S(vAj{FuBf8E&0&v&8XTx)4^N)am{0@O1GD9f)1 zEHu8|_I+p2EP`g6d2%%Hjuw1#%z9o1w9@OoJT@eu79kbQZ=$s*6bP{(4^3iL#xs)X z%0q%gY%&h!KN&BTw$fLsiNSyWc0i>HOG8}y5*UXS{u`Jp5?<|MunDk)p|Y_~%LX3c7G2WVQyrO%e9UJ#^QfP|*On{*GN4@9_TnvsA@%4;$ju$ZrBZr-4j z>pRulA~ShEUN9yji^`vLiH05BN--fh?l^ww+C>||=4=!}$wuG7CjpE-QJYDhv$7;} z?KtuFf|H;e1|Ft;!ZG*H`u$v*DZ&kr7o>V06gmqVGxJMTDuD(r16P&!kJm-$@E7+| zMK|lHrSHxNHUI$icL3=ZV6C^a+f*OmermC44d!eDfRX}TE1uZ1bErR$!sZFI_W7J1 zBf`Y~;b*cW2qo`N8DX`I#eI%KK2`0FlvOD+WyDrauoImB==Kr0ts6191*GUv&iMMm zrfVjwrbr`bs?^4B$NjM!64Wp6GF)13G@8^-0wD&F&1w}Sg1bV0uz#4{HbL)>guCP} z1^{Z~OEXJqF%jJLCEY{NvS(j#0Pp_LVHH$;*Eyda8`e0PQ!|Q z1DkL|(*+Zu(R*_bvTEqS=ZYHXRPp)C4)M+a6KuerIzkNZI&N#pzYdj;uP9>yK%ox$ zSt^Cjf!ANKP-TMM>{=zGf&iek5;0|x8=g71DxGso5Ow~yi8i-Cbl9FV-gP)^&VUR` z(of&g06=dsBeWmZyO*gBsr_FsXO*IVrxyaUxqn01`J2*aVJG{DyVOaj+R^N`g@fY# zMGfEG%yxY8F4VS?{0%n06EW)<>D4_vl5=mti`NKXb!H&_kaO-8uj4EW+LLId5s#xo zwZEfJKh;UO#pMdtx~v#A?BLIBi(8^IgBLPfO>pNA&~( zLF-mvMic65`spl%llgKYY9U0bz2;F0(%4aY$a{?0=X2#jUF2LeosQq(*AxHL@gDh3 zqSKLTKyc)O+pPH%kbED-dDM&s2z?-2-^VO1m|wTP6ir z=m)tS9dnoc*g^t+B#`m@=k!LLI96-jU91RC`8c1l7a2Nq5dt;2;1Czugc5UJga#IC z&u{jKb$%F`fR`?h&OfA43(@E1YtpCjH-|LTZ#F6ue!d~a*8zTQC!no^ZwX@fIZ0ig;H`PEpW`Vky_#02h_54jxW(5Y>!w**#8>Wff-)?|@N;a)SX8_J!0S;*FL zoIUDMjC3B!_G@IF0dyD$VwK3uG9zeWZ0qy-Jrjw1UJfo__dz+@eru&1_3SLHj-VIZ zi#}lf2EFf?yc%ELV%_x3W@vv?Y+1Hfia%|ZbqN5PhL%7<6Ihhyc)_XO@EVPJLWDg5 za`FVkO->al`YtAMPdzOpc3z!gUc&UjQBYw2%9-p4o$osArM%Aj48kycyMPx;t*Thp z4|gS@u$Ceqx9yjD3BDgy=h16Gik-T|;fDADFC3&61pZ3-Yd4)SSKZ!xS47bv=^qT7VrQv+*G9IwgE*+4 zR!_))YF1ezw(osjeA9>_Y1+`jD5(*18;kPtuRkK5a#UlD>D16Ca;{BP-M+(Z6xF9w z9W4OCPFAQ&&7z>)Qaw>U7@%dLZ+**k=dr>Cy9A<3P$8$W_y(Lg7$nSzkrka~Zs&Wd z+>4h#>Q1z7LBBd^HP_HdeuOG_a4-0&&c!9AT7DpL(Xt=pr`njk!$I&-b z;iEHp(IKL$650LZ_Atk&Pn%#PQ!yo*(-&D3Rc20sxvSSWWww9Hx|W0^8J zPc{YVsL@&?6V)|QzNFDn+~`mohcEKDbU3HUo2?^+Vx|Y_G<7B zDs%T}3E8eky*$%`O;5k_9d6MjEE>JPxS~w=x0Ei^igi9@h)bc8mu`Cb+h%Pjs1n(d zkFsf3u6fQ@V_PNADf+tUwTm#F+p6>VoXoCJk~F!H+)_ZKp)-b_j42{Gt+_8uR5vf% zw;sh>9I=TDfq4o*V>R6P`9qTWN@EXtNDGMt_A2|lN?h4R|KhFO&JfP-{O=!4AD#aS zhrde*PKDcdcihemce?5tZkg7B00P|@hs|)PK#v1A^Zmc0JI;zrhB|SY8mf@TNHpq( zFM$9OQl#zVSdpSd-5cx-krI+O3;evYG#!{W#1V)TQXu*M2nSwei+BC3`;282OBALi zEkG7NS?ls5w})AL_L_lvcb-QHWuwX);D@jktTPb@r9X$agznrEC<*2KQ-=q^?_Gzg z@oFt8*2Jb}2>`Sg`qbr+uH-BYN^djgSxWT#<>ebaE%vLn3z;cd&HbtJ^IBUN~z4KOqnQnp4?kPmEVD%BJ zH!cks$9P@ixxK%j8ekX9jV;#ccDj}{bjM;fY$Y|Mzd;!FCd4jYE1I?|v4XHwM70-1 zLG8$4Du4-{Z|{7=45}crLIN|^N+rI1+6w+fH;Ho?W@M<&z}&A9!On)q@_HK42%ky9 zga$^^n23a(XRl7pd3X9WEz)0zuG-T`7dD(h4bdU6_;bLL&jRLHFBNG(Ow0tyF$uQR zt5|hTO_iHwr?EupV~S)Cr2q-1=Wb+%46Wk6w;q#)BjZQ!d9l>9D|r9*1PY7v7MK3& zTb;!fNl^*>yRB9$dTpA`04%!iqb=K1TSUu%Ti+t-k+PH*s(v%gFu zhX>|-3g#LRo^<>k9&_&+!L!mhYs*o>7=EHmCia>#^6E(<$9M#Z632yJPQ^}bUQ#8P zM?nfLhx=%2MH(-^6c>lr*AZ~JAGsISIZZ(@4Un`}RYW=V{*BuH1AdxF%<>j%QQRGb z!Sf|RvUpqhLkmEwXeyc8_e_gLjkK`M&@D$^{EzVAkMwwb3yk3(uI2rPeiO*BI?GovVV=Kx69kZ8s^lmbS&vkUE<6_a$uQqV&m1!jH-@J`g}pe zb21D@cEEDv)5i#n7?-9P<+LpDCFnv#6%`+K2u0s8dGXz`ntJ<_XdW^^9Vug7jJPOoMEkk8m{ld424+VAnz1 z=k-d#&VB5Rv7TX(@)6zQh49w-M^WI+2@{80X6BR%qru#5WXy0Eqh zr#oG&kc()z^>|mC0zJDcmAZ#Q%#Q^PFgVji;bF5>n%ah8J0E?iG(m43`(ETes{Ll+vTI0_${GltRua&2a;;2cFNE-THe)!{3iEFZ>f8{u5 z?6Wj8l9GASmb-|Zj)r9p@=j$Uh{VATSvf90=&i^N>2Vc@@~MY~ljHovhBren+!JWk z*q;NoVRC4)PqAfe?8GqQHAHwF)EY`MzwCgZI?R$3zvKsqf8y>@_Oyaku(BmHM zwI=BrdPdg>?7R}u8y@G|!~!!9Dp4|D>AsX!HZI|?%fyhr$~aKEo4%G}69$m2B=ZJ{ zO@+}%b^#7P3Q-L^eNemCC8B8F{fw&Jt!@>*`+U$tdn!F@r@X21IXVZbmEdBNLt?nP zuV06?<{|(QJqR=`C_lb!UEVCk@tNjud=Ex#@5>zPoc7E|^Wxo%`hLzW^-mBhl4@N3 z70sFuS-Oaetp4!_9#cO#UkzkFi`>aY#uTR)CJ%e=F|zQ}V%@P0!!2=ZJr93hPuJD6 z@r*gnE8MWG_0HxgE{bL_713hdobf)q_J@oNE22kwJFS+X_3`;gVWhAX+S*h``!Mt5 zxsqD?G$gasdI>e$xh;O9>K?amNMyEgH)j09BiSGrxI+1aE!-K3%OuHsn(C% zif4|q+wNd|c=#A%iC#ldg*smnL$%D<{TwE0?XgPNvOIlFnO_xMt4IBa=RXR|^5UPd z@{X}CeL*>25nIHBhIY!WWlc#I7u_Fw%0gk;b%eww=SV~j{T!vK>*qxie;SXoQEV8B z%XPC;b+?KxDIyn;D8CpOg*}Zkzmh;@k_1+*B7sG%!%$SO79=qtWdMZPp;n7vZIAdH zNdA*1|3i`molH$E4F8$<;QR|H6Td@2NB;i>E5EzzADS$pi}b3FVS6cL73!B(YGXo8 zms_=g?vKX3Qp_xHLxpJbjLwTKI%}{xoHk48e#aJFbkIQE9~oNuW7rNvkpte^mvEAX zGZiW+I*2xBha>VJjZA#&WYY@}QEpc2TQx8qn^Q~Wl^&(24Lho?b;+AuuDf~9Zy0AU z@*`G4vPmG#hhx3MZ)n4%vc77*^-OyJoU|ArbJxt_3h{LNB8SYQQ^ys{J~ac0xLlCp z`VM##oxq_!%Uqa|xT}DFH;)R3#AYD&Tu}ECrAh{xPJVlXk%QGb+`xg-)^`$l)@p|4 zgS>{QeTTfe83@kAl0vqShyO}5<+Tat7E;%;efK10Uq$HlP|xCmkqT&XqN79}?ynr+ zVQU;6tNtZ?6hoOzaS`gKE>LQ~VH*l;M`!Z1cy>r!N45Og@Koy^r;9M}uexVXQO*7g zId?iWf4>FPEE6Nthm30*5oIy%``sM%)MdMu#zsTHA=_oKc>)K)$-oml#Fcyff|!ob zO1EDvGsID0h$6q@YDZUp`{mWJ(=nW@hmp!ijq%qU(+b#qAPfl{X8whIpuOJU5g7&K z{{65jKvore-S4EY+C1tyZxfneKS}Qfx|VAr52iRcpT}Nlt*+}7G}HJ8)k|vEEe)AG z=`4&QT`i-0-+hR`8qtSB_$;@GNX>8QVP9YjK}c-=N@D*bO}1tSWV6%rE?)H+YFVb` zGM?DBrEcCz5deVl+e3#iEb=uwv)PPXWva!(Tfv8aB*TBvWT68~Bu8gPCbv2+lgOV?T{!U$^Oo=-YN;`Ow>aOlQ0 z$^*F)QTMqSPyI|Quu`#bEjgvl1`|8KII%6-yh7&XeVJ+-09qt-Spz<{ct|qQ^tGdK zo1n_51@2d+pDR0{YPQd^?DTG10z#5?uSUR!#Blf+QkNTUQJ$pbCDdcC))xm6`)@ZC zCwLx`+ydf-h5O5}}ZA~c4CB&L!bw07m%{NpgzrjS$CG!RbL zCV;qpi;GM}_dJJDU(|+^R!_Tj(jfS;<8q=wF_Q{~YTC9@Cq$s68(>ot@W<;SbclL? zI{(mQGCM%dsd2rFydILe+;t2g`5Lh^^Ha4iQod(Y?FSB&Y|RM`HZ z^DmsNZlcN~vHA3{dL5Ho3(8aGh!2Ukzx8 zu^KNA#j2Mzo!gE-5bg^M%qTKg-(M#}+8?TBjtY?z`LfNVhsz{|ZtTfIA#E`yO2r8i z$<3LjzMj|z&ES^!d}?7q8nY-d&0nCxn!QYvOd#=#`Tikuf_~J{hEv<98suda-0j5i z2a}6UyMR$ex;k?zAK{J!4+jfVNdZgNqv~nsd_`K`yj|xhfW@ljrv(Jo8c2q;8XO-B ze_^_g#QKvii5B^!IsZ{Re5-TO@#70UYh$>+?a(5fU@__>sOpFoKGk@pnA;}I9$IPk zXHHH7nHcNSEE^g8QNJ zGGg;Y=>e|`lND4SZ-o_oiY)7g1jdM=JY|?RB?1I!tuJQV_0A7zC6w#y(#Y_G3xa(M zA+J=TRDLkek7!fxJn0|2%JwSs?v8&>Ef_uma#ExWD%zfa+TN7#V$y>*7J#;qw^8Yd zwX@&RoPzjd@S~5(>q#XAl?&?sfs_9#Y5&2=o{NAN`kNgkvY_#8F$88_VHBzh`K0D3 zM;1~EuM<%HeSWwKzzZGKSC$8b4Sm+n+qmPJ6~g+6{5rPFq(5Yu<1^}*ul@u8|H8@k z{D7PRGb^xEqa=7U?uGy}p#>+fpSMZ?px9+r4{|&B(m4DMN2{@7a?yat(I5BA0pxH1cau^a>9VU*u#=@IRax0c<*$2W4TU9m) zPq*qZ_}uk!mkUs8fL?D7XaVd6>a8?*9ojnjHo!0+W^p!oCfK=(d&~W@s{_Bu^dr}k zXGzIA+mYo8Gf|}4Tp|UpK9TjM%UzkKm!R{XLTB!anD&bYUV3~ZtE7}q=cPTB;hHVU z0P7{eRyPu8k1FKP2J;X+sBGJ1CCEPCib?Y#B{wWh74SA{Vj|i#Y}3_n80+7pK~gVE zye+E+PNsCqyMF3!z4=YM2dfemgL~)fx~JXd}Ga zVa@3JLX+%@V!P>3s-}s@N_kADA6HRZQPkMWphT=Je0;xj+LDKR0z42VtfH)TxSa6DRCpyt z*4{0Ia5$nG_CDn2Ph%GlbvN(Rw}jA%`IfJj01#+D>Fg z3!lBV!D!}i8px54wItmwoAPpVH(D64$cZ}3(*>V0BuK4p4G>iSx?B^G?nKleVxww2 z`*kN+D)UG7{#S?RvjWIMZTzI-UIGCnU%a?$zK=%k7>6qY$b?IrcVP{>%JOKsC@xin z2GDsyu>J>@{wsO^gQby9Kma8S=zJLgh2J>3uGqN^KFoX;thgJitT_!|AY-E!(Z>P2 z>aqlZj}F@>Kiit3@;!0wQV#NeJ#Mk*(7YqPxkyC${Kq=~g_FCr0YHPnNaEOQ&mQFO z_ujDLuI}DUoA-chip4L#Lw*HxGj?L@v;#O7bHUEuaq@qCTOs=|yiF1g$U>LS$TuE0 zuVz&)IRCYBIPWjY`{@(R?*7@Fr z3<`y)qGspP%_pE8k)F3qXOw{rc{BahldDx7AUds|@c0qp{b0%96W!KdZYlIsN^>cUIR63&H zN4d7*pn0ciD{-8hdaDvX+-Vo(r!kOY)wnv6NQIvhV-H2aGCR$_Su=eNzcS*{nTBUW zwM(hKbDW+89YhEpz;#d^*UHMC0hU|%J8YeZ@CQzGxfr1tJ=^XLK0W@TIW0}N2?`Kg zZLgdz`iOd2!fS3*cNfNst&aamv?vH@i@98JwIm!|Cs1W=Y7=cbj}AAHJTVX3%j^Tr zk|TZ}_4SgH9QM!b^)K3fc!>-MqfTbw z*Qfj4?If#H-}llb7Zf*j0c(DPy$U`T)nnQUUSji!wBbZW7Rt=U;L%ORS6&*#eZhf` zSK$(=pFw?8sB-EP_;yA@-@Q%x5Hw}`brF1(UZ;A1hpbO0_yy)z5Y?$Xvp%I5OQ=S$ zOvC;NU&Q_cYebuukye%Iq|ZDF)#u9GmHqR zt*!|-`9TESw?MI*`s4PO7mUNplT-1*$R8Pzl|q7k4_U>t>R)b7Rw!@Kcyjn*c` z;)|Ly>fD66w83zPYZZe=wm9C>1;`JdR3{D{V0u>y+`i%}Z1vKEqDB&6~E9B_0M6{@Yar_{!4KBdbUY1LhL4}~_DgSDv8+$pXIE6Gt)Cxf$Y&purFjTbDHK%|2S#Pbp4pNM7oYrC9tV9MO*kX z$JBFj!ev`RLQ@|U8N_lmjqs8MuPx7=(Q<@oZ~%1?I*>+)SdY%zx4`yLW`Po zC8x_G*%dF*Lo&C!1OFRshu=ba6~WNF2PRE!Tx^-wg&RX>EE3S)`9e@(T}jlZZ3-J3 z(l{covFrjA_cFjILKmr_0Wdvb4$!4nF{>GIvB)tSnc#7L4nqtX zY>n-GxpND^hH1kZsz#=3%fO#_a9U&dI2rvO302%Fp8OND&YN4wN8cK%y0(w`)H{0`t6xWu1DaD3Z zF@!#Ll2K=PJKagXLCGpG!l)D<<2(?t&H`b z@n@qij0|6e_yV0QhQOaT(RxhEQ7Qb_81gungJgWyLcHRhtL*RZpu|)gpjrWOlq@Db z1zK_CumjU^=sc!p>VIdm|B<#Y3L(94qy_Sk4PHPHGbPyH8DP0zvQ8}QVAI#dtLr#s z^NZw0)6E<)dDssw2UD|DyLNP{VL*FnKNKK8IaVMH!~&XiwWd0=M$!)XYSRscQ-o5W zx@xiGK1cf~nwkR2O%XX_&3$0Qc%de%!(Z&V&UTve2~3?z3FHy*%{N4&Xpq^X?2iKN>DD6&=AQEPw`6W7Ntw%^0&4OmX&ozfBy#l;6jr=E`r z`mXo^nREfK?Tsz@eD&RjZ4P9S!f^6L2{u;ebWww&f`KYa#nTcF*aO z_H@(xWvKDQ;0YpdH^O`lW0&t~+t_*O1J$516gx_hd+jl^rL>S8KQo7`P$S+;liT)L z)(prTc?j8Zie)2{6ZlmC%}2dKO7*dk7|#(8_JjvM8RvD3(a43kb4x;?P7nQj)yNQn z@FtV;^Q16?gFD}@>B}X;pPLRd`2T7Yqw~vpCFE z0{zN70^T=$+)u{r2q&^yVr$+sc4LKN*al?_EPXus zVAONwsn@8au(8kZp>ZFeu|?D2kbP&{yt*A9g^ z%O&wU?@{VZ+nfLr&j+!Lg1I0|662E?Z;CvsbOj==3a%M8Cgf*9iUa&rE+c$MAQsp4 z=byHP)ab(3^}OZ8h+bTW5X6kF#Mo$SA?P5iARKWJPcA3 z=?7YMJ5Hk7!(GA+DfoUO|MJe3S3md5hJVdm{~t>J-(Q*ifyh56{(nT|Yx+p9vi$gU zPw*+JkdhhHir!ZjPk5}W2TS*Qmfst(yBf;d_l!Kz30I-$HIOJfdc;e7Z*;5OY_CEb zC;02h>X1ecLMyWrsV3i!NHZPhF@<^uhY|1HInjUCckA@5$~>oa)n7@B36UUE%ximV zqnI(6fCOzaG927rvS0QXetUH$#^(*{K#wdE2oxqWu&8izt9lf=dtv`nl)CV%Eoqzs zGKAB|*};Z(VGif{2-w{aXr#y@(a?$&=o_a5;8kgrM{j_-=-hLiFiu<<-(V?HTn!P`86_|V>K_^5Lr9@pAj-X}Ovw26H$5L>$!_w~#`X+JS*9rGsuR{wB} zx~B~&)`3*)P)irGGK}b+W;&TMOH)V);@uNJ!S3^N{s>pGVqUj>|cmnMfz>> zRzc6w4#aUU0>37tp7OK%v*m>gAPdVtTL?lrqq8wD=Ja7I4{8fx-u;jD{0otLC%@6d z%A4|z*t~J=WKg%Xvj{Y$@9f)ebzQ8~sl}FH>kPf5Dk(Er?4l7I%Kw7M)v=&nh_`k8 zf#)6g&%KPvnBuFx;?~#u8zj3&!tH$2>t}B6%-@^~+}f-Hh55q_eqlZUGVxC+);kin zdKJO;+^uMuyw8-*>Jv5rug&J2XYAS(g1dA$)F-d$*Zrmh0`f+ov%nsH6D-Z0w7nx% z@koG&5fdIOJ|0LA+LHnis|^qFO|pG@HzeqWwT0ntd8dh7X}~!F9aLL~HL`1S@rU?V zdDE@@q+U(8t(j~mgh>hj zn6l4>c(SFZgKUr?9GQcGZoLN85!zqxcSz3Ts9o>;s%CM0L}yg`1xW}${_(p0g~-Ez zfJ}r-%{B|amfw~ZCkQ-TTA!#&f0+StdW}<|0*`U}f(;<#xHv9T2IZ%A|IqmtB2QO+ z(^2#lWBZK(Vcz#*5cHigzuHcoACQHHNpFe1V7d%uJs1CpM;=U)g4gR$o&TJ;_I#Ug zcCu2EuOR@H2;Xv-O7V!t<{pzx1mp~XRpFd}===+je`E*b z?DZ3(MR;hGDSPUWM07I`8M+<+2ITDQQC?}zMd;yMaZW_FRNr(y{%4^=z>IBB@w|2LG&QnB1mxMyOX)OnLGC%cxKMbTh95t z=Xt}d47>3hyKlt~W)Ms+P2Av+oeYBnIV5z!Aj}`yJn%ocp*2p_=_w@Y z>_1?!zJU8CI4y`g#T1}P5AsHC`}Sdphu~V%kizM1d43-cVCO+5 z#z7lujh!@iuxTKWE`3^{MkX)9oy55;{oe6=|1r88FJSOVf9BKWYYBe4ye(~Wn7pKo z-TXSuaNW;!R%T%cPCf!Bz?1&Z3;wTwq}(U%23mc8tGNk2Ub9%dLz28B>7rjSHR41I zUv%NLc}yU@MsnVFPgK0sn>ocn_zlsR@98&}wY$vE2DvvEK5Zq;ZQpUBbv2RmPqPU6 z?ASkg=1sEUUD_D48uBCXFewhW^4DG!sm{o`Iy1ul)1!2cyQk`J8)MDZ%5n=vq+b)j zBCUQ-u>OPK@BEC8UkJYc%J4F*)0MKJmsa!;O@!ilNm%Ny{*4a5Lq0z<$?he7rZ3`N{T?Q!)1T zOl!DX%NClIK10p5%g)B<0v_7pFXWRHcGEiYqX^6Ge(nE=N|4G~)}UxE#HQr}dGR@B zMuk4PK<4>H{KiyMin5GQ@r95mO(ldm{oPpB6mrTWgle0oHP_EVhI|c%L#dDozGM1W z<>s*kf)CiQ8DNw$m`TokbzPyu7VzL;m@@Lc!VN(4;;*?9q+^Ge^v*ysWO5*PO6$ z9URFHaUL7q6+2z_KhwC=W-+2oL*D(S1u3V$k1-HS`hu&M`#UVwd&WJ^Gb(@SxMiAA z6Su8Em8m0_ZbQC)O`1Ah7Nk@v<&-$p!LuO5&&8`hnHrXHK(xA$2vxM_Glvf3D{CDR z!x9#Yr^qK7amzZ2>D#A#dba249qn@B1c~<58mPxCMd{Qx!WKoHavc{731j~YMN60x!|GyCV$7fTlBn?S>8|+Q*YgJ=pBlr< zVQf{lngq(nx)21`#2>{-j6tlQ;pI6xQCoK9eC%Ng?)y;`6DaZGT+aQs^ZtRzt*)Fv z910rW6ApMg!hM)1XKO};YFw8?@$zhGYsI6q%`2#rQ!Q=mD9wy39M=C2+V1WHT*7wE z+80m2-Ijcn(%QWWjUSr7+Vq%*B=dAq?1+mpGo03JX{n8vEiS(0ohTCfg0mZFn2~WQ z>&@Nr@t`YZ{GT2Uil*5F_2pM0wF)H$s9K|mcSr@68m{SyOL7a`&C)ch1&Y;) zt_m45x7F~^nB%hmioB(%d=LS}b>GBIn@x8BDW@oT2WA`phJ&Tgv5f`d!_(?Y_Rlw_ zWmfgZ2{QAMypTdfoEB>y)`vanU54Ip~+0X*>Ft6 zYf0ZE@9%%TepO3v-=V)?L<;4NE}?e?^~P-O_<`wFsOwnZ<)brGmu%$C|1{fQK94`p zw&@D_h1mWebebrYx{?UUZ`Nz;rM5RbVMNHSaNQ5xRCanZqz?ANI_aaPU(6zXArkE@ zX3GjV-tkyvwjNNfc4`<{=^z6ISk>e8$*&v51=_JkE1C>8*d0FQyfq)4;L*i1>YRgl zn?#r|M1Y8pIr`ZDP4yFTH>7i}p<799TiVtxZ@8(HVBDb806uHy{ zP04A*8K|$kAc->`1TRV8B~y|pR~pnlo7FKKp7GX2Q1s8&^HCJ1|FFtwJ(`oXO&LJV zPtL~c_dGC{Q10^r&z7%sF(%TEg;>kHU5m{k*BBRNW z#*od^B&6zOONp=a#{v{^$WLfVYTb{>G0c%*#8rmXqi9uIc_@4n2 z;%Bw^HDF?e;$;yyT?&!wRUsl*2BRAt<3*cZZS-HQ2CF#AXkGO?)a|8-8}%Sa7U`l| z_${0NK;&+7S7cs%#U zKRW*tk?)sZJ-(c}M4FhLpMwn~LvDQ{PLOvKrSRB5R-9T>^9Y7L!7Z@$k}p9JRp-3-kd-(- ziWHF&k&Ef>PkU<@jfOh$VQd}+JOW*s+)-)fn2{B_^)rMMp&;g2zQsPXu(q~_rtBor zRBI?R;6}9_G_s4Umk1b;;eV>z`Mtu6Ha+8OMcW<5)^?5LE^X;_M?gH6eS5Ux8+(<* zg>bC*9HhI=58o;4xH#J?_1bhu|9v?QUQ5tp4mX{q<7EPXRP_FS5WuPGej&e z?yJR1gz1g!&7$^P8ZSwqZWb@1s%!zKD^VJx{pQMsQzF4Nsi37>rcpKXUA7erhP739 z{4ROI2E*iJh(_nnjWHGdREZnF7ur8S*;s-)pCdal6mVuG2P1C&RjwWoi|^Sr*OHrG z)s)Gveueb21diI#MK=Z!blWSJT`=Rzr`V{?3{jxW{X(tB;UagphoMnpSixF~V4mHa zOD6bVUE2i#`b(mF{nPg6N&czG0(rhQHJl)~IOC9X+`RY{lmy=eow|7ZE*2Mr4h|cS zT^JT{eL&JCbjLS>?DV`RkATJ6rbVlvEclp-*t(aQVgz_iX;=ePqNgFDK(wg51w%;c z#{7P#`-6d+P+wI=^V2o&MLr%I)k_D#hi@rn>yE#M81zN<$auS+Em0bi6Lp)B5dAULlHPN>l-0VqD~Wrr4J!xH_m2adW|8W&6ox zXQt{J<^iaH)|8XTS^5@b-E5de{{DB}z#nbFq#8ZJ1I1yv>GHl2jyl`s@5HM9x&XUV zfl85Ojp*n-B_1|^I^h%|NvB=OgmUo9Ys=F#^_YjD!T_W0?c_QR;Y&9N@vAQA(9Swi zqmB}NI}0{Fm}tx`dqSvf)P(k}ZV*;QwsYDj8j zKo>e5^bwNsxvBsK4=Rxn89Xys)*PewFY4;Oc@|O%uFG}74q~I{hPBsKSW~{l!z1`_ z151P=IExl0iv^4yv%-3n5{qttI#c3|6! -Subject: Drop useless test in another_hunk() -Upstream: Committed (65193f1cc1bf38bdd63d1f3087b0d7e16ad3f082) - -This test will always succeed so it is either broken or useless. The -equivalent code path for context patches doesn't have this test so I -suppose it's OK to just remove it. ---- - src/pch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/pch.c -+++ b/src/pch.c -@@ -1651,7 +1651,7 @@ another_hunk (enum diff difftype, bool r - if (*s == ' ') s++; - if (*s++ != '@') - malformed (); -- if (*s++ == '@' && *s == ' ' && *s != '\0') -+ if (*s++ == '@' && *s == ' ') - { - p_c_function = s; - while (*s != '\n') diff --git a/reject-print-function-02-handle-unified-format.patch b/reject-print-function-02-handle-unified-format.patch deleted file mode 100644 index 97a91f0..0000000 --- a/reject-print-function-02-handle-unified-format.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Steven Rostedt -Subject: Preserve function names in reject files -Upstream: Committed (a2f4bfe0f3f54181a8f1077cde9ebef0b4f891c0) -References: bnc#904519 - -* src/patch.c (main): Preserve function names in reject files. -* tests/reject-format: Update the test case. ---- - src/patch.c | 3 ++- - tests/reject-format | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/src/patch.c -+++ b/src/patch.c -@@ -1237,6 +1237,7 @@ abort_hunk_unified (bool header, bool re - lin old = 1; - lin lastline = pch_ptrn_lines (); - lin new = lastline + 1; -+ char const *c_function = pch_c_function(); - - if (header) - { -@@ -1251,7 +1252,7 @@ abort_hunk_unified (bool header, bool re - print_unidiff_range (rejfp, pch_first () + out_offset, lastline); - fprintf (rejfp, " +"); - print_unidiff_range (rejfp, pch_newfirst () + out_offset, pch_repl_lines ()); -- fprintf (rejfp, " @@\n"); -+ fprintf (rejfp, " @@%s\n", c_function ? c_function : ""); - - while (pch_char (new) == '=' || pch_char (new) == '\n') - new++; ---- a/tests/reject-format -+++ b/tests/reject-format -@@ -79,7 +79,7 @@ check 'cat f.rej' <