From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.pqgruber.com ([178.189.19.235]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fSqmI-00043o-My for ptxdist@pengutronix.de; Tue, 12 Jun 2018 23:24:34 +0200 From: Clemens Gruber Date: Tue, 12 Jun 2018 23:22:53 +0200 Message-Id: <20180612212253.8607-7-clemens.gruber@pqgruber.com> In-Reply-To: <20180612212253.8607-1-clemens.gruber@pqgruber.com> References: <20180612212253.8607-1-clemens.gruber@pqgruber.com> Subject: [ptxdist] [PATCH] systemd: add upstream patch to fix OnFailure behaviour List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Clemens Gruber V2l0aG91dCB0aGlzIHBhdGNoLCB0aGUgT25GYWlsdXJlIGFjdGlvbiBpcyB0cmlnZ2VyZWQsIGV2 ZW4gdGhvdWdoIHRoZXJlCndhcyBhIG5vcm1hbC9zdWNjZXNzZnVsIHJlc3RhcnQuIChlLmcuIHdp dGggUmVzdGFydEZvcmNlRXhpdFN0YXR1cyBhbmQKU3VjY2Vzc0V4aXRTdGF0dXMgdG8gdHJpZ2dl ciBzZXJ2aWNlIHJlc3RhcnRzIHdpdGggc3BlY2lhbCBleGl0IGNvZGVzKQoKU2lnbmVkLW9mZi1i eTogQ2xlbWVucyBHcnViZXIgPGNsZW1lbnMuZ3J1YmVyQHBxZ3J1YmVyLmNvbT4KLS0tCiAuLi5l ci1PbkZhaWx1cmUtZGVwcy13aGVuLWEtdW5pdC1pcy1nb2kucGF0Y2ggfCAyNDQgKysrKysrKysr KysrKysrKysrCiBwYXRjaGVzL3N5c3RlbWQtMjM4L3NlcmllcyAgICAgICAgICAgICAgICAgICAg fCAgIDMgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjQ2IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24o LSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBwYXRjaGVzL3N5c3RlbWQtMjM4LzAwMDUtY29yZS1kb24t dC10cmlnZ2VyLU9uRmFpbHVyZS1kZXBzLXdoZW4tYS11bml0LWlzLWdvaS5wYXRjaAoKZGlmZiAt LWdpdCBhL3BhdGNoZXMvc3lzdGVtZC0yMzgvMDAwNS1jb3JlLWRvbi10LXRyaWdnZXItT25GYWls dXJlLWRlcHMtd2hlbi1hLXVuaXQtaXMtZ29pLnBhdGNoIGIvcGF0Y2hlcy9zeXN0ZW1kLTIzOC8w MDA1LWNvcmUtZG9uLXQtdHJpZ2dlci1PbkZhaWx1cmUtZGVwcy13aGVuLWEtdW5pdC1pcy1nb2ku cGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwLi5iNzgzY2FjM2EKLS0t IC9kZXYvbnVsbAorKysgYi9wYXRjaGVzL3N5c3RlbWQtMjM4LzAwMDUtY29yZS1kb24tdC10cmln Z2VyLU9uRmFpbHVyZS1kZXBzLXdoZW4tYS11bml0LWlzLWdvaS5wYXRjaApAQCAtMCwwICsxLDI0 NCBAQAorRnJvbTogTGVubmFydCBQb2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcubmV0Pgor RGF0ZTogRnJpLCAxIEp1biAyMDE4IDE5OjA2OjE5ICswMjAwCitTdWJqZWN0OiBbUEFUQ0hdIGNv cmU6IGRvbid0IHRyaWdnZXIgT25GYWlsdXJlPSBkZXBzIHdoZW4gYSB1bml0IGlzIGdvaW5nIHRv CisgcmVzdGFydAorCitUaGlzIGFkZHMgYSBmbGFncyBwYXJhbWV0ZXIgdG8gdW5pdF9ub3RpZnko KSB3aGljaCBjYW4gYmUgdXNlZCB0byBwYXNzCithZGRpdGlvbmFsIG5vdGlmaWNhdGlvbiBpbmZv cm1hdGlvbiB0byB0aGUgZnVuY3Rpb24uIFdlIHRoZSBtYWtlIHRoZSBvbGQKK3JlbG9hZF9mYWls dXJlIGJvb2xlYW4gcGFyYW1ldGVyIG9uZSBvZiB0aGVzZSBmbGFncywgYW5kIHRoZW4gYWRkIGEg bmV3CitmbGFnIHRoYXQgbGV0J3MgdW5pdF9ub3RpZnkoKSBpZiB3ZSBhcmUgY29uZmlndXJlZCB0 byByZXN0YXJ0IHRoZQorc2VydmljZS4KKworTm90ZSB0aGF0IHRoaXMgYWRqdXN0cyBiZWhhdmlv dXIgb2Ygc3lzdGVtZCB0byBtYXRjaCB3aGF0IHRoZSBkb2NzIHNheS4KKworRml4ZXM6ICM4Mzk4 CistLS0KKyBzcmMvY29yZS9hdXRvbW91bnQuYyB8ICAyICstCisgc3JjL2NvcmUvZGV2aWNlLmMg ICAgfCAgMiArLQorIHNyYy9jb3JlL21vdW50LmMgICAgIHwgIDMgKystCisgc3JjL2NvcmUvcGF0 aC5jICAgICAgfCAgMiArLQorIHNyYy9jb3JlL3Njb3BlLmMgICAgIHwgIDIgKy0KKyBzcmMvY29y ZS9zZXJ2aWNlLmMgICB8ICA1ICsrKystCisgc3JjL2NvcmUvc2xpY2UuYyAgICAgfCAgMiArLQor IHNyYy9jb3JlL3NvY2tldC5jICAgIHwgIDIgKy0KKyBzcmMvY29yZS9zd2FwLmMgICAgICB8ICAy ICstCisgc3JjL2NvcmUvdGFyZ2V0LmMgICAgfCAgMiArLQorIHNyYy9jb3JlL3RpbWVyLmMgICAg IHwgIDIgKy0KKyBzcmMvY29yZS91bml0LmMgICAgICB8IDEwICsrKysrKy0tLS0KKyBzcmMvY29y ZS91bml0LmggICAgICB8ICA3ICsrKysrKy0KKyAxMyBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRp b25zKCspLCAxNiBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3NyYy9jb3JlL2F1dG9tb3Vu dC5jIGIvc3JjL2NvcmUvYXV0b21vdW50LmMKK2luZGV4IDAxYTZmZjgwNmUxNi4uYjY2YzdiYWFk N2UzIDEwMDY0NAorLS0tIGEvc3JjL2NvcmUvYXV0b21vdW50LmMKKysrKyBiL3NyYy9jb3JlL2F1 dG9tb3VudC5jCitAQCAtMjY1LDcgKzI2NSw3IEBAIHN0YXRpYyB2b2lkIGF1dG9tb3VudF9zZXRf c3RhdGUoQXV0b21vdW50ICphLCBBdXRvbW91bnRTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgaWYg KHN0YXRlICE9IG9sZF9zdGF0ZSkKKyAgICAgICAgICAgICAgICAgbG9nX3VuaXRfZGVidWcoVU5J VChhKSwgIkNoYW5nZWQgJXMgLT4gJXMiLCBhdXRvbW91bnRfc3RhdGVfdG9fc3RyaW5nKG9sZF9z dGF0ZSksIGF1dG9tb3VudF9zdGF0ZV90b19zdHJpbmcoc3RhdGUpKTsKKyAKKy0gICAgICAgIHVu aXRfbm90aWZ5KFVOSVQoYSksIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW29sZF9zdGF0ZV0sIHN0 YXRlX3RyYW5zbGF0aW9uX3RhYmxlW3N0YXRlXSwgdHJ1ZSk7CisrICAgICAgICB1bml0X25vdGlm eShVTklUKGEpLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFu c2xhdGlvbl90YWJsZVtzdGF0ZV0sIDApOworIH0KKyAKKyBzdGF0aWMgaW50IGF1dG9tb3VudF9j b2xkcGx1ZyhVbml0ICp1KSB7CitkaWZmIC0tZ2l0IGEvc3JjL2NvcmUvZGV2aWNlLmMgYi9zcmMv Y29yZS9kZXZpY2UuYworaW5kZXggYjBkZDQ2OWZkMTRiLi5kOTJlOTJiZGNjNmIgMTAwNjQ0Cist LS0gYS9zcmMvY29yZS9kZXZpY2UuYworKysrIGIvc3JjL2NvcmUvZGV2aWNlLmMKK0BAIC0xMzYs NyArMTM2LDcgQEAgc3RhdGljIHZvaWQgZGV2aWNlX3NldF9zdGF0ZShEZXZpY2UgKmQsIERldmlj ZVN0YXRlIHN0YXRlKSB7CisgICAgICAgICBpZiAoc3RhdGUgIT0gb2xkX3N0YXRlKQorICAgICAg ICAgICAgICAgICBsb2dfdW5pdF9kZWJ1ZyhVTklUKGQpLCAiQ2hhbmdlZCAlcyAtPiAlcyIsIGRl dmljZV9zdGF0ZV90b19zdHJpbmcob2xkX3N0YXRlKSwgZGV2aWNlX3N0YXRlX3RvX3N0cmluZyhz dGF0ZSkpOworIAorLSAgICAgICAgdW5pdF9ub3RpZnkoVU5JVChkKSwgc3RhdGVfdHJhbnNsYXRp b25fdGFibGVbb2xkX3N0YXRlXSwgc3RhdGVfdHJhbnNsYXRpb25fdGFibGVbc3RhdGVdLCB0cnVl KTsKKysgICAgICAgIHVuaXRfbm90aWZ5KFVOSVQoZCksIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxl W29sZF9zdGF0ZV0sIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW3N0YXRlXSwgMCk7CisgfQorIAor IHN0YXRpYyBpbnQgZGV2aWNlX2NvbGRwbHVnKFVuaXQgKnUpIHsKK2RpZmYgLS1naXQgYS9zcmMv Y29yZS9tb3VudC5jIGIvc3JjL2NvcmUvbW91bnQuYworaW5kZXggZmI1NWM3MWQzYzAwLi40NmFk ZDRkNjQ4MWUgMTAwNjQ0CistLS0gYS9zcmMvY29yZS9tb3VudC5jCisrKysgYi9zcmMvY29yZS9t b3VudC5jCitAQCAtNjY5LDcgKzY2OSw4IEBAIHN0YXRpYyB2b2lkIG1vdW50X3NldF9zdGF0ZShN b3VudCAqbSwgTW91bnRTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgaWYgKHN0YXRlICE9IG9sZF9z dGF0ZSkKKyAgICAgICAgICAgICAgICAgbG9nX3VuaXRfZGVidWcoVU5JVChtKSwgIkNoYW5nZWQg JXMgLT4gJXMiLCBtb3VudF9zdGF0ZV90b19zdHJpbmcob2xkX3N0YXRlKSwgbW91bnRfc3RhdGVf dG9fc3RyaW5nKHN0YXRlKSk7CisgCistICAgICAgICB1bml0X25vdGlmeShVTklUKG0pLCBzdGF0 ZV90cmFuc2xhdGlvbl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtz dGF0ZV0sIG0tPnJlbG9hZF9yZXN1bHQgPT0gTU9VTlRfU1VDQ0VTUyk7CisrICAgICAgICB1bml0 X25vdGlmeShVTklUKG0pLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0 ZV90cmFuc2xhdGlvbl90YWJsZVtzdGF0ZV0sCisrICAgICAgICAgICAgICAgICAgICBtLT5yZWxv YWRfcmVzdWx0ID09IE1PVU5UX1NVQ0NFU1MgPyAwIDogVU5JVF9OT1RJRllfUkVMT0FEX0ZBSUxV UkUpOworIH0KKyAKKyBzdGF0aWMgaW50IG1vdW50X2NvbGRwbHVnKFVuaXQgKnUpIHsKK2RpZmYg LS1naXQgYS9zcmMvY29yZS9wYXRoLmMgYi9zcmMvY29yZS9wYXRoLmMKK2luZGV4IDE4OTNkOGRl NDU4MS4uZTVlNjBiODZlOTk1IDEwMDY0NAorLS0tIGEvc3JjL2NvcmUvcGF0aC5jCisrKysgYi9z cmMvY29yZS9wYXRoLmMKK0BAIC00MzgsNyArNDM4LDcgQEAgc3RhdGljIHZvaWQgcGF0aF9zZXRf c3RhdGUoUGF0aCAqcCwgUGF0aFN0YXRlIHN0YXRlKSB7CisgICAgICAgICBpZiAoc3RhdGUgIT0g b2xkX3N0YXRlKQorICAgICAgICAgICAgICAgICBsb2dfdW5pdF9kZWJ1ZyhVTklUKHApLCAiQ2hh bmdlZCAlcyAtPiAlcyIsIHBhdGhfc3RhdGVfdG9fc3RyaW5nKG9sZF9zdGF0ZSksIHBhdGhfc3Rh dGVfdG9fc3RyaW5nKHN0YXRlKSk7CisgCistICAgICAgICB1bml0X25vdGlmeShVTklUKHApLCBz dGF0ZV90cmFuc2xhdGlvbl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJs ZVtzdGF0ZV0sIHRydWUpOworKyAgICAgICAgdW5pdF9ub3RpZnkoVU5JVChwKSwgc3RhdGVfdHJh bnNsYXRpb25fdGFibGVbb2xkX3N0YXRlXSwgc3RhdGVfdHJhbnNsYXRpb25fdGFibGVbc3RhdGVd LCAwKTsKKyB9CisgCisgc3RhdGljIHZvaWQgcGF0aF9lbnRlcl93YWl0aW5nKFBhdGggKnAsIGJv b2wgaW5pdGlhbCwgYm9vbCByZWNoZWNrKTsKK2RpZmYgLS1naXQgYS9zcmMvY29yZS9zY29wZS5j IGIvc3JjL2NvcmUvc2NvcGUuYworaW5kZXggNWI5YzJiYjNjNGYwLi5lZmViYjJmMTEyMDAgMTAw NjQ0CistLS0gYS9zcmMvY29yZS9zY29wZS5jCisrKysgYi9zcmMvY29yZS9zY29wZS5jCitAQCAt MTExLDcgKzExMSw3IEBAIHN0YXRpYyB2b2lkIHNjb3BlX3NldF9zdGF0ZShTY29wZSAqcywgU2Nv cGVTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgaWYgKHN0YXRlICE9IG9sZF9zdGF0ZSkKKyAgICAg ICAgICAgICAgICAgbG9nX2RlYnVnKCIlcyBjaGFuZ2VkICVzIC0+ICVzIiwgVU5JVChzKS0+aWQs IHNjb3BlX3N0YXRlX3RvX3N0cmluZyhvbGRfc3RhdGUpLCBzY29wZV9zdGF0ZV90b19zdHJpbmco c3RhdGUpKTsKKyAKKy0gICAgICAgIHVuaXRfbm90aWZ5KFVOSVQocyksIHN0YXRlX3RyYW5zbGF0 aW9uX3RhYmxlW29sZF9zdGF0ZV0sIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW3N0YXRlXSwgdHJ1 ZSk7CisrICAgICAgICB1bml0X25vdGlmeShVTklUKHMpLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJs ZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtzdGF0ZV0sIDApOworIH0KKyAK KyBzdGF0aWMgaW50IHNjb3BlX2FkZF9kZWZhdWx0X2RlcGVuZGVuY2llcyhTY29wZSAqcykgewor ZGlmZiAtLWdpdCBhL3NyYy9jb3JlL3NlcnZpY2UuYyBiL3NyYy9jb3JlL3NlcnZpY2UuYworaW5k ZXggZGYzNjAxOWY2MjM4Li5mYzk4YWI5MGU5ZTEgMTAwNjQ0CistLS0gYS9zcmMvY29yZS9zZXJ2 aWNlLmMKKysrKyBiL3NyYy9jb3JlL3NlcnZpY2UuYworQEAgLTEwOTEsNyArMTA5MSw5IEBAIHN0 YXRpYyB2b2lkIHNlcnZpY2Vfc2V0X3N0YXRlKFNlcnZpY2UgKnMsIFNlcnZpY2VTdGF0ZSBzdGF0 ZSkgeworICAgICAgICAgaWYgKG9sZF9zdGF0ZSAhPSBzdGF0ZSkKKyAgICAgICAgICAgICAgICAg bG9nX3VuaXRfZGVidWcoVU5JVChzKSwgIkNoYW5nZWQgJXMgLT4gJXMiLCBzZXJ2aWNlX3N0YXRl X3RvX3N0cmluZyhvbGRfc3RhdGUpLCBzZXJ2aWNlX3N0YXRlX3RvX3N0cmluZyhzdGF0ZSkpOwor IAorLSAgICAgICAgdW5pdF9ub3RpZnkoVU5JVChzKSwgdGFibGVbb2xkX3N0YXRlXSwgdGFibGVb c3RhdGVdLCBzLT5yZWxvYWRfcmVzdWx0ID09IFNFUlZJQ0VfU1VDQ0VTUyk7CisrICAgICAgICB1 bml0X25vdGlmeShVTklUKHMpLCB0YWJsZVtvbGRfc3RhdGVdLCB0YWJsZVtzdGF0ZV0sCisrICAg ICAgICAgICAgICAgICAgICAocy0+cmVsb2FkX3Jlc3VsdCA9PSBTRVJWSUNFX1NVQ0NFU1MgPyAw IDogVU5JVF9OT1RJRllfUkVMT0FEX0ZBSUxVUkUpIHwKKysgICAgICAgICAgICAgICAgICAgIChz LT53aWxsX2F1dG9fcmVzdGFydCA/IFVOSVRfTk9USUZZX1dJTExfQVVUT19SRVNUQVJUIDogMCkp OworIH0KKyAKKyBzdGF0aWMgdXNlY190IHNlcnZpY2VfY29sZHBsdWdfdGltZW91dChTZXJ2aWNl ICpzKSB7CitAQCAtMTYwNiw2ICsxNjA4LDcgQEAgc3RhdGljIGJvb2wgc2VydmljZV93aWxsX3Jl c3RhcnQoVW5pdCAqdSkgeworICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg ICBpZiAoVU5JVChzKS0+am9iLT50eXBlID09IEpPQl9TVEFSVCkKKyAgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisrCisgICAgICAgICByZXR1cm4gZmFsc2U7CisgfQorIAorZGlmZiAtLWdp dCBhL3NyYy9jb3JlL3NsaWNlLmMgYi9zcmMvY29yZS9zbGljZS5jCitpbmRleCAxYzQ1NzRiOGJi MTUuLmVhMmRmYjc4ZjZlNSAxMDA2NDQKKy0tLSBhL3NyYy9jb3JlL3NsaWNlLmMKKysrKyBiL3Ny Yy9jb3JlL3NsaWNlLmMKK0BAIC01NSw3ICs1NSw3IEBAIHN0YXRpYyB2b2lkIHNsaWNlX3NldF9z dGF0ZShTbGljZSAqdCwgU2xpY2VTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2xpY2Vfc3RhdGVfdG9fc3RyaW5nKG9sZF9zdGF0ZSksCisgICAgICAgICAgICAgICAg ICAgICAgICAgICBzbGljZV9zdGF0ZV90b19zdHJpbmcoc3RhdGUpKTsKKyAKKy0gICAgICAgIHVu aXRfbm90aWZ5KFVOSVQodCksIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW29sZF9zdGF0ZV0sIHN0 YXRlX3RyYW5zbGF0aW9uX3RhYmxlW3N0YXRlXSwgdHJ1ZSk7CisrICAgICAgICB1bml0X25vdGlm eShVTklUKHQpLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFu c2xhdGlvbl90YWJsZVtzdGF0ZV0sIDApOworIH0KKyAKKyBzdGF0aWMgaW50IHNsaWNlX2FkZF9w YXJlbnRfc2xpY2UoU2xpY2UgKnMpIHsKK2RpZmYgLS1naXQgYS9zcmMvY29yZS9zb2NrZXQuYyBi L3NyYy9jb3JlL3NvY2tldC5jCitpbmRleCA0MTk4ODc4OGI4OTguLjUzMjI2ZWYwMDY5NCAxMDA2 NDQKKy0tLSBhL3NyYy9jb3JlL3NvY2tldC5jCisrKysgYi9zcmMvY29yZS9zb2NrZXQuYworQEAg LTE4MTMsNyArMTgxMyw3IEBAIHN0YXRpYyB2b2lkIHNvY2tldF9zZXRfc3RhdGUoU29ja2V0ICpz LCBTb2NrZXRTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgaWYgKHN0YXRlICE9IG9sZF9zdGF0ZSkK KyAgICAgICAgICAgICAgICAgbG9nX3VuaXRfZGVidWcoVU5JVChzKSwgIkNoYW5nZWQgJXMgLT4g JXMiLCBzb2NrZXRfc3RhdGVfdG9fc3RyaW5nKG9sZF9zdGF0ZSksIHNvY2tldF9zdGF0ZV90b19z dHJpbmcoc3RhdGUpKTsKKyAKKy0gICAgICAgIHVuaXRfbm90aWZ5KFVOSVQocyksIHN0YXRlX3Ry YW5zbGF0aW9uX3RhYmxlW29sZF9zdGF0ZV0sIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW3N0YXRl XSwgdHJ1ZSk7CisrICAgICAgICB1bml0X25vdGlmeShVTklUKHMpLCBzdGF0ZV90cmFuc2xhdGlv bl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtzdGF0ZV0sIDApOwor IH0KKyAKKyBzdGF0aWMgaW50IHNvY2tldF9jb2xkcGx1ZyhVbml0ICp1KSB7CitkaWZmIC0tZ2l0 IGEvc3JjL2NvcmUvc3dhcC5jIGIvc3JjL2NvcmUvc3dhcC5jCitpbmRleCBlZDM5N2M0YzllMzcu Ljk2YzFlZjVhMTcxZSAxMDA2NDQKKy0tLSBhL3NyYy9jb3JlL3N3YXAuYworKysrIGIvc3JjL2Nv cmUvc3dhcC5jCitAQCAtNTA4LDcgKzUwOCw3IEBAIHN0YXRpYyB2b2lkIHN3YXBfc2V0X3N0YXRl KFN3YXAgKnMsIFN3YXBTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgaWYgKHN0YXRlICE9IG9sZF9z dGF0ZSkKKyAgICAgICAgICAgICAgICAgbG9nX3VuaXRfZGVidWcoVU5JVChzKSwgIkNoYW5nZWQg JXMgLT4gJXMiLCBzd2FwX3N0YXRlX3RvX3N0cmluZyhvbGRfc3RhdGUpLCBzd2FwX3N0YXRlX3Rv X3N0cmluZyhzdGF0ZSkpOworIAorLSAgICAgICAgdW5pdF9ub3RpZnkoVU5JVChzKSwgc3RhdGVf dHJhbnNsYXRpb25fdGFibGVbb2xkX3N0YXRlXSwgc3RhdGVfdHJhbnNsYXRpb25fdGFibGVbc3Rh dGVdLCB0cnVlKTsKKysgICAgICAgIHVuaXRfbm90aWZ5KFVOSVQocyksIHN0YXRlX3RyYW5zbGF0 aW9uX3RhYmxlW29sZF9zdGF0ZV0sIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW3N0YXRlXSwgMCk7 CisgCisgICAgICAgICAvKiBJZiB0aGVyZSBvdGhlciB1bml0cyBmb3IgdGhlIHNhbWUgZGV2aWNl IG5vZGUgaGF2ZSBhIGpvYgorICAgICAgICAgICAgcXVldWVkIGl0IG1pZ2h0IGJlIHdvcnRoIGNo ZWNraW5nIGFnYWluIGlmIGl0IGlzIHJ1bm5hYmxlCitkaWZmIC0tZ2l0IGEvc3JjL2NvcmUvdGFy Z2V0LmMgYi9zcmMvY29yZS90YXJnZXQuYworaW5kZXggNzU2Y2JiZmI2Y2U0Li45MTZmMGRmZjQz OTQgMTAwNjQ0CistLS0gYS9zcmMvY29yZS90YXJnZXQuYworKysrIGIvc3JjL2NvcmUvdGFyZ2V0 LmMKK0BAIC00NCw3ICs0NCw3IEBAIHN0YXRpYyB2b2lkIHRhcmdldF9zZXRfc3RhdGUoVGFyZ2V0 ICp0LCBUYXJnZXRTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgdGFy Z2V0X3N0YXRlX3RvX3N0cmluZyhvbGRfc3RhdGUpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgdGFyZ2V0X3N0YXRlX3RvX3N0cmluZyhzdGF0ZSkpOworIAorLSAgICAgICAgdW5pdF9ub3Rp ZnkoVU5JVCh0KSwgc3RhdGVfdHJhbnNsYXRpb25fdGFibGVbb2xkX3N0YXRlXSwgc3RhdGVfdHJh bnNsYXRpb25fdGFibGVbc3RhdGVdLCB0cnVlKTsKKysgICAgICAgIHVuaXRfbm90aWZ5KFVOSVQo dCksIHN0YXRlX3RyYW5zbGF0aW9uX3RhYmxlW29sZF9zdGF0ZV0sIHN0YXRlX3RyYW5zbGF0aW9u X3RhYmxlW3N0YXRlXSwgMCk7CisgfQorIAorIHN0YXRpYyBpbnQgdGFyZ2V0X2FkZF9kZWZhdWx0 X2RlcGVuZGVuY2llcyhUYXJnZXQgKnQpIHsKK2RpZmYgLS1naXQgYS9zcmMvY29yZS90aW1lci5j IGIvc3JjL2NvcmUvdGltZXIuYworaW5kZXggZGRiOWM4MmI4NzE1Li4yY2YwODM2MTU1YWEgMTAw NjQ0CistLS0gYS9zcmMvY29yZS90aW1lci5jCisrKysgYi9zcmMvY29yZS90aW1lci5jCitAQCAt Mjc3LDcgKzI3Nyw3IEBAIHN0YXRpYyB2b2lkIHRpbWVyX3NldF9zdGF0ZShUaW1lciAqdCwgVGlt ZXJTdGF0ZSBzdGF0ZSkgeworICAgICAgICAgaWYgKHN0YXRlICE9IG9sZF9zdGF0ZSkKKyAgICAg ICAgICAgICAgICAgbG9nX3VuaXRfZGVidWcoVU5JVCh0KSwgIkNoYW5nZWQgJXMgLT4gJXMiLCB0 aW1lcl9zdGF0ZV90b19zdHJpbmcob2xkX3N0YXRlKSwgdGltZXJfc3RhdGVfdG9fc3RyaW5nKHN0 YXRlKSk7CisgCistICAgICAgICB1bml0X25vdGlmeShVTklUKHQpLCBzdGF0ZV90cmFuc2xhdGlv bl90YWJsZVtvbGRfc3RhdGVdLCBzdGF0ZV90cmFuc2xhdGlvbl90YWJsZVtzdGF0ZV0sIHRydWUp OworKyAgICAgICAgdW5pdF9ub3RpZnkoVU5JVCh0KSwgc3RhdGVfdHJhbnNsYXRpb25fdGFibGVb b2xkX3N0YXRlXSwgc3RhdGVfdHJhbnNsYXRpb25fdGFibGVbc3RhdGVdLCAwKTsKKyB9CisgCisg c3RhdGljIHZvaWQgdGltZXJfZW50ZXJfd2FpdGluZyhUaW1lciAqdCwgYm9vbCBpbml0aWFsKTsK K2RpZmYgLS1naXQgYS9zcmMvY29yZS91bml0LmMgYi9zcmMvY29yZS91bml0LmMKK2luZGV4IGMz MDU2NjI0ZWYyMy4uZTY0ZmYyYjhhZGU5IDEwMDY0NAorLS0tIGEvc3JjL2NvcmUvdW5pdC5jCisr KysgYi9zcmMvY29yZS91bml0LmMKK0BAIC0xOTU5LDcgKzE5NTksNyBAQCBpbnQgdW5pdF9yZWxv YWQoVW5pdCAqdSkgeworIAorICAgICAgICAgaWYgKCFVTklUX1ZUQUJMRSh1KS0+cmVsb2FkKSB7 CisgICAgICAgICAgICAgICAgIC8qIFVuaXQgZG9lc24ndCBoYXZlIGEgcmVsb2FkIGZ1bmN0aW9u LCBidXQgd2UgbmVlZCB0byBwcm9wYWdhdGUgdGhlIHJlbG9hZCBhbnl3YXkgKi8KKy0gICAgICAg ICAgICAgICAgdW5pdF9ub3RpZnkodSwgdW5pdF9hY3RpdmVfc3RhdGUodSksIHVuaXRfYWN0aXZl X3N0YXRlKHUpLCB0cnVlKTsKKysgICAgICAgICAgICAgICAgdW5pdF9ub3RpZnkodSwgdW5pdF9h Y3RpdmVfc3RhdGUodSksIHVuaXRfYWN0aXZlX3N0YXRlKHUpLCAwKTsKKyAgICAgICAgICAgICAg ICAgcmV0dXJuIDA7CisgICAgICAgICB9CisgCitAQCAtMjMyNyw3ICsyMzI3LDcgQEAgc3RhdGlj IHZvaWQgdW5pdF91cGRhdGVfb25fY29uc29sZShVbml0ICp1KSB7CisgCisgfQorIAorLXZvaWQg dW5pdF9ub3RpZnkoVW5pdCAqdSwgVW5pdEFjdGl2ZVN0YXRlIG9zLCBVbml0QWN0aXZlU3RhdGUg bnMsIGJvb2wgcmVsb2FkX3N1Y2Nlc3MpIHsKKyt2b2lkIHVuaXRfbm90aWZ5KFVuaXQgKnUsIFVu aXRBY3RpdmVTdGF0ZSBvcywgVW5pdEFjdGl2ZVN0YXRlIG5zLCBVbml0Tm90aWZ5RmxhZ3MgZmxh Z3MpIHsKKyAgICAgICAgIGJvb2wgdW5leHBlY3RlZDsKKyAgICAgICAgIE1hbmFnZXIgKm07Cisg CitAQCAtMjQwMyw3ICsyNDAzLDcgQEAgdm9pZCB1bml0X25vdGlmeShVbml0ICp1LCBVbml0QWN0 aXZlU3RhdGUgb3MsIFVuaXRBY3RpdmVTdGF0ZSBucywgYm9vbCByZWxvYWRfc3UKKyAKKyAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAodS0+am9iLT5zdGF0ZSA9PSBKT0JfUlVOTklORykgewor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG5zID09IFVOSVRfQUNUSVZFKQor LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBqb2JfZmluaXNoX2FuZF9p bnZhbGlkYXRlKHUtPmpvYiwgcmVsb2FkX3N1Y2Nlc3MgPyBKT0JfRE9ORSA6IEpPQl9GQUlMRUQs IHRydWUsIGZhbHNlKTsKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg am9iX2ZpbmlzaF9hbmRfaW52YWxpZGF0ZSh1LT5qb2IsIChmbGFncyAmIFVOSVRfTk9USUZZX1JF TE9BRF9GQUlMVVJFKSA/IEpPQl9GQUlMRUQgOiBKT0JfRE9ORSwgdHJ1ZSwgZmFsc2UpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoIUlOX1NFVChucywgVU5JVF9B Q1RJVkFUSU5HLCBVTklUX1JFTE9BRElORykpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdW5leHBlY3RlZCA9IHRydWU7CisgCitAQCAtMjQ1Niw3ICsyNDU2LDkg QEAgdm9pZCB1bml0X25vdGlmeShVbml0ICp1LCBVbml0QWN0aXZlU3RhdGUgb3MsIFVuaXRBY3Rp dmVTdGF0ZSBucywgYm9vbCByZWxvYWRfc3UKKyAKKyAgICAgICAgICAgICAgICAgaWYgKG5zICE9 IG9zICYmIG5zID09IFVOSVRfRkFJTEVEKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgbG9n X3VuaXRfZGVidWcodSwgIlVuaXQgZW50ZXJlZCBmYWlsZWQgc3RhdGUuIik7CistICAgICAgICAg ICAgICAgICAgICAgICAgdW5pdF9zdGFydF9vbl9mYWlsdXJlKHUpOworKworKyAgICAgICAgICAg ICAgICAgICAgICAgIGlmICghKGZsYWdzICYgVU5JVF9OT1RJRllfV0lMTF9BVVRPX1JFU1RBUlQp KQorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5pdF9zdGFydF9vbl9mYWlsdXJl KHUpOworICAgICAgICAgICAgICAgICB9CisgICAgICAgICB9CisgCitkaWZmIC0tZ2l0IGEvc3Jj L2NvcmUvdW5pdC5oIGIvc3JjL2NvcmUvdW5pdC5oCitpbmRleCBlOTAzYmY4YWQ3ZWYuLjM2OGM2 ZWFiODJkOSAxMDA2NDQKKy0tLSBhL3NyYy9jb3JlL3VuaXQuaAorKysrIGIvc3JjL2NvcmUvdW5p dC5oCitAQCAtNjY2LDcgKzY2NiwxMiBAQCBpbnQgdW5pdF9yZWxvYWQoVW5pdCAqdSk7CisgaW50 IHVuaXRfa2lsbChVbml0ICp1LCBLaWxsV2hvIHcsIGludCBzaWdubywgc2RfYnVzX2Vycm9yICpl cnJvcik7CisgaW50IHVuaXRfa2lsbF9jb21tb24oVW5pdCAqdSwgS2lsbFdobyB3aG8sIGludCBz aWdubywgcGlkX3QgbWFpbl9waWQsIHBpZF90IGNvbnRyb2xfcGlkLCBzZF9idXNfZXJyb3IgKmVy cm9yKTsKKyAKKy12b2lkIHVuaXRfbm90aWZ5KFVuaXQgKnUsIFVuaXRBY3RpdmVTdGF0ZSBvcywg VW5pdEFjdGl2ZVN0YXRlIG5zLCBib29sIHJlbG9hZF9zdWNjZXNzKTsKKyt0eXBlZGVmIGVudW0g VW5pdE5vdGlmeUZsYWdzIHsKKysgICAgICAgIFVOSVRfTk9USUZZX1JFTE9BRF9GQUlMVVJFICAg ID0gMVUgPDwgMCwKKysgICAgICAgIFVOSVRfTk9USUZZX1dJTExfQVVUT19SRVNUQVJUID0gMVUg PDwgMSwKKyt9IFVuaXROb3RpZnlGbGFnczsKKysKKyt2b2lkIHVuaXRfbm90aWZ5KFVuaXQgKnUs IFVuaXRBY3RpdmVTdGF0ZSBvcywgVW5pdEFjdGl2ZVN0YXRlIG5zLCBVbml0Tm90aWZ5RmxhZ3Mg ZmxhZ3MpOworIAorIGludCB1bml0X3dhdGNoX3BpZChVbml0ICp1LCBwaWRfdCBwaWQpOworIHZv aWQgdW5pdF91bndhdGNoX3BpZChVbml0ICp1LCBwaWRfdCBwaWQpOwpkaWZmIC0tZ2l0IGEvcGF0 Y2hlcy9zeXN0ZW1kLTIzOC9zZXJpZXMgYi9wYXRjaGVzL3N5c3RlbWQtMjM4L3NlcmllcwppbmRl eCBjOTQ0MzQ5ZjIuLmUzZjliMTkwNSAxMDA2NDQKLS0tIGEvcGF0Y2hlcy9zeXN0ZW1kLTIzOC9z ZXJpZXMKKysrIGIvcGF0Y2hlcy9zeXN0ZW1kLTIzOC9zZXJpZXMKQEAgLTQsNCArNCw1IEBACiAw MDAyLWNvcmUtZG8tbm90LWZyZWUtaGVhcC1hbGxvY2F0ZWQtc3RyaW5ncy04MzkxLnBhdGNoCiAw MDAzLXVuaXRzLUZpeC1TdWNjZXNzQWN0aW9uLXRoYXQtYmVsb25ncy10by1Vbml0LXNlY3Rpb24u cGF0Y2gKIDAwMDQtYWRkLV9fbnJfc3RhdHgtZGVmaW5lcy1mb3ItZXh0cmEtYXJjaGl0ZWN0dXJl cy5wYXRjaAotIyA2YjViYWZmNWJkMjVmZTgzNzhlODNmY2JlNjBmOWQwYyAgLSBnaXQtcHR4LXBh dGNoZXMgbWFnaWMKKzAwMDUtY29yZS1kb24tdC10cmlnZ2VyLU9uRmFpbHVyZS1kZXBzLXdoZW4t YS11bml0LWlzLWdvaS5wYXRjaAorIyAxZjA5NjI2MTViZTIyZTgzMWI1OTQwNGM1OTRhMzUyZCAg LSBnaXQtcHR4LXBhdGNoZXMgbWFnaWMKLS0gCjIuMTcuMQoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCnB0eGRpc3QgbWFpbGluZyBsaXN0CnB0eGRpc3RA cGVuZ3V0cm9uaXguZGU=