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: Dusty Mabe To: git-commits@fedoraproject.org Subject: [rpms/ostree] rawhide: Backport changes for ostree min-free-space accounting Date: Mon, 27 Jul 2026 16:51:45 GMT Message-ID: <178517110524.1.1339067946339889027.rpms-ostree-029cd0b3ef04@fedoraproject.org> List-ID: X-Git-Repo: rpms/ostree X-Git-Branch: rawhide X-Git-Rev: 029cd0b3ef04f81d4113ecf2fce04cd51e62b1f6 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvb3N0cmVlCiAgICAgICAgICAgIEJyYW5jaCA6IHJhd2hpZGUKICAgICAgICAg ICAgQ29tbWl0IDogMDI5Y2QwYjNlZjA0ZjgxZDQxMTNlY2YyZmNlMDRjZDUxZTYyYjFmNgogICAg ICAgICAgICBBdXRob3IgOiBEdXN0eSBNYWJlIDxkdXN0eUBkdXN0eW1hYmUuY29tPgogICAgICAg ICAgICBEYXRlICAgOiAyMDI2LTA3LTI3VDEyOjA2OjMzLTA0OjAwCiAgICAgICAgICAgIFN0YXRz ICA6ICszODUvLTAgaW4gNCBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8vc3Jj LmZlZG9yYXByb2plY3Qub3JnL3JwbXMvb3N0cmVlL2MvMDI5Y2QwYjNlZjA0ZjgxZDQxMTNlY2Yy ZmNlMDRjZDUxZTYyYjFmNj9icmFuY2g9cmF3aGlkZQoKICAgICAgICAgICAgTG9nOgogICAgICAg ICAgICBCYWNrcG9ydCBjaGFuZ2VzIGZvciBvc3RyZWUgbWluLWZyZWUtc3BhY2UgYWNjb3VudGlu ZwoKLSBodHRwczovL2dpdGh1Yi5jb20vb3N0cmVlZGV2L29zdHJlZS9wdWxsLzM2MTQKLSBodHRw czovL2dpdGh1Yi5jb20vb3N0cmVlZGV2L29zdHJlZS9wdWxsLzM2MTUKCkFzc2lzdGVkLUJ5OiA8 YW50aHJvcGljL2NsYXVkZS1vcHVzLTQuNj4KCi0tLQpkaWZmIC0tZ2l0IGEvMDAwMS1saWItY29t bWl0LVJlcG9ydC13aGV0aGVyLWNvbW1pdHRlZC1vYmplY3QtYWxyZWFkeS1leGlzdGVkLnBhdGNo IGIvMDAwMS1saWItY29tbWl0LVJlcG9ydC13aGV0aGVyLWNvbW1pdHRlZC1vYmplY3QtYWxyZWFk eS1leGlzdGVkLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc4OGQ4 YTQKLS0tIC9kZXYvbnVsbAorKysgYi8wMDAxLWxpYi1jb21taXQtUmVwb3J0LXdoZXRoZXItY29t bWl0dGVkLW9iamVjdC1hbHJlYWR5LWV4aXN0ZWQucGF0Y2gKQEAgLTAsMCArMSwxNTIgQEAKK0Zy b20gOTc0YjUxODRjYmQ0YjgzZTA0MjM0NTJhY2JiNjFiODZkMTllZTE2MCBNb24gU2VwIDE3IDAw OjAwOjAwIDIwMDEKK0Zyb206IEpvbmF0aGFuIExlYm9uIDxqbGVib25AcmVkaGF0LmNvbT4KK0Rh dGU6IFdlZCwgMjIgSnVsIDIwMjYgMjI6MDg6MjkgLTA0MDAKK1N1YmplY3Q6IFtQQVRDSCAxLzNd IGxpYi9jb21taXQ6IFJlcG9ydCB3aGV0aGVyIGNvbW1pdHRlZCBvYmplY3QgYWxyZWFkeQorIGV4 aXN0ZWQKKworQWRkIGFuIGBvdXRfZXhpc3RlZGAgb3V0cHV0IHBhcmFtZXRlciB0bworYF9vc3Ry ZWVfcmVwb19jb21taXRfdG1wZl9maW5hbCgpYCBhbmQgYGNvbW1pdF9sb29zZV9yZWdmaWxlX29i amVjdCgpYC4KK1RoaXMgcmVxdWlyZXMgc3dpdGNoaW5nIGZyb20gYEdMTlhfTElOS19UTVBGSUxF X05PUkVQTEFDRV9JR05PUkVfRVhJU1RgCit0byBgR0xOWF9MSU5LX1RNUEZJTEVfTk9SRVBMQUNF YCBzbyB3ZSBjYW4gZGV0ZWN0IGBHX0lPX0VSUk9SX0VYSVNUU2AKK291cnNlbHZlcy4KKworTm8g dXNlcnMgZm9yIG5vdy4gUHJlcCBmb3IgYSBmb2xsb3ctdXAgcGF0Y2ggdXNpbmcgdGhpcy4KKwor QXNzaXN0ZWQtYnk6IEFJCistLS0KKyBzcmMvbGlib3N0cmVlL29zdHJlZS1yZXBvLWNvbW1pdC5j ICB8IDM5ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCisgc3JjL2xpYm9zdHJlZS9vc3Ry ZWUtcmVwby1wcml2YXRlLmggfCAgMyArKy0KKyBzcmMvbGlib3N0cmVlL29zdHJlZS1yZXBvLXB1 bGwuYyAgICB8ICA0ICstLQorIDMgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMTcg ZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9zcmMvbGlib3N0cmVlL29zdHJlZS1yZXBvLWNv bW1pdC5jIGIvc3JjL2xpYm9zdHJlZS9vc3RyZWUtcmVwby1jb21taXQuYworaW5kZXggYjc3NzNl MWRiMS4uNDk4Mzc2MDkwYSAxMDA2NDQKKy0tLSBhL3NyYy9saWJvc3RyZWUvb3N0cmVlLXJlcG8t Y29tbWl0LmMKKysrKyBiL3NyYy9saWJvc3RyZWUvb3N0cmVlLXJlcG8tY29tbWl0LmMKK0BAIC0x ODEsNyArMTgxLDggQEAgb3Rfc2VjdXJpdHlfc21hY2tfcmVzZXRfZmQgKGludCBmZCkKKyAvKiBH aXZlbiBhbiBPX1RNUEZJTEUgcmVndWxhciBmaWxlLCBsaW5rIGl0IGludG8gcGxhY2UuICovCisg Z2Jvb2xlYW4KKyBfb3N0cmVlX3JlcG9fY29tbWl0X3RtcGZfZmluYWwgKE9zdHJlZVJlcG8gKnNl bGYsIGNvbnN0IGNoYXIgKmNoZWNrc3VtLCBPc3RyZWVPYmplY3RUeXBlIG9ianR5cGUsCistICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTG54VG1wZmlsZSAqdG1wZiwgR0NhbmNlbGxh YmxlICpjYW5jZWxsYWJsZSwgR0Vycm9yICoqZXJyb3IpCisrICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBHTG54VG1wZmlsZSAqdG1wZiwgZ2Jvb2xlYW4gKm91dF9leGlzdGVkLCBHQ2Fu Y2VsbGFibGUgKmNhbmNlbGxhYmxlLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg R0Vycm9yICoqZXJyb3IpCisgeworICAgY2hhciB0bXBidWZbX09TVFJFRV9MT09TRV9QQVRIX01B WF07CisgICBfb3N0cmVlX2xvb3NlX3BhdGggKHRtcGJ1ZiwgY2hlY2tzdW0sIG9ianR5cGUsIHNl bGYtPm1vZGUpOworQEAgLTE5MywxMCArMTk0LDE5IEBAIF9vc3RyZWVfcmVwb19jb21taXRfdG1w Zl9maW5hbCAoT3N0cmVlUmVwbyAqc2VsZiwgY29uc3QgY2hhciAqY2hlY2tzdW0sIE9zdHJlZU9i CisgICBpZiAoIV9vc3RyZWVfdG1wZl9mc3Zlcml0eSAoc2VsZiwgdG1wZiwgTlVMTCwgZXJyb3Ip KQorICAgICByZXR1cm4gRkFMU0U7CisgCistICBpZiAoIWdsbnhfbGlua190bXBmaWxlX2F0ICh0 bXBmLCBHTE5YX0xJTktfVE1QRklMRV9OT1JFUExBQ0VfSUdOT1JFX0VYSVNULCBkZXN0X2RmZCwg dG1wYnVmLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IpKQorLSAgICByZXR1 cm4gRkFMU0U7CistICAvKiBXZSdyZSBkb25lIHdpdGggdGhlIGZkICovCisrICBnYm9vbGVhbiBl eGlzdGVkID0gRkFMU0U7CisrICBnX2F1dG9wdHIgKEdFcnJvcikgbG9jYWxfZXJyb3IgPSBOVUxM OworKyAgaWYgKCFnbG54X2xpbmtfdG1wZmlsZV9hdCAodG1wZiwgR0xOWF9MSU5LX1RNUEZJTEVf Tk9SRVBMQUNFLCBkZXN0X2RmZCwgdG1wYnVmLCAmbG9jYWxfZXJyb3IpKQorKyAgICB7CisrICAg ICAgaWYgKCFnX2Vycm9yX21hdGNoZXMgKGxvY2FsX2Vycm9yLCBHX0lPX0VSUk9SLCBHX0lPX0VS Uk9SX0VYSVNUUykpCisrICAgICAgICB7CisrICAgICAgICAgIGdfcHJvcGFnYXRlX2Vycm9yIChl cnJvciwgZ19zdGVhbF9wb2ludGVyICgmbG9jYWxfZXJyb3IpKTsKKysgICAgICAgICAgcmV0dXJu IEZBTFNFOworKyAgICAgICAgfQorKyAgICAgIGV4aXN0ZWQgPSBUUlVFOworKyAgICB9CisrICBp ZiAob3V0X2V4aXN0ZWQpCisrICAgICpvdXRfZXhpc3RlZCA9IGV4aXN0ZWQ7CisgICBnbG54X3Rt cGZpbGVfY2xlYXIgKHRtcGYpOworICAgcmV0dXJuIFRSVUU7CisgfQorQEAgLTIzNyw4ICsyNDcs OCBAQCBjb21taXRfcGF0aF9maW5hbCAoT3N0cmVlUmVwbyAqc2VsZiwgY29uc3QgY2hhciAqY2hl Y2tzdW0sIE9zdHJlZU9iamVjdFR5cGUgb2JqdAorICAqLworIHN0YXRpYyBnYm9vbGVhbgorIGNv bW1pdF9sb29zZV9yZWdmaWxlX29iamVjdCAoT3N0cmVlUmVwbyAqc2VsZiwgY29uc3QgY2hhciAq Y2hlY2tzdW0sIEdMbnhUbXBmaWxlICp0bXBmLCBndWludDMyIHVpZCwKKy0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGd1aW50MzIgZ2lkLCBndWludDMyIG1vZGUsIEdWYXJpYW50ICp4YXR0 cnMsIEdDYW5jZWxsYWJsZSAqY2FuY2VsbGFibGUsCistICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHRXJyb3IgKiplcnJvcikKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50 MzIgZ2lkLCBndWludDMyIG1vZGUsIEdWYXJpYW50ICp4YXR0cnMsIGdib29sZWFuICpvdXRfZXhp c3RlZCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdDYW5jZWxsYWJsZSAqY2FuY2Vs bGFibGUsIEdFcnJvciAqKmVycm9yKQorIHsKKyAgIGlmIChzZWxmLT5tb2RlID09IE9TVFJFRV9S RVBPX01PREVfQkFSRSkKKyAgICAgeworQEAgLTMwOCw4ICszMTgsOCBAQCBjb21taXRfbG9vc2Vf cmVnZmlsZV9vYmplY3QgKE9zdHJlZVJlcG8gKnNlbGYsIGNvbnN0IGNoYXIgKmNoZWNrc3VtLCBH TG54VG1wZmlsZQorICAgICAgICAgcmV0dXJuIGdsbnhfdGhyb3dfZXJybm9fcHJlZml4IChlcnJv ciwgImZzeW5jIik7CisgICAgIH0KKyAKKy0gIGlmICghX29zdHJlZV9yZXBvX2NvbW1pdF90bXBm X2ZpbmFsIChzZWxmLCBjaGVja3N1bSwgT1NUUkVFX09CSkVDVF9UWVBFX0ZJTEUsIHRtcGYsIGNh bmNlbGxhYmxlLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVycm9y KSkKKysgIGlmICghX29zdHJlZV9yZXBvX2NvbW1pdF90bXBmX2ZpbmFsIChzZWxmLCBjaGVja3N1 bSwgT1NUUkVFX09CSkVDVF9UWVBFX0ZJTEUsIHRtcGYsIG91dF9leGlzdGVkLAorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhbmNlbGxhYmxlLCBlcnJvcikpCisgICAg IHJldHVybiBGQUxTRTsKKyAKKyAgIHJldHVybiBUUlVFOworQEAgLTU2OSw3ICs1NzksNyBAQCBf b3N0cmVlX3JlcG9fYmFyZV9jb250ZW50X2NvbW1pdCAoT3N0cmVlUmVwbyAqc2VsZiwgT3N0cmVl UmVwb0JhcmVDb250ZW50ICpiYXJldworICAgICByZXR1cm4gRkFMU0U7CisgCisgICBpZiAoIWNv bW1pdF9sb29zZV9yZWdmaWxlX29iamVjdCAoc2VsZiwgY2hlY2tzdW1fYnVmLCAmcmVhbC0+dG1w ZiwgcmVhbC0+dWlkLCByZWFsLT5naWQsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVhbC0+bW9kZSwgcmVhbC0+eGF0dHJzLCBjYW5jZWxsYWJsZSwgZXJyb3IpKQorKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWwtPm1vZGUsIHJlYWwtPnhhdHRy cywgTlVMTCwgY2FuY2VsbGFibGUsIGVycm9yKSkKKyAgICAgcmV0dXJuIEZBTFNFOworIAorICAg LyogTGV0J3MgaGF2ZSBhIGd1YXJhbnRlZSB0aGF0IGFmdGVyIGNvbW1pdCB0aGUgb2JqZWN0IGlz IGNsZWFuZWQgdXAgKi8KK0BAIC0xMTY4LDcgKzExNzgsNyBAQCB3cml0ZV9jb250ZW50X29iamVj dCAoT3N0cmVlUmVwbyAqc2VsZiwgY29uc3QgY2hhciAqZXhwZWN0ZWRfY2hlY2tzdW0sIEdJbnB1 dFN0cgorICAgICAgICAgcmV0dXJuIEZBTFNFOworIAorICAgICAgIC8qIFRoaXMgcGF0aCBpcyBm b3IgcmVndWxhciBmaWxlcyAqLworLSAgICAgIGlmICghY29tbWl0X2xvb3NlX3JlZ2ZpbGVfb2Jq ZWN0IChzZWxmLCBhY3R1YWxfY2hlY2tzdW0sICZ0bXBmLCB1aWQsIGdpZCwgbW9kZSwgeGF0dHJz LAorKyAgICAgIGlmICghY29tbWl0X2xvb3NlX3JlZ2ZpbGVfb2JqZWN0IChzZWxmLCBhY3R1YWxf Y2hlY2tzdW0sICZ0bXBmLCB1aWQsIGdpZCwgbW9kZSwgeGF0dHJzLCBOVUxMLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYW5jZWxsYWJsZSwgZXJyb3IpKQorICAg ICAgICAgcmV0dXJuIEZBTFNFOworIAorQEAgLTEzODksNyArMTM5OSw4IEBAIHdyaXRlX21ldGFk YXRhX29iamVjdCAoT3N0cmVlUmVwbyAqc2VsZiwgT3N0cmVlT2JqZWN0VHlwZSBvYmp0eXBlLCBj b25zdCBjaGFyICplCisgICAgIHJldHVybiBGQUxTRTsKKyAKKyAgIC8qIEFuZCBjb21taXQgaXQg aW50byBwbGFjZSAqLworLSAgaWYgKCFfb3N0cmVlX3JlcG9fY29tbWl0X3RtcGZfZmluYWwgKHNl bGYsIGFjdHVhbF9jaGVja3N1bSwgb2JqdHlwZSwgJnRtcGYsIGNhbmNlbGxhYmxlLCBlcnJvcikp CisrICBpZiAoIV9vc3RyZWVfcmVwb19jb21taXRfdG1wZl9maW5hbCAoc2VsZiwgYWN0dWFsX2No ZWNrc3VtLCBvYmp0eXBlLCAmdG1wZiwgTlVMTCwgY2FuY2VsbGFibGUsCisrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IpKQorICAgICByZXR1cm4gRkFMU0U7Cisg CisgICBpZiAob2JqdHlwZSA9PSBPU1RSRUVfT0JKRUNUX1RZUEVfQ09NTUlUKQorQEAgLTQ0NjYs OCArNDQ3Nyw4IEBAIGltcG9ydF9vbmVfb2JqZWN0X2RpcmVjdCAoT3N0cmVlUmVwbyAqZGVzdF9y ZXBvLCBPc3RyZWVSZXBvICpzcmNfcmVwbywgY29uc3QgY2hhCisgICAgICAgICAgICh2b2lkKWZ1 dGltZW5zICh0bXBfZGVzdC5mZCwgdHMpOworICAgICAgICAgfQorIAorLSAgICAgIGlmICghX29z dHJlZV9yZXBvX2NvbW1pdF90bXBmX2ZpbmFsIChkZXN0X3JlcG8sIGNoZWNrc3VtLCBvYmp0eXBl LCAmdG1wX2Rlc3QsIGNhbmNlbGxhYmxlLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlcnJvcikpCisrICAgICAgaWYgKCFfb3N0cmVlX3JlcG9fY29tbWl0X3Rt cGZfZmluYWwgKGRlc3RfcmVwbywgY2hlY2tzdW0sIG9ianR5cGUsICZ0bXBfZGVzdCwgTlVMTCwK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FuY2VsbGFibGUs IGVycm9yKSkKKyAgICAgICAgIHJldHVybiBGQUxTRTsKKyAgICAgfQorIAorZGlmZiAtLWdpdCBh L3NyYy9saWJvc3RyZWUvb3N0cmVlLXJlcG8tcHJpdmF0ZS5oIGIvc3JjL2xpYm9zdHJlZS9vc3Ry ZWUtcmVwby1wcml2YXRlLmgKK2luZGV4IDc3ZWEyYTZiY2MuLmRkYWY1ZTc4ODggMTAwNjQ0Cist LS0gYS9zcmMvbGlib3N0cmVlL29zdHJlZS1yZXBvLXByaXZhdGUuaAorKysrIGIvc3JjL2xpYm9z dHJlZS9vc3RyZWUtcmVwby1wcml2YXRlLmgKK0BAIC0zNjAsNyArMzYwLDggQEAgZ2Jvb2xlYW4g X29zdHJlZV9yZXBvX2ltcG9ydF9vYmplY3QgKE9zdHJlZVJlcG8gKnNlbGYsIE9zdHJlZVJlcG8g KnNvdXJjZSwgT3N0cmUKKyAKKyBnYm9vbGVhbiBfb3N0cmVlX3JlcG9fY29tbWl0X3RtcGZfZmlu YWwgKE9zdHJlZVJlcG8gKnNlbGYsIGNvbnN0IGNoYXIgKmNoZWNrc3VtLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgT3N0cmVlT2JqZWN0VHlwZSBvYmp0eXBlLCBH TG54VG1wZmlsZSAqdG1wZiwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIEdDYW5jZWxsYWJsZSAqY2FuY2VsbGFibGUsIEdFcnJvciAqKmVycm9yKTsKKysgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICpvdXRfZXhpc3RlZCwg R0NhbmNlbGxhYmxlICpjYW5jZWxsYWJsZSwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdFcnJvciAqKmVycm9yKTsKKyAKKyB0eXBlZGVmIHN0cnVjdAorIHsKK2Rp ZmYgLS1naXQgYS9zcmMvbGlib3N0cmVlL29zdHJlZS1yZXBvLXB1bGwuYyBiL3NyYy9saWJvc3Ry ZWUvb3N0cmVlLXJlcG8tcHVsbC5jCitpbmRleCA5OTg5NDE1ZmEyLi41MjdlYzJjYjk3IDEwMDY0 NAorLS0tIGEvc3JjL2xpYm9zdHJlZS9vc3RyZWUtcmVwby1wdWxsLmMKKysrKyBiL3NyYy9saWJv c3RyZWUvb3N0cmVlLXJlcG8tcHVsbC5jCitAQCAtOTUyLDggKzk1Miw4IEBAIGNvbnRlbnRfZmV0 Y2hfb25fY29tcGxldGUgKEdPYmplY3QgKm9iamVjdCwgR0FzeW5jUmVzdWx0ICpyZXN1bHQsIGdw b2ludGVyIHVzZXJfCisgICBpZiAocHVsbF9kYXRhLT50cnVzdGVkX2h0dHBfZGlyZWN0KQorICAg ICB7CisgICAgICAgZ19hc3NlcnQgKCF2ZXJpZnlpbmdfYmFyZXVzZXJvbmx5KTsKKy0gICAgICBp ZiAoIV9vc3RyZWVfcmVwb19jb21taXRfdG1wZl9maW5hbCAocHVsbF9kYXRhLT5yZXBvLCBjaGVj a3N1bSwgb2JqdHlwZSwgJnRtcGYsIGNhbmNlbGxhYmxlLAorLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBlcnJvcikpCisrICAgICAgaWYgKCFfb3N0cmVlX3JlcG9f Y29tbWl0X3RtcGZfZmluYWwgKHB1bGxfZGF0YS0+cmVwbywgY2hlY2tzdW0sIG9ianR5cGUsICZ0 bXBmLCBOVUxMLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj YW5jZWxsYWJsZSwgZXJyb3IpKQorICAgICAgICAgZ290byBvdXQ7CisgICAgICAgcHVsbF9kYXRh LT5uX2ZldGNoZWRfY29udGVudCsrOworICAgICB9CistLSAKKzIuNDkuMAorCgpkaWZmIC0tZ2l0 IGEvMDAwMi1saWItY29tbWl0LUZpeC1taW4tZnJlZS1zcGFjZS1hY2NvdW50aW5nLWZvci1kdXBs aWNhdGUtY29udGVudC1vYmplY3RzLnBhdGNoIGIvMDAwMi1saWItY29tbWl0LUZpeC1taW4tZnJl ZS1zcGFjZS1hY2NvdW50aW5nLWZvci1kdXBsaWNhdGUtY29udGVudC1vYmplY3RzLnBhdGNoCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU5OGMyYjQKLS0tIC9kZXYvbnVsbAor KysgYi8wMDAyLWxpYi1jb21taXQtRml4LW1pbi1mcmVlLXNwYWNlLWFjY291bnRpbmctZm9yLWR1 cGxpY2F0ZS1jb250ZW50LW9iamVjdHMucGF0Y2gKQEAgLTAsMCArMSwxNDIgQEAKK0Zyb20gMTZl NTM3Y2I4YTliNjlkOGYyNTRkZmJmNGFiZjRmMDM1ODI1MWY1NiBNb24gU2VwIDE3IDAwOjAwOjAw IDIwMDEKK0Zyb206IEpvbmF0aGFuIExlYm9uIDxqbGVib25AcmVkaGF0LmNvbT4KK0RhdGU6IFdl ZCwgMjIgSnVsIDIwMjYgMjI6MDk6MTUgLTA0MDAKK1N1YmplY3Q6IFtQQVRDSCAyLzNdIGxpYi9j b21taXQ6IEZpeCBtaW4tZnJlZS1zcGFjZSBhY2NvdW50aW5nIGZvciBkdXBsaWNhdGUKKyBjb250 ZW50IG9iamVjdHMKKworRmlyc3QsIGluIHRoZSBfb3N0cmVlX3JlcG9fYmFyZV9jb250ZW50X2Nv bW1pdCgpLCB3ZSBuZXZlciBhY3R1YWxseQorY2hlY2tlZCB3aGV0aGVyIHRoZSBmaWxlIHdhcyBh bHJlYWR5IHByZXNlbnQgaW4gdGhlIHJlcG8gYmVmb3JlIGxpbmtpbmcKK2l0IGluIHBsYWNlLiBE byB0aGlzIHNvIHRoYXQgd2UgY2FuIG5vLW9wIHVwIGZyb250LgorCitTZWNvbmQsIGFuZCB0aGUg YWN0dWFsIGJ1ZyB0aGlzIHBhdGNoIGlzIGZpeGluZzogdGhlIG1pbi1mcmVlLXNwYWNlCithY2Nv dW50aW5nIGluIHdyaXRlX2NvbnRlbnRfb2JqZWN0KCkgYW5kCitfb3N0cmVlX3JlcG9fYmFyZV9j b250ZW50X2NvbW1pdCgpIG9wdGltaXN0aWNhbGx5IHJlc2VydmVzIHNwYWNlIGZyb20KK3RoZSBy dW5uaW5nIGB0eG4ubWF4X2Jsb2Nrc2AgY291bnRlciBfYmVmb3JlXyBrbm93aW5nIHdoZXRoZXIg d2UnbGwKK2FjdHVhbGx5IG5vLW9wIG9yIG5vdCBiYXNlZCBvbiB0aGUgb2JqZWN0IGFscmVhZHkg ZXhpc3RpbmcuCisKK092ZXIgbWFueSBkdXBsaWNhdGUgd3JpdGVzIHdpdGhpbiBhIHNpbmdsZSB0 cmFuc2FjdGlvbiwgdGhlIGNvdW50ZXIKK2RpdmVyZ2VzIGZyb20gdGhlIGFjdHVhbCBmcmVlIHNw YWNlIGFuZCBldmVudHVhbGx5IGhpdHMgemVybywgY2F1c2luZyBhCitzcHVyaW91cyAibWluLWZy ZWUtc3BhY2Ugd291bGQgYmUgZXhjZWVkZWQiIGVycm9yIGV2ZW4gd2l0aCBwbGVudHkgb2YKK2Rp c2sgc3BhY2UgYXZhaWxhYmxlLgorCitUaGlzIG1heSBiZSB0aGUgc291cmNlIG9mIHRoZSBDSSBp c3N1ZSBGQ09TIGlzIGhpdHRpbmcgaW4KK2h0dHBzOi8vZ2l0aHViLmNvbS9jb3Jlb3MvZmVkb3Jh LWNvcmVvcy1jb25maWcvcHVsbC80MjY1IGR1ZSB0byB0aGUKK2Jvb3RjIFNFTGludXggcmVsYWJl bGluZyBkb25lIHNpbmNlCitodHRwczovL2dpdGh1Yi5jb20vYm9vdGMtZGV2L2Jvb3RjL3B1bGwv MjA4OC4KKworVGhpcyBwYXRjaCBzYXZlcyB0aGUgbnVtYmVyIG9mIGJsb2NrcyByZXNlcnZlZCBh bmQgY3JlZGl0cyB0aGVtIGJhY2sgaW4KK2JvdGggY29kZSBwYXRocyB3aGVuIGEgZHVwbGljYXRl IG9iamVjdCBpcyBkZXRlY3RlZC4KKworVGhpcyB3YXMgaGVhdmlseSBBSS1ndWlkZWQsIGZpbmRp bmcgdGhlIGJ1ZywgYW5kIHRoZW4gZG9pbmcgcmVkLWdyZWVuCit0ZXN0aW5nIHRvd2FyZHMgdGhl IGZpeC4KKworQXNzaXN0ZWQtYnk6IEFJCistLS0KKyBzcmMvbGlib3N0cmVlL29zdHJlZS1yZXBv LWNvbW1pdC5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCisgMSBmaWxlIGNo YW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEv c3JjL2xpYm9zdHJlZS9vc3RyZWUtcmVwby1jb21taXQuYyBiL3NyYy9saWJvc3RyZWUvb3N0cmVl LXJlcG8tY29tbWl0LmMKK2luZGV4IDQ5ODM3NjA5MGEuLmYwZmRiZDU3YWEgMTAwNjQ0CistLS0g YS9zcmMvbGlib3N0cmVlL29zdHJlZS1yZXBvLWNvbW1pdC5jCisrKysgYi9zcmMvbGlib3N0cmVl L29zdHJlZS1yZXBvLWNvbW1pdC5jCitAQCAtNTUwLDYgKzU1MCw3IEBAIF9vc3RyZWVfcmVwb19i YXJlX2NvbnRlbnRfY29tbWl0IChPc3RyZWVSZXBvICpzZWxmLCBPc3RyZWVSZXBvQmFyZUNvbnRl bnQgKmJhcmV3CisgICBPc3RyZWVSZWFsUmVwb0JhcmVDb250ZW50ICpyZWFsID0gKE9zdHJlZVJl YWxSZXBvQmFyZUNvbnRlbnQgKiliYXJld3JpdGU7CisgICBnX2Fzc2VydCAocmVhbC0+aW5pdGlh bGl6ZWQpOworIAorKyAgZnNibGtjbnRfdCBvYmplY3RfYmxvY2tzX3Jlc2VydmVkID0gMDsKKyAg IGlmICgoc2VsZi0+bWluX2ZyZWVfc3BhY2VfcGVyY2VudCA+IDAgfHwgc2VsZi0+bWluX2ZyZWVf c3BhY2VfbWIgPiAwKSAmJiBzZWxmLT5pbl90cmFuc2FjdGlvbikKKyAgICAgeworICAgICAgIHN0 cnVjdCBzdGF0IHN0X2J1ZjsKK0BAIC01NTksMTUgKzU2MCwxNSBAQCBfb3N0cmVlX3JlcG9fYmFy ZV9jb250ZW50X2NvbW1pdCAoT3N0cmVlUmVwbyAqc2VsZiwgT3N0cmVlUmVwb0JhcmVDb250ZW50 ICpiYXJldworICAgICAgIGdfbXV0ZXhfbG9jayAoJnNlbGYtPnR4bl9sb2NrKTsKKyAgICAgICBn X2Fzc2VydF9jbXBpbnQgKHNlbGYtPnR4bi5ibG9ja3NpemUsID4sIDApOworIAorLSAgICAgIGNv bnN0IGZzYmxrY250X3Qgb2JqZWN0X2Jsb2NrcyA9IChzdF9idWYuc3Rfc2l6ZSAvIHNlbGYtPnR4 bi5ibG9ja3NpemUpICsgMTsKKy0gICAgICBpZiAob2JqZWN0X2Jsb2NrcyA+IHNlbGYtPnR4bi5t YXhfYmxvY2tzKQorKyAgICAgIG9iamVjdF9ibG9ja3NfcmVzZXJ2ZWQgPSAoc3RfYnVmLnN0X3Np emUgLyBzZWxmLT50eG4uYmxvY2tzaXplKSArIDE7CisrICAgICAgaWYgKG9iamVjdF9ibG9ja3Nf cmVzZXJ2ZWQgPiBzZWxmLT50eG4ubWF4X2Jsb2NrcykKKyAgICAgICAgIHsKKyAgICAgICAgICAg c2VsZi0+Y2xlYW51cF9zdGFnZWRpciA9IFRSVUU7CisgICAgICAgICAgIGdfbXV0ZXhfdW5sb2Nr ICgmc2VsZi0+dHhuX2xvY2spOworICAgICAgICAgICByZXR1cm4gdGhyb3dfbWluX2ZyZWVfc3Bh Y2VfZXJyb3IgKHNlbGYsIHN0X2J1Zi5zdF9zaXplLCBlcnJvcik7CisgICAgICAgICB9CisgICAg ICAgLyogVGhpcyBpcyB0aGUgbWFpbiBiaXQgdGhhdCBuZWVkcyBtdXRleCBwcm90ZWN0aW9uICov CistICAgICAgc2VsZi0+dHhuLm1heF9ibG9ja3MgLT0gb2JqZWN0X2Jsb2NrczsKKysgICAgICBz ZWxmLT50eG4ubWF4X2Jsb2NrcyAtPSBvYmplY3RfYmxvY2tzX3Jlc2VydmVkOworICAgICAgIGdf bXV0ZXhfdW5sb2NrICgmc2VsZi0+dHhuX2xvY2spOworICAgICB9CisgCitAQCAtNTc4LDkgKzU3 OSwxOSBAQCBfb3N0cmVlX3JlcG9fYmFyZV9jb250ZW50X2NvbW1pdCAoT3N0cmVlUmVwbyAqc2Vs ZiwgT3N0cmVlUmVwb0JhcmVDb250ZW50ICpiYXJldworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjaGVja3N1bV9idWYsIGVycm9yKSkKKyAgICAgcmV0dXJuIEZB TFNFOworIAorKyAgZ2Jvb2xlYW4gb2JqX2V4aXN0ZWQ7CisgICBpZiAoIWNvbW1pdF9sb29zZV9y ZWdmaWxlX29iamVjdCAoc2VsZiwgY2hlY2tzdW1fYnVmLCAmcmVhbC0+dG1wZiwgcmVhbC0+dWlk LCByZWFsLT5naWQsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVhbC0+ bW9kZSwgcmVhbC0+eGF0dHJzLCBOVUxMLCBjYW5jZWxsYWJsZSwgZXJyb3IpKQorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWwtPm1vZGUsIHJlYWwtPnhhdHRycywgJm9i al9leGlzdGVkLCBjYW5jZWxsYWJsZSwgZXJyb3IpKQorICAgICByZXR1cm4gRkFMU0U7CisrICAv KiBJZiB0aGUgb2JqZWN0IGFscmVhZHkgZXhpc3RlZCwgY3JlZGl0IGJhY2sgdGhlIHNwYWNlIHJl c2VydmF0aW9uIHdlCisrICAgKiBtYWRlIGFib3ZlIOKAlCBubyBuZXcgZGlzayBzcGFjZSB3YXMg Y29uc3VtZWQuCisrICAgKi8KKysgIGlmIChvYmpfZXhpc3RlZCkKKysgICAgeworKyAgICAgIGdf bXV0ZXhfbG9jayAoJnNlbGYtPnR4bl9sb2NrKTsKKysgICAgICBzZWxmLT50eG4ubWF4X2Jsb2Nr cyArPSBvYmplY3RfYmxvY2tzX3Jlc2VydmVkOworKyAgICAgIGdfbXV0ZXhfdW5sb2NrICgmc2Vs Zi0+dHhuX2xvY2spOworKyAgICB9CisgCisgICAvKiBMZXQncyBoYXZlIGEgZ3VhcmFudGVlIHRo YXQgYWZ0ZXIgY29tbWl0IHRoZSBvYmplY3QgaXMgY2xlYW5lZCB1cCAqLworICAgX29zdHJlZV9y ZXBvX2JhcmVfY29udGVudF9jbGVhbnVwIChiYXJld3JpdGUpOworQEAgLTk2OSwyMSArOTgwLDI4 IEBAIHdyaXRlX2NvbnRlbnRfb2JqZWN0IChPc3RyZWVSZXBvICpzZWxmLCBjb25zdCBjaGFyICpl eHBlY3RlZF9jaGVja3N1bSwgR0lucHV0U3RyCisgCisgICAodm9pZClmaWxlX2lucHV0X293bmVk OyAvLyBDb25kaXRpb25hbGx5IG93bmVkCisgCistICAvKiBGcmVlIHNwYWNlIGNoZWNrOyBvbmx5 IGFwcGxpZXMgZHVyaW5nIHRyYW5zYWN0aW9ucyAqLworKyAgLyogRnJlZSBzcGFjZSBjaGVjazsg b25seSBhcHBsaWVzIGR1cmluZyB0cmFuc2FjdGlvbnMuCisrICAgKgorKyAgICogV2Ugb3B0aW1p c3RpY2FsbHkgcmVzZXJ2ZSBzcGFjZSBoZXJlIGJlZm9yZSB3ZSBrbm93IHRoZSBvYmplY3Qncwor KyAgICogY2hlY2tzdW0uICBJZiB3ZSBsYXRlciBkaXNjb3ZlciB0aGUgb2JqZWN0IGFscmVhZHkg ZXhpc3RzIGluIHRoZSByZXBvCisrICAgKiAoaS5lLiBpdCBpcyBhIGR1cGxpY2F0ZSksIHdlIGNy ZWRpdCB0aGUgcmVzZXJ2YXRpb24gYmFjayDigJQgc2VlIHRoZQorKyAgICogaGF2ZV9vYmogYmxv Y2sgYmVsb3cuCisrICAgKi8KKysgIGZzYmxrY250X3Qgb2JqZWN0X2Jsb2Nrc19yZXNlcnZlZCA9 IDA7CisgICBpZiAoKHNlbGYtPm1pbl9mcmVlX3NwYWNlX3BlcmNlbnQgPiAwIHx8IHNlbGYtPm1p bl9mcmVlX3NwYWNlX21iID4gMCkgJiYgc2VsZi0+aW5fdHJhbnNhY3Rpb24pCisgICAgIHsKKyAg ICAgICBnX211dGV4X2xvY2sgKCZzZWxmLT50eG5fbG9jayk7CisgICAgICAgZ19hc3NlcnRfY21w aW50IChzZWxmLT50eG4uYmxvY2tzaXplLCA+LCAwKTsKKy0gICAgICBjb25zdCBmc2Jsa2NudF90 IG9iamVjdF9ibG9ja3MgPSAoc2l6ZSAvIHNlbGYtPnR4bi5ibG9ja3NpemUpICsgMTsKKy0gICAg ICBpZiAob2JqZWN0X2Jsb2NrcyA+IHNlbGYtPnR4bi5tYXhfYmxvY2tzKQorKyAgICAgIG9iamVj dF9ibG9ja3NfcmVzZXJ2ZWQgPSAoc2l6ZSAvIHNlbGYtPnR4bi5ibG9ja3NpemUpICsgMTsKKysg ICAgICBpZiAob2JqZWN0X2Jsb2Nrc19yZXNlcnZlZCA+IHNlbGYtPnR4bi5tYXhfYmxvY2tzKQor ICAgICAgICAgeworLSAgICAgICAgICBndWludDY0IGJ5dGVzX3JlcXVpcmVkID0gKGd1aW50NjQp b2JqZWN0X2Jsb2NrcyAqIHNlbGYtPnR4bi5ibG9ja3NpemU7CisrICAgICAgICAgIGd1aW50NjQg Ynl0ZXNfcmVxdWlyZWQgPSAoZ3VpbnQ2NClvYmplY3RfYmxvY2tzX3Jlc2VydmVkICogc2VsZi0+ dHhuLmJsb2Nrc2l6ZTsKKyAgICAgICAgICAgc2VsZi0+Y2xlYW51cF9zdGFnZWRpciA9IFRSVUU7 CisgICAgICAgICAgIGdfbXV0ZXhfdW5sb2NrICgmc2VsZi0+dHhuX2xvY2spOworICAgICAgICAg ICByZXR1cm4gdGhyb3dfbWluX2ZyZWVfc3BhY2VfZXJyb3IgKHNlbGYsIGJ5dGVzX3JlcXVpcmVk LCBlcnJvcik7CisgICAgICAgICB9CisgICAgICAgLyogVGhpcyBpcyB0aGUgbWFpbiBiaXQgdGhh dCBuZWVkcyBtdXRleCBwcm90ZWN0aW9uICovCistICAgICAgc2VsZi0+dHhuLm1heF9ibG9ja3Mg LT0gb2JqZWN0X2Jsb2NrczsKKysgICAgICBzZWxmLT50eG4ubWF4X2Jsb2NrcyAtPSBvYmplY3Rf YmxvY2tzX3Jlc2VydmVkOworICAgICAgIGdfbXV0ZXhfdW5sb2NrICgmc2VsZi0+dHhuX2xvY2sp OworICAgICB9CisgCitAQCAtMTExMCwxMSArMTEyOCwxNCBAQCB3cml0ZV9jb250ZW50X29iamVj dCAoT3N0cmVlUmVwbyAqc2VsZiwgY29uc3QgY2hhciAqZXhwZWN0ZWRfY2hlY2tzdW0sIEdJbnB1 dFN0cgorICAgaWYgKCFfb3N0cmVlX3JlcG9faGFzX2xvb3NlX29iamVjdCAoc2VsZiwgYWN0dWFs X2NoZWNrc3VtLCBPU1RSRUVfT0JKRUNUX1RZUEVfRklMRSwgJmhhdmVfb2JqLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FuY2VsbGFibGUsIGVycm9yKSkKKyAgICAg cmV0dXJuIEZBTFNFOworLSAgLyogSWYgd2UgYWxyZWFkeSBoYXZlIGl0LCBqdXN0IHVwZGF0ZSB0 aGUgc3RhdHMuICovCisrICAvKiBJZiB3ZSBhbHJlYWR5IGhhdmUgaXQsIGp1c3QgdXBkYXRlIHRo ZSBzdGF0cy4gIEFsc28gY3JlZGl0IGJhY2sgdGhlCisrICAgKiBmcmVlLXNwYWNlIHJlc2VydmF0 aW9uIHdlIG1hZGUgYWJvdmUg4oCUIG5vIG5ldyBkaXNrIHNwYWNlIHdhcyBjb25zdW1lZC4KKysg ICAqLworICAgaWYgKGhhdmVfb2JqKQorICAgICB7CisgICAgICAgZ19tdXRleF9sb2NrICgmc2Vs Zi0+dHhuX2xvY2spOworICAgICAgIHNlbGYtPnR4bi5zdGF0cy5jb250ZW50X29iamVjdHNfdG90 YWwrKzsKKysgICAgICBzZWxmLT50eG4ubWF4X2Jsb2NrcyArPSBvYmplY3RfYmxvY2tzX3Jlc2Vy dmVkOworICAgICAgIGdfbXV0ZXhfdW5sb2NrICgmc2VsZi0+dHhuX2xvY2spOworIAorICAgICAg IGlmICghX2NyZWF0ZV9wYXlsb2FkX2xpbmsgKHNlbGYsIGFjdHVhbF9jaGVja3N1bSwgYWN0dWFs X3BheWxvYWRfY2hlY2tzdW0sIGZpbGVfaW5mbywKKy0tIAorMi40OS4wCisKCmRpZmYgLS1naXQg YS8wMDAzLWxpYi1jb21taXQtRml4LW1pbi1mcmVlLXNwYWNlLWFjY291bnRpbmctZm9yLXJlZmxp bmtlZC1jb250ZW50LW9iamVjdHMucGF0Y2ggYi8wMDAzLWxpYi1jb21taXQtRml4LW1pbi1mcmVl LXNwYWNlLWFjY291bnRpbmctZm9yLXJlZmxpbmtlZC1jb250ZW50LW9iamVjdHMucGF0Y2gKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDllZTExMwotLS0gL2Rldi9udWxsCisr KyBiLzAwMDMtbGliLWNvbW1pdC1GaXgtbWluLWZyZWUtc3BhY2UtYWNjb3VudGluZy1mb3ItcmVm bGlua2VkLWNvbnRlbnQtb2JqZWN0cy5wYXRjaApAQCAtMCwwICsxLDg1IEBACitGcm9tIDA3NTQ3 ZDI5ZTA1YTdlNmMzMjFhOGNjNzEwMWQwZDdmZDM2MWY1YTYgTW9uIFNlcCAxNyAwMDowMDowMCAy MDAxCitGcm9tOiBKb25hdGhhbiBMZWJvbiA8amxlYm9uQHJlZGhhdC5jb20+CitEYXRlOiBGcmks IDI0IEp1bCAyMDI2IDEzOjAyOjU4IC0wNDAwCitTdWJqZWN0OiBbUEFUQ0ggMy8zXSBsaWIvY29t bWl0OiBGaXggbWluLWZyZWUtc3BhY2UgYWNjb3VudGluZyBmb3IgcmVmbGlua2VkCisgY29udGVu dCBvYmplY3RzCisKK1doZW4gd3JpdGluZyBhIGNvbnRlbnQgb2JqZWN0LAorY3JlYXRlX3JlZ3Vs YXJfdG1wZmlsZV9saW5rYWJsZV93aXRoX2NvbnRlbnQoKSBvcHBvcnR1bmlzdGljYWxseSB0cmll cworRklDTE9ORSB0byByZWZsaW5rIGRhdGEgZnJvbSB0aGUgaW5wdXQgZmQuIFRoZSByZWZsaW5r ZWQgZmlsZSBzaGFyZXMgaXRzCitkYXRhIGJsb2NrcyB2aWEgY29weS1vbi13cml0ZSwgc28gdGhl IGFjdHVhbCBkaXNrIGNvc3QgaXMganVzdCBtZXRhZGF0YS4KKworSG93ZXZlciwgdGhlIG1pbi1m cmVlLXNwYWNlIGFjY291bnRpbmcgaW4gd3JpdGVfY29udGVudF9vYmplY3QoKQorcmVzZXJ2ZXMg dGhlIGZ1bGwgZmlsZSBzaXplIGluIG1heF9ibG9ja3MgdXBmcm9udCBhbmQgbmV2ZXIgY3JlZGl0 cyBpdAorYmFjayBhZnRlciBhIHN1Y2Nlc3NmdWwgcmVmbGluay4gT3ZlciBtYW55IGZpbGVzIHRo aXMgY2F1c2VzIG1heF9ibG9ja3MKK3RvIGRpdmVyZ2Ugc2lnbmlmaWNhbnRseSBmcm9tIGFjdHVh bCBmcmVlIHNwYWNlLgorCitQcm9wYWdhdGUgdGhlIHJlZmxpbmsgc3RhdHVzIGZyb20KK2NyZWF0 ZV9yZWd1bGFyX3RtcGZpbGVfbGlua2FibGVfd2l0aF9jb250ZW50IGJhY2sgdG8KK3dyaXRlX2Nv bnRlbnRfb2JqZWN0IHNvIGl0IGNhbiBjcmVkaXQgYmFjayB0aGUgcmVzZXJ2ZWQgYmxvY2tzLAor Zm9sbG93aW5nIHRoZSBzYW1lIHBhdHRlcm4gdXNlZCBmb3IgZHVwbGljYXRlIG9iamVjdHMgaW4g MTZlNTM3Y2IKKygibGliL2NvbW1pdDogRml4IG1pbi1mcmVlLXNwYWNlIGFjY291bnRpbmcgZm9y IGR1cGxpY2F0ZSBjb250ZW50CitvYmplY3RzIikuCisKK1RoaXMgc2hvdWxkIGZpeCB0aGUgQ0kg aXNzdWVzIGluCitodHRwczovL2dpdGh1Yi5jb20vY29yZW9zL2ZlZG9yYS1jb3Jlb3MtY29uZmln L3B1bGwvNDI2NS4KKworSGVhdmlseSBBSS1ndWlkZWQgaW52ZXN0aWdhdGlvbiBhbmQgcmVzb2x1 dGlvbiBhbmQgcmVkLWdyZWVuIHRlc3RpbmcuCisKK0Fzc2lzdGVkLWJ5OiBBSQorLS0tCisgc3Jj L2xpYm9zdHJlZS9vc3RyZWUtcmVwby1jb21taXQuYyB8IDIyICsrKysrKysrKysrKysrKysrKyst LS0KKyAxIGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKKwor ZGlmZiAtLWdpdCBhL3NyYy9saWJvc3RyZWUvb3N0cmVlLXJlcG8tY29tbWl0LmMgYi9zcmMvbGli b3N0cmVlL29zdHJlZS1yZXBvLWNvbW1pdC5jCitpbmRleCBmMGZkYmQ1N2FhLi5hNjM0NTYzOTA1 IDEwMDY0NAorLS0tIGEvc3JjL2xpYm9zdHJlZS9vc3RyZWUtcmVwby1jb21taXQuYworKysrIGIv c3JjL2xpYm9zdHJlZS9vc3RyZWUtcmVwby1jb21taXQuYworQEAgLTYxNyw4ICs2MTcsOCBAQCBf b3N0cmVlX3JlcG9fYmFyZV9jb250ZW50X2NsZWFudXAgKE9zdHJlZVJlcG9CYXJlQ29udGVudCAq cmVnd3JpdGUpCisgc3RhdGljIGdib29sZWFuCisgY3JlYXRlX3JlZ3VsYXJfdG1wZmlsZV9saW5r YWJsZV93aXRoX2NvbnRlbnQgKE9zdHJlZVJlcG8gKnNlbGYsIGd1aW50NjQgbGVuZ3RoLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHSW5wdXRTdHJlYW0g Km9yaWdpbmFsX2lucHV0LCBHSW5wdXRTdHJlYW0gKmlucHV0LAorLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTG54VG1wZmlsZSAqb3V0X3RtcGYsIEdDYW5j ZWxsYWJsZSAqY2FuY2VsbGFibGUsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdFcnJvciAqKmVycm9yKQorKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBHTG54VG1wZmlsZSAqb3V0X3RtcGYsIGdib29sZWFuICpvdXRf d2FzX3JlZmxpbmtlZCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgR0NhbmNlbGxhYmxlICpjYW5jZWxsYWJsZSwgR0Vycm9yICoqZXJyb3IpCisgeworICAg Z19hdXRvIChHTG54VG1wZmlsZSkgdG1wZiA9IHsKKyAgICAgMCwKK0BAIC02NzAsNiArNjcwLDgg QEAgY3JlYXRlX3JlZ3VsYXJfdG1wZmlsZV9saW5rYWJsZV93aXRoX2NvbnRlbnQgKE9zdHJlZVJl cG8gKnNlbGYsIGd1aW50NjQgbGVuZ3RoLAorICAgaWYgKCFnbG54X2ZjaG1vZCAodG1wZi5mZCwg MDY0NCwgZXJyb3IpKQorICAgICByZXR1cm4gRkFMU0U7CisgCisrICBpZiAob3V0X3dhc19yZWZs aW5rZWQpCisrICAgICpvdXRfd2FzX3JlZmxpbmtlZCA9IGRpZF9jbG9uZTsKKyAgICpvdXRfdG1w ZiA9IHRtcGY7CisgICB0bXBmLmluaXRpYWxpemVkID0gRkFMU0U7CisgICByZXR1cm4gVFJVRTsK K0BAIC0xMDMyLDkgKzEwMzQsMjMgQEAgd3JpdGVfY29udGVudF9vYmplY3QgKE9zdHJlZVJlcG8g KnNlbGYsIGNvbnN0IGNoYXIgKmV4cGVjdGVkX2NoZWNrc3VtLCBHSW5wdXRTdHIKKyAgICAgfQor ICAgZWxzZSBpZiAocmVwb19tb2RlICE9IE9TVFJFRV9SRVBPX01PREVfQVJDSElWRSkKKyAgICAg eworKyAgICAgIGdib29sZWFuIHdhc19yZWZsaW5rZWQgPSBGQUxTRTsKKyAgICAgICBpZiAoIWNy ZWF0ZV9yZWd1bGFyX3RtcGZpbGVfbGlua2FibGVfd2l0aF9jb250ZW50IChzZWxmLCBzaXplLCBp bnB1dCwgZmlsZV9pbnB1dCwgJnRtcGYsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FuY2VsbGFibGUsIGVycm9yKSkKKysgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmd2FzX3Jl ZmxpbmtlZCwgY2FuY2VsbGFibGUsIGVycm9yKSkKKyAgICAgICAgIHJldHVybiBGQUxTRTsKKysg ICAgICAvKiBXZSBnb3QgYSByZWZsaW5rLCBzbyB3ZSdyZSBub3QgYWN0dWFsbHkgcGF5aW5nIGZv ciBkYXRhIGhlcmUuIENyZWRpdCBiYWNrIG1heF9ibG9jaworKyAgICAgICAqIHJlc2VydmF0aW9u LiBJbiB0aGVvcnksIHdlJ3JlIHN0aWxsIHBheWluZyBmb3IgaW5vZGUgbWV0YWRhdGEsIGJ1dCB0 aGF0J3MgYSB2YXJpYWJsZSBjb3N0CisrICAgICAgICogZGVwZW5kaW5nIG9uIHRoZSBhY3R1YWwg ZmlsZXN5c3RlbS4gRS5nLiB4ZnMgYWxsb2NhdGVzIGZyb20gYSBzZXBhcmF0ZSBwb29sLCBub3Qg ZnJvbSBkYXRhCisrICAgICAgICogYmxvY2tzLCBzbyBpdCB0cnVseSBkb2Vzbid0IGNvbnN1bWUg Zl9iYXZhaWwuIGJ0cmZzIE9UT0ggd291bGQgYnV0IGl0IHdvdWxkbid0IGV2ZW4gY29zdCBhCisr ICAgICAgICogd2hvbGUgYmxvY2suIFRyeWluZyB0byBnZXQgdGhpcyBleGFjdGx5IHJpZ2h0IGlz IHByb2JhYmx5IG5vdCB3b3J0aCBpdCBzaW5jZSB0aGUgYWN0dWFsCisrICAgICAgICogYW1vdW50 IGlzIHN0aWxsIHRyaXZpYWwuCisrICAgICAgICovCisrICAgICAgaWYgKHdhc19yZWZsaW5rZWQg JiYgb2JqZWN0X2Jsb2Nrc19yZXNlcnZlZCA+IDApCisrICAgICAgICB7CisrICAgICAgICAgIGdf bXV0ZXhfbG9jayAoJnNlbGYtPnR4bl9sb2NrKTsKKysgICAgICAgICAgc2VsZi0+dHhuLm1heF9i bG9ja3MgKz0gb2JqZWN0X2Jsb2Nrc19yZXNlcnZlZDsKKysgICAgICAgICAgZ19tdXRleF91bmxv Y2sgKCZzZWxmLT50eG5fbG9jayk7CisrICAgICAgICB9CisgICAgIH0KKyAgIGVsc2UKKyAgICAg eworLS0gCisyLjQ5LjAKKwoKZGlmZiAtLWdpdCBhL29zdHJlZS5zcGVjIGIvb3N0cmVlLnNwZWMK aW5kZXggZjIzMDVhMy4uZThlN2YxMCAxMDA2NDQKLS0tIGEvb3N0cmVlLnNwZWMKKysrIGIvb3N0 cmVlLnNwZWMKQEAgLTE5LDYgKzE5LDEyIEBAIFVSTDogaHR0cHM6Ly9vc3RyZWVkZXYuZ2l0aHVi LmlvL29zdHJlZS8KIEV4Y2x1ZGVBcmNoOiAgICAle2l4ODZ9CiAlZW5kaWYKIAorIyBCYWNrcG9y dCBodHRwczovL2dpdGh1Yi5jb20vb3N0cmVlZGV2L29zdHJlZS9wdWxsLzM2MTQKK1BhdGNoMDog MDAwMS1saWItY29tbWl0LVJlcG9ydC13aGV0aGVyLWNvbW1pdHRlZC1vYmplY3QtYWxyZWFkeS1l eGlzdGVkLnBhdGNoCitQYXRjaDE6IDAwMDItbGliLWNvbW1pdC1GaXgtbWluLWZyZWUtc3BhY2Ut YWNjb3VudGluZy1mb3ItZHVwbGljYXRlLWNvbnRlbnQtb2JqZWN0cy5wYXRjaAorIyBCYWNrcG9y dCBodHRwczovL2dpdGh1Yi5jb20vb3N0cmVlZGV2L29zdHJlZS9wdWxsLzM2MTUKK1BhdGNoMjog MDAwMy1saWItY29tbWl0LUZpeC1taW4tZnJlZS1zcGFjZS1hY2NvdW50aW5nLWZvci1yZWZsaW5r ZWQtY29udGVudC1vYmplY3RzLnBhdGNoCisKIEJ1aWxkUmVxdWlyZXM6IG1ha2UKIEJ1aWxkUmVx dWlyZXM6IGdpdAogIyBXZSBhbHdheXMgcnVuIGF1dG9nZW4uc2gK