From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manolis Ragkousis Subject: Re: [PATCH 1/4] gnu: base: Add glibc-hurd and hurd-minimal. Date: Wed, 18 Feb 2015 11:37:28 +0200 Message-ID: References: <87h9uoghnl.fsf@netris.org> <87mw4c6tlx.fsf@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=047d7bacb528545d00050f5991be Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO14b-00018O-QG for Guix-devel@gnu.org; Wed, 18 Feb 2015 04:37:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO14U-0005KA-H7 for Guix-devel@gnu.org; Wed, 18 Feb 2015 04:37:37 -0500 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:60598) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO14U-0005Ji-1x for Guix-devel@gnu.org; Wed, 18 Feb 2015 04:37:30 -0500 Received: by mail-wg0-f48.google.com with SMTP id l18so37988784wgh.7 for ; Wed, 18 Feb 2015 01:37:28 -0800 (PST) In-Reply-To: <87mw4c6tlx.fsf@netris.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: mhw@netris.org Cc: Guix-devel --047d7bacb528545d00050f5991be Content-Type: text/plain; charset=UTF-8 > After a few iterations on IRC, I proposed this code which seems to work: > > --8<---------------cut here---------------start------------->8--- > ((#:configure-flags original-configure-flags) > `(append (list "--host=i686-pc-gnu" > > ;; nscd fails to build for GNU/Hurd: > ;; . > ;; Disable it. > "--disable-nscd") > (filter (lambda (flag) > (not (or (string-prefix? "--with-headers=" flag) > (string-prefix? "--enable-kernel=" flag)))) > ;; Evaluate 'original-configure-flags' in a > ;; lexical environment that has a dummy > ;; "linux-headers" input, to prevent errors. > (let ((%build-inputs `(("linux-headers" "@DUMMY@") > ,@%build-inputs))) > ,original-configure-flags)))) > --8<---------------cut here---------------end--------------->8--- The above code works perfectly. Mark I added you as a co-author to this patch because your help was invaluable. Thank you :-) > but obviously it's a bit gross. Ideally, we consider consider having a > 'glibc/base' package that is inherited by both 'glibc/linux' and > 'glibc/hurd'. The base package would not add any linux stuff, on the > theory that it is easier and cleaner to add kernel-specific stuff than > to remove it. The best solution would have been to have a single glibc package for everything but as this is not possible with the current status of the hurd glibc, I believe your idea would really help avoid any futute problems and help simplify everything. Then we would just have a simple macro in base.scm that would choose the right glibc depending on the target/current system. Can/will do and update you on this. But for now the current solution will do in order to continue working on the port. Here is the updated patch after Mark's suggestions. --047d7bacb528545d00050f5991be Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-base-Add-glibc-hurd-and-hurd-minimal.patch" Content-Disposition: attachment; filename="0001-gnu-base-Add-glibc-hurd-and-hurd-minimal.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i6aist2f0 RnJvbSBkNmI3MmJhNjc5NzNjMmRiZjExZmYzN2QwMmM5N2E5YWVlMzVjMTU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYW5vbGlzIFJhZ2tvdXNpcyA8bWFub2xpczgzN0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgMjcgU2VwIDIwMTQgMjA6MDc6MTkgKzAzMDAKU3ViamVjdDogW1BBVENI XSBnbnU6IGJhc2U6IEFkZCBnbGliYy1odXJkIGFuZCBodXJkLW1pbmltYWwuCgoqIGdudS9wYWNr YWdlcy9iYXNlLnNjbSAoZ2xpYmMvaHVyZCwgZ2xpYmMvaHVyZC1oZWFkZXJzKTogTmV3IHZhcmlh Ymxlcy4KKiBnbnUvcGFja2FnZXMvaHVyZC5zY20gKGh1cmQtbWluaW1hbCk6IE5ldyB2YXJpYWJs ZS4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nbGliYy1tYWtlLTQuMC5wYXRjaDogTmV3IGZpbGUu CiogZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2xpYmMtaHVyZC1leHRlcm4taW5saW5lLnBhdGNoOiBO ZXcgZmlsZS4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9saWJwdGhyZWFkLWdsaWJjLXByZXBhcmF0 aW9uLnBhdGNoOiBOZXcgZmlsZS4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9odXJkLW1pbmltYWwu cGF0Y2g6IE5ldyBmaWxlLgoqIGdudS1zeXN0ZW0uYW0gKGRpc3RfcGF0Y2hfREFUQSk6IEFkZCB0 aGVtLgoKQ28tYXV0aG9yZWQtYnk6IEx1ZG92aWMgQ291cnTDqHMgPGx1ZG9AZ251Lm9yZz4KQ28t YXV0aG9yZWQtYnk6IE1hcmsgSCBXZWF2ZXIgPG1od0BuZXRyaXMub3JnPgotLS0KIGdudS1zeXN0 ZW0uYW0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA0ICsKIGdudS9w YWNrYWdlcy9iYXNlLnNjbSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTExICsrKysr KysrKysrKysrKysrKysrKwogZ251L3BhY2thZ2VzL2h1cmQuc2NtICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgNjcgKysrKysrKysrKysrLQogLi4uL3BhdGNoZXMvZ2xpYmMtaHVyZC1l eHRlcm4taW5saW5lLnBhdGNoICAgICAgICAgfCAgMzQgKysrKysrKwogZ251L3BhY2thZ2VzL3Bh dGNoZXMvZ2xpYmMtbWFrZS00LjAucGF0Y2ggICAgICAgICAgfCAgMTIgKysrCiBnbnUvcGFja2Fn ZXMvcGF0Y2hlcy9odXJkLW1pbmltYWwucGF0Y2ggICAgICAgICAgICB8ICAyMiArKysrCiAuLi4v cGF0Y2hlcy9saWJwdGhyZWFkLWdsaWJjLXByZXBhcmF0aW9uLnBhdGNoICAgICB8ICA1OSArKysr KysrKysrKwogNyBmaWxlcyBjaGFuZ2VkLCAzMDggaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL2dsaWJjLWh1cmQtZXh0 ZXJuLWlubGluZS5wYXRjaAogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVz L2dsaWJjLW1ha2UtNC4wLnBhdGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3BhY2thZ2VzL3Bh dGNoZXMvaHVyZC1taW5pbWFsLnBhdGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3BhY2thZ2Vz L3BhdGNoZXMvbGlicHRocmVhZC1nbGliYy1wcmVwYXJhdGlvbi5wYXRjaAoKZGlmZiAtLWdpdCBh L2dudS1zeXN0ZW0uYW0gYi9nbnUtc3lzdGVtLmFtCmluZGV4IGVlYWRkOGYuLjRhNDAxYWMgMTAw NjQ0Ci0tLSBhL2dudS1zeXN0ZW0uYW0KKysrIGIvZ251LXN5c3RlbS5hbQpAQCAtNDAxLDYgKzQw MSw4IEBAIGRpc3RfcGF0Y2hfREFUQSA9CQkJCQkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9n bGliYy1sb2NhbGVzLnBhdGNoCQkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nbGliYy1taXBz LWRhbmdsaW5nLXZmb3JrLXJlZi5wYXRjaAlcCiAgIGdudS9wYWNrYWdlcy9wYXRjaGVzL2dtcC1h cm0tYXNtLW5vdGh1bWIucGF0Y2gJCVwKKyAgZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2xpYmMtbWFr ZS00LjAucGF0Y2gJCQlcCisgIGdudS9wYWNrYWdlcy9wYXRjaGVzL2dsaWJjLWh1cmQtZXh0ZXJu LWlubGluZS5wYXRjaAkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nbnVuZXQtZml4LXNjaGVk dWxlci5wYXRjaAkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nbnVuZXQtZml4LXRlc3RzLnBh dGNoICAgIAkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nb2JqZWN0LWludHJvc3BlY3Rpb24t YWJzb2x1dGUtc2hsaWItcGF0aC5wYXRjaCBcCkBAIC00MTgsNiArNDIwLDcgQEAgZGlzdF9wYXRj aF9EQVRBID0JCQkJCQlcCiAgIGdudS9wYWNrYWdlcy9wYXRjaGVzL2d0a2dsZXh0LWRpc2FibGUt ZGlzYWJsZS1kZXByZWNhdGVkLnBhdGNoIFwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMvaG9wLWJp Z2xvby00LjBiLnBhdGNoCQkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9pcnJsaWNodC1tZXNh LTEwLnBhdGNoCQkJXAorICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9odXJkLW1pbmltYWwucGF0Y2gJ CQlcCiAgIGdudS9wYWNrYWdlcy9wYXRjaGVzL2piaWcyZGVjLWlnbm9yZS10ZXN0dGVzdC5wYXRj aAkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9rbW9kLW1vZHVsZS1kaXJlY3RvcnkucGF0Y2gJ CVwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMvbGliYXJjaGl2ZS1DVkUtMjAxMy0wMjExLnBhdGNo CQlcCkBAIC00MzUsNiArNDM4LDcgQEAgZGlzdF9wYXRjaF9EQVRBID0JCQkJCQlcCiAgIGdudS9w YWNrYWdlcy9wYXRjaGVzL2xpYnZweC1maXgtYXJtaGYtbGluay5wYXRjaAkJXAogICBnbnUvcGFj a2FnZXMvcGF0Y2hlcy9saWJ2cHgtZml4LXNzc2UzLXF1YW50aXplLnBhdGNoCQlcCiAgIGdudS9w YWNrYWdlcy9wYXRjaGVzL2xpYnZweC12cDktb3V0LW9mLWJvdW5kcy1hY2Nlc3MucGF0Y2gJXAor ICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9saWJwdGhyZWFkLWdsaWJjLXByZXBhcmF0aW9uLnBhdGNo CVwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMvbG0tc2Vuc29ycy1od21vbi1hdHRycy5wYXRjaAkJ XAogICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9sdWE1MS1saWJsdWEtc28ucGF0Y2ggICAgICAgICAg ICAgICAgICAgIFwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMvbHVpdC1wb3NpeC5wYXRjaAkJCQlc CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvYmFzZS5zY20gYi9nbnUvcGFja2FnZXMvYmFzZS5z Y20KaW5kZXggNTU0ZTg0OC4uZWVjMjg2OCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2Jhc2Uu c2NtCisrKyBiL2dudS9wYWNrYWdlcy9iYXNlLnNjbQpAQCAtNCw2ICs0LDcgQEAKIDs7OyBDb3B5 cmlnaHQgwqkgMjAxMiBOaWtpdGEgS2FyZXRuaWtvdiA8bmlraXRhQGthcmV0bmlrb3Yub3JnPgog Ozs7IENvcHlyaWdodCDCqSAyMDE0IE1hcmsgSCBXZWF2ZXIgPG1od0BuZXRyaXMub3JnPgogOzs7 IENvcHlyaWdodCDCqSAyMDE0IEFsZXggS29zdCA8YWxlem9zdEBnbWFpbC5jb20+Cis7OzsgQ29w eXJpZ2h0IMKpIDIwMTQsIDIwMTUgTWFub2xpcyBGcmFna2lza29zIFJhZ2tvdXNpcyA8bWFub2xp czgzN0BnbWFpbC5jb20+CiA7OzsKIDs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4K IDs7OwpAQCAtMzIsMTAgKzMzLDEzIEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBl cmwpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGxpbnV4KQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyB0ZXhpbmZvKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnZXR0 ZXh0KQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBodXJkKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGd1aXggdXRpbHMpCiAg ICM6dXNlLW1vZHVsZSAoZ3VpeCBwYWNrYWdlcykKICAgIzp1c2UtbW9kdWxlIChndWl4IGRvd25s b2FkKQorICAjOnVzZS1tb2R1bGUgKGd1aXggZ2l0LWRvd25sb2FkKQogICAjOnVzZS1tb2R1bGUg KGd1aXggYnVpbGQtc3lzdGVtIGdudSkpCiAKIDs7OyBDb21tZW50YXJ5OgpAQCAtNTU1LDYgKzU1 OSwxMTMgQEAgdGhlICdzaGFyZS9sb2NhbGUnIHN1Yi1kaXJlY3Rvcnkgb2YgdGhpcyBwYWNrYWdl LiIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiAl b3V0cHV0cyAib3V0IikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi L3NoYXJlL2xvY2FsZSIpKSkpKSkpKSkKIAorKGRlZmluZS1wdWJsaWMgZ2xpYmMvaHVyZAorICAo cGFja2FnZSAoaW5oZXJpdCBnbGliYykKKyAgICAobmFtZSAiZ2xpYmMtaHVyZCIpCisgICAgKHZl cnNpb24gIjIuMTgiKQorICAgIChzb3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAobWV0aG9k IGdpdC1mZXRjaCkKKyAgICAgICAgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQorICAgICAgICAg ICAgICAgICAgICAodXJsICJnaXQ6Ly9naXQuc3YuZ251Lm9yZy9odXJkL2dsaWJjIikKKyAgICAg ICAgICAgICAgICAgICAgKGNvbW1pdCAiYTlkOGQzODA4ZjE4ZGU0ZGE5YjU4N2U5YmRmYjZjY2E0 NzA0MzQ0YiIpKSkKKyAgICAgICAgICAgICAgKHNoYTI1NgorICAgICAgICAgICAgICAgKGJhc2Uz MgorICAgICAgICAgICAgICAgICIwam1jenpkeXBzNXN5aHJxeWY3bGdsM2g3N2JyOHM3NHF3MDQx N2pwOGI0ZjI5a3M3cGJ6IikpCisgICAgICAgICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBl bmQgbmFtZSAiLSIgdmVyc2lvbikpCisgICAgICAgICAgICAgIChwYXRjaGVzIChtYXAgc2VhcmNo LXBhdGNoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJygiZ2xpYmMtbWFrZS00LjAucGF0 Y2giCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZ2xpYmMtaHVyZC1leHRlcm4taW5s aW5lLnBhdGNoIikpKSkpCisKKyAgICA7OyBMaWJjIHByb3ZpZGVzIDxodXJkLmg+LCB3aGljaCBp bmNsdWRlcyBhIGJ1bmNoIG9mIEh1cmQgYW5kIE1hY2ggaGVhZGVycywKKyAgICA7OyBzbyBib3Ro IHNob3VsZCBiZSBwcm9wYWdhdGVkLgorICAgIChwcm9wYWdhdGVkLWlucHV0cyBgKCgiZ251bWFj aC1oZWFkZXJzIiAsZ251bWFjaC1oZWFkZXJzKQorICAgICAgICAgICAgICAgICAgICAgICAgICgi aHVyZC1oZWFkZXJzIiAsaHVyZC1oZWFkZXJzKQorICAgICAgICAgICAgICAgICAgICAgICAgICgi aHVyZC1taW5pbWFsIiAsaHVyZC1taW5pbWFsKSkpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAg YCgsQChwYWNrYWdlLW5hdGl2ZS1pbnB1dHMgZ2xpYmMpCisgICAgICAgKCJwYXRjaC9saWJwdGhy ZWFkLXBhdGNoIiAsKHNlYXJjaC1wYXRjaCAibGlicHRocmVhZC1nbGliYy1wcmVwYXJhdGlvbi5w YXRjaCIpKQorICAgICAgICgibWlnIiAsbWlnKQorICAgICAgICgicGVybCIgLHBlcmwpCisgICAg ICAgKCJsaWJwdGhyZWFkIiAsKG9yaWdpbgorICAgICAgICAgICAgICAgICAgICAgICAgKG1ldGhv ZCBnaXQtZmV0Y2gpCisgICAgICAgICAgICAgICAgICAgICAgICAodXJpIChnaXQtcmVmZXJlbmNl CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodXJsICJnaXQ6Ly9naXQuc3YuZ251Lm9y Zy9odXJkL2xpYnB0aHJlYWQiKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbW1p dCAiZjUxNzAyNGRjZTNlMjFjNTI1YTdiNjM0ZWFiNjEzMDJkNmI5OTE1MCIpKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAgICAgICAgICAgICAgICAoYmFzZTMy CisgICAgICAgICAgICAgICAgICAgICAgICAgICIweXFmbTFoZnFseWp6cXYzbWdmOWEzbWg0cXh4 MW1xa3puNXhpYWMydmx2amk4bm5zMzV5IikpCisgICAgICAgICAgICAgICAgICAgICAgICAoZmls ZS1uYW1lICJsaWJwdGhyZWFkIikpKSkpCisKKyAgICAoYXJndW1lbnRzCisgICAgIChzdWJzdGl0 dXRlLWtleXdvcmQtYXJndW1lbnRzIChwYWNrYWdlLWFyZ3VtZW50cyBnbGliYykKKyAgICAgICAo KCM6Y29uZmlndXJlLWZsYWdzIG9yaWdpbmFsLWNvbmZpZ3VyZS1mbGFncykKKyAgICAgICAgYChh cHBlbmQgKGxpc3QgIi0taG9zdD1pNjg2LXBjLWdudSIKKworICAgICAgICAgICAgICAgICAgICAg ICA7OyBuc2NkIGZhaWxzIHRvIGJ1aWxkIGZvciBHTlUvSHVyZDoKKyAgICAgICAgICAgICAgICAg ICAgICAgOzsgPGh0dHBzOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwvYnVnLWh1cmQvMjAx NC0wNy9tc2cwMDAwNi5odG1sPi4KKyAgICAgICAgICAgICAgICAgICAgICAgOzsgRGlzYWJsZSBp dC4KKyAgICAgICAgICAgICAgICAgICAgICAgIi0tZGlzYWJsZS1uc2NkIikKKyAgICAgICAgICAg ICAgICAgKGZpbHRlciAobGFtYmRhIChmbGFnKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg KG5vdCAob3IgKHN0cmluZy1wcmVmaXg/ICItLXdpdGgtaGVhZGVycz0iIGZsYWcpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLXByZWZpeD8gIi0tZW5hYmxlLWtl cm5lbD0iIGZsYWcpKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgOzsgRXZhbHVhdGUgJ29y aWdpbmFsLWNvbmZpZ3VyZS1mbGFncycgaW4gYQorICAgICAgICAgICAgICAgICAgICAgICAgIDs7 IGxleGljYWwgZW52aXJvbm1lbnQgdGhhdCBoYXMgYSBkdW1teQorICAgICAgICAgICAgICAgICAg ICAgICAgIDs7ICJsaW51eC1oZWFkZXJzIiBpbnB1dCwgdG8gcHJldmVudCBlcnJvcnMuCisgICAg ICAgICAgICAgICAgICAgICAgICAgKGxldCAoKCVidWlsZC1pbnB1dHMgYCgoImxpbnV4LWhlYWRl cnMiIC4gIkBEVU1NWUAiKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLEAlYnVpbGQtaW5wdXRzKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAs b3JpZ2luYWwtY29uZmlndXJlLWZsYWdzKSkpKQorICAgICAgICgoIzpwaGFzZXMgcGhhc2VzKQor ICAgICAgICBgKGFsaXN0LWNvbnMtYWZ0ZXIKKyAgICAgICAgICAndW5wYWNrICdwcmVwYXJlLWxp YnB0aHJlYWQKKyAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKKyAgICAgICAgICAgIChjb3B5LXJlY3Vyc2l2ZWx5IChhc3NvYy1yZWYgaW5wdXRzICJs aWJwdGhyZWFkIikgImxpYnB0aHJlYWQiKQorCisgICAgICAgICAgICAoc3lzdGVtKiAicGF0Y2gi ICItLWZvcmNlIiAiLXAxIiAiLWkiCisgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmIGlu cHV0cyAicGF0Y2gvbGlicHRocmVhZC1wYXRjaCIpKQorCisgICAgICAgICAgICA7OyBNYWtlIHRo ZSBmaWxlIHdyaXRhYmxlLgorICAgICAgICAgICAgKGNobW9kICJiaXRzL3B0aHJlYWR0eXBlcy5o IiAjbzY0NCkKKyAgICAgICAgICAgIChjb3B5LXJlY3Vyc2l2ZWx5ICJsaWJwdGhyZWFkL3N5c2Rl cHMvZ2VuZXJpYy9iaXRzIiAiYml0cyIpCisgICAgICAgICAgICAjdCkKKyAgICAgICAgICAscGhh c2VzKSkpKSkpCisKKyhkZWZpbmUtcHVibGljIGdsaWJjL2h1cmQtaGVhZGVycworICAocGFja2Fn ZSAoaW5oZXJpdCBnbGliYy9odXJkKQorICAgIChuYW1lICJnbGliYy1odXJkLWhlYWRlcnMiKQor ICAgIChvdXRwdXRzICcoIm91dCIpKQorICAgIChhcmd1bWVudHMKKyAgICAgKHN1YnN0aXR1dGUt a2V5d29yZC1hcmd1bWVudHMgKHBhY2thZ2UtYXJndW1lbnRzIGdsaWJjL2h1cmQpCisgICAgICAg OzsgV2UganVzdCBwYXNzIHRoZSBmbGFncyByZWFsbHkgbmVlZGVkIHRvIGJ1aWxkIHRoZSBoZWFk ZXJzLgorICAgICAgICgoIzpjb25maWd1cmUtZmxhZ3MgXykKKyAgICAgICAgYChsaXN0ICItLWVu YWJsZS1hZGQtb25zIgorICAgICAgICAgICAgICAgIi0taG9zdD1pNjg2LXBjLWdudSIKKyAgICAg ICAgICAgICAgICItLWVuYWJsZS1vYnNvbGV0ZS1ycGMiKSkKKyAgICAgICAoKCM6cGhhc2VzIF8p CisgICAgICAgICcoYWxpc3QtcmVwbGFjZQorICAgICAgICAgICdpbnN0YWxsCisgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAg KGFuZCAoemVybz8gKHN5c3RlbSogIm1ha2UiICJpbnN0YWxsLWhlYWRlcnMiKSkKKworICAgICAg ICAgICAgICAgICA7OyBNYWtlIGFuIGVtcHR5IHN0dWJzLmggdG8gd29yayBhcm91bmQgbm90IGJl aW5nIGFibGUgdG8KKyAgICAgICAgICAgICAgICAgOzsgcHJvZHVjZSBhIHZhbGlkIHN0dWJzLmgg YW5kIGNhdXNpbmcgdGhlIGJ1aWxkIHRvIGZhaWwuIFNlZQorICAgICAgICAgICAgICAgICA7OyA8 aHR0cDovL2xpc3RzLmdudS5vcmcvYXJjaGl2ZS9odG1sL2d1aXgtZGV2ZWwvMjAxNC0wNC9tc2cw MDIzMy5odG1sPi4KKyAgICAgICAgICAgICAgICAgKGxldCAoKG91dCAoYXNzb2MtcmVmIG91dHB1 dHMgIm91dCIpKSkKKyAgICAgICAgICAgICAgICAgICAoY2xvc2UtcG9ydAorICAgICAgICAgICAg ICAgICAgICAob3Blbi1vdXRwdXQtZmlsZQorICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1h cHBlbmQgb3V0ICIvaW5jbHVkZS9nbnUvc3R1YnMuaCIpKSkpKSkKKworICAgICAgICAgIDs7IE5v dGhpbmcgdG8gYnVpbGQuCisgICAgICAgICAgKGFsaXN0LWRlbGV0ZQorICAgICAgICAgICAnYnVp bGQKKworICAgICAgICAgICAoYWxpc3QtY29ucy1iZWZvcmUKKyAgICAgICAgICAgICdjb25maWd1 cmUgJ3ByZS1jb25maWd1cmUKKyAgICAgICAgICAgIChsYW1iZGEgXworICAgICAgICAgICAgICA7 OyBVc2UgdGhlIHJpZ2h0ICdwd2QnLgorICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogImNvbmZp Z3VyZSIKKyAgICAgICAgICAgICAgICAoKCIvYmluL3B3ZCIpICJwd2QiKSkpCisgICAgICAgICAg ICAlc3RhbmRhcmQtcGhhc2VzKSkpKSkpKSkKKwogKGRlZmluZS1wdWJsaWMgdHpkYXRhCiAgIChw YWNrYWdlCiAgICAgKG5hbWUgInR6ZGF0YSIpCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvaHVy ZC5zY20gYi9nbnUvcGFja2FnZXMvaHVyZC5zY20KaW5kZXggOGFjNzhkMy4uNTEwODExNCAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL2h1cmQuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9odXJkLnNj bQpAQCAtMjAsMTEgKzIwLDE0IEBACiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBsaWNlbnNlcykKICAg Izp1c2UtbW9kdWxlIChndWl4IGRvd25sb2FkKQogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2Fn ZXMpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzKQogICAjOnVzZS1tb2R1bGUgKGd1aXgg YnVpbGQtc3lzdGVtIGdudSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZmxleCkKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgYmlzb24pCiAgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHBlcmwpCi0gICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGF1dG90b29scykpCisg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGF1dG90b29scykKKyAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgYmFzZSkKKyAgIzp1c2UtbW9kdWxlIChndWl4IGdpdC1kb3dubG9hZCkpCiAK IChkZWZpbmUtcHVibGljIGdudW1hY2gtaGVhZGVycwogICAocGFja2FnZQpAQCAtMTI4LDMgKzEz MSw2NSBAQCBjb21tdW5pY2F0aW9uLiIpCiAgICAgICJUaGlzIHBhY2thZ2UgcHJvdmlkZXMgQyBo ZWFkZXJzIG9mIHRoZSBHTlUgSHVyZCwgdXNlZCB0byBidWlsZCB0aGUgR05VIEMKIExpYnJhcnkg YW5kIG90aGVyIHVzZXIgcHJvZ3JhbXMuIikKICAgICAobGljZW5zZSBncGwyKykpKQorCisoZGVm aW5lLXB1YmxpYyBodXJkLW1pbmltYWwKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAiaHVyZC1taW5p bWFsIikKKyAgICAodmVyc2lvbiAiMC41IikKKyAgICAoc291cmNlCisgICAgIChvcmlnaW4KKyAg ICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAodXJpIChnaXQtcmVmZXJlbmNlCisgICAg ICAgICAgICAgKHVybCAiZ2l0Oi8vZ2l0LnNhdmFubmFoLmdudS5vcmcvaHVyZC9odXJkIikKKyAg ICAgICAgICAgICAoY29tbWl0ICJhNWNhMWRlMWViNTc1Mjk0ZGJjODY1YTJjNGZmNjQzZWZjMTE3 ZWY0IikpKQorICAgICAgIChzaGEyNTYKKyAgICAgICAgKGJhc2UzMgorICAgICAgICAgIjE3dnFk bHB5MWlmdzRpamhjM3lka3A4cDVkNDA2YzdhcTRnaHBtZzRhMWgxd2x3eTMya3IiKSkKKyAgICAg ICAoZmlsZS1uYW1lIChzdHJpbmctYXBwZW5kIG5hbWUgIi0iIHZlcnNpb24pKQorICAgICAgIChw YXRjaGVzIChsaXN0IChzZWFyY2gtcGF0Y2ggImh1cmQtbWluaW1hbC5wYXRjaCIpKSkpKQorICAg IChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKKyAgICAoaW5wdXRzIGAoKCJnbGliYy1o dXJkLWhlYWRlcnMiICxnbGliYy9odXJkLWhlYWRlcnMpKSkKKyAgICAobmF0aXZlLWlucHV0cwor ICAgICBgKCgiYXV0b2NvbmYiICwoYXV0b2NvbmYtd3JhcHBlcikpCisgICAgICAgKCJtaWciICxt aWcpKSkKKworICAgIChhcmd1bWVudHMKKyAgICAgYCgjOnBoYXNlcyAoYWxpc3QtcmVwbGFjZQor ICAgICAgICAgICAgICAgICAnaW5zdGFsbAorICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzpr ZXkgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAgICAgICAgKGxldCAo KG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkKKyAgICAgICAgICAgICAgICAgICAgIDs7 IFdlIG5lZWQgdG8gY29weSBsaWJpaGFzaC5hIHRvIHRoZSBvdXRwdXQgZGlyZWN0b3J5IG1hbnVh bGx5LAorICAgICAgICAgICAgICAgICAgICAgOzsgc2luY2UgdGhlcmUgaXMgbm8gdGFyZ2V0IGZv ciB0aGF0IGluIHRoZSBtYWtlZmlsZS4KKyAgICAgICAgICAgICAgICAgICAgIChta2Rpci1wIChz dHJpbmctYXBwZW5kIG91dCAiL2luY2x1ZGUiKSkKKyAgICAgICAgICAgICAgICAgICAgIChjb3B5 LWZpbGUgImxpYmloYXNoL2loYXNoLmgiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChzdHJpbmctYXBwZW5kIG91dCAiL2luY2x1ZGUvaWhhc2guaCIpKQorICAgICAgICAgICAgICAg ICAgICAgKG1rZGlyLXAgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGliIikpCisgICAgICAgICAgICAg ICAgICAgICAoY29weS1maWxlICJsaWJpaGFzaC9saWJpaGFzaC5hIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saWIvbGliaWhhc2guYSIpKQor ICAgICAgICAgICAgICAgICAgICAgI3QpKQorICAgICAgICAgICAgICAgICAoYWxpc3QtcmVwbGFj ZQorICAgICAgICAgICAgICAgICAgJ2J1aWxkCisgICAgICAgICAgICAgICAgICAobGFtYmRhIF8K KyAgICAgICAgICAgICAgICAgICAgKHplcm8/IChzeXN0ZW0qICJtYWtlIiAiLUNsaWJpaGFzaCIg ImxpYmloYXNoLmEiKSkpCisgICAgICAgICAgICAgICAgICAoYWxpc3QtY29ucy1iZWZvcmUKKyAg ICAgICAgICAgICAgICAgICAnY29uZmlndXJlICdib290c3RyYXAKKyAgICAgICAgICAgICAgICAg ICAobGFtYmRhIF8KKyAgICAgICAgICAgICAgICAgICAgICh6ZXJvPyAoc3lzdGVtKiAiYXV0b3Jl Y29uZiIgIi12ZmkiKSkpCisgICAgICAgICAgICAgICAgICAgJXN0YW5kYXJkLXBoYXNlcykpKQor ICAgICAgICM6Y29uZmlndXJlLWZsYWdzICcoOzsgUHJldGVuZCB3ZSdyZSBvbiBHTlUvSHVyZDsg J2NvbmZpZ3VyZScgd2FudHMKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IHRoYXQuCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1ob3N0PWk2ODYtcGMtZ251IgorCisgICAgICAg ICAgICAgICAgICAgICAgICAgICA7OyBSZWR1Y2Ugc2V0IG9mIGRlcGVuZGVuY2llcy4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICItLWRpc2FibGUtbmN1cnNlc3ciCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAiLS1kaXNhYmxlLXRlc3QiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAiLS13aXRob3V0LWxpYmJ6MiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLXdpdGhv dXQtbGlieiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLXdpdGhvdXQtcGFydGVkIikK KyAgICAgICAjOnRlc3RzPyAjZikpCisgICAgKGhvbWUtcGFnZSAiaHR0cDovL3d3dy5nbnUub3Jn L3NvZnR3YXJlL2h1cmQvaHVyZC5odG1sIikKKyAgICAoc3lub3BzaXMgIkdOVSBIdXJkIGxpYnJh cmllcyIpCisgICAgKGRlc2NyaXB0aW9uCisgICAgICJUaGlzIHBhY2thZ2UgcHJvdmlkZXMgbGli aWhhc2gsIG5lZWRlZCB0byBidWlsZCB0aGUgR05VIEMgCitMaWJyYXJ5IGZvciBHTlUvSHVyZCIp CisgICAgKGxpY2Vuc2UgZ3BsMispKSkKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wYXRjaGVz L2dsaWJjLWh1cmQtZXh0ZXJuLWlubGluZS5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2ds aWJjLWh1cmQtZXh0ZXJuLWlubGluZS5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5mMTM5MDNjCi0tLSAvZGV2L251bGwKKysrIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMv Z2xpYmMtaHVyZC1leHRlcm4taW5saW5lLnBhdGNoCkBAIC0wLDAgKzEsMzQgQEAKK1RoaXMgY2hh bmdlcyB0aGUgd2F5IF9FWFRFUk5fSU5MSU5FIGlzIGRlZmluZWQgc28gd2UgY2FuCithdm9pZCBl eHRlcm5hbCBkZWZpbml0aW9uIGVycm9ycy4KK2h0dHBzOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZl L2h0bWwvYnVnLWh1cmQvMjAxNC0wNC9tc2cwMDAwMi5odG1sCisKK2RpZmYgLS1naXQgYS9zaWdu YWwvc2lnc2V0b3BzLmMgYi9zaWduYWwvc2lnc2V0b3BzLmMKK2luZGV4IDAzMTc2NjIuLmI5MmMy OTYgMTAwNjQ0CistLS0gYS9zaWduYWwvc2lnc2V0b3BzLmMKKysrKyBiL3NpZ25hbC9zaWdzZXRv cHMuYworQEAgLTMsNyArMyw5IEBACisgCisgI2luY2x1ZGUgPGZlYXR1cmVzLmg+CisgCistI2Rl ZmluZSBfRVhURVJOX0lOTElORQorKyNpZm5kZWYgX0VYVEVSTl9JTkxJTkUKKysjZGVmaW5lIF9F WFRFUk5fSU5MSU5FIF9fZXh0ZXJuX2lubGluZQorKyNlbmRpZgorICNpZm5kZWYgX19VU0VfRVhU RVJOX0lOTElORVMKKyAjIGRlZmluZSBfX1VTRV9FWFRFUk5fSU5MSU5FUyAgMQorICNlbmRpZgor CitUaGlzIGZpeGVzIHRoZSBlcnJvciBAbm9kZSBmb3VuZCBiZWZvcmUgQGVuZCBkZWZ0eXBlZnVu CisKK2RpZmYgLS1naXQgYS9tYW51YWwvY29udHJpYi50ZXhpIGIvbWFudWFsL2NvbnRyaWIudGV4 aQoraW5kZXggM2I5ZDIzYy4uMzc2YjQwZCAxMDA2NDQKKy0tLSBhL21hbnVhbC9jb250cmliLnRl eGkKKysrKyBiL21hbnVhbC9jb250cmliLnRleGkKK0BAIC0xLDMgKzEsNCBAQAorK0BlbmQgZGVm dHlwZWZ1bgorIEBub2RlIENvbnRyaWJ1dG9ycywgRnJlZSBNYW51YWxzLCBQbGF0Zm9ybSwgVG9w CisgQGMgJU1FTlUlIFdobyB3cm90ZSB3aGF0IHBhcnRzIG9mIHRoZSBHTlUgQyBMaWJyYXJ5Cisg QGFwcGVuZGl4IENvbnRyaWJ1dG9ycyB0byBAdGhlZ2xpYmN7fQorLS0gCisxLjkuMgorCmRpZmYg LS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9nbGliYy1tYWtlLTQuMC5wYXRjaCBiL2dudS9w YWNrYWdlcy9wYXRjaGVzL2dsaWJjLW1ha2UtNC4wLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLmQ4M2RlMWQKLS0tIC9kZXYvbnVsbAorKysgYi9nbnUvcGFja2FnZXMv cGF0Y2hlcy9nbGliYy1tYWtlLTQuMC5wYXRjaApAQCAtMCwwICsxLDEyIEBACitBbGxvdyBsaWJj IHRvIGJlIGNvbXBpbGVkIHdpdGggR05VIE1ha2UgNC4wLgorCistLS0gZ2xpYmMtMi4xOC9jb25m aWd1cmUJMjAxMy0wOC0xMSAwMDo1Mjo1NS4wMDAwMDAwMDAgKzAyMDAKKysrKyBnbGliYy0yLjE4 L2NvbmZpZ3VyZQkyMDEzLTEwLTE2IDE2OjUzOjA5LjAwMDAwMDAwMCArMDIwMAorQEAgLTQ3NzIs NyArNDc3Miw3IEBAICRhc19lY2hvX24gImNoZWNraW5nIHZlcnNpb24gb2YgJE1BS0UuLi4KKyAg IGFjX3Byb2dfdmVyc2lvbj1gJE1BS0UgLS12ZXJzaW9uIDI+JjEgfCBzZWQgLW4gJ3MvXi4qR05V IE1ha2VbXjAtOV0qXChbMC05XVswLTkuXSpcKS4qJC9cMS9wJ2AKKyAgIGNhc2UgJGFjX3Byb2df dmVyc2lvbiBpbgorICAgICAnJykgYWNfcHJvZ192ZXJzaW9uPSJ2LiA/Lj8/LCBiYWQiOyBhY192 ZXJjX2ZhaWw9eWVzOzsKKy0gICAgMy43OSogfCAzLls4OV0qKQorKyAgICAzLjc5KiB8IDMuWzg5 XSogfCA0LiopCisgICAgICAgIGFjX3Byb2dfdmVyc2lvbj0iJGFjX3Byb2dfdmVyc2lvbiwgb2si OyBhY192ZXJjX2ZhaWw9bm87OworICAgICAqKSBhY19wcm9nX3ZlcnNpb249IiRhY19wcm9nX3Zl cnNpb24sIGJhZCI7IGFjX3ZlcmNfZmFpbD15ZXM7OwpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2Vz L3BhdGNoZXMvaHVyZC1taW5pbWFsLnBhdGNoIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvaHVyZC1t aW5pbWFsLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI1NTFkNWMK LS0tIC9kZXYvbnVsbAorKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9odXJkLW1pbmltYWwucGF0 Y2gKQEAgLTAsMCArMSwyMiBAQAorV2Ugd2FudCB0byBidWlsZCB0aGUgSHVyZCdzIGxpYmloYXNo IHZlcnkgZWFybHkgc28gdGhhdCB3ZSBjYW4gdGhlbgorYnVpbGQgbGliYy4gIEJlY2F1c2Ugb2Yg dGhhdCwgd2UgY2Fubm90IGxpbmsgYWdhaW5zdCBsaWJjLCBhbmQgdGh1cword2UgbWlzcyAnY2xu dF9jcmVhdGUnIGFuZCBmcmllbmRzLgorCitTZWUgPGh0dHA6Ly9saXN0cy5nbnUub3JnL2FyY2hp dmUvaHRtbC9idWctaHVyZC8yMDE0LTA0L21zZzAwMTE2Lmh0bWw+LgorCitkaWZmIC0tZ2l0IGEv Y29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCitpbmRleCBmODg1NmRiLi5hMzgxMjE5IDEwMDY0 NAorLS0tIGEvY29uZmlndXJlLmFjCisrKysgYi9jb25maWd1cmUuYWMKK0BAIC0yOTcsOSArMjk3 LDkgQEAgQUNfU1VCU1QoW1hLQl9CQVNFXSkKKyBBQ19ERUZJTkVfVU5RVU9URUQoW1gxMV9QUkVG SVhdLCAiJFgxMV9QUkVGSVgiKQorIEFDX1NVQlNUKFtYMTFfS0VZU1lNREVGX0hdKQorIAorLSMg Q2hlY2sgZm9yIFN1biBSUEMgaGVhZGVycyBhbmQgbGlicmFyeS4KKysjIENoZWNrIG9ubHkgZm9y IFN1biBSUEMgaGVhZGVycy4gV2UgZG8gbm90IG5lZWQgdGhlIGxpYnJhcnkgeWV0LgorIEFDX0NI RUNLX0hFQURFUihbcnBjL3R5cGVzLmhdLCBbSEFWRV9TVU5fUlBDPXllc10sIFtIQVZFX1NVTl9S UEM9bm9dKQorLUFDX1NFQVJDSF9MSUJTKFtjbG50X2NyZWF0ZV0sIFtdLCBbOl0sIFtIQVZFX1NV Tl9SUEM9bm9dKQorKyMgQUNfU0VBUkNIX0xJQlMoW2NsbnRfY3JlYXRlXSwgW10sIFs6XSwgW0hB VkVfU1VOX1JQQz1ub10pCisgQUNfU1VCU1QoW0hBVkVfU1VOX1JQQ10pCisgCisgaWYgdGVzdCAt ZiAuLyRhY191bmlxdWVfZmlsZTsgdGhlbgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNo ZXMvbGlicHRocmVhZC1nbGliYy1wcmVwYXJhdGlvbi5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRj aGVzL2xpYnB0aHJlYWQtZ2xpYmMtcHJlcGFyYXRpb24ucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMTg5NzI0OAotLS0gL2Rldi9udWxsCisrKyBiL2dudS9wYWNrYWdl cy9wYXRjaGVzL2xpYnB0aHJlYWQtZ2xpYmMtcHJlcGFyYXRpb24ucGF0Y2gKQEAgLTAsMCArMSw1 OSBAQAorVGhpcyBwYXRjaCBoZWxwcyB0byBpbnRlZ3JhdGUgdGhlIEh1cmQncyBsaWJwdGhyZWFk IGFzIGEgbGliYyBhZGQtb24uCisKK0l0IHdyaXRlcyB0aGUgY29uZmlndXJlIGZpbGUsIHJlbW92 ZXMgYW4gcnBjIGNhbGwgbm90IHlldCAKK2ltcGxlbWVudGVkIG9uIHRoZSB2ZXJzaW9uIG9mIGdu dW1hY2ggd2UgdXNlIGFuZCBkZWZpbmVzCithIG1pc3NpbmcgbWFjcm8uCisKK2RpZmYgLS1naXQg YS9saWJwdGhyZWFkL2NvbmZpZ3VyZSBiL2xpYnB0aHJlYWQvY29uZmlndXJlCituZXcgZmlsZSBt b2RlIDEwMDY0NAoraW5kZXggMDAwMDAwMC4uMmNkYmM3MQorLS0tIC9kZXYvbnVsbAorKysrIGIv bGlicHRocmVhZC9jb25maWd1cmUKK0BAIC0wLDAgKzEsMiBAQAorK2xpYmNfYWRkX29uX2Nhbm9u aWNhbD1saWJwdGhyZWFkCisrbGliY19hZGRfb25fc3ViZGlycz0uCistLSAKKzEuOS4wCisKK1dl IGFyZSB1c2luZyBhIHZlcnNpb24gb2YgR05VIE1hY2ggdGhhdCBsYWNrcyAndGhyZWFkX3Rlcm1p bmF0ZV9yZWxlYXNlJworKG5vdCBpbnRyb2R1Y2VkIHlldCkuICBUaGUgJ3RocmVhZF90ZXJtaW5h dGUnIFJQQyBjYWxsIHdpbGwgYmUgZW5vdWdoIGZvcgorb3VyIG5lZWRzLgorU2VlIDxodHRwOi8v bGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwvYnVnLWh1cmQvMjAxNC0wNS9tc2cwMDEyNy5odG1s Pi4KKworZGlmZiAtLWdpdCBhL2xpYnB0aHJlYWQvc3lzZGVwcy9tYWNoL3B0LXRocmVhZC10ZXJt aW5hdGUuYyBiL2xpYnB0aHJlYWQvc3lzZGVwcy9tYWNoL3B0LXRocmVhZC10ZXJtaW5hdGUuYwor aW5kZXggNjY3MjA2NS4uMTI5YTYxMSAxMDA2NDQKKy0tLSBhL2xpYnB0aHJlYWQvc3lzZGVwcy9t YWNoL3B0LXRocmVhZC10ZXJtaW5hdGUuYworKysrIGIvbGlicHRocmVhZC9zeXNkZXBzL21hY2gv cHQtdGhyZWFkLXRlcm1pbmF0ZS5jCitAQCAtNzAsOSArNzAsOSBAQCBfX3B0aHJlYWRfdGhyZWFk X3Rlcm1pbmF0ZSAoc3RydWN0IF9fcHRocmVhZCAqdGhyZWFkKQorICAgX19tYWNoX3BvcnRfZGVz dHJveSAoX19tYWNoX3Rhc2tfc2VsZiAoKSwgd2FrZXVwX3BvcnQpOworIAorICAgLyogVGVybWlu YXRlIGFuZCByZWxlYXNlIGFsbCB0aGF0J3MgbGVmdC4gICovCistICBlcnIgPSBfX3RocmVhZF90 ZXJtaW5hdGVfcmVsZWFzZSAoa2VybmVsX3RocmVhZCwgbWFjaF90YXNrX3NlbGYgKCksCistCQkJ CSAgICBrZXJuZWxfdGhyZWFkLCByZXBseV9wb3J0LAorLQkJCQkgICAgc3RhY2thZGRyLCBzdGFj a3NpemUpOworKyAgLyogZXJyID0gX190aHJlYWRfdGVybWluYXRlX3JlbGVhc2UgKGtlcm5lbF90 aHJlYWQsIG1hY2hfdGFza19zZWxmICgpLCAqLworKyAgLyogCQkJCSAgICBrZXJuZWxfdGhyZWFk LCByZXBseV9wb3J0LCAqLworKyAgLyogCQkJCSAgICBzdGFja2FkZHIsIHN0YWNrc2l6ZSk7ICov CisgCisgICAvKiBUaGUga2VybmVsIGRvZXMgbm90IHN1cHBvcnQgaXQgeWV0LiAgTGVhayBidXQg YXQgbGVhc3QgdGVybWluYXRlCisgICAgICBjb3JyZWN0bHkuICAqLworLS0gCisxLjkuMgorCitU aGUgX19QVEhSRUFEX1NQSU5fTE9DS19JTklUSUFMSVpFUiBkZWZpbml0aW9uIGlzIG1pc3Npbmcs IHNvIHdlIAorZGVmaW5lIGl0IHRvIF9fU1BJTl9MT0NLX0lOSVRJQUxJWkVSIHdoaWNoIGFscmVh ZHkgZXhpc3RzLgorU2VlIDxodHRwOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwvY29tbWl0 LWh1cmQvMjAwOS0wNC9tc2cwMDAwNi5odG1sPi4KKyAgCitkaWZmIC0tZ2l0IGEvbGlicHRocmVh ZC9zeXNkZXBzL21hY2gvYml0cy9zcGluLWxvY2suaCBiL2xpYnB0aHJlYWQvc3lzZGVwcy9tYWNo L2JpdHMvc3Bpbi1sb2NrLmgKK2luZGV4IDUzN2RhYzkuLmZjYTBlNWEgMTAwNjQ0CistLS0gYS9s aWJwdGhyZWFkL3N5c2RlcHMvbWFjaC9iaXRzL3NwaW4tbG9jay5oCisrKysgYi9saWJwdGhyZWFk L3N5c2RlcHMvbWFjaC9iaXRzL3NwaW4tbG9jay5oCitAQCAtMzAsNyArMzAsNyBAQCB0eXBlZGVm IF9fc3Bpbl9sb2NrX3QgX19wdGhyZWFkX3NwaW5sb2NrX3Q7CisgCisgLyogSW5pdGlhbGl6ZXIg Zm9yIGEgc3BpbiBsb2NrIG9iamVjdC4gICovCisgI2lmbmRlZiBfX1BUSFJFQURfU1BJTl9MT0NL X0lOSVRJQUxJWkVSCistI2Vycm9yIF9fUFRIUkVBRF9TUElOX0xPQ0tfSU5JVElBTElaRVIgdW5k ZWZpbmVkOiBzaG91bGQgYmUgZGVmaW5lZCBieSA8bG9jay1pbnRlcm4uaD4uCisrI2RlZmluZSBf X1BUSFJFQURfU1BJTl9MT0NLX0lOSVRJQUxJWkVSIF9fU1BJTl9MT0NLX0lOSVRJQUxJWkVSCisg I2VuZGlmCisgCisgX19FTkRfREVDTFMKLS0gCjIuMy4wCgo= --047d7bacb528545d00050f5991be--