From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_NXDOMAIN autolearn=no autolearn_force=no version=3.4.4 Received: from inbox.vuxu.org (inbox.vuxu.org [IPv6:::1]) by inbox.vuxu.org (Postfix) with ESMTP id 7EC86250B3 for ; Sun, 21 Apr 2024 12:59:40 +0200 (CEST) Content-Type: multipart/mixed; boundary="===============5250978531096885250==" MIME-Version: 1.0 Subject: =?utf8?q?=5BPR_PATCH=5D_libosmgpsmap=3A_port_to_libsoup-3=2E0?= To: ml@inbox.vuxu.org From: sgn Reply-to: ml@inbox.vuxu.org Message-ID: Date: Sun, 21 Apr 2024 12:59:40 +0200 List-Id: GitHub notification mails are now in MIME to allow UTF8. --===============5250978531096885250== Content-Type: text/plain; charset="utf8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IHNnbiBhZ2FpbnN0IG1hc3RlciBvbiB0aGUg dm9pZC1wYWNrYWdlcyByZXBvc2l0b3J5CgpodHRwczovL2dpdGh1Yi5jb20vc2duL3ZvaWQtcGFj a2FnZXMgbGlib3NtZ3BzbWFwLWxpYnNvdXAtMy4wCmh0dHBzOi8vZ2l0aHViLmNvbS92b2lkLWxp bnV4L3ZvaWQtcGFja2FnZXMvcHVsbC80OTk1NQoKbGlib3NtZ3BzbWFwOiBwb3J0IHRvIGxpYnNv dXAtMy4wCjwhLS0gVW5jb21tZW50IHJlbGV2YW50IHNlY3Rpb25zIGFuZCBkZWxldGUgb3B0aW9u cyB3aGljaCBhcmUgbm90IGFwcGxpY2FibGUgLS0+DQoNCiMjIyMgVGVzdGluZyB0aGUgY2hhbmdl cw0KLSBJIHRlc3RlZCB0aGUgY2hhbmdlcyBpbiB0aGlzIFBSOiAqKllFUyoqfCoqYnJpZWZseSoq fCoqTk8qKg0KDQo8IS0tDQojIyMjIE5ldyBwYWNrYWdlDQotIFRoaXMgbmV3IHBhY2thZ2UgY29u Zm9ybXMgdG8gdGhlIFtwYWNrYWdlIHJlcXVpcmVtZW50c10oaHR0cHM6Ly9naXRodWIuY29tL3Zv aWQtbGludXgvdm9pZC1wYWNrYWdlcy9ibG9iL21hc3Rlci9DT05UUklCVVRJTkcubWQjcGFja2Fn ZS1yZXF1aXJlbWVudHMpOiAqKllFUyoqfCoqTk8qKg0KLS0+DQoNCjwhLS0gTm90ZTogSWYgdGhl IGJ1aWxkIGlzIGxpa2VseSB0byB0YWtlIG1vcmUgdGhhbiAyIGhvdXJzLCBwbGVhc2UgYWRkIGNp IHNraXAgdGFnIGFzIGRlc2NyaWJlZCBpbg0KaHR0cHM6Ly9naXRodWIuY29tL3ZvaWQtbGludXgv dm9pZC1wYWNrYWdlcy9ibG9iL21hc3Rlci9DT05UUklCVVRJTkcubWQjY29udGludW91cy1pbnRl Z3JhdGlvbg0KYW5kIHRlc3QgYXQgbGVhc3Qgb25lIG5hdGl2ZSBidWlsZCBhbmQsIGlmIHN1cHBv cnRlZCwgYXQgbGVhc3Qgb25lIGNyb3NzIGJ1aWxkLg0KSWdub3JlIHRoaXMgc2VjdGlvbiBpZiB0 aGlzIFBSIGlzIG5vdCBza2lwcGluZyBDSS4NCi0tPg0KPCEtLQ0KIyMjIyBMb2NhbCBidWlsZCB0 ZXN0aW5nDQotIEkgYnVpbHQgdGhpcyBQUiBsb2NhbGx5IGZvciBteSBuYXRpdmUgYXJjaGl0ZWN0 dXJlLCAoQVJDSC1MSUJDKQ0KLSBJIGJ1aWx0IHRoaXMgUFIgbG9jYWxseSBmb3IgdGhlc2UgYXJj aGl0ZWN0dXJlcyAoaWYgc3VwcG9ydGVkLiBtYXJrIGNyb3NzYnVpbGRzKToNCiAgLSBhYXJjaDY0 LW11c2wNCiAgLSBhcm12N2wNCiAgLSBhcm12NmwtbXVzbA0KLS0+DQoKCkEgcGF0Y2ggZmlsZSBm cm9tIGh0dHBzOi8vZ2l0aHViLmNvbS92b2lkLWxpbnV4L3ZvaWQtcGFja2FnZXMvcHVsbC80OTk1 NS5wYXRjaCBpcyBhdHRhY2hlZA== --===============5250978531096885250== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-libosmgpsmap-libsoup-3.0-49955.patch" RnJvbSA1Mjc5NjA0YjNlYmZjOWM4Nzc3MzIyOTY4NTA4M2YyMGVkYzNmZDYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUM0PTkwbz1DMz1BMG49MjBUcj1FMT1CQT1B N249MjBDPUMzPUI0bmc9MjBEYW5oPz0KIDxjb25nZGFuaHF4QGdtYWlsLmNvbT4KRGF0ZTogU3Vu LCAyMSBBcHIgMjAyNCAxNzo1NTowMCArMDcwMApTdWJqZWN0OiBbUEFUQ0hdIGxpYm9zbWdwc21h cDogcG9ydCB0byBsaWJzb3VwLTMuMAoKLS0tCiBzcmNwa2dzL2xpYm9zbWdwc21hcC9wYXRjaGVz L2xpYnNvdXAtMy5wYXRjaCB8IDI3OCArKysrKysrKysrKysrKysrKysrCiBzcmNwa2dzL2xpYm9z bWdwc21hcC90ZW1wbGF0ZSAgICAgICAgICAgICAgICB8ICAxMCArLQogMiBmaWxlcyBjaGFuZ2Vk LCAyODUgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBz cmNwa2dzL2xpYm9zbWdwc21hcC9wYXRjaGVzL2xpYnNvdXAtMy5wYXRjaAoKZGlmZiAtLWdpdCBh L3NyY3BrZ3MvbGlib3NtZ3BzbWFwL3BhdGNoZXMvbGlic291cC0zLnBhdGNoIGIvc3JjcGtncy9s aWJvc21ncHNtYXAvcGF0Y2hlcy9saWJzb3VwLTMucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAuLjk3ZGM0NDgwZjYwMDE2Ci0tLSAvZGV2L251bGwKKysrIGIv c3JjcGtncy9saWJvc21ncHNtYXAvcGF0Y2hlcy9saWJzb3VwLTMucGF0Y2gKQEAgLTAsMCArMSwy NzggQEAKK0Zyb20gYTc5NjU3NTE4MjFkNWJiNTVmOGZiMzdiNDA0NTI5NWQwYzQ0ZGQ5YiBNb24g U2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206ID0/VVRGLTg/cT9TPUMzPUE5YmFzdGllbj0yME5v ZWw/PSA8c2ViYXN0aWVuQHR3b2xpZmUuYmU+CitEYXRlOiBXZWQsIDE1IEZlYiAyMDIzIDExOjU2 OjQ4ICswMTAwCitTdWJqZWN0OiBbUEFUQ0hdIFBvcnQgdG8gbGlic291cDMKKworLS0tCisgLmdp dGh1Yi93b3JrZmxvd3MvY2kueW1sICAgfCAgMiArLQorIGNvbmZpZ3VyZS5hYyAgICAgICAgICAg ICAgIHwgIDIgKy0KKyBkb2NzL3JlZmVyZW5jZS9NYWtlZmlsZS5hbSB8ICA0ICstLQorIGV4YW1w bGVzL01ha2VmaWxlLmFtICAgICAgIHwgIDQgKy0tCisgb3NtZ3BzbWFwLTEuMC5wYy5pbiAgICAg ICAgfCAgMiArLQorIHNyYy9NYWtlZmlsZS5hbSAgICAgICAgICAgIHwgIDQgKy0tCisgc3JjL29z bS1ncHMtbWFwLXdpZGdldC5jICAgfCA3NCArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLQorIDcgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25z KC0pCisKKy0tLSBhL2NvbmZpZ3VyZS5hYworKysrIGIvY29uZmlndXJlLmFjCitAQCAtMjUsNyAr MjUsNyBAQCBBTV9TSUxFTlRfUlVMRVMoW3llc10pCisgUEtHX0NIRUNLX01PRFVMRVMoR0xJQiwg ICAgIFtnbGliLTIuMCA+PSAyLjE2XSkKKyBQS0dfQ0hFQ0tfTU9EVUxFUyhHVEssICAgICAgW2d0 aystMy4wID49IDMuMF0pCisgUEtHX0NIRUNLX01PRFVMRVMoQ0FJUk8sICAgIFtjYWlybyA+PSAx LjhdKQorLVBLR19DSEVDS19NT0RVTEVTKFNPVVAyNCwgICBbbGlic291cC0yLjRdKQorK1BLR19D SEVDS19NT0RVTEVTKFNPVVAzMCwgICBbbGlic291cC0zLjBdKQorIAorICMgVGhlIG1hcHZpZXdl ciBkZW1vIGFsc28gY2FsbHMgZ190aHJlYWRfaW5pdCwgc28gaXQgbmVlZHMgdG8gbGluayBhZ2Fp bnN0CisgIyBsaWJndGhyZWFkLTIuMC4KKy0tLSBhL2RvY3MvcmVmZXJlbmNlL01ha2VmaWxlLmFt CisrKysgYi9kb2NzL3JlZmVyZW5jZS9NYWtlZmlsZS5hbQorQEAgLTcxLDEyICs3MSwxMiBAQCBB TV9DRkxBR1M9LUkkKHRvcF9zcmNkaXIpIC1JJCh0b3BfYnVpbGRkCisgCSQoR0xJQl9DRkxBR1Mp IFwKKyAJJChHVEtfQ0ZMQUdTKSBcCisgCSQoQ0FJUk9fQ0ZMQUdTKSBcCistCSQoU09VUDI0X0NG TEFHUykKKysJJChTT1VQMzBfQ0ZMQUdTKQorIEdUS0RPQ19MSUJTPSQodG9wX2J1aWxkZGlyKS9z cmMvbGlib3NtZ3BzbWFwLTEuMC5sYSBcCisgCSQoR0xJQl9MSUJTKSBcCisgCSQoR1RLX0xJQlMp IFwKKyAJJChDQUlST19MSUJTKSBcCistCSQoU09VUDI0X0xJQlMpCisrCSQoU09VUDMwX0xJQlMp CisgCisgIyBUaGlzIGluY2x1ZGVzIHRoZSBzdGFuZGFyZCBndGstZG9jIG1ha2UgcnVsZXMsIGNv cGllZCBieSBndGtkb2NpemUuCisgaW5jbHVkZSAkKHRvcF9zcmNkaXIpL2d0ay1kb2MubWFrZQor LS0tIGEvZXhhbXBsZXMvTWFrZWZpbGUuYW0KKysrKyBiL2V4YW1wbGVzL01ha2VmaWxlLmFtCitA QCAtNCwxMyArNCwxMyBAQCBPU01HUFNNQVBfQ0ZMQUdTID0gICAgICAgICAgXAorICAgICAkKEdM SUJfQ0ZMQUdTKSAgICAgICAgICBcCisgICAgICQoR1RLX0NGTEFHUykgICAgICAgICAgIFwKKyAg ICAgJChDQUlST19DRkxBR1MpICAgICAgICAgXAorLSAgICAkKFNPVVAyNF9DRkxBR1MpCisrICAg ICQoU09VUDMwX0NGTEFHUykKKyAKKyBPU01HUFNNQVBfTElCUyA9ICAgICAgICAgICAgXAorICAg ICAkKEdMSUJfTElCUykgICAgICAgICAgICBcCisgICAgICQoR1RLX0xJQlMpICAgICAgICAgICAg IFwKKyAgICAgJChDQUlST19MSUJTKSAgICAgICAgICAgXAorLSAgICAkKFNPVVAyNF9MSUJTKQor KyAgICAkKFNPVVAzMF9MSUJTKQorIAorICMjIERlbW8gQXBwbGljYXRpb24KKyBub2luc3RfUFJP R1JBTVMgPSBtYXB2aWV3ZXIgcG9seWdvbiBlZGl0YWJsZV90cmFjaworLS0tIGEvb3NtZ3BzbWFw LTEuMC5wYy5pbgorKysrIGIvb3NtZ3BzbWFwLTEuMC5wYy5pbgorQEAgLTYsNiArNiw2IEBAIGlu Y2x1ZGVkaXI9QGluY2x1ZGVkaXJACisgTmFtZTogQFBBQ0tBR0VfTkFNRUAKKyBEZXNjcmlwdGlv bjogTW92aW5nIG1hcCB3aWRnZXQgdXNpbmcgb3BlbnN0cmVldCBtYXAgZGF0YQorIFZlcnNpb246 IEBQQUNLQUdFX1ZFUlNJT05ACistUmVxdWlyZXM6IGd0aystMy4wIGxpYnNvdXAtMi40CisrUmVx dWlyZXM6IGd0aystMy4wIGxpYnNvdXAtMy4wCisgTGliczogLUwke2xpYmRpcn0gLWxvc21ncHNt YXAtMS4wCisgQ2ZsYWdzOiAtSSR7aW5jbHVkZWRpcn0vb3NtZ3BzbWFwLTEuMAorLS0tIGEvc3Jj L01ha2VmaWxlLmFtCisrKysgYi9zcmMvTWFrZWZpbGUuYW0KK0BAIC01LDEzICs1LDEzIEBAIE9T TUdQU01BUF9DRkxBR1MgPSAgICAgICAgICBcCisgCSQoR0xJQl9DRkxBR1MpICAgICAgICAgIFwK KyAJJChHVEtfQ0ZMQUdTKSAgICAgICAgICAgXAorIAkkKENBSVJPX0NGTEFHUykgICAgICAgICBc CistICAgICQoU09VUDI0X0NGTEFHUykKKysgICAgJChTT1VQMzBfQ0ZMQUdTKQorIAorIE9TTUdQ U01BUF9MSUJTID0gICAgICAgICAgICBcCisgICAgICQoR0xJQl9MSUJTKSAgICAgICAgICAgIFwK KyAgICAgJChHVEtfTElCUykgICAgICAgICAgICAgXAorICAgICAkKENBSVJPX0xJQlMpICAgICAg ICAgICBcCistICAgICQoU09VUDI0X0xJQlMpCisrICAgICQoU09VUDMwX0xJQlMpCisgCisgIyMg U2hhcmVkIGxpYnJhcnkKKyBsaWJvc21ncHNtYXBfMV8wX2xhX0NGTEFHUyA9ICAgIFwKKy0tLSBh L3NyYy9vc20tZ3BzLW1hcC13aWRnZXQuYworKysrIGIvc3JjL29zbS1ncHMtbWFwLXdpZGdldC5j CitAQCAtMzI0LDcgKzMyNCw3IEBAIEdfREVGSU5FX1RZUEUgKE9zbUdwc01hcCwgb3NtX2dwc19t YXAsIEcKKyAgKi8KKyBzdGF0aWMgZ2NoYXIgICAgKnJlcGxhY2Vfc3RyaW5nKGNvbnN0IGdjaGFy ICpzcmMsIGNvbnN0IGdjaGFyICpmcm9tLCBjb25zdCBnY2hhciAqdG8pOworIHN0YXRpYyBnY2hh ciAgICAqcmVwbGFjZV9tYXBfdXJpKE9zbUdwc01hcCAqbWFwLCBjb25zdCBnY2hhciAqdXJpLCBp bnQgem9vbSwgaW50IHgsIGludCB5KTsKKy1zdGF0aWMgdm9pZCAgICAgb3NtX2dwc19tYXBfdGls ZV9kb3dubG9hZF9jb21wbGV0ZSAoU291cFNlc3Npb24gKnNlc3Npb24sIFNvdXBNZXNzYWdlICpt c2csIGdwb2ludGVyIHVzZXJfZGF0YSk7Cisrc3RhdGljIHZvaWQgICAgIG9zbV9ncHNfbWFwX3Rp bGVfZG93bmxvYWRfY29tcGxldGUgKFNvdXBTZXNzaW9uICpzZXNzaW9uLCBHQXN5bmNSZXN1bHQg KnJlc3VsdCwgZ3BvaW50ZXIgdXNlcl9kYXRhKTsKKyBzdGF0aWMgdm9pZCAgICAgb3NtX2dwc19t YXBfZG93bmxvYWRfdGlsZSAoT3NtR3BzTWFwICptYXAsIGludCB6b29tLCBpbnQgeCwgaW50IHks IGdib29sZWFuIHJlZHJhdyk7Cisgc3RhdGljIEdka1BpeGJ1Ziogb3NtX2dwc19tYXBfcmVuZGVy X3RpbGVfdXBzY2FsZWQgKE9zbUdwc01hcCAqbWFwLCBHZGtQaXhidWYgKnRpbGUsIGludCB0aWxl X3pvb20sIGludCB6b29tLCBpbnQgeCwgaW50IHkpOworIAorQEAgLTc0MCwxMiArNzQwLDEwIEBA IG9zbV9ncHNfbWFwX2JsaXRfdGlsZShPc21HcHNNYXAgKm1hcCwgR2QKKyAgICAgfQorIH0KKyAK Ky0jZGVmaW5lIE1TR19SRVNQT05TRV9CT0RZKGEpICAgICgoYSktPnJlc3BvbnNlX2JvZHktPmRh dGEpCistI2RlZmluZSBNU0dfUkVTUE9OU0VfTEVOKGEpICAgICAoKGEpLT5yZXNwb25zZV9ib2R5 LT5sZW5ndGgpCisgI2RlZmluZSBNU0dfUkVTUE9OU0VfTEVOX0ZPUk1BVCAiJSJHX0dPRkZTRVRf Rk9STUFUCisgCisgc3RhdGljIHZvaWQKKy1vc21fZ3BzX21hcF90aWxlX2Rvd25sb2FkX2NvbXBs ZXRlIChTb3VwU2Vzc2lvbiAqc2Vzc2lvbiwgU291cE1lc3NhZ2UgKm1zZywgZ3BvaW50ZXIgdXNl cl9kYXRhKQorK29zbV9ncHNfbWFwX3RpbGVfZG93bmxvYWRfY29tcGxldGUgKFNvdXBTZXNzaW9u ICpzZXNzaW9uLCBHQXN5bmNSZXN1bHQgKnJlc3VsdCwgZ3BvaW50ZXIgdXNlcl9kYXRhKQorIHsK KyAgICAgRklMRSAqZmlsZTsKKyAgICAgT3NtVGlsZURvd25sb2FkICpkbCA9IChPc21UaWxlRG93 bmxvYWQgKil1c2VyX2RhdGE7CitAQCAtNzUzLDE1ICs3NTEsMjMgQEAgb3NtX2dwc19tYXBfdGls ZV9kb3dubG9hZF9jb21wbGV0ZSAoU291cAorICAgICBPc21HcHNNYXBQcml2YXRlICpwcml2ID0g bWFwLT5wcml2OworICAgICBnYm9vbGVhbiBmaWxlX3NhdmVkID0gRkFMU0U7CisgCistICAgIGlm IChTT1VQX1NUQVRVU19JU19TVUNDRVNTRlVMIChtc2ctPnN0YXR1c19jb2RlKSkgeworKyAgICBH RXJyb3IgKmVycm9yID0gTlVMTDsKKysgICAgU291cE1lc3NhZ2UgKm1zZyA9IHNvdXBfc2Vzc2lv bl9nZXRfYXN5bmNfcmVzdWx0X21lc3NhZ2Uoc2Vzc2lvbiwgcmVzdWx0KTsKKysgICAgU291cFN0 YXR1cyBzb3VwX3N0YXR1cyA9IHNvdXBfbWVzc2FnZV9nZXRfc3RhdHVzKG1zZyk7CisrICAgIEdC eXRlcyAqYm9keSA9IHNvdXBfc2Vzc2lvbl9zZW5kX2FuZF9yZWFkX2ZpbmlzaCAoc2Vzc2lvbiwg cmVzdWx0LCAmZXJyb3IpOworKworKyAgICBHQ2FuY2VsbGFibGUgKmNhbmNlbGxhYmxlID0gKEdD YW5jZWxsYWJsZSAqKWdfaGFzaF90YWJsZV9sb29rdXAocHJpdi0+dGlsZV9xdWV1ZSwgZGwtPnVy aSk7CisrICAgIGdfb2JqZWN0X3VucmVmIChjYW5jZWxsYWJsZSk7CisrCisrICAgIGlmIChTT1VQ X1NUQVRVU19JU19TVUNDRVNTRlVMIChzb3VwX3N0YXR1cykpIHsKKyAgICAgICAgIC8qIHNhdmUg dGlsZSBpbnRvIGNhY2hlZGlyIGlmIG9uZSBoYXMgYmVlbiBzcGVjaWZpZWQgKi8KKyAgICAgICAg IGlmIChwcml2LT5jYWNoZV9kaXIpIHsKKyAgICAgICAgICAgICBpZiAoZ19ta2Rpcl93aXRoX3Bh cmVudHMoZGwtPmZvbGRlciwwNzAwKSA9PSAwKSB7CisgICAgICAgICAgICAgICAgIGZpbGUgPSBn X2ZvcGVuKGRsLT5maWxlbmFtZSwgIndiIik7CisgICAgICAgICAgICAgICAgIGlmIChmaWxlICE9 IE5VTEwpIHsKKy0gICAgICAgICAgICAgICAgICAgIGZ3cml0ZSAoTVNHX1JFU1BPTlNFX0JPRFko bXNnKSwgMSwgTVNHX1JFU1BPTlNFX0xFTihtc2cpLCBmaWxlKTsKKysgICAgICAgICAgICAgICAg ICAgIGZ3cml0ZSAoZ19ieXRlc19nZXRfZGF0YShib2R5LCBOVUxMKSwgMSwgZ19ieXRlc19nZXRf c2l6ZShib2R5KSwgZmlsZSk7CisgICAgICAgICAgICAgICAgICAgICBmaWxlX3NhdmVkID0gVFJV RTsKKy0gICAgICAgICAgICAgICAgICAgIGdfZGVidWcoIldyb3RlICJNU0dfUkVTUE9OU0VfTEVO X0ZPUk1BVCIgYnl0ZXMgdG8gJXMiLCBNU0dfUkVTUE9OU0VfTEVOKG1zZyksIGRsLT5maWxlbmFt ZSk7CisrICAgICAgICAgICAgICAgICAgICBnX2RlYnVnKCJXcm90ZSAiTVNHX1JFU1BPTlNFX0xF Tl9GT1JNQVQiIGJ5dGVzIHRvICVzIiwgZ19ieXRlc19nZXRfc2l6ZShib2R5KSwgZGwtPmZpbGVu YW1lKTsKKyAgICAgICAgICAgICAgICAgICAgIGZjbG9zZSAoZmlsZSk7CisgCisgICAgICAgICAg ICAgICAgIH0KK0BAIC03ODYsNyArNzkyLDcgQEAgb3NtX2dwc19tYXBfdGlsZV9kb3dubG9hZF9j b21wbGV0ZSAoU291cAorICAgICAgICAgICAgICAgICAvKiBwYXJzZSBmaWxlIGRpcmVjdGx5IGZy b20gbWVtb3J5ICovCisgICAgICAgICAgICAgICAgIGlmIChleHRlbnNpb24pIHsKKyAgICAgICAg ICAgICAgICAgICAgIGxvYWRlciA9IGdka19waXhidWZfbG9hZGVyX25ld193aXRoX3R5cGUgKGV4 dGVuc2lvbisxLCBOVUxMKTsKKy0gICAgICAgICAgICAgICAgICAgIGlmICghZ2RrX3BpeGJ1Zl9s b2FkZXJfd3JpdGUgKGxvYWRlciwgKHVuc2lnbmVkIGNoYXIqKU1TR19SRVNQT05TRV9CT0RZKG1z ZyksIE1TR19SRVNQT05TRV9MRU4obXNnKSwgTlVMTCkpCisrICAgICAgICAgICAgICAgICAgICBp ZiAoIWdka19waXhidWZfbG9hZGVyX3dyaXRlIChsb2FkZXIsICh1bnNpZ25lZCBjaGFyKilnX2J5 dGVzX2dldF9kYXRhKGJvZHksIE5VTEwpLCBnX2J5dGVzX2dldF9zaXplKGJvZHkpLCBOVUxMKSkK KyAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICBnX3dhcm5p bmcoIkVycm9yOiBEZWNvZGluZyBvZiBpbWFnZSBmYWlsZWQiKTsKKyAgICAgICAgICAgICAgICAg ICAgIH0KK0BAIC04MjQsMjEgKzgzMCwyMSBAQCBvc21fZ3BzX21hcF90aWxlX2Rvd25sb2FkX2Nv bXBsZXRlIChTb3VwCisgICAgICAgICBnX2ZyZWUoZGwtPmZpbGVuYW1lKTsKKyAgICAgICAgIGdf ZnJlZShkbCk7CisgICAgIH0gZWxzZSB7CistICAgICAgICBpZiAoKG1zZy0+c3RhdHVzX2NvZGUg PT0gU09VUF9TVEFUVVNfTk9UX0ZPVU5EKSB8fCAobXNnLT5zdGF0dXNfY29kZSA9PSBTT1VQX1NU QVRVU19GT1JCSURERU4pKSB7CisrICAgICAgICBpZiAoKHNvdXBfc3RhdHVzID09IFNPVVBfU1RB VFVTX05PVF9GT1VORCkgfHwgKHNvdXBfc3RhdHVzID09IFNPVVBfU1RBVFVTX0ZPUkJJRERFTikp IHsKKyAgICAgICAgICAgICBnX2hhc2hfdGFibGVfaW5zZXJ0KHByaXYtPm1pc3NpbmdfdGlsZXMs IGRsLT51cmksIE5VTEwpOworICAgICAgICAgICAgIGdfaGFzaF90YWJsZV9yZW1vdmUocHJpdi0+ dGlsZV9xdWV1ZSwgZGwtPnVyaSk7CisgICAgICAgICAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JK RUNUKG1hcCksICJ0aWxlcy1xdWV1ZWQiKTsKKy0gICAgICAgIH0gZWxzZSBpZiAobXNnLT5zdGF0 dXNfY29kZSA9PSBTT1VQX1NUQVRVU19DQU5DRUxMRUQpIHsKKysgICAgICAgIH0gZWxzZSBpZiAo Z19lcnJvcl9tYXRjaGVzIChlcnJvciwgR19JT19FUlJPUiwgR19JT19FUlJPUl9DQU5DRUxMRUQp KSB7CisgICAgICAgICAgICAgLyogY2FsbGVkIGFzIGFwcGxpY2F0aW9uIGV4aXQgb3IgYWZ0ZXIg b3NtX2dwc19tYXBfZG93bmxvYWRfY2FuY2VsX2FsbCAqLworICAgICAgICAgICAgIGdfaGFzaF90 YWJsZV9yZW1vdmUocHJpdi0+dGlsZV9xdWV1ZSwgZGwtPnVyaSk7CisgICAgICAgICAgICAgZ19v YmplY3Rfbm90aWZ5KEdfT0JKRUNUKG1hcCksICJ0aWxlcy1xdWV1ZWQiKTsKKyAgICAgICAgIH0g ZWxzZSB7CistICAgICAgICAgICAgZ193YXJuaW5nKCJFcnJvciBkb3dubG9hZGluZyB0aWxlOiAl ZCAtICVzIiwgbXNnLT5zdGF0dXNfY29kZSwgbXNnLT5yZWFzb25fcGhyYXNlKTsKKy0gICAgICAg ICAgICBkbC0+dHRsLS07CistICAgICAgICAgICAgaWYgKGRsLT50dGwpIHsKKy0gICAgICAgICAg ICAgICAgc291cF9zZXNzaW9uX3JlcXVldWVfbWVzc2FnZShzZXNzaW9uLCBtc2cpOworLSAgICAg ICAgICAgICAgICByZXR1cm47CistICAgICAgICAgICAgfQorKyAgICAgICAgICAgIGdfd2Fybmlu ZygiRXJyb3IgZG93bmxvYWRpbmcgdGlsZTogJWQgLSAlcyIsIHNvdXBfc3RhdHVzLCBzb3VwX3N0 YXR1c19nZXRfcGhyYXNlKHNvdXBfc3RhdHVzKSk7CisrICAgICAgICAgICAgLy9kbC0+dHRsLS07 CisrICAgICAgICAgICAgLy9pZiAoZGwtPnR0bCkgeworKyAgICAgICAgICAgIC8vICAgIHNvdXBf c2Vzc2lvbl9yZXF1ZXVlX21lc3NhZ2Uoc2Vzc2lvbiwgbXNnKTsKKysgICAgICAgICAgICAvLyAg ICByZXR1cm47CisrICAgICAgICAgICAgLy99CisgCisgICAgICAgICAgICAgZ19oYXNoX3RhYmxl X3JlbW92ZShwcml2LT50aWxlX3F1ZXVlLCBkbC0+dXJpKTsKKyAgICAgICAgICAgICBnX29iamVj dF9ub3RpZnkoR19PQkpFQ1QobWFwKSwgInRpbGVzLXF1ZXVlZCIpOworQEAgLTg4OCwyMSArODk0 LDI2IEBAIG9zbV9ncHNfbWFwX2Rvd25sb2FkX3RpbGUgKE9zbUdwc01hcCAqbWEKKyAgICAgICAg ICAgICBpZiAocHJpdi0+aXNfZ29vZ2xlKSB7CisgICAgICAgICAgICAgICAgIC8vU2V0IG1hcHMu Z29vZ2xlLmNvbSBhcyB0aGUgcmVmZXJyZXIKKyAgICAgICAgICAgICAgICAgZ19kZWJ1ZygiU2V0 dGluZyBHb29nbGUgUmVmZXJyZXIiKTsKKy0gICAgICAgICAgICAgICAgc291cF9tZXNzYWdlX2hl YWRlcnNfYXBwZW5kKG1zZy0+cmVxdWVzdF9oZWFkZXJzLCAiUmVmZXJlciIsICJodHRwOi8vbWFw cy5nb29nbGUuY29tLyIpOworKyAgICAgICAgICAgICAgICBzb3VwX21lc3NhZ2VfaGVhZGVyc19h cHBlbmQoc291cF9tZXNzYWdlX2dldF9yZXF1ZXN0X2hlYWRlcnMobXNnKSwgIlJlZmVyZXIiLCAi aHR0cDovL21hcHMuZ29vZ2xlLmNvbS8iKTsKKyAgICAgICAgICAgICAgICAgLy9Gb3IgZ29vZ2xl IHNhdGVsaXRlIGFsc28gc2V0IHRoZSBhcHByb3ByaWF0ZSBjb29raWUgdmFsdWUKKyAgICAgICAg ICAgICAgICAgaWYgKHByaXYtPnVyaV9mb3JtYXQgJiBVUklfSEFTX1EpIHsKKyAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IGNoYXIgKmNvb2tpZSA9IGdfZ2V0ZW52KCJHT09HTEVfQ09PS0lFIik7 CisgICAgICAgICAgICAgICAgICAgICBpZiAoY29va2llKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICAgZ19kZWJ1ZygiQWRkaW5nIEdvb2dsZSBDb29raWUiKTsKKy0gICAgICAgICAgICAgICAg ICAgICAgICBzb3VwX21lc3NhZ2VfaGVhZGVyc19hcHBlbmQobXNnLT5yZXF1ZXN0X2hlYWRlcnMs ICJDb29raWUiLCBjb29raWUpOworKyAgICAgICAgICAgICAgICAgICAgICAgIHNvdXBfbWVzc2Fn ZV9oZWFkZXJzX2FwcGVuZChzb3VwX21lc3NhZ2VfZ2V0X3JlcXVlc3RfaGVhZGVycyhtc2cpLCAi Q29va2llIiwgY29va2llKTsKKyAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgIH0KKyAKKy0gICAgICAgICAgICBnX2hhc2hfdGFibGVfaW5zZXJ0 IChwcml2LT50aWxlX3F1ZXVlLCBkbC0+dXJpLCBtc2cpOworKyAgICAgICAgICAgIEdDYW5jZWxs YWJsZSAqY2FuY2VsbGFibGUgPSBnX2NhbmNlbGxhYmxlX25ldyAoKTsKKysgICAgICAgICAgICBn X2hhc2hfdGFibGVfaW5zZXJ0IChwcml2LT50aWxlX3F1ZXVlLCBkbC0+dXJpLCBjYW5jZWxsYWJs ZSk7CisgICAgICAgICAgICAgZ19vYmplY3Rfbm90aWZ5IChHX09CSkVDVCAobWFwKSwgInRpbGVz LXF1ZXVlZCIpOworICAgICAgICAgICAgIC8qIHRoZSBzb3VwIHNlc3Npb24gdW5yZWZzIHRoZSBt ZXNzYWdlIHdoZW4gdGhlIGRvd25sb2FkIGZpbmlzaGVzICovCistICAgICAgICAgICAgc291cF9z ZXNzaW9uX3F1ZXVlX21lc3NhZ2UgKHByaXYtPnNvdXBfc2Vzc2lvbiwgbXNnLCBvc21fZ3BzX21h cF90aWxlX2Rvd25sb2FkX2NvbXBsZXRlLCBkbCk7CisrICAgICAgICAgICAgc291cF9zZXNzaW9u X3NlbmRfYW5kX3JlYWRfYXN5bmMocHJpdi0+c291cF9zZXNzaW9uLCBtc2csCisrICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgR19QUklPUklUWV9ERUZBVUxULAorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhbmNlbGxhYmxlLAorKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChHQXN5bmNSZWFkeUNhbGxiYWNrKW9zbV9ncHNfbWFwX3Rp bGVfZG93bmxvYWRfY29tcGxldGUsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGwpOworICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICBnX3dhcm5pbmcoIkNvdWxk IG5vdCBjcmVhdGUgc291cCBtZXNzYWdlIik7CisgICAgICAgICAgICAgZ19mcmVlKGRsLT51cmkp OworQEAgLTE2ODYsMTEgKzE2OTcsOCBAQCBvc21fZ3BzX21hcF9pbml0IChPc21HcHNNYXAgKm9i amVjdCkKKyAgICAgICAgIHNvdXBfc2Vzc2lvbl9hc3luY19uZXdfd2l0aF9vcHRpb25zKFNPVVBf U0VTU0lPTl9VU0VSX0FHRU5ULAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgVVNFUl9BR0VOVCwgTlVMTCk7CisgI2Vsc2UKKy0gICAgLy8gbGlzb3VwIHNpbmNl IDIuNDIuMCBoYXMgdW5pdmVyc2FsIHNlc3Npb24sIG9ubHkgbWV0aG9kcyBjYW4gYmUgc3luYy9h c3luYworLSAgICAvLyBhbmQgd2UgdXNlIGFzeW5jCistICAgIHByaXYtPnNvdXBfc2Vzc2lvbiA9 CistICAgICAgICBzb3VwX3Nlc3Npb25fbmV3X3dpdGhfb3B0aW9ucyhTT1VQX1NFU1NJT05fVVNF Ul9BR0VOVCwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFVT RVJfQUdFTlQsIE5VTEwpOworKyAgICBwcml2LT5zb3VwX3Nlc3Npb24gPSBzb3VwX3Nlc3Npb25f bmV3ICgpOworKyAgICBzb3VwX3Nlc3Npb25fc2V0X3VzZXJfYWdlbnQgKHByaXYtPnNvdXBfc2Vz c2lvbiwgVVNFUl9BR0VOVCk7CisgI2VuZGlmCisgCisgICAgIC8qIEhhc2ggdGFibGUgd2hpY2gg bWFwcyB0aWxlIGQvbCBVUklzIHRvIFNvdXBNZXNzYWdlIHJlcXVlc3RzLCB0aGUgaGFzaHRhYmxl CitAQCAtMTkyMiwxMCArMTkzMCwxMCBAQCBvc21fZ3BzX21hcF9zZXRfcHJvcGVydHkgKEdPYmpl Y3QgKm9iamVjCisgICAgICAgICAgICAgICAgIGdfZGVidWcoIlNldHRpbmcgcHJveHkgc2VydmVy OiAlcyIsIHByaXYtPnByb3h5X3VyaSk7CisgCisgICAgICAgICAgICAgICAgIEdWYWx1ZSB2YWwg PSB7MH07CistICAgICAgICAgICAgICAgIFNvdXBVUkkqIHVyaSA9IHNvdXBfdXJpX25ldyhwcml2 LT5wcm94eV91cmkpOworLSAgICAgICAgICAgICAgICBnX3ZhbHVlX2luaXQoJnZhbCwgU09VUF9U WVBFX1VSSSk7CisrICAgICAgICAgICAgICAgIEdVcmkqIHVyaSA9IGdfdXJpX3BhcnNlKHByaXYt PnByb3h5X3VyaSwgU09VUF9IVFRQX1VSSV9GTEFHUywgTlVMTCk7CisrICAgICAgICAgICAgICAg IGdfdmFsdWVfaW5pdCgmdmFsLCBHX1RZUEVfVVJJKTsKKyAgICAgICAgICAgICAgICAgZ192YWx1 ZV90YWtlX2JveGVkKCZ2YWwsIHVyaSk7CistICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldF9w cm9wZXJ0eShHX09CSkVDVChwcml2LT5zb3VwX3Nlc3Npb24pLFNPVVBfU0VTU0lPTl9QUk9YWV9V UkksJnZhbCk7CisrICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldF9wcm9wZXJ0eShHX09CSkVD VChwcml2LT5zb3VwX3Nlc3Npb24pLCJwcm94eS1yZXNvbHZlciIsJnZhbCk7CisgCisgICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgZ19mcmVlKHByaXYtPnByb3h5X3VyaSk7 CitAQCAtMTk0NSw3ICsxOTUzLDcgQEAgb3NtX2dwc19tYXBfc2V0X3Byb3BlcnR5IChHT2JqZWN0 ICpvYmplYworICAgICAgICAgICAgICAgICBwcml2LT51c2VyX2FnZW50ID0gTlVMTDsKKyAgICAg ICAgICAgICAgICAgZ192YWx1ZV9zZXRfc3RyaW5nICgmZnVsbF91c2VyX2FnZW50LCBVU0VSX0FH RU5UKTsKKyAgICAgICAgICAgICB9CistICAgICAgICAgICAgZ19vYmplY3Rfc2V0X3Byb3BlcnR5 KEdfT0JKRUNUKHByaXYtPnNvdXBfc2Vzc2lvbiksU09VUF9TRVNTSU9OX1VTRVJfQUdFTlQsICZm dWxsX3VzZXJfYWdlbnQpOworKyAgICAgICAgICAgIGdfb2JqZWN0X3NldF9wcm9wZXJ0eShHX09C SkVDVChwcml2LT5zb3VwX3Nlc3Npb24pLCJ1c2VyLWFnZW50IiwgJmZ1bGxfdXNlcl9hZ2VudCk7 CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNlIFBST1BfVElMRV9DQUNIRV9ESVI6 CisgICAgICAgICAgICAgaWYgKCBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpICkgeworQEAgLTI5 ODcsOSArMjk5NSw5IEBAIG9zbV9ncHNfbWFwX2Rvd25sb2FkX21hcHMgKE9zbUdwc01hcCAqbWEK KyB9CisgCisgc3RhdGljIHZvaWQKKy1jYW5jZWxfbWVzc2FnZSAoY2hhciAqa2V5LCBTb3VwTWVz c2FnZSAqdmFsdWUsIFNvdXBTZXNzaW9uICp1c2VyX2RhdGEpCisrY2FuY2VsX21lc3NhZ2UgKGNo YXIgKmtleSwgR0NhbmNlbGxhYmxlICpjYW5jZWxsYWJsZSwgdm9pZCAqdXNlcmRhdGEpCisgewor LSAgICBzb3VwX3Nlc3Npb25fY2FuY2VsX21lc3NhZ2UgKHVzZXJfZGF0YSwgdmFsdWUsIFNPVVBf U1RBVFVTX0NBTkNFTExFRCk7CisrICAgIGdfY2FuY2VsbGFibGVfY2FuY2VsKGNhbmNlbGxhYmxl KTsKKyB9CisgCisgLyoqCitAQCAtMjk5Nyw3ICszMDA1LDcgQEAgY2FuY2VsX21lc3NhZ2UgKGNo YXIgKmtleSwgU291cE1lc3NhZ2UgKgorICAqIEBtYXA6IGEgI09zbUdwc01hcCB3aWRnZXQKKyAg KgorICAqIENhbmNlbHMgYWxsIHRpbGVzIGN1cnJlbnRseSBiZWluZyBkb3dubG9hZGVkLiBUeXBp Y2FsbHkgdXNlZCBpZiB5b3Ugd2lzaCB0bworLSAqIGNhY2VsIGEgbGFyZ2UgbnVtYmVyIG9mIHRp bGVzIHF1ZXVlZCB1c2luZyBvc21fZ3BzX21hcF9kb3dubG9hZF9tYXBzKCkKKysgKiBjYW5jZWwg YSBsYXJnZSBudW1iZXIgb2YgdGlsZXMgcXVldWVkIHVzaW5nIG9zbV9ncHNfbWFwX2Rvd25sb2Fk X21hcHMoKQorICAqCisgICogU2luY2U6IDAuNy4wCisgICoqLworQEAgLTMwMDUsNyArMzAxMyw3 IEBAIHZvaWQKKyBvc21fZ3BzX21hcF9kb3dubG9hZF9jYW5jZWxfYWxsIChPc21HcHNNYXAgKm1h cCkKKyB7CisgICAgIE9zbUdwc01hcFByaXZhdGUgKnByaXYgPSBtYXAtPnByaXY7CistICAgIGdf aGFzaF90YWJsZV9mb3JlYWNoIChwcml2LT50aWxlX3F1ZXVlLCAoR0hGdW5jKWNhbmNlbF9tZXNz YWdlLCBwcml2LT5zb3VwX3Nlc3Npb24pOworKyAgICBnX2hhc2hfdGFibGVfZm9yZWFjaCAocHJp di0+dGlsZV9xdWV1ZSwgKEdIRnVuYyljYW5jZWxfbWVzc2FnZSwgTlVMTCk7CisgfQorIAorIC8q KgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9saWJvc21ncHNtYXAvdGVtcGxhdGUgYi9zcmNwa2dzL2xp Ym9zbWdwc21hcC90ZW1wbGF0ZQppbmRleCBmNmFkMDRkNTcxNTBmYy4uYTFkNzg4OGI4MDdhMjAg MTAwNjQ0Ci0tLSBhL3NyY3BrZ3MvbGlib3NtZ3BzbWFwL3RlbXBsYXRlCisrKyBiL3NyY3BrZ3Mv bGlib3NtZ3BzbWFwL3RlbXBsYXRlCkBAIC0xLDEyICsxLDEyIEBACiAjIFRlbXBsYXRlIGZpbGUg Zm9yICdsaWJvc21ncHNtYXAnCiBwa2duYW1lPWxpYm9zbWdwc21hcAogdmVyc2lvbj0xLjIuMAot cmV2aXNpb249MgorcmV2aXNpb249MwogYnVpbGRfc3R5bGU9Z251LWNvbmZpZ3VyZQogYnVpbGRf aGVscGVyPSJnaXIiCiBjb25maWd1cmVfYXJncz0iJCh2b3B0X2VuYWJsZSBnaXIgaW50cm9zcGVj dGlvbikiCi1ob3N0bWFrZWRlcGVuZHM9InBrZy1jb25maWcgZ3RrLWRvYyIKLW1ha2VkZXBlbmRz PSJsaWJzb3VwLWRldmVsIGd0ayszLWRldmVsIGNhaXJvLWRldmVsIgoraG9zdG1ha2VkZXBlbmRz PSJwa2ctY29uZmlnIGd0ay1kb2MgYXV0b21ha2UgbGlidG9vbCIKK21ha2VkZXBlbmRzPSJsaWJz b3VwMy1kZXZlbCBndGsrMy1kZXZlbCBjYWlyby1kZXZlbCIKIHNob3J0X2Rlc2M9Ikd0aysgV2lk Z2V0IGZvciBEaXNwbGF5aW5nIE9wZW5TdHJlZXRNYXAgdGlsZXMiCiBtYWludGFpbmVyPSJsZW1t aSA8bGVtbWlAbmVyZDJuZXJkLm9yZz4iCiBsaWNlbnNlPSJHUEwtMi4wLW9yLWxhdGVyIgpAQCAt MTgsNiArMTgsMTAgQEAgY2hlY2tzdW09ZGRlYzExNDQ5ZjM3YjVkZmZiNGJjYTEzNGQwMjQ2MjM4 OTdjNjE0MGFmMWY5OTgxYThhY2M1MTJkYmY2YTdhNQogYnVpbGRfb3B0aW9ucz0iZ2lyIgogYnVp bGRfb3B0aW9uc19kZWZhdWx0PSJnaXIiCiAKK3ByZV9jb25maWd1cmUoKSB7CisJYXV0b3JlY29u ZiAtZmkKK30KKwogbGlib3NtZ3BzbWFwLWRvY19wYWNrYWdlKCkgewogCWRlcGVuZHM9IiR7c291 cmNlcGtnfT49JHt2ZXJzaW9ufV8ke3JldmlzaW9ufSIKIAlzaG9ydF9kZXNjKz0iIC0gRG9jdW1l bnRhdGlvbiIK --===============5250978531096885250==--