From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: =?utf-8?b?T25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+?= To: git-commits@fedoraproject.org Subject: [rpms/fedpkg] 1.48-1: Backporting epel8 related changes Date: Mon, 10 Aug 2026 21:45:45 GMT Message-ID: <178639834579.1.16971213903991325478.rpms-fedpkg-9cb26eba36a8@fedoraproject.org> List-ID: X-Git-Repo: rpms/fedpkg X-Git-Branch: 1.48-1 X-Git-Rev: 9cb26eba36a854290012100014c7516fb4b89cce ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZmVkcGtnCiAgICAgICAgICAgIEJyYW5jaCA6IDEuNDgtMQogICAgICAgICAg ICBDb21taXQgOiA5Y2IyNmViYTM2YTg1NDI5MDAxMjEwMDAxNGM3NTE2ZmI0Yjg5Y2NlCiAgICAg ICAgICAgIEF1dGhvciA6IE9uZMWZZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgogICAgICAg ICAgICBEYXRlICAgOiAyMDE5LTA4LTAyVDEwOjQ3OjQxKzAwOjAwCiAgICAgICAgICAgIFN0YXRz ICA6ICsxNDcvLTEgaW4gMyBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8vc3Jj LmZlZG9yYXByb2plY3Qub3JnL3JwbXMvZmVkcGtnL2MvOWNiMjZlYmEzNmE4NTQyOTAwMTIxMDAw MTRjNzUxNmZiNGI4OWNjZT9icmFuY2g9MS40OC0xCgogICAgICAgICAgICBMb2c6CiAgICAgICAg ICAgIEJhY2twb3J0aW5nIGVwZWw4IHJlbGF0ZWQgY2hhbmdlcwoKQWRkIGVwZWwqLXBsYXlncm91 bmQgaW50byBycG1kZWZpbmVzCkJhY2twb3J0OiBVc2UgcGFja2FnZS5jZmcgZm9yIGVwZWw4KyBi cmFuY2hlcwoKU2lnbmVkLW9mZi1ieTogT25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+ CgotLS0KZGlmZiAtLWdpdCBhLzAwMDQtQWRkLWVwZWwtcGxheWdyb3VuZC1pbnRvLXJwbWRlZmlu ZXMucGF0Y2ggYi8wMDA0LUFkZC1lcGVsLXBsYXlncm91bmQtaW50by1ycG1kZWZpbmVzLnBhdGNo Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY4NDg5NjcKLS0tIC9kZXYvbnVs bAorKysgYi8wMDA0LUFkZC1lcGVsLXBsYXlncm91bmQtaW50by1ycG1kZWZpbmVzLnBhdGNoCkBA IC0wLDAgKzEsNTkgQEAKK0Zyb20gMjczNjZiM2UzNTAwOGQwZmZlZjY5ODY1NTU2OTNiMTg3NDU4 Njc5NSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IFN0ZXBoZW4gU21vb2dlbiA8c21v b2dlQGdtYWlsLmNvbT4KK0RhdGU6IE1vbiwgMjIgSnVsIDIwMTkgMTM6MDQ6MzAgLTA0MDAKK1N1 YmplY3Q6IFtQQVRDSF0gQWRkIGVwZWwqLXBsYXlncm91bmQgaW50byBycG1kZWZpbmVzCisKK1Np Z25lZC1vZmYtYnk6IFN0ZXBoZW4gU21vb2dlbiA8c21vb2dlQGdtYWlsLmNvbT4KK01lcmdlczog aHR0cHM6Ly9wYWd1cmUuaW8vZmVkcGtnL3B1bGwtcmVxdWVzdC8zNDMKKy0tLQorIGZlZHBrZy9f X2luaXRfXy5weSAgICB8ICA3ICsrKysrKysKKyB0ZXN0L3Rlc3RfY29tbWFuZHMucHkgfCAxNSAr KysrKysrKysrKysrKysKKyAyIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKykKKworZGlm ZiAtLWdpdCBhL2ZlZHBrZy9fX2luaXRfXy5weSBiL2ZlZHBrZy9fX2luaXRfXy5weQoraW5kZXgg ZjY2Y2IxMi4uZmQwNTBlNiAxMDA2NDQKKy0tLSBhL2ZlZHBrZy9fX2luaXRfXy5weQorKysrIGIv ZmVkcGtnL19faW5pdF9fLnB5CitAQCAtMTQxLDYgKzE0MSwxMyBAQCBjbGFzcyBDb21tYW5kcyhw eXJwa2cuQ29tbWFuZHMpOgorICAgICAgICAgICAgIHNlbGYubW9ja2NvbmZpZyA9ICdlcGVsLSVz LSVzJyAlIChzZWxmLl9kaXN0dmFsLCBzZWxmLmxvY2FsYXJjaCkKKyAgICAgICAgICAgICBzZWxm Lm92ZXJyaWRlID0gJ2VwZWwlcy1vdmVycmlkZScgJSBzZWxmLl9kaXN0dmFsCisgICAgICAgICAg ICAgc2VsZi5fZGlzdHVuc2V0ID0gJ2ZlZG9yYScKKysgICAgICAgIGVsaWYgcmUubWF0Y2gocidl cGVsXGQrLXBsYXlncm91bmQkJywgc2VsZi5icmFuY2hfbWVyZ2UpOgorKyAgICAgICAgICAgIHNl bGYuX2Rpc3R2YWwgPSByZS5zZWFyY2gocidcZCsnLCBzZWxmLmJyYW5jaF9tZXJnZSkuZ3JvdXAo MCkKKysgICAgICAgICAgICBzZWxmLl9kaXN0dmFyID0gJ3JoZWwnCisrICAgICAgICAgICAgc2Vs Zi5fZGlzdHRhZyA9ICdlbCVzX3BsYXlncm91bmQnICUgc2VsZi5fZGlzdHZhbAorKyAgICAgICAg ICAgIHNlbGYubW9ja2NvbmZpZyA9ICdlcGVsLSVzLSVzJyAlIChzZWxmLl9kaXN0dmFsLCBzZWxm LmxvY2FsYXJjaCkKKysgICAgICAgICAgICBzZWxmLm92ZXJyaWRlID0gJ2VwZWwlcy1vdmVycmlk ZScgJSBzZWxmLl9kaXN0dmFsCisrICAgICAgICAgICAgc2VsZi5fZGlzdHVuc2V0ID0gJ2ZlZG9y YScKKyAgICAgICAgIGVsaWYgcmUubWF0Y2gocidvbHBjXGQkJywgc2VsZi5icmFuY2hfbWVyZ2Up OgorICAgICAgICAgICAgIHNlbGYuX2Rpc3R2YWwgPSBzZWxmLmJyYW5jaF9tZXJnZS5zcGxpdCgn b2xwYycpWzFdCisgICAgICAgICAgICAgc2VsZi5fZGlzdHZhciA9ICdvbHBjJworZGlmZiAtLWdp dCBhL3Rlc3QvdGVzdF9jb21tYW5kcy5weSBiL3Rlc3QvdGVzdF9jb21tYW5kcy5weQoraW5kZXgg NzgyNGY5Zi4uZWJmNGEzZiAxMDA2NDQKKy0tLSBhL3Rlc3QvdGVzdF9jb21tYW5kcy5weQorKysr IGIvdGVzdC90ZXN0X2NvbW1hbmRzLnB5CitAQCAtMjQ1LDYgKzI0NSwyMSBAQCBjbGFzcyBUZXN0 TG9hZFJwbURlZmluZXMoQ29tbWFuZFRlc3RDYXNlKToKKyAKKyAgICAgICAgIHNlbGYuYXNzZXJ0 X3JwbWRlZmluZXMoKQorIAorKyAgICBAcGF0Y2goJ3B5cnBrZy5Db21tYW5kcy5icmFuY2hfbWVy Z2UnLCBuZXdfY2FsbGFibGU9UHJvcGVydHlNb2NrKQorKyAgICBkZWYgdGVzdF9sb2FkX2VwZWw4 X3BsYXlncm91bmRfZGlzdF90YWcoc2VsZiwgYnJhbmNoX21lcmdlKToKKysgICAgICAgIGJyYW5j aF9tZXJnZS5yZXR1cm5fdmFsdWUgPSAnZXBlbDgtcGxheWdyb3VuZCcKKysKKysgICAgICAgIHNl bGYuY21kLmxvYWRfcnBtZGVmaW5lcygpCisrCisrICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCc4 Jywgc2VsZi5jbWQuX2Rpc3R2YWwpCisrICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdyaGVsJywg c2VsZi5jbWQuX2Rpc3R2YXIpCisrICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdlbDhfcGxheWdy b3VuZCcsIHNlbGYuY21kLl9kaXN0dGFnKQorKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnZXBl bC04LWk2ODYnLCBzZWxmLmNtZC5tb2NrY29uZmlnKQorKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgnZXBlbDgtb3ZlcnJpZGUnLCBzZWxmLmNtZC5vdmVycmlkZSkKKysgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShoYXNhdHRyKHNlbGYuY21kLCAnX2Rpc3R1bnNldCcpKQorKworKyAgICAgICAgc2Vs Zi5hc3NlcnRfcnBtZGVmaW5lcygpCisrCisgICAgIEBwYXRjaCgncHlycGtnLkNvbW1hbmRzLmJy YW5jaF9tZXJnZScsIG5ld19jYWxsYWJsZT1Qcm9wZXJ0eU1vY2spCisgICAgIEBwYXRjaCgnZmVk cGtnLkNvbW1hbmRzLl9maW5kbWFzdGVyYnJhbmNoJykKKyAgICAgZGVmIHRlc3RfbG9hZF9tYXN0 ZXJfZGlzdF90YWcoc2VsZiwgX2ZpbmRtYXN0ZXJicmFuY2gsIGJyYW5jaF9tZXJnZSk6CistLSAK KzIuMjEuMAorCgpkaWZmIC0tZ2l0IGEvMDAwNS1Vc2UtcGFja2FnZS5jZmctZm9yLWVwZWw4LWJy YW5jaGVzLnBhdGNoIGIvMDAwNS1Vc2UtcGFja2FnZS5jZmctZm9yLWVwZWw4LWJyYW5jaGVzLnBh dGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU5ZjIyMjgKLS0tIC9kZXYv bnVsbAorKysgYi8wMDA1LVVzZS1wYWNrYWdlLmNmZy1mb3ItZXBlbDgtYnJhbmNoZXMucGF0Y2gK QEAgLTAsMCArMSw4MSBAQAorRnJvbSA3MDJkNjg1NDRkMjBlOWNjM2YyZWI4MjBkYWNiMTJmNWZk NzZlOGIwIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogTW9oYW4gQm9kZHUgPG1ib2Rk dUBiaHVqamkuY29tPgorRGF0ZTogRnJpLCAyNiBKdWwgMjAxOSAxMTo0MDowMCAtMDQwMAorU3Vi amVjdDogW1BBVENIXSBVc2UgcGFja2FnZS5jZmcgZm9yIGVwZWw4KyBicmFuY2hlcworCitTaWdu ZWQtb2ZmLWJ5OiBNb2hhbiBCb2RkdSA8bWJvZGR1QGJodWpqaS5jb20+CitNZXJnZXM6IGh0dHBz Oi8vcGFndXJlLmlvL2ZlZHBrZy9wdWxsLXJlcXVlc3QvMzQ4CistLS0KKyBmZWRwa2cvdXRpbHMu cHkgICAgfCAyOCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCisgdGVzdC90ZXN0X3V0aWxz LnB5IHwgIDQgKysrLQorIDIgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxl dGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL2ZlZHBrZy91dGlscy5weSBiL2ZlZHBrZy91dGlscy5w eQoraW5kZXggZWEyNTQzOS4uZmNhYTZlYyAxMDA2NDQKKy0tLSBhL2ZlZHBrZy91dGlscy5weQor KysrIGIvZmVkcGtnL3V0aWxzLnB5CitAQCAtMzUwLDExICszNTAsMjUgQEAgZGVmIGdldF9zdHJl YW1fYnJhbmNoZXMoc2VydmVyX3VybCwgcGFja2FnZV9uYW1lKToKKyAgICAgIyBQbGVhc2UgcmVt ZW1iZXIgdG8gcmV2aWV3IHRoZSBkYXRhIHJlZ3VsYXJseSwgdGhlcmUgYXJlIG9ubHkgc3RyZWFt CisgICAgICMgYnJhbmNoZXMsIG9yIHNvbWUgbmV3IHJlcGxhY2VtZW50IG9mIFBEQyBmaXhlcyB0 aGUgaXNzdWUgYXMgd2VsbCwgaXQKKyAgICAgIyBzaG91bGQgYmUgb2sgdG8gcmVtb3ZlIGlmIGZy b20gdGhpcyBsaXN0LgorLSAgICByZXR1cm4gWworLSAgICAgICAgaXRlbSBmb3IgaXRlbSBpbiBi cmFuY2hlcworLSAgICAgICAgaWYgbm90IHJlLm1hdGNoKHInXihmfGVsfGVwZWwpXGQrJCcsIGl0 ZW1bJ25hbWUnXSkgYW5kCistICAgICAgICBpdGVtWyduYW1lJ10gIT0gJ21hc3RlcicKKy0gICAg XQorKyAgICBzdHJlYW1fYnJhbmNoZXMgPSBbXQorKyAgICBmb3IgaXRlbSBpbiBicmFuY2hlczoK KysgICAgICAgIGlmIGl0ZW1bJ25hbWUnXSA9PSAnbWFzdGVyJzoKKysgICAgICAgICAgICBjb250 aW51ZQorKyAgICAgICAgZWxpZiByZS5tYXRjaChyJ14oZnxlbClcZCskJywgaXRlbVsnbmFtZSdd KToKKysgICAgICAgICAgICBjb250aW51ZQorKyAgICAgICAgIyBlcGVsNyBpcyByZWd1bGFyIHJl bGVhc2UgYnJhbmNoCisrICAgICAgICAjIGVwZWw4IGFuZCBhYm92ZSBzaG91bGQgYmUgY29uc2lk ZXJlZCBhIHN0cmVhbSBicmFuY2ggdG8gdXNlCisrICAgICAgICAjIHBhY2thZ2UuY2ZnIGZpbGUg aW4gdGhlIGJyYW5jaC4KKysgICAgICAgIGVsaWYgJ2VwZWw3JyA9PSBpdGVtWyduYW1lJ106Cisr ICAgICAgICAgICAgY29udGludWUKKysgICAgICAgICMgZXBlbDgtcGxheWdyb3VuZCBhbmQgYWJv dmUgcGxheWdyb3VuZCBicmFuY2hlcyBzaG91bGQgYmUgY29uc2lkZXJlZAorKyAgICAgICAgIyBh cyByZWxlYXNlIGJyYW5jaGVzIHNvIHRoYXQgaXQgd2lsbCB1c2UgZXBlbFgtcGxheWdyb3VuZC1j YW5kaWRhdGUKKysgICAgICAgICMgdGFyZ2V0IHRvIGJ1aWxkLgorKyAgICAgICAgZWxpZiByZS5t YXRjaChyJ15lcGVsXGQrLXBsYXlncm91bmQkJywgaXRlbVsnbmFtZSddKToKKysgICAgICAgICAg ICBjb250aW51ZQorKyAgICAgICAgZWxzZToKKysgICAgICAgICAgICBzdHJlYW1fYnJhbmNoZXMu YXBwZW5kKGl0ZW0pCisrICAgIHJldHVybiBzdHJlYW1fYnJhbmNoZXMKKyAKKyAKKyBkZWYgZXhw YW5kX3JlbGVhc2UocmVsLCBhY3RpdmVfcmVsZWFzZXMpOgorQEAgLTM3OSw1ICszOTMsOSBAQCBk ZWYgZXhwYW5kX3JlbGVhc2UocmVsLCBhY3RpdmVfcmVsZWFzZXMpOgorICAgICAgICAgcmV0dXJu IGFjdGl2ZV9yZWxlYXNlc1snZXBlbCddCisgICAgIGVsaWYgcmVsIGluIGFjdGl2ZV9yZWxlYXNl c1snZmVkb3JhJ10gb3IgcmVsIGluIGFjdGl2ZV9yZWxlYXNlc1snZXBlbCddOgorICAgICAgICAg cmV0dXJuIFtyZWxdCisrICAgICMgaWYgZXBlbFgtcGxheWdyb3VuZCBicmFuY2ggdGhlbiByZXR1 cm4gdGhlIHJlbGVhc2UgdG8gdXNlCisrICAgICMgZXBlbFgtcGxheWdyb3VuZC1jYW5kaWRhdGUg dGFyZ2V0CisrICAgIGVsaWYgcmUubWF0Y2gocideZXBlbFxkKy1wbGF5Z3JvdW5kJCcsIHJlbCk6 CisrICAgICAgICByZXR1cm4gW3JlbF0KKyAgICAgZWxzZToKKyAgICAgICAgIHJldHVybiBOb25l CitkaWZmIC0tZ2l0IGEvdGVzdC90ZXN0X3V0aWxzLnB5IGIvdGVzdC90ZXN0X3V0aWxzLnB5Citp bmRleCA3NGRiMjI3Li4xZWU0Y2U4IDEwMDY0NAorLS0tIGEvdGVzdC90ZXN0X3V0aWxzLnB5Cisr KysgYi90ZXN0L3Rlc3RfdXRpbHMucHkKK0BAIC00NjgsMTMgKzQ2OCwxNSBAQCBjbGFzcyBUZXN0 R2V0U3RyZWFtQnJhbmNoZXModW5pdHRlc3QuVGVzdENhc2UpOgorICAgICAgICAgICAgICAgICB7 J25hbWUnOiAnZjI4J30sCisgICAgICAgICAgICAgICAgIHsnbmFtZSc6ICdlcGVsNyd9LAorICAg ICAgICAgICAgICAgICB7J25hbWUnOiAnbWFzdGVyJ30sCisrICAgICAgICAgICAgICAgIHsnbmFt ZSc6ICdlcGVsOCd9LAorKyAgICAgICAgICAgICAgICB7J25hbWUnOiAnZXBlbDgtcGxheWdyb3Vu ZCd9CisgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAnbmV4dCc6IE5vbmUKKyAgICAgICAg IH0KKyAgICAgICAgIGdldC5yZXR1cm5fdmFsdWUgPSBydgorIAorICAgICAgICAgcmVzdWx0ID0g dXRpbHMuZ2V0X3N0cmVhbV9icmFuY2hlcygnaHR0cDovL2xvY2FsaG9zdC8nLCAncGtnJykKKy0g ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoW3snbmFtZSc6ICc4J30sIHsnbmFtZSc6ICcxMCd9XSwg bGlzdChyZXN1bHQpKQorKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbeyduYW1lJzogJzgnfSwg eyduYW1lJzogJzEwJ30sIHsnbmFtZSc6ICdlcGVsOCd9XSwgbGlzdChyZXN1bHQpKQorIAorIAor IGNsYXNzIFRlc3RFeHBhbmRSZWxlYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKKy0tIAorMi4yMS4w CisKCmRpZmYgLS1naXQgYS9mZWRwa2cuc3BlYyBiL2ZlZHBrZy5zcGVjCmluZGV4IDdlMDhlY2Mu LjM0ZGM1NjkgMTAwNjQ0Ci0tLSBhL2ZlZHBrZy5zcGVjCisrKyBiL2ZlZHBrZy5zcGVjCkBAIC01 LDcgKzUsNyBAQAogCiBOYW1lOiAgICAgICAgICAgZmVkcGtnCiBWZXJzaW9uOiAgICAgICAgMS4z NwotUmVsZWFzZTogICAgICAgIDUlez9kaXN0fQorUmVsZWFzZTogICAgICAgIDYlez9kaXN0fQog U3VtbWFyeTogICAgICAgIEZlZG9yYSB1dGlsaXR5IGZvciB3b3JraW5nIHdpdGggZGlzdC1naXQK IAogTGljZW5zZTogICAgICAgIEdQTHYyKwpAQCAtMTYsNiArMTYsOCBAQCBCdWlsZEFyY2g6ICAg ICAgbm9hcmNoCiBQYXRjaDA6ICAgICAgICAgMDAwMS1CdW1wLWNoZWNrLWZvci1ib2RoaS1jbGll bnQucGF0Y2gKIFBhdGNoMTogICAgICAgICAwMDAyLVN1cHBvcnQtZm9yLWVwZWwtcGxheWdyb3Vu ZC1icmFuY2gtcmVxdWVzdHMucGF0Y2gKIFBhdGNoMjogICAgICAgICAwMDAzLUFsbG93LWVwZWwt cGxheWdyb3VuZC1yZXF1ZXN0cy1mb3ItZXBlbDgtYW5kLW5ld2VyLnBhdGNoCitQYXRjaDM6ICAg ICAgICAgMDAwNC1BZGQtZXBlbC1wbGF5Z3JvdW5kLWludG8tcnBtZGVmaW5lcy5wYXRjaAorUGF0 Y2g0OiAgICAgICAgIDAwMDUtVXNlLXBhY2thZ2UuY2ZnLWZvci1lcGVsOC1icmFuY2hlcy5wYXRj aAogCiAjIGZlZHBrZyBjb21tYW5kIHN3aXRjaGVkIHRvIHB5dGhvbjMgb24gRmVkb3JhIDI5IGFu ZCBSSEVMID4gNzoKICVpZiAwJXs/ZmVkb3JhfSA+IDI4IHx8IDAlez9yaGVsfSA+IDcKQEAgLTE2 Niw2ICsxNjgsMTAgQEAgbm9zZXRlc3RzCiAKIAogJWNoYW5nZWxvZworKiBUaHUgQXVnIDAxIDIw MTkgT25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+IC0gMS4zNy02CistIEJhY2twb3J0 OiBBZGQgZXBlbCotcGxheWdyb3VuZCBpbnRvIHJwbWRlZmluZXMKKy0gQmFja3BvcnQ6IFVzZSBw YWNrYWdlLmNmZyBmb3IgZXBlbDgrIGJyYW5jaGVzCisKICogVGh1IEp1bCAyNSAyMDE5IEZlZG9y YSBSZWxlYXNlIEVuZ2luZWVyaW5nIDxyZWxlbmdAZmVkb3JhcHJvamVjdC5vcmc+IC0gMS4zNy01 CiAtIFJlYnVpbHQgZm9yIGh0dHBzOi8vZmVkb3JhcHJvamVjdC5vcmcvd2lraS9GZWRvcmFfMzFf TWFzc19SZWJ1aWxkCiAK