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: Michel Lind To: git-commits@fedoraproject.org Subject: [rpms/python-django-extensions] rawhide: Backport fix for Django 6 support regressions; Fixes rhbz#2458683 Date: Tue, 16 Jun 2026 17:15:06 GMT Message-ID: <178163010632.1.8416426562471712538.rpms-python-django-extensions-4b4327800747@fedoraproject.org> List-ID: X-Git-Repo: rpms/python-django-extensions X-Git-Branch: rawhide X-Git-Rev: 4b4327800747df9816a94c0b383b24d1afe54dc7 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvcHl0aG9uLWRqYW5nby1leHRlbnNpb25zCiAgICAgICAgICAgIEJyYW5jaCA6 IHJhd2hpZGUKICAgICAgICAgICAgQ29tbWl0IDogNGI0MzI3ODAwNzQ3ZGY5ODE2YTk0YzBiMzgz YjI0ZDFhZmU1NGRjNwogICAgICAgICAgICBBdXRob3IgOiBNaWNoZWwgTGluZCA8c2FsaW1tYUBm ZWRvcmFwcm9qZWN0Lm9yZz4KICAgICAgICAgICAgRGF0ZSAgIDogMjAyNi0wNi0xNlQxNzo1Njow MSswMTowMAogICAgICAgICAgICBTdGF0cyAgOiArMTAxLy0zIGluIDMgZmlsZShzKQogICAgICAg ICAgICBVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3B5dGhvbi1k amFuZ28tZXh0ZW5zaW9ucy9jLzRiNDMyNzgwMDc0N2RmOTgxNmE5NGMwYjM4M2IyNGQxYWZlNTRk Yzc/YnJhbmNoPXJhd2hpZGUKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAgQmFja3BvcnQg Zml4IGZvciBEamFuZ28gNiBzdXBwb3J0IHJlZ3Jlc3Npb25zOyBGaXhlcyByaGJ6IzI0NTg2ODMK ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBMaW5kIDxzYWxpbW1hQGZlZG9yYXByb2plY3Qub3JnPgoK LS0tCmRpZmYgLS1naXQgYS9kamFuZ28tZXh0ZW5zaW9ucy1maXgtZGphbmdvNi1yZWdyZXNzaW9u cy5kaWZmIGIvZGphbmdvLWV4dGVuc2lvbnMtZml4LWRqYW5nbzYtcmVncmVzc2lvbnMuZGlmZgpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42OGYzYzAzCi0tLSAvZGV2L251bGwK KysrIGIvZGphbmdvLWV4dGVuc2lvbnMtZml4LWRqYW5nbzYtcmVncmVzc2lvbnMuZGlmZgpAQCAt MCwwICsxLDkwIEBACistLS0gYS9kamFuZ29fZXh0ZW5zaW9ucy9kYi9maWVsZHMvX19pbml0X18u cHkKKysrKyBiL2RqYW5nb19leHRlbnNpb25zL2RiL2ZpZWxkcy9fX2luaXRfXy5weQorQEAgLTg3 LDcgKzg3LDExIEBAIGNsYXNzIFVuaXF1ZUZpZWxkTWl4aW46CisgCisgICAgICAgICBuZXcgPSBu ZXh0KGl0ZXJhdG9yKQorICAgICAgICAga3dhcmdzW3NlbGYuYXR0bmFtZV0gPSBuZXcKKy0gICAg ICAgIHdoaWxlIG5vdCBuZXcgb3IgcXVlcnlzZXQuZmlsdGVyKHF1ZXJ5LCAqKmt3YXJncyk6Cisr ICAgICAgICB3aGlsZSBUcnVlOgorKyAgICAgICAgICAgIG1hdGNoaW5nID0gcXVlcnlzZXQuZmls dGVyKHF1ZXJ5LCAqKmt3YXJncykKKysgICAgICAgICAgICBoYXNfbWF0Y2ggPSBtYXRjaGluZy5l eGlzdHMoKSBpZiBoYXNhdHRyKG1hdGNoaW5nLCAiZXhpc3RzIikgZWxzZSBib29sKG1hdGNoaW5n KQorKyAgICAgICAgICAgIGlmIG5ldyBhbmQgbm90IGhhc19tYXRjaDoKKysgICAgICAgICAgICAg ICAgYnJlYWsKKyAgICAgICAgICAgICBuZXcgPSBuZXh0KGl0ZXJhdG9yKQorICAgICAgICAgICAg IGt3YXJnc1tzZWxmLmF0dG5hbWVdID0gbmV3CisgICAgICAgICBzZXRhdHRyKG1vZGVsX2luc3Rh bmNlLCBzZWxmLmF0dG5hbWUsIG5ldykKK0BAIC0zODksMTAgKzM5MywxNCBAQCBjbGFzcyBSYW5k b21DaGFyRmllbGQoVW5pcXVlRmllbGRNaXhpbiwKKyAgICAgICAgIHJldHVybiBGYWxzZQorIAor ICAgICBkZWYgcHJlX3NhdmUoc2VsZiwgbW9kZWxfaW5zdGFuY2UsIGFkZCk6CistICAgICAgICBp ZiAobm90IGFkZCBvciBzZWxmLmtlZXBfZGVmYXVsdCkgYW5kIGdldGF0dHIoCistICAgICAgICAg ICAgbW9kZWxfaW5zdGFuY2UsIHNlbGYuYXR0bmFtZQorLSAgICAgICAgKSAhPSAiIjoKKy0gICAg ICAgICAgICByZXR1cm4gZ2V0YXR0cihtb2RlbF9pbnN0YW5jZSwgc2VsZi5hdHRuYW1lKQorKyAg ICAgICAgY3VycmVudF92YWx1ZSA9IGdldGF0dHIobW9kZWxfaW5zdGFuY2UsIHNlbGYuYXR0bmFt ZSkKKysgICAgICAgICMgRGphbmdvIDYgbWF5IGNhbGwgcHJlX3NhdmUgbXVsdGlwbGUgdGltZXMg Zm9yIGluc2VydHM7IGlmIHdlJ3ZlIGFscmVhZHkKKysgICAgICAgICMgcG9wdWxhdGVkIHRoZSBm aWVsZCB2YWx1ZSwgcmV1c2UgaXQgaW5zdGVhZCBvZiByZWdlbmVyYXRpbmcuCisrICAgICAgICBp ZiBjdXJyZW50X3ZhbHVlIG5vdCBpbiAoIiIsIE5vbmUpOgorKyAgICAgICAgICAgIHJldHVybiBj dXJyZW50X3ZhbHVlCisrCisrICAgICAgICBpZiAobm90IGFkZCBvciBzZWxmLmtlZXBfZGVmYXVs dCkgYW5kIGN1cnJlbnRfdmFsdWUgIT0gIiI6CisrICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnRf dmFsdWUKKyAKKyAgICAgICAgIHBvcHVsYXRpb24gPSAiIgorICAgICAgICAgaWYgc2VsZi5pbmNs dWRlX2FscGhhOgorLS0tIGEvZGphbmdvX2V4dGVuc2lvbnMvbWFuYWdlbWVudC9jb21tYW5kcy9s aXN0X3NpZ25hbHMucHkKKysrKyBiL2RqYW5nb19leHRlbnNpb25zL21hbmFnZW1lbnQvY29tbWFu ZHMvbGlzdF9zaWduYWxzLnB5CitAQCAtNTMsNyArNTMsOSBAQCBjbGFzcyBDb21tYW5kKEJhc2VD b21tYW5kKToKKyAgICAgICAgIGZvciBzaWduYWwgaW4gc2lnbmFsczoKKyAgICAgICAgICAgICBz aWduYWxfbmFtZSA9IFNJR05BTF9OQU1FUy5nZXQoc2lnbmFsLCAidW5rbm93biIpCisgICAgICAg ICAgICAgZm9yIHJlY2VpdmVyIGluIHNpZ25hbC5yZWNlaXZlcnM6CistICAgICAgICAgICAgICAg IGlmIGRqYW5nby5WRVJTSU9OID49ICg1LCAwKToKKysgICAgICAgICAgICAgICAgaWYgZGphbmdv LlZFUlNJT04gPj0gKDYsIDApOgorKyAgICAgICAgICAgICAgICAgICAgbG9va3VwLCByZWNlaXZl ciwgX3NlbmRlciwgaXNfYXN5bmMgPSByZWNlaXZlcgorKyAgICAgICAgICAgICAgICBlbGlmIGRq YW5nby5WRVJTSU9OID49ICg1LCAwKToKKyAgICAgICAgICAgICAgICAgICAgIGxvb2t1cCwgcmVj ZWl2ZXIsIGlzX2FzeW5jID0gcmVjZWl2ZXIKKyAgICAgICAgICAgICAgICAgZWxzZToKKyAgICAg ICAgICAgICAgICAgICAgIGxvb2t1cCwgcmVjZWl2ZXIgPSByZWNlaXZlcgorLS0tIGEvdGVzdHMv dGVzdF9tYW5hZ2VtZW50X2NvbW1hbmQucHkKKysrKyBiL3Rlc3RzL3Rlc3RfbWFuYWdlbWVudF9j b21tYW5kLnB5CitAQCAtNCw2ICs0LDcgQEAgZnJvbSB1bml0dGVzdCBpbXBvcnQgbW9jaworIGlt cG9ydCBsb2dnaW5nCisgaW1wb3J0IGltcG9ydGxpYgorIAorK2ltcG9ydCBkamFuZ28KKyBmcm9t IGRqYW5nby5jb3JlLm1hbmFnZW1lbnQgaW1wb3J0ICgKKyAgICAgY2FsbF9jb21tYW5kLAorICAg ICBmaW5kX2NvbW1hbmRzLAorQEAgLTQyMiw3ICs0MjMsMTAgQEAgY2xhc3MgTGlzdE1vZGVsSW5m b1Rlc3RzKFRlc3RDYXNlKToKKyAgICAgICAgICAgICBzdGRvdXQ9b3V0LAorICAgICAgICAgKQor ICAgICAgICAgc2VsZi5vdXRwdXQgPSBvdXQuZ2V0dmFsdWUoKQorLSAgICAgICAgc2VsZi5hc3Nl cnRJbigiaWQgLSBBdXRvRmllbGQiLCBzZWxmLm91dHB1dCkKKysgICAgICAgIGlmIGRqYW5nby5W RVJTSU9OID49ICg2LCAwKToKKysgICAgICAgICAgICBzZWxmLmFzc2VydEluKCJpZCAtIEJpZ0F1 dG9GaWVsZCIsIHNlbGYub3V0cHV0KQorKyAgICAgICAgZWxzZToKKysgICAgICAgICAgICBzZWxm LmFzc2VydEluKCJpZCAtIEF1dG9GaWVsZCIsIHNlbGYub3V0cHV0KQorICAgICAgICAgc2VsZi5h c3NlcnRJbigiY2hhcl9maWVsZCAtIENoYXJGaWVsZCIsIHNlbGYub3V0cHV0KQorICAgICAgICAg c2VsZi5hc3NlcnRJbigiaW50ZWdlcl9maWVsZCAtIEludGVnZXJGaWVsZCIsIHNlbGYub3V0cHV0 KQorICAgICAgICAgc2VsZi5hc3NlcnRJbigiZm9yZWlnbl9rZXlfZmllbGQgLSBGb3JlaWduS2V5 Iiwgc2VsZi5vdXRwdXQpCistLS0gYS90ZXN0cy90ZXN0YXBwL21vZGVscy5weQorKysrIGIvdGVz dHMvdGVzdGFwcC9tb2RlbHMucHkKK0BAIC0xLDQgKzEsNSBAQAorICMgLSotIGNvZGluZzogdXRm LTggLSotCisraW1wb3J0IGRqYW5nbworIGZyb20gZGphbmdvLmRiIGltcG9ydCBtb2RlbHMKKyBm cm9tIGRqYW5nby5jb250cmliLmF1dGggaW1wb3J0IGdldF91c2VyX21vZGVsCisgZnJvbSBkamFu Z28uZGIubW9kZWxzIGltcG9ydCBVbmlxdWVDb25zdHJhaW50CitAQCAtMTc5LDcgKzE4MCwxMSBA QCBjbGFzcyBQb3N0V2l0aFVuaXFGaWVsZChtb2RlbHMuTW9kZWwpOgorICAgICAgICAgICAgICAg ICBmaWVsZHM9KCJjb21tb25fZmllbGQiLCAidW5pcV9maWVsZCIpLCBuYW1lPSJ1bmlxdWVfY29t bW9uX3VuaXFfcGFpciIKKyAgICAgICAgICAgICApLAorICAgICAgICAgICAgIG1vZGVscy5DaGVj a0NvbnN0cmFpbnQoCistICAgICAgICAgICAgICAgIGNoZWNrPX5tb2RlbHMuUShjb21tb25fZmll bGQ9bW9kZWxzLkYoImFub3RoZXJfY29tbW9uX2ZpZWxkIikpLAorKyAgICAgICAgICAgICAgICAq KigKKysgICAgICAgICAgICAgICAgICAgIHsiY29uZGl0aW9uIjogfm1vZGVscy5RKGNvbW1vbl9m aWVsZD1tb2RlbHMuRigiYW5vdGhlcl9jb21tb25fZmllbGQiKSl9CisrICAgICAgICAgICAgICAg ICAgICBpZiBkamFuZ28uVkVSU0lPTiA+PSAoNSwgMikKKysgICAgICAgICAgICAgICAgICAgIGVs c2UgeyJjaGVjayI6IH5tb2RlbHMuUShjb21tb25fZmllbGQ9bW9kZWxzLkYoImFub3RoZXJfY29t bW9uX2ZpZWxkIikpfQorKyAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgICBuYW1l PSJjb21tb25fYW5kX2Fub3RoZXJfY29tbW9uX2RpZmZlciIsCisgICAgICAgICAgICAgKSwKKyAg ICAgICAgIF0KCmRpZmYgLS1naXQgYS9weXRob24tZGphbmdvLWV4dGVuc2lvbnMuc3BlYyBiL3B5 dGhvbi1kamFuZ28tZXh0ZW5zaW9ucy5zcGVjCmluZGV4IGU4MjZjNzEuLmY0OTgyMDYgMTAwNjQ0 Ci0tLSBhL3B5dGhvbi1kamFuZ28tZXh0ZW5zaW9ucy5zcGVjCisrKyBiL3B5dGhvbi1kamFuZ28t ZXh0ZW5zaW9ucy5zcGVjCkBAIC0xLDUgKzEsNyBAQAogIyBCdWlsZCBkb2MgYnkgZGVmYXVsdAot JWJjb25kX3dpdGhvdXQgZG9jCislYmNvbmQgZG9jIDEKKworJWJjb25kIHB5cGlfc291cmNlIDAK IAogJWdsb2JhbCBzcmNuYW1lIGRqYW5nby1leHRlbnNpb25zCiAlZ2xvYmFsIG1vZG5hbWUgZGph bmdvX2V4dGVuc2lvbnMKQEAgLTExLDkgKzEzLDE0IEBAIFN1bW1hcnk6ICAgICAgICBFeHRlbnNp b25zIGZvciBEamFuZ28KIAogTGljZW5zZTogICAgICAgIEdQTC0zLjAtb3ItbGF0ZXIKIFVSTDog ICAgICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vZGphbmdvLWV4dGVuc2lvbnMvZGphbmdvLWV4 dGVuc2lvbnMKKyVpZiAle3dpdGggcHlwaV9zb3VyY2V9CiAjIFB5UEkgdGFyYmFsbCBkb2Vzbid0 IGNvbnRhaW4gc29tZSByZXF1aXJlbWVudHMgZmlsZXMKLSMgU291cmNlMDogICAgICAgICUle3B5 cGlfc291cmNlICUle3NyY25hbWV9fQotU291cmNlMDogICAgICAgICV7dXJsfS9hcmNoaXZlLyV7 dmVyc2lvbn0vJXtzcmNuYW1lfS0le3ZlcnNpb259LnRhci5negorU291cmNlOiAgICAgICAgICV7 cHlwaV9zb3VyY2UgJXtzcmNuYW1lfX0KKyVlbHNlCitTb3VyY2U6ICAgICAgICAgJXt1cmx9L2Fy Y2hpdmUvJXt2ZXJzaW9ufS8le3NyY25hbWV9LSV7dmVyc2lvbn0udGFyLmd6CislZW5kaWYKKyMg QmFja3BvcnRlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9kamFuZ28tZXh0ZW5zaW9ucy9kamFu Z28tZXh0ZW5zaW9ucy9wdWxsLzE5NzkKK1BhdGNoOiAgICAgICAgICAle3NyY25hbWV9LWZpeC1k amFuZ282LXJlZ3Jlc3Npb25zLmRpZmYKIAogQnVpbGRBcmNoOiAgICAgIG5vYXJjaAogCgpkaWZm IC0tZ2l0IGEvc2VyaWVzIGIvc2VyaWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjZiNGY3ODUKLS0tIC9kZXYvbnVsbAorKysgYi9zZXJpZXMKQEAgLTAsMCArMSBAQAorZGph bmdvLWV4dGVuc2lvbnMtZml4LWRqYW5nbzYtcmVncmVzc2lvbnMuZGlmZgo=