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?THVib23DrXIgU2VkbMOhxZkgPGxzZWRsYXJAcmVkaGF0LmNvbT4=?= To: git-commits@fedoraproject.org Subject: [rpms/rpkg] 1.70-1: Backport patch to move inheritance check to a method Date: Mon, 10 Aug 2026 21:43:42 GMT Message-ID: <178639822204.1.15050266332362895177.rpms-rpkg-37c0ec7ecf3f@fedoraproject.org> List-ID: X-Git-Repo: rpms/rpkg X-Git-Branch: 1.70-1 X-Git-Rev: 37c0ec7ecf3f9393396d755dcbe92874da1a5984 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvcnBrZwpCcmFuY2gg OiAxLjcwLTEKQ29tbWl0IDogMzdjMGVjN2VjZjNmOTM5MzM5NmQ3NTVkY2JlOTI4NzRkYTFhNTk4 NApBdXRob3IgOiBMdWJvbcOtciBTZWRsw6HFmSA8bHNlZGxhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDE3LTAyLTAxVDA4OjM3OjAxKzAxOjAwClN0YXRzICA6ICsxMzYvLTEgaW4gMiBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvcnBrZy9jLzM3YzBl YzdlY2YzZjkzOTMzOTZkNzU1ZGNiZTkyODc0ZGExYTU5ODQ/YnJhbmNoPTEuNzAtMQoKTG9nOgpC YWNrcG9ydCBwYXRjaCB0byBtb3ZlIGluaGVyaXRhbmNlIGNoZWNrIHRvIGEgbWV0aG9kCgotLS0K ZGlmZiAtLWdpdCBhLzAwMDEtTW92ZS10YWctaW5oZXJpdGFuY2UtY2hlY2staW50by1hLXNlcGFy YXRlLW1ldGhvZC5wYXRjaCBiLzAwMDEtTW92ZS10YWctaW5oZXJpdGFuY2UtY2hlY2staW50by1h LXNlcGFyYXRlLW1ldGhvZC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li4zMzdjZjY4Ci0tLSAvZGV2L251bGwKKysrIGIvMDAwMS1Nb3ZlLXRhZy1pbmhlcml0YW5jZS1j aGVjay1pbnRvLWEtc2VwYXJhdGUtbWV0aG9kLnBhdGNoCkBAIC0wLDAgKzEsMTI5IEBACitGcm9t IDVkMjVhOTE4Njg0MmMwYTY3ZmVhMzU1N2RmZGE1NzFmOGVjZWVmNGYgTW9uIFNlcCAxNyAwMDow MDowMCAyMDAxCitGcm9tOiBDaGVueGlvbmcgUWkgPGNxaUByZWRoYXQuY29tPgorRGF0ZTogVHVl LCAxMCBKYW4gMjAxNyAxNToyODozNCArMDgwMAorU3ViamVjdDogW1BBVENIXSBNb3ZlIHRhZyBp bmhlcml0YW5jZSBjaGVjayBpbnRvIGEgc2VwYXJhdGUgbWV0aG9kCisKK1RhZyBpbmhlcml0YW5j ZSBjaGVjayBtYXkgbm90IGJlIHJlcXVpcmVkIGJ5IGFsbCBkb3duc3RyZWFtIHBhY2thZ2UKK3Rv b2xzIGJ1aWx0IG9uIHRvcCBvZiBycGtnLiBNb3ZpbmcgdGhpcyBjaGVjayBpbnRvIGEgc2VwYXJh dGUgbWV0aG9kCit3b3VsZCBiZSBlYXN5IGZvciBkb3duc3RyZWFtIHRvb2xzIHRvIGN1c3RvbWl6 ZSB0aGUgYmVoYXZpb3IuIEJ5CitkZWZhdWx0LCB0YWcgaW5oZXJpdGFuY2UgY2hlY2sgaGFwcGVu cyB3aGVuIGRvaW5nIGEgY2hhaW4gYnVpbGQuIE9uY2UKK3NvbWUgdG9vbCBkb2VzIG5vdCBuZWVk IHRoZSBjaGVjaywgaXQgY2FuIGJlIGRpc2FibGVkIGluIGRlcml2ZWQKK0NvbW1hbmRzIGNsYXNz LgorCitTaWduZWQtb2ZmLWJ5OiBDaGVueGlvbmcgUWkgPGNxaUByZWRoYXQuY29tPgorLS0tCisg Q0hBTkdFTE9HLnJzdCAgICAgICAgICB8ICA1ICsrKysrCisgcHlycGtnL19faW5pdF9fLnB5ICAg ICB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KKyB0ZXN0cy90ZXN0X2NvbW1hbmRzLnB5IHwgMzcg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKworIDMgZmlsZXMgY2hhbmdlZCwg NTIgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL0NIQU5HRUxP Ry5yc3QgYi9DSEFOR0VMT0cucnN0CitpbmRleCAzYjAwMzFjLi5iMjVhNGRiIDEwMDY0NAorLS0t IGEvQ0hBTkdFTE9HLnJzdAorKysrIGIvQ0hBTkdFTE9HLnJzdAorQEAgLTEsNiArMSwxMSBAQAor IENoYW5nZUxvZworID09PT09PT09PQorIAorK05FWFQKKystLS0tCisrCisrLSBNb3ZlIHRhZyBp bmhlcml0YW5jZSBjaGVjayBpbnRvIGEgc2VwYXJhdGUgbWV0aG9kIChjcWkpCisrCisgdjEuNDgg KDIwMTYtMTItMjIpCisgLS0tLS0tLS0tLS0tLS0tLS0tCisgCitkaWZmIC0tZ2l0IGEvcHlycGtn L19faW5pdF9fLnB5IGIvcHlycGtnL19faW5pdF9fLnB5CitpbmRleCA2MTkwN2EyLi42MTAzOWYz IDEwMDY0NAorLS0tIGEvcHlycGtnL19faW5pdF9fLnB5CisrKysgYi9weXJwa2cvX19pbml0X18u cHkKK0BAIC0xODIyLDYgKzE4MjIsMTQgQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAg ICAgICAgICBpZiBzZWxmLnJlcG8uZ2l0LnJldl9saXN0KCclcy4uLiVzJyAlIChtZXJnZSwgYnJh bmNoKSk6CisgICAgICAgICAgICAgICAgIHJhaXNlIHJwa2dFcnJvcignVGhlcmUgYXJlIHVucHVz aGVkIGNoYW5nZXMgaW4geW91ciByZXBvJykKKyAKKysgICAgZGVmIGNoZWNrX2luaGVyaXRhbmNl KHNlbGYsIGJ1aWxkX3RhcmdldCwgZGVzdF90YWcpOgorKyAgICAgICAgIiIiQ2hlY2sgaWYgYnVp bGQgdGFnIGluaGVyaXRzIGZyb20gZGVzdCB0YWciIiIKKysgICAgICAgIGFuY2VzdG9ycyA9IHNl bGYua29qaXNlc3Npb24uZ2V0RnVsbEluaGVyaXRhbmNlKGJ1aWxkX3RhcmdldFsnYnVpbGRfdGFn J10pCisrICAgICAgICBhbmNlc3RvcnMgPSBbYW5jZXN0b3JbJ3BhcmVudF9pZCddIGZvciBhbmNl c3RvciBpbiBhbmNlc3RvcnNdCisrICAgICAgICBpZiBkZXN0X3RhZ1snaWQnXSBub3QgaW4gW2J1 aWxkX3RhcmdldFsnYnVpbGRfdGFnJ11dICsgYW5jZXN0b3JzOgorKyAgICAgICAgICAgIHJhaXNl IHJwa2dFcnJvcignUGFja2FnZXMgaW4gZGVzdGluYXRpb24gdGFnICUoZGVzdF90YWdfbmFtZSlz IGFyZSBub3QgaW5oZXJpdGVkIGJ5JworKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnIGJ1 aWxkIHRhZyAlKGJ1aWxkX3RhZ19uYW1lKXMnICUgYnVpbGRfdGFyZ2V0KQorKworICAgICBkZWYg YnVpbGQoc2VsZiwgc2tpcF90YWc9RmFsc2UsIHNjcmF0Y2g9RmFsc2UsIGJhY2tncm91bmQ9RmFs c2UsCisgICAgICAgICAgICAgICB1cmw9Tm9uZSwgY2hhaW49Tm9uZSwgYXJjaGVzPU5vbmUsIHNl dHM9RmFsc2UsIG52cl9jaGVjaz1UcnVlKToKKyAgICAgICAgICIiIkluaXRpYXRlIGEgYnVpbGQg b2YgdGhlIG1vZHVsZS4gIEF2YWlsYWJsZSBvcHRpb25zIGFyZToKK0BAIC0xODc2LDE3ICsxODg0 LDEwIEBAIGNsYXNzIENvbW1hbmRzKG9iamVjdCk6CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICUgYnVpbGRfdGFyZ2V0WydkZXN0X3RhZ19uYW1lJ10pCisgICAgICAgICBpZiBkZXN0X3Rh Z1snbG9ja2VkJ10gYW5kIG5vdCBzY3JhdGNoOgorICAgICAgICAgICAgIHJhaXNlIHJwa2dFcnJv cignRGVzdGluYXRpb24gdGFnICVzIGlzIGxvY2tlZCcgJSBkZXN0X3RhZ1snbmFtZSddKQorLSAg ICAgICAgIyBJZiB3ZSdyZSBjaGFpbiBidWlsZGluZywgbWFrZSBzdXJlIGluaGVyaXRhbmNlIHdv cmtzCisgICAgICAgICBpZiBjaGFpbjoKKyAgICAgICAgICAgICBjbWQuYXBwZW5kKCdjaGFpbi1i dWlsZCcpCistICAgICAgICAgICAgYW5jZXN0b3JzID0gc2VsZi5rb2ppc2Vzc2lvbi5nZXRGdWxs SW5oZXJpdGFuY2UoCistICAgICAgICAgICAgICAgIGJ1aWxkX3RhcmdldFsnYnVpbGRfdGFnJ10p CistICAgICAgICAgICAgYW5jZXN0b3JzID0gW2FuY2VzdG9yWydwYXJlbnRfaWQnXSBmb3IgYW5j ZXN0b3IgaW4gYW5jZXN0b3JzXQorLSAgICAgICAgICAgIGlmIGRlc3RfdGFnWydpZCddIG5vdCBp biBbYnVpbGRfdGFyZ2V0WydidWlsZF90YWcnXV0gKyBhbmNlc3RvcnM6CistICAgICAgICAgICAg ICAgIHJhaXNlIHJwa2dFcnJvcignUGFja2FnZXMgaW4gZGVzdGluYXRpb24gdGFnICcKKy0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICclKGRlc3RfdGFnX25hbWUpcyBhcmUgbm90IGlu aGVyaXRlZCBieScKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdidWlsZCB0YWcg JShidWlsZF90YWdfbmFtZSlzJyAlCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi dWlsZF90YXJnZXQpCisrICAgICAgICAgICAgIyBXZSdyZSBjaGFpbiBidWlsZGluZywgbWFrZSBz dXJlIGluaGVyaXRhbmNlIHdvcmtzCisrICAgICAgICAgICAgc2VsZi5jaGVja19pbmhlcml0YW5j ZShidWlsZF90YXJnZXQsIGRlc3RfdGFnKQorICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICBj bWQuYXBwZW5kKCdidWlsZCcpCisgICAgICAgICAjIGRlZmluZSBvdXIgZGljdGlvbmFyeSBmb3Ig b3B0aW9ucworZGlmZiAtLWdpdCBhL3Rlc3RzL3Rlc3RfY29tbWFuZHMucHkgYi90ZXN0cy90ZXN0 X2NvbW1hbmRzLnB5CitpbmRleCAwZDA4ZWIxLi45NzY1ZDZkIDEwMDY0NAorLS0tIGEvdGVzdHMv dGVzdF9jb21tYW5kcy5weQorKysrIGIvdGVzdHMvdGVzdF9jb21tYW5kcy5weQorQEAgLTcsNiAr Nyw3IEBAIGltcG9ydCB0ZW1wZmlsZQorIGltcG9ydCBnaXQKKyBpbXBvcnQgcnBtCisgZnJvbSBt b2NrIGltcG9ydCBwYXRjaAorK2Zyb20gbW9jayBpbXBvcnQgTW9jaworIAorIGZyb20gcHlycGtn IGltcG9ydCBycGtnRXJyb3IKKyAKK0BAIC01MDQsMyArNTA1LDM5IEBAIGNsYXNzIFRlc3RHZXRM YXRlc3RDb21taXQoQ29tbWFuZFRlc3RDYXNlKToKKyAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c3RyKGdpdC5SZXBvKHNlbGYucmVwb19wYXRoKS5pdGVyX2NvbW1pdHMoKS5uZXh0KCkpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICBjbWQuZ2V0X2xhdGVzdF9jb21taXQob3MucGF0aC5iYXNl bmFtZShzZWxmLnJlcG9fcGF0aCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnZW5nLXJoZWwtNicpKQorKworKworK2RlZiBsb2FkX2tvamlzZXNzaW9u KHNlbGYpOgorKyAgICBzZWxmLl9rb2ppc2Vzc2lvbiA9IE1vY2soKQorKyAgICBzZWxmLl9rb2pp c2Vzc2lvbi5nZXRGdWxsSW5oZXJpdGFuY2UucmV0dXJuX3ZhbHVlID0gWworKyAgICAgICAgeydj aGlsZF9pZCc6IDM0MiwgJ2N1cnJkZXB0aCc6IDEsICdmaWx0ZXInOiBbXSwgJ2ludHJhbnNpdGl2 ZSc6IEZhbHNlLAorKyAgICAgICAgICdtYXhkZXB0aCc6IE5vbmUsICduYW1lJzogJ2YyNS1vdmVy cmlkZScsICduZXh0ZGVwdGgnOiBOb25lLCAnbm9jb25maWcnOiBGYWxzZSwKKysgICAgICAgICAn cGFyZW50X2lkJzogMzQxLCAncGtnX2ZpbHRlcic6ICcnLCAncHJpb3JpdHknOiAwfSwKKysgICAg ICAgIHsnY2hpbGRfaWQnOiAzNDEsICdjdXJyZGVwdGgnOiAyLCAnZmlsdGVyJzogW10sICdpbnRy YW5zaXRpdmUnOiBGYWxzZSwKKysgICAgICAgICAnbWF4ZGVwdGgnOiBOb25lLCAnbmFtZSc6ICdm MjUtdXBkYXRlcycsICduZXh0ZGVwdGgnOiBOb25lLCAnbm9jb25maWcnOiBGYWxzZSwKKysgICAg ICAgICAncGFyZW50X2lkJzogMzM2LCAncGtnX2ZpbHRlcic6ICcnLCAncHJpb3JpdHknOiAwfSwK KysgICAgICAgIHsnY2hpbGRfaWQnOiAzMzYsICdjdXJyZGVwdGgnOiAzLCAnZmlsdGVyJzogW10s ICdpbnRyYW5zaXRpdmUnOiBGYWxzZSwKKysgICAgICAgICAnbWF4ZGVwdGgnOiBOb25lLCAnbmFt ZSc6ICdmMjUnLCAnbmV4dGRlcHRoJzogTm9uZSwgJ25vY29uZmlnJzogRmFsc2UsCisrICAgICAg ICAgJ3BhcmVudF9pZCc6IDMzNSwgJ3BrZ19maWx0ZXInOiAnJywgJ3ByaW9yaXR5JzogMH0sCisr ICAgICAgICBdCisrCisrCisrY2xhc3MgVGVzdFRhZ0luaGVyaXRhbmNlVGFnKENvbW1hbmRUZXN0 Q2FzZSk6CisrCisrICAgIEBwYXRjaCgncHlycGtnLkNvbW1hbmRzLmxvYWRfa29qaXNlc3Npb24n LCBuZXc9bG9hZF9rb2ppc2Vzc2lvbikKKysgICAgZGVmIHRlc3RfZXJyb3JfaWZfbm90X2luaGVy aXQoc2VsZik6CisrICAgICAgICBidWlsZF90YXJnZXQgPSB7CisrICAgICAgICAgICAgJ2J1aWxk X3RhZyc6IDM0MiwgJ2J1aWxkX3RhZ19uYW1lJzogJ2YyNS1idWlsZCcsCisrICAgICAgICAgICAg J2Rlc3RfdGFnJzogMzM3LCAnZGVzdF90YWdfbmFtZSc6ICdmMjUtdXBkYXRlcy1jYW5kaWRhdGUn LAorKyAgICAgICAgICAgICdpZCc6IDE2NywgJ25hbWUnOiAnZjI1LWNhbmRpZGF0ZScsCisrICAg ICAgICAgICAgfQorKyAgICAgICAgZGVzdF90YWcgPSB7CisrICAgICAgICAgICAgJ2FyY2hlcyc6 IE5vbmUsICdleHRyYSc6IHt9LAorKyAgICAgICAgICAgICdpZCc6IDMzNywgJ2xvY2tlZCc6IEZh bHNlLAorKyAgICAgICAgICAgICdtYXZlbl9pbmNsdWRlX2FsbCc6IEZhbHNlLCAnbWF2ZW5fc3Vw cG9ydCc6IEZhbHNlLAorKyAgICAgICAgICAgICduYW1lJzogJ2YyNS11cGRhdGVzLWNhbmRpZGF0 ZScsCisrICAgICAgICAgICAgJ3Blcm0nOiBOb25lLCAncGVybV9pZCc6IE5vbmUsCisrICAgICAg ICAgICAgfQorKworKyAgICAgICAgY21kID0gc2VsZi5tYWtlX2NvbW1hbmRzKCkKKysgICAgICAg IHNlbGYuYXNzZXJ0UmFpc2VzKHJwa2dFcnJvciwgY21kLmNoZWNrX2luaGVyaXRhbmNlLCBidWls ZF90YXJnZXQsIGRlc3RfdGFnKQorLS0gCisyLjkuMworCgpkaWZmIC0tZ2l0IGEvcnBrZy5zcGVj IGIvcnBrZy5zcGVjCmluZGV4IDQwZTUwZGYuLjg0OWQ1NGIgMTAwNjQ0Ci0tLSBhL3Jwa2cuc3Bl YworKysgYi9ycGtnLnNwZWMKQEAgLTMsMTMgKzMsMTUgQEAKIAogTmFtZTogICAgICAgICAgIHJw a2cKIFZlcnNpb246ICAgICAgICAxLjQ4Ci1SZWxlYXNlOiAgICAgICAgMSV7P2Rpc3R9CitSZWxl YXNlOiAgICAgICAgMiV7P2Rpc3R9CiBTdW1tYXJ5OiAgICAgICAgVXRpbGl0eSBmb3IgaW50ZXJh Y3Rpbmcgd2l0aCBycG0rZ2l0IHBhY2thZ2luZyBzeXN0ZW1zCiAKIEdyb3VwOiAgICAgICAgICBB cHBsaWNhdGlvbnMvU3lzdGVtCiBMaWNlbnNlOiAgICAgICAgR1BMdjIrIGFuZCBMR1BMdjIKIFVS TDogICAgICAgICAgICBodHRwczovL3BhZ3VyZS5pby9ycGtnCiBTb3VyY2UwOiAgICAgICAgaHR0 cHM6Ly9wYWd1cmUuaW8vcmVsZWFzZXMvcnBrZy9ycGtnLSV7dmVyc2lvbn0udGFyLmd6CisjIEJh Y2twb3J0ZWQgZnJvbSBnaXQ7IGRyb3AgZm9yIG5leHQgdXBzdHJlYW0gcmVsZWFzZQorUGF0Y2gw OiAgICAgICAgIDAwMDEtTW92ZS10YWctaW5oZXJpdGFuY2UtY2hlY2staW50by1hLXNlcGFyYXRl LW1ldGhvZC5wYXRjaAogQnVpbGRSb290OiAgICAgICV7X3RtcHBhdGh9LyV7bmFtZX0tJXt2ZXJz aW9ufS0le3JlbGVhc2V9LXJvb3QtJSgle19faWRfdX0gLW4pCiAKIFJlcXVpcmVzOiAgICAgICBw eXJwa2cgPj0gJXt2ZXJzaW9ufS0le3JlbGVhc2V9CkBAIC02Miw2ICs2NCw3IEBAIEEgcHl0aG9u IGxpYnJhcnkgZm9yIG1hbmFnaW5nIFJQTSBwYWNrYWdlIHNvdXJjZXMgaW4gYSBnaXQgcmVwb3Np dG9yeS4KIAogJXByZXAKICVzZXR1cCAtcQorJXBhdGNoMCAtcDEKIAogCiAlYnVpbGQKQEAgLTk2 LDYgKzk5LDkgQEAgcm0gLXJmICRSUE1fQlVJTERfUk9PVAogCiAKICVjaGFuZ2Vsb2cKKyogV2Vk IEZlYiAxIDIwMTcgTHVib23DrXIgU2VkbMOhxZkgPGxzZWRsYXJAcmVkaGF0LmNvbT4gLSAxLjQ4 LTIKKy0gQmFja3BvcnQgcGF0Y2ggdG8gbW92ZSB0YWcgaW5oZXJpdGFuY2UgY2hlY2sgdG8gc2Vw YXJhdGUgbWV0aG9kCisKICogVGh1IERlYyAyMiAyMDE2IENoZW54aW9uZyBRaSA8Y3FpQHJlZGhh dC5jb20+IC0gMS40OC0xCiAtIEJldHRlciBtZXNzYWdlIHdoZW4gZmFpbCB0byBhdXRoZW50aWNh dGUgdmlhIEtlcmJlcm9zIC0gIzE4MCAoY3FpKQogCg==