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: Robert Scheck To: git-commits@fedoraproject.org Subject: [rpms/haproxy] f43: Fix accidential merge from rawhide instead of f44 Date: Fri, 26 Jun 2026 12:32:38 GMT Message-ID: <178247715875.1.6084613221303177651.rpms-haproxy-51d85f874699@fedoraproject.org> List-ID: X-Git-Repo: rpms/haproxy X-Git-Branch: f43 X-Git-Rev: 51d85f874699b9c0e9a8e028328f8538bd074dee QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaGFwcm94eQpCcmFu Y2ggOiBmNDMKQ29tbWl0IDogNTFkODVmODc0Njk5YjljMGU5YThlMDI4MzI4Zjg1MzhiZDA3NGRl ZQpBdXRob3IgOiBSb2JlcnQgU2NoZWNrIDxyb2JlcnRAZmVkb3JhcHJvamVjdC5vcmc+CkRhdGUg ICA6IDIwMjYtMDYtMjZUMTQ6MzI6MTkrMDI6MDAKU3RhdHMgIDogKzUyLy0zNCBpbiA0IGZpbGUo cykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9oYXByb3h5L2Mv NTFkODVmODc0Njk5YjljMGU5YThlMDI4MzI4Zjg1MzhiZDA3NGRlZT9icmFuY2g9ZjQzCgpMb2c6 CkZpeCBhY2NpZGVudGlhbCBtZXJnZSBmcm9tIHJhd2hpZGUgaW5zdGVhZCBvZiBmNDQKCi0tLQpk aWZmIC0tZ2l0IGEvaGFwcm94eS0zLjAuMTctbHVhLTUuNS5wYXRjaCBiL2hhcHJveHktMy4wLjE3 LWx1YS01LjUucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjk0YzJl ZAotLS0gL2Rldi9udWxsCisrKyBiL2hhcHJveHktMy4wLjE3LWx1YS01LjUucGF0Y2gKQEAgLTAs MCArMSwzMSBAQAorRnJvbSAxYzBmNzgxOTk0YTg5YjVjYmQ3YjRiODkzYzIzZTZkMmI3NWIxNzY0 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogTWlrZSBMb3RoaWFuIDxtaWtlQGZpcmVi dXJuLmNvLnVrPgorRGF0ZTogRnJpLCAyIEphbiAyMDI2IDE0OjM4OjEwICswMDAwCitTdWJqZWN0 OiBbUEFUQ0hdIE1JTk9SOiBobHVhOiBBZGQgc3VwcG9ydCBmb3IgbHVhIDUuNQorCitMdWEgNS41 IGFkZHMgYW4gZXh0cmEgYXJndW1lbnQgdG8gbHVhX25ld3N0YXRlKCkuIFNpbmNlIHRoZXJlIGFy ZQorYWxyZWFkeSBhIGZldyBvdGhlciBpZmRlZnMgaW4gaGx1YS5jIGNoZWNraW5nIGZvciB0aGUg THVhIHZlcnNpb24sCithbmQgdGhlcmUncyBhIHNpbmdsZSBjYWxsIHBsYWNlLCBsZXQncyBkbyB0 aGUgc2FtZSBoZXJlLiBUaGlzIHNob3VsZAorYmUgc2FmZSBmb3IgYmFja3BvcnRpbmcgaWYgbmVl ZGVkLgorCitTaWduZWQtb2ZmLWJ5OiBNaWtlIExvdGhpYW4gPG1pa2VAZmlyZWJ1cm4uY28udWs+ CistLS0KKyBzcmMvaGx1YS5jIHwgNCArKysrCisgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9u cygrKQorCitkaWZmIC0tZ2l0IGEvc3JjL2hsdWEuYyBiL3NyYy9obHVhLmMKK2luZGV4IDUxMDlk M2MwNGIzMy4uYmI3M2IzNzdjNTcxIDEwMDY0NAorLS0tIGEvc3JjL2hsdWEuYworKysrIGIvc3Jj L2hsdWEuYworQEAgLTE0MDI3LDcgKzE0MDI3LDExIEBAIGx1YV9TdGF0ZSAqaGx1YV9pbml0X3N0 YXRlKGludCB0aHJlYWRfbnVtKQorIAlzdHJ1Y3QgcHJlcGVuZF9wYXRoICpwcDsKKyAKKyAJLyog SW5pdCBtYWluIGx1YSBzdGFjay4gKi8KKysjaWYgZGVmaW5lZChMVUFfVkVSU0lPTl9OVU0pICYm IExVQV9WRVJTSU9OX05VTSA+PSA1MDUKKysJTCA9IGx1YV9uZXdzdGF0ZShobHVhX2FsbG9jLCAm aGx1YV9nbG9iYWxfYWxsb2NhdG9yLCBsdWFMX21ha2VzZWVkKDApKTsKKysjZWxzZQorIAlMID0g bHVhX25ld3N0YXRlKGhsdWFfYWxsb2MsICZobHVhX2dsb2JhbF9hbGxvY2F0b3IpOworKyNlbmRp ZgorIAorIAlpZiAoIUwpIHsKKyAJCWZwcmludGYoc3RkZXJyLAoKZGlmZiAtLWdpdCBhL2hhcHJv eHkubG9ncm90YXRlIGIvaGFwcm94eS5sb2dyb3RhdGUKaW5kZXggMWZjZjNjYy4uYTAzNmVjMSAx MDA2NDQKLS0tIGEvaGFwcm94eS5sb2dyb3RhdGUKKysrIGIvaGFwcm94eS5sb2dyb3RhdGUKQEAg LTEsMTIgKzEsMTMgQEAKIC92YXIvbG9nL2hhcHJveHkubG9nIC92YXIvbG9nL2hhcHJveHkvKi5s b2cgewotCWRhaWx5Ci0Jcm90YXRlIDEwCi0JbWlzc2luZ29rCi0JY29tcHJlc3MKLQlkZWxheWNv bXByZXNzCi0Jbm90aWZlbXB0eQotCXBvc3Ryb3RhdGUKLQkJc3lzdGVtY3RsIHRyeS1yZWxvYWQt b3ItcmVzdGFydCByc3lzbG9nLnNlcnZpY2Ugc3lzbG9nLW5nLnNlcnZpY2UKLQllbmRzY3JpcHQK LQlzaGFyZWRzY3JpcHRzCisgICAgZGFpbHkKKyAgICByb3RhdGUgMTAKKyAgICBtaXNzaW5nb2sK KyAgICBub3RpZmVtcHR5CisgICAgY29tcHJlc3MKKyAgICBkZWxheWNvbXByZXNzCisgICAgc2hh cmVkc2NyaXB0cworICAgIHBvc3Ryb3RhdGUKKyAgICAgICAgL2Jpbi9raWxsIC1IVVAgYGNhdCAv dmFyL3J1bi9zeXNsb2dkLnBpZCAyPiAvZGV2L251bGxgIDI+IC9kZXYvbnVsbCB8fCB0cnVlCisg ICAgICAgIC9iaW4va2lsbCAtSFVQIGBjYXQgL3Zhci9ydW4vcnN5c2xvZ2QucGlkIDI+IC9kZXYv bnVsbGAgMj4gL2Rldi9udWxsIHx8IHRydWUKKyAgICBlbmRzY3JpcHQKIH0KCmRpZmYgLS1naXQg YS9oYXByb3h5LnNwZWMgYi9oYXByb3h5LnNwZWMKaW5kZXggOTA0OWY3Zi4uYzFmZTlmZiAxMDA2 NDQKLS0tIGEvaGFwcm94eS5zcGVjCisrKyBiL2hhcHJveHkuc3BlYwpAQCAtMiw3ICsyLDcgQEAK IAogU3VtbWFyeTogICAgICAgIFJlbGlhYmxlLCBoaWdoLXBlcmZvcm1hbmNlIFRDUC9IVFRQIGxv YWQtYmFsYW5jaW5nIHJldmVyc2UgcHJveHkKIE5hbWU6ICAgICAgICAgICBoYXByb3h5Ci1WZXJz aW9uOiAgICAgICAgMy40LjEKK1ZlcnNpb246ICAgICAgICAzLjAuMjQKIFJlbGVhc2U6ICAgICAg ICAxJXs/ZGlzdH0KIExpY2Vuc2U6ICAgICAgICBHUEwtMi4wLW9yLWxhdGVyIEFORCBMR1BMLTIu MS1vci1sYXRlcgogVVJMOiAgICAgICAgICAgIGh0dHBzOi8vd3d3LmhhcHJveHkub3JnLwpAQCAt MTMsNiArMTMsNyBAQCBTb3VyY2UzOiAgICAgICAgJXtuYW1lfS5sb2dyb3RhdGUKIFNvdXJjZTQ6 ICAgICAgICAle25hbWV9LnN5c2NvbmZpZwogU291cmNlNTogICAgICAgICV7bmFtZX0uc3lzdXNl cnNkCiBTb3VyY2U2OiAgICAgICAgaHR0cHM6Ly9zYWxzYS5kZWJpYW4ub3JnL2hhcHJveHktdGVh bS9oYXByb3h5Ly0vcmF3L2MzMGE3NDExMjAzYjhjNDIzNDY5OGU0NzMyNWQyNTQzMzU5ZjlkNjYv ZGViaWFuL2hhbG9nLjEKK1BhdGNoMDogICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vaGFwcm94 eS9oYXByb3h5L2NvbW1pdC8xYzBmNzgxOTk0YTg5YjVjYmQ3YjRiODkzYzIzZTZkMmI3NWIxNzY0 LnBhdGNoIy9oYXByb3h5LTMuMC4xNy1sdWEtNS41LnBhdGNoCiBCdWlsZFJlcXVpcmVzOiAgJXtf X2NjfQogQnVpbGRSZXF1aXJlczogIGxpYnhjcnlwdC1kZXZlbAogQnVpbGRSZXF1aXJlczogIGx1 YS1kZXZlbApAQCAtMTExLDE5ICsxMTIsMTAgQEAgcm0gLWYgZG9jL3tncGwsbGdwbH0udHh0IGRv Yy8le25hbWV9LjEgZXhhbXBsZXMvJXtuYW1lfS5pbml0CiAlZGlyICV7X2xvY2Fsc3RhdGVkaXJ9 L2xpYi8le25hbWV9LwogCiAlY2hhbmdlbG9nCi0qIFRodSBKdW4gMjUgMjAyNiBSb2JlcnQgU2No ZWNrIDxyb2JlcnRAZmVkb3JhcHJvamVjdC5vcmc+IC0gMy40LjEtMQotLSBVcGdyYWRlIHRvIDMu NC4xICgjMjQ5Mjk5MCkKKyogRnJpIEp1biAyNiAyMDI2IFJvYmVydCBTY2hlY2sgPHJvYmVydEBm ZWRvcmFwcm9qZWN0Lm9yZz4gLSAzLjAuMjQtMQorLSBVcGdyYWRlIHRvIDMuMC4yNAogLSBBZGQg bG9ncm90YXRlIGltcHJvdmVtZW50cyAodGhhbmtzIHRvIFhvc2UgVmF6cXVleiBQZXJleikKIAot KiBGcmkgSnVuIDEyIDIwMjYgWWFha292IFNlbGtvd2l0eiA8eXNlbGtvd2lAcmVkaGF0LmNvbT4g LSAzLjQuMC0yCi0tIFJlYnVpbHQgZm9yIG9wZW5zc2wgNC4wCi0KLSogVGh1IEp1biAwNCAyMDI2 IFJvYmVydCBTY2hlY2sgPHJvYmVydEBmZWRvcmFwcm9qZWN0Lm9yZz4gLSAzLjQuMC0xCi0tIFVw Z3JhZGUgdG8gMy40LjAgKCMyMzI0NDM2KQotLSBSZW1vdmUgb2Jzb2xldGUgY29tcGlsZSBvcHRp b24gTUFYX1NFU1NfU1RLQ1RSICgjMjM2ODAzNSkKLS0gVXNlIHN5c3RlbWN0bCBpbiBsb2dyb3Rh dGUgcG9zdHJvdGF0ZSBzY3JpcHQgKCMyMzcyNzgyKQotLSBNb3ZlIGV4YW1wbGUgZXJyb3IgZmls ZXMgZnJvbSAvdXNyL3NoYXJlL2hhcHJveHkvIHRvICUlZG9jCi0KICogTW9uIE1heSAxOCAyMDI2 IFJvYmVydCBTY2hlY2sgPHJvYmVydEBmZWRvcmFwcm9qZWN0Lm9yZz4gLSAzLjAuMjMtMgogLSBS ZXZlcnQgdG8gcGVybWlzc2lvbnMgMDc1NSBmb3Igcm9vdDpyb290IG9uIC92YXIvbGliL2hhcHJv eHkKIAoKZGlmZiAtLWdpdCBhL3NvdXJjZXMgYi9zb3VyY2VzCmluZGV4IGM4NzdmMDguLjY4MTA0 ZDYgMTAwNjQ0Ci0tLSBhL3NvdXJjZXMKKysrIGIvc291cmNlcwpAQCAtMSArMSBAQAotU0hBNTEy IChoYXByb3h5LTMuNC4xLnRhci5neikgPSA5N2RlYjQzYTlkNTIwMzExMDZmNDMyZTA3MTEyYjli Zjk5MTI1OTdmOWE5YTNkNDJjYTAxNjg1Yzc2ZmY1M2NkMGJlNWM2MmMyOTlmOTU5ZDE4MWI5NWY0 MTY2MTI2YWY4Y2I3ZDA1MjcxZWQzNjIyZDJhMzA4MjVhYjg5ZWJmYgorU0hBNTEyIChoYXByb3h5 LTMuMC4yNC50YXIuZ3opID0gN2Q3YWI5NzcyNjRkZGRkNmY5ZWFkYTIyNzNkNmFiYjU2ODI0NGEw OTg1MWNlNjgxMTZhYzJjYjMxOWMwOWIwM2M2OWI3OTE4MzZkNGRkMjk5NjYxYjQ0M2YwZmRhNjFi MGQ4YjhhZDhmZDNhNzQxZjk5Y2ZjYThkNzkxYmM2YjkKCmRpZmYgLS1naXQgYS9oYXByb3h5LnNw ZWMgYi9oYXByb3h5LnNwZWMKaW5kZXggMTQ2YmU1NS4uYzFmZTlmZiAxMDA2NDQKLS0tIGEvaGFw cm94eS5zcGVjCisrKyBiL2hhcHJveHkuc3BlYwpAQCAtMTgsNyArMTgsNyBAQCBCdWlsZFJlcXVp cmVzOiAgJXtfX2NjfQogQnVpbGRSZXF1aXJlczogIGxpYnhjcnlwdC1kZXZlbAogQnVpbGRSZXF1 aXJlczogIGx1YS1kZXZlbAogQnVpbGRSZXF1aXJlczogIG1ha2UKLUJ1aWxkUmVxdWlyZXM6ICBv cGVuc3NsLWRldmVsCitCdWlsZFJlcXVpcmVzOiAgb3BlbnNzbC1kZXZlbCA+PSAzLjUuMgogQnVp bGRSZXF1aXJlczogIHBjcmUyLWRldmVsCiBCdWlsZFJlcXVpcmVzOiAgc3lzdGVtZC1kZXZlbAog QnVpbGRSZXF1aXJlczogIHN5c3RlbWQtcnBtLW1hY3JvcwpAQCAtNTAsMTMgKzUwLDEzIEBAIGF2 YWlsYWJpbGl0eSBlbnZpcm9ubWVudHMuIEluZGVlZCwgaXQgY2FuOgogICBFWFRSQVZFUlNJT049 Ii0le3JlbGVhc2V9IiBcCiAgIFVTRV9QQ1JFMj0xIFwKICAgVVNFX09QRU5TU0w9MSBcCisgIFVT RV9RVUlDPTEgXAogICBVU0VfTFVBPTEgXAogICBVU0VfUFJPTUVYPTEgXAogICBDQz0le19fY2N9 IFwKICAgQ0ZMQUdTPSIle2J1aWxkX2NmbGFnc30iIFwKICAgTERGTEFHUz0iJXtidWlsZF9sZGZs YWdzfSIgXAogICBPUFRfQ0ZMQUdTPSIiIEFSQ0hfRkxBR1M9IiIgXAotICBERUZJTkU9LURNQVhf U0VTU19TVEtDVFI9MTIgXAogICBFWFRSQT0iYWRtaW4vaGFsb2cvaGFsb2cgYWRtaW4vaXByYW5n ZS9pcHJhbmdlIGFkbWluL2lwcmFuZ2UvaXA2cmFuZ2UiCiAKICVpbnN0YWxsCkBAIC03MSwxOSAr NzEsMTQgQEAgaW5zdGFsbCAtRCAtcCAtbSAwNjQ0ICV7U09VUkNFNX0gJXtidWlsZHJvb3R9JXtf c3lzdXNlcnNkaXJ9LyV7bmFtZX0uY29uZgogaW5zdGFsbCAtcCAtRCAtbSAwNjQ0ICV7U09VUkNF Nn0gJXtidWlsZHJvb3R9JXtfbWFuZGlyfS9tYW4xL2hhbG9nLjEKIG1rZGlyIC1wICV7YnVpbGRy b290fXsle19zeXNjb25mZGlyfS8le25hbWV9L2NvbmYuZCwle19sb2NhbHN0YXRlZGlyfS9saWIv JXtuYW1lfX0vCiAKLWZvciBodHRwZmlsZSBpbiAkKGZpbmQgZXhhbXBsZXMvZXJyb3JmaWxlcy8g LXR5cGUgZik7IGRvCi0gIGluc3RhbGwgLUQgLXAgLW0gMDY0NCAke2h0dHBmaWxlfSAle2J1aWxk cm9vdH0le19kYXRhZGlyfS8le25hbWV9LyR7aHR0cGZpbGUjIyovfQotZG9uZQotcm0gLXJmIGV4 YW1wbGVzL3tlcnJvcmZpbGVzLyxoYXByb3h5LmluaXR9Ci0KICMgQ29udmVydCBmcm9tIElTTy04 ODU5LTEgdG8gVVRGLTgKIGljb252IC1mIElTTy04ODU5LTEgLXQgVVRGLTggLW8gZG9jL2ludGVy bmFscy9jb25uZWN0aW9uLXNjYWxlLnR4dHsudXRmOCx9CiB0b3VjaCAtYyAtciBkb2MvaW50ZXJu YWxzL2Nvbm5lY3Rpb24tc2NhbGUudHh0eywudXRmOH0KIG12IC1mIGRvYy9pbnRlcm5hbHMvY29u bmVjdGlvbi1zY2FsZS50eHR7LnV0ZjgsfQogCi0jIFByZXBhcmUgZG9jLyBmb3IgJSVkb2MgaW5j bHVzaW9uCisjIFByZXBhcmUgZG9jLyBhbmQgZXhhbXBsZXMvIGZvciAlJWRvYyBpbmNsdXNpb24K IG12IC1mIGRvYy97Z3BsLGxncGx9LnR4dCAuCi1ybSAtZiBkb2Mve2dwbCxsZ3BsfS50eHQgZG9j LyV7bmFtZX0uMQorcm0gLWYgZG9jL3tncGwsbGdwbH0udHh0IGRvYy8le25hbWV9LjEgZXhhbXBs ZXMvJXtuYW1lfS5pbml0CiAKICVwcmUKICVzeXN1c2Vyc19jcmVhdGVfY29tcGF0ICV7U09VUkNF NX0KQEAgLTk5LDcgKzk0LDcgQEAgcm0gLWYgZG9jL3tncGwsbGdwbH0udHh0IGRvYy8le25hbWV9 LjEKIAogJWZpbGVzCiAlbGljZW5zZSBMSUNFTlNFIGdwbC50eHQgbGdwbC50eHQKLSVkb2MgQ0hB TkdFTE9HIFJFQURNRSBkb2MvKiBleGFtcGxlcy8KKyVkb2MgQ0hBTkdFTE9HIFJFQURNRS5tZCBk b2MvKiBleGFtcGxlcy8KICVkaXIgJXtfc3lzY29uZmRpcn0vJXtuYW1lfS8KICVjb25maWcobm9y ZXBsYWNlKSAle19zeXNjb25mZGlyfS8le25hbWV9LyV7bmFtZX0uY2ZnCiAlZGlyICV7X3N5c2Nv bmZkaXJ9LyV7bmFtZX0vY29uZi5kLwpAQCAtMTEyLDcgKzEwNyw2IEBAIHJtIC1mIGRvYy97Z3Bs LGxncGx9LnR4dCBkb2MvJXtuYW1lfS4xCiAle19zYmluZGlyfS8le25hbWV9CiAle191bml0ZGly fS8le25hbWV9LnNlcnZpY2UKICV7X3N5c3VzZXJzZGlyfS8le25hbWV9LmNvbmYKLSV7X2RhdGFk aXJ9LyV7bmFtZX0vCiAle19tYW5kaXJ9L21hbjEvaGFsb2cuMSoKICV7X21hbmRpcn0vbWFuMS8l e25hbWV9LjEqCiAlZGlyICV7X2xvY2Fsc3RhdGVkaXJ9L2xpYi8le25hbWV9Lwo=