From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5006138359 for ; Sun, 18 Oct 2020 15:15:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04859E09F6; Sun, 18 Oct 2020 15:15:23 +0000 (UTC) Received: from mail02.rohde-schwarz.com (mail02.rohde-schwarz.com [80.246.32.97]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5D27E09F6 for ; Sun, 18 Oct 2020 15:15:22 +0000 (UTC) Received: from amu316.rsint.net (10.0.26.65) by mail-emea.rohde-schwarz.com (172.21.64.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.659.4; Sun, 18 Oct 2020 17:15:19 +0200 Received: from GMU419.rsint.net ([10.0.230.184]) by amu316.rsint.net (Totemo SMTP Server) with SMTP ID 760 for ; Sun, 18 Oct 2020 17:15:19 +0200 (CEST) Received: from GMU018.rsint.net (10.0.2.46) by GMU419.rsint.net (10.0.230.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Sun, 18 Oct 2020 17:15:18 +0200 Received: from GMU017.rsint.net (10.0.2.67) by GMU018.rsint.net (10.0.2.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2044.4; Sun, 18 Oct 2020 17:15:17 +0200 Received: from GMU017.rsint.net ([fe80::310e:b15b:ca4:8119]) by GMU017.rsint.net ([fe80::310e:b15b:ca4:8119%12]) with mapi id 15.01.2044.006; Sun, 18 Oct 2020 17:15:16 +0200 From: Felix Bier To: "gentoo-catalyst@lists.gentoo.org" Subject: [gentoo-catalyst] Re: [PATCH 2/2] Move from PORTDIR_OVERLAY to repos.conf Thread-Topic: [PATCH 2/2] Move from PORTDIR_OVERLAY to repos.conf /ur/ Thread-Index: AQHWpLfMEt3yhfvgs0euXdqBfxgtbqmdV+6A Date: Sun, 18 Oct 2020 15:15:16 +0000 Message-ID: References: <914cce4739709511771f27bed773c7e4e01c3c9a.camel@rohde-schwarz.com> In-Reply-To: <914cce4739709511771f27bed773c7e4e01c3c9a.camel@rohde-schwarz.com> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.0.9.40] Content-Type: text/plain; charset="utf-8" Content-ID: <566B2524F8B3A445A1C7C820327C075D@rohde-schwarz.com> Content-Transfer-Encoding: base64 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-IQAV: YES X-RUS_SENSITIVITY: 10 X-GBS-PROC: O3zNY9Rpr2hzvWGn/WL/6M21YQ4LttzlkYI4ZXpgjYw= X-Archives-Salt: 4161cb86-c18f-447b-b382-da8ebaac2376 X-Archives-Hash: 56a14367aeb13062749a6b6217a0dcb9 VGhpcyBjb21taXQgZml4ZXMgdGhlIGZvbGxvd2luZyBpc3N1ZXM6DQoNCiAgKiBUaGUgUE9SVERJ Ul9PVkVSTEFZIHZhcmlhYmxlIGhhcyBiZWVuIGRlcHJlY2F0ZWQgYnkgR2VudG9vLg0KDQogICAg V2l0aCB0aGlzIGNvbW1pdCwgdGhlIHZhcmlhYmxlIGlzIG5vIGxvbmdlciB3cml0dGVuIHRvIHRo ZQ0KICAgIGdlbmVyYXRlZCBtYWtlLmNvbmYuIEluc3RlYWQsIGEgY29uZmlnIGZpbGUNCiAgICAv ZXRjL3BvcnRhZ2UvcmVwb3MuY29uZi88cmVwby1uYW1lPi5jb25mDQogICAgaXMgZ2VuZXJhdGVk IGZvciBlYWNoIG92ZXJsYXkuIFRoZSByZXBvIG5hbWUgaXMgcmVhZCBmcm9tIHRoZQ0KICAgIG92 ZXJsYXkgdXNpbmcgdGhlIHBvcnRhZ2UgQVBJLiBJbnRlcm5hbGx5LCBwb3J0YWdlIHBhcnNlcw0K ICAgIG1ldGFkYXRhL2xheW91dC5jb25mIGFuZCBwcm9maWxlcy9yZXBvX25hbWUgdG8gb2J0YWlu IHRoZSBuYW1lLg0KDQogICAgUmVmZXJlbmNlczoNCiAgICBodHRwczovL3dpa2kuZ2VudG9vLm9y Zy93aWtpLy9ldGMvcG9ydGFnZS9tYWtlLmNvbmYNCiAgICBodHRwczovL3dpa2kuZ2VudG9vLm9y Zy93aWtpLy9ldGMvcG9ydGFnZS9yZXBvcy5jb25mDQoNCiAgKiBBbGwgb3ZlcmxheXMgd2VyZSBj b3BpZWQgaW50byB0aGUgc2FtZSB0YXJnZXQgZGlyZWN0b3J5LiBJZiB0aGUNCiAgICBzYW1lIGZp bGUgbmFtZSBvY2N1cnJlZCBpbiBtdWx0aXBsZSBvdmVybGF5cywgdGhlIGxhc3Qgb3ZlcmxheQ0K ICAgIHdvdWxkIG92ZXJ3cml0ZSBhbGwgcHJldmlvdXMgZmlsZXMgd2l0aCB0aGlzIG5hbWUuIElu IHBhcnRpY3VsYXIsDQogICAgb25seSB0aGUgbWV0YWRhdGEvbGF5b3V0LmNvbmYgb2YgdGhlIGxh c3Qgb3ZlcmxheSB3YXMgcmV0YWluZWQsDQogICAgc28gaXQgd2FzIG5vdCBwb3NzaWJsZSB0byBy ZWZlcmVuY2UgdGhlIG90aGVyIG92ZXJsYXlzIGUuZy4gdmlhDQogICAgdGhlIG1hc3RlcnMgZW50 cnkgaW4gdGhlIGxheW91dC5jb25mIG9yIHRoZSBwb3J0YWdlLTIgc3ludGF4DQogICAgZm9yIHNw ZWNpZnlpbmcgYSBwYXJlbnQgcHJvZmlsZSBmcm9tIGFub3RoZXIgb3ZlcmxheS4gQWxzbywNCiAg ICB0aGlzIGNyZWF0ZWQgcHJvYmxlbXMgd2hlbiB0aGUgb3ZlcmxheXMgY29udGFpbmVkIGVidWls ZHMNCiAgICBmb3IgdGhlIHNhbWUgcGFja2FnZSwgYnV0IHdpdGggZGlmZmVyaW5nIHZlcnNpb25z LCBiZWNhdXNlDQogICAgYWZ0ZXIgY29weWluZywgdGhlIHRhcmdldCBkaXJlY3RvcnkgY29udGFp bmVkIGJvdGggdmVyc2lvbnMgb2YgdGhlDQogICAgZWJ1aWxkIGJ1dCBvbmx5IHRoZSBtYW5pZmVz dCBmaWxlIG9mIHRoZSBsYXN0IG92ZXJsYXkuDQoNCiAgICBXaXRoIHRoaXMgY29tbWl0LCBlYWNo IG92ZXJsYXkgaXMgY29waWVkIGludG8gYSBzZXBhcmF0ZQ0KICAgIHN1Yi1kaXJlY3RvcnksIGUu Zy4gL3Zhci9nZW50b28vcmVwb3MvbG9jYWwvPHJlcG8tbmFtZT4vLg0KICAgIFRoaXMgZGlyZWN0 b3J5IGlzIHJlZmVyZW5jZWQgdmlhIHRoZSBsb2NhdGlvbiBlbnRyeSBpbiB0aGUNCiAgICBnZW5l cmF0ZWQgL2V0Yy9wb3J0YWdlL3JlcG9zLmNvbmYvPHJlcG8tbmFtZT4uY29uZi4NCi0tLQ0KIGNh dGFseXN0L2Jhc2Uvc3RhZ2ViYXNlLnB5IHwgNzIgKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0NCiBjYXRhbHlzdC9kZWZhdWx0cy5weSAgICAgICB8ICAxICsNCiBjYXRhbHlz dC9zdXBwb3J0LnB5ICAgICAgICB8IDE4ICsrKysrKysrKysNCiAzIGZpbGVzIGNoYW5nZWQsIDcy IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvY2F0YWx5c3Qv YmFzZS9zdGFnZWJhc2UucHkgYi9jYXRhbHlzdC9iYXNlL3N0YWdlYmFzZS5weQ0KaW5kZXggYWMw ZjRmMjQuLjNkNGYyYTc2IDEwMDY0NA0KLS0tIGEvY2F0YWx5c3QvYmFzZS9zdGFnZWJhc2UucHkN CisrKyBiL2NhdGFseXN0L2Jhc2Uvc3RhZ2ViYXNlLnB5DQpAQCAtMSw0ICsxLDUgQEANCiANCitp bXBvcnQgY29uZmlncGFyc2VyDQogaW1wb3J0IGNvcHkNCiBpbXBvcnQgb3MNCiBpbXBvcnQgcGxh dGZvcm0NCkBAIC0xNyw3ICsxOCw4IEBAIGZyb20gRGVDb21wLmNvbXByZXNzIGltcG9ydCBDb21w cmVzc01hcA0KIGZyb20gY2F0YWx5c3QgaW1wb3J0IGxvZw0KIGZyb20gY2F0YWx5c3QuZGVmYXVs dHMgaW1wb3J0IChjb25mZGVmYXVsdHMsIE1PVU5UX0RFRkFVTFRTLCBQT1JUX0xPR0RJUl9DTEVB TikNCiBmcm9tIGNhdGFseXN0LnN1cHBvcnQgaW1wb3J0IChDYXRhbHlzdEVycm9yLCBmaWxlX2xv Y2F0ZSwgbm9ybXBhdGgsDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY21kLCByZWFk X21ha2Vjb25mLCBpc21vdW50LCBmaWxlX2NoZWNrKQ0KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNtZCwgcmVhZF9tYWtlY29uZiwgZ2V0X3JlcG9fbmFtZSwgaXNtb3VudCwNCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlX2NoZWNrKQ0KIGZyb20gY2F0YWx5c3QuYmFz ZS50YXJnZXRiYXNlIGltcG9ydCBUYXJnZXRCYXNlDQogZnJvbSBjYXRhbHlzdC5iYXNlLmNsZWFy YmFzZSBpbXBvcnQgQ2xlYXJCYXNlDQogZnJvbSBjYXRhbHlzdC5iYXNlLmdlbmJhc2UgaW1wb3J0 IEdlbkJhc2UNCkBAIC04MjEsMTcgKzgyMyw0OCBAQCBjbGFzcyBTdGFnZUJhc2UoVGFyZ2V0QmFz ZSwgQ2xlYXJCYXNlLCBHZW5CYXNlKToNCiAgICAgICAgICAgICAgICAgICAgIGVudj1zZWxmLmVu dikNCiAgICAgICAgICAgICAgICAgc2VsZi5yZXN1bWUuZW5hYmxlKCJzZXR1cF9jb25mZGlyIikN CiANCisgICAgZGVmIGdldF9yZXBvX2NvbmZfcGF0aChzZWxmLCByZXBvX25hbWUpOg0KKyAgICAg ICAgIiIiIENvbnN0cnVjdCByZXBvIGNvbmYgcGF0aDogL2V0Yy9wb3J0YWdlL3JlcG9zLmNvbmYv e25hbWV9LmNvbmYgIiIiDQorICAgICAgICByZXR1cm4gbm9ybXBhdGgob3MucGF0aC5qb2luKHNl bGYuc2V0dGluZ3NbJ3JlcG9zX2NvbmYnXSwgcmVwb19uYW1lICsgIi5jb25mIikpDQorDQorICAg IGRlZiBnZXRfb3ZlcmxheV9sb2NhdGlvbihzZWxmLCByZXBvX25hbWUpOg0KKyAgICAgICAgIiIi IENvbnN0cnVjdCBvdmVybGF5IHJlcG8gcGF0aDogL3Zhci9nZW50b28vcmVwb3MvbG9jYWwve25h bWV9ICIiIg0KKyAgICAgICAgcmV0dXJuIG5vcm1wYXRoKG9zLnBhdGguam9pbihzZWxmLnNldHRp bmdzWydsb2NhbF9vdmVybGF5J10sIHJlcG9fbmFtZSkpDQorDQorICAgIGRlZiB3cml0ZV9yZXBv X2NvbmYoc2VsZiwgcmVwb19uYW1lLCBjb25maWcpOg0KKyAgICAgICAgIiIiIFdyaXRlIENvbmZp Z1BhcnNlciB0byB7Y2hyb290fS9ldGMvcG9ydGFnZS9yZXBvLmNvbmYve25hbWV9LmNvbmYgIiIi DQorICAgICAgICByZXBvX2NvbmYgPSBzZWxmLmdldF9yZXBvX2NvbmZfcGF0aChyZXBvX25hbWUp DQorICAgICAgICBjaHJvb3RfcmVwb19jb25mID0gc2VsZi5zZXR0aW5nc1snY2hyb290X3BhdGgn XSArIHJlcG9fY29uZg0KKyAgICAgICAgbG9nLmluZm8oJ0NyZWF0aW5nIHJlcG8gY29uZmlnICVz LicsIGNocm9vdF9yZXBvX2NvbmYpDQorICAgICAgICBlbnN1cmVfZGlycyhvcy5wYXRoLmRpcm5h bWUoY2hyb290X3JlcG9fY29uZikpDQorDQorICAgICAgICB0cnk6DQorICAgICAgICAgICAgd2l0 aCBvcGVuKGNocm9vdF9yZXBvX2NvbmYsICd3JykgYXMgbXlmOg0KKyAgICAgICAgICAgICAgICBj b25maWcud3JpdGUobXlmKQ0KKyAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMgZToNCisgICAgICAg ICAgICByYWlzZSBDYXRhbHlzdEVycm9yKCdDb3VsZCBub3Qgd3JpdGUge306IHt9Jy5mb3JtYXQo DQorICAgICAgICAgICAgICAgIGNocm9vdF9yZXBvX2NvbmYsIGUpKSBmcm9tIGUNCisNCiAgICAg ZGVmIHBvcnRhZ2Vfb3ZlcmxheShzZWxmKToNCi0gICAgICAgICIiIiBXZSBjb3B5IHRoZSBjb250 ZW50cyBvZiBvdXIgb3ZlcmxheXMgdG8gL3Vzci9sb2NhbC9wb3J0YWdlICIiIg0KKyAgICAgICAg IiIiIFdlIGNvcHkgdGhlIGNvbnRlbnRzIG9mIG91ciBvdmVybGF5cyB0byAvdmFyL2dlbnRvby9y ZXBvcy9sb2NhbC97bmFtZX0gIiIiDQogICAgICAgICBpZiAicG9ydGFnZV9vdmVybGF5IiBpbiBz ZWxmLnNldHRpbmdzOg0KICAgICAgICAgICAgIGZvciB4IGluIHNlbGYuc2V0dGluZ3NbInBvcnRh Z2Vfb3ZlcmxheSJdOg0KICAgICAgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyh4KToNCi0g ICAgICAgICAgICAgICAgICAgIGxvZy5pbmZvKCdDb3B5aW5nIG92ZXJsYXkgZGlyICVzJywgeCkN Ci0gICAgICAgICAgICAgICAgICAgIGVuc3VyZV9kaXJzKA0KLSAgICAgICAgICAgICAgICAgICAg ICAgIHNlbGYuc2V0dGluZ3NbJ2Nocm9vdF9wYXRoJ10gKyBzZWxmLnNldHRpbmdzWydsb2NhbF9v dmVybGF5J10pDQotICAgICAgICAgICAgICAgICAgICBjbWQoImNwIC1hICIgKyB4ICsgIi8qICIg KyBzZWxmLnNldHRpbmdzWyJjaHJvb3RfcGF0aCJdICsNCi0gICAgICAgICAgICAgICAgICAgICAg ICBzZWxmLnNldHRpbmdzWyJsb2NhbF9vdmVybGF5Il0sDQotICAgICAgICAgICAgICAgICAgICAg ICAgZW52PXNlbGYuZW52KQ0KKyAgICAgICAgICAgICAgICAgICAgbmFtZSA9IGdldF9yZXBvX25h bWUoeCkNCisNCisgICAgICAgICAgICAgICAgICAgIGxvY2F0aW9uID0gc2VsZi5nZXRfb3Zlcmxh eV9sb2NhdGlvbihuYW1lKQ0KKyAgICAgICAgICAgICAgICAgICAgY29uZmlnID0gY29uZmlncGFy c2VyLkNvbmZpZ1BhcnNlcigpDQorICAgICAgICAgICAgICAgICAgICBjb25maWdbbmFtZV0gPSB7 J2xvY2F0aW9uJzogbG9jYXRpb259DQorICAgICAgICAgICAgICAgICAgICBzZWxmLndyaXRlX3Jl cG9fY29uZihuYW1lLCBjb25maWcpDQorDQorICAgICAgICAgICAgICAgICAgICBjaHJvb3RfbG9j YXRpb24gPSBub3JtcGF0aCgNCisgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNldHRpbmdz WydjaHJvb3RfcGF0aCddICsgbG9jYXRpb24pDQorICAgICAgICAgICAgICAgICAgICBsb2cuaW5m bygnQ29weWluZyBvdmVybGF5IGRpciAlcyB0byAlcycsDQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB4LCBjaHJvb3RfbG9jYXRpb24pDQorICAgICAgICAgICAgICAgICAgICBlbnN1cmVf ZGlycyhjaHJvb3RfbG9jYXRpb24pDQorICAgICAgICAgICAgICAgICAgICBjbWQoJ2NwIC1hICcg KyB4ICsgJy8qICcgKyBjaHJvb3RfbG9jYXRpb24sIGVudj1zZWxmLmVudikNCisgICAgICAgICAg ICAgICAgZWxzZToNCisgICAgICAgICAgICAgICAgICAgIGxvZy53YXJuaW5nKCdTa2lwcGluZyBt aXNzaW5nIG92ZXJsYXkgJXMuJywgeCkNCiANCiAgICAgZGVmIHJvb3Rfb3ZlcmxheShzZWxmKToN CiAgICAgICAgICIiIiBDb3B5IG92ZXIgdGhlIHJvb3Rfb3ZlcmxheSAiIiINCkBAIC0xMDgwLDEy ICsxMTEzLDYgQEAgY2xhc3MgU3RhZ2VCYXNlKFRhcmdldEJhc2UsIENsZWFyQmFzZSwgR2VuQmFz ZSk6DQogICAgICAgICAgICAgICAgICAgICB2YXJuYW1lID0geC5zcGxpdCgnXycpWzFdLnVwcGVy KCkNCiAgICAgICAgICAgICAgICAgICAgIG15Zi53cml0ZShmJ3t2YXJuYW1lfT0ie3NlbGYuc2V0 dGluZ3NbeF19IlxuJykNCiANCi0gICAgICAgICAgICBpZiBzZXR1cDoNCi0gICAgICAgICAgICAg ICAgIyBTZXR1cCB0aGUgcG9ydGFnZSBvdmVybGF5DQotICAgICAgICAgICAgICAgIGlmICJwb3J0 YWdlX292ZXJsYXkiIGluIHNlbGYuc2V0dGluZ3M6DQotICAgICAgICAgICAgICAgICAgICBteWYu d3JpdGUoJ1BPUlRESVJfT1ZFUkxBWT0iJXMiXG4nICUNCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzZWxmLnNldHRpbmdzWyJsb2NhbF9vdmVybGF5Il0pDQotDQogICAgICAgICAgICAg IyBTZXQgZGVmYXVsdCBsb2NhbGUgZm9yIHN5c3RlbSByZXNwb25zZXMuICM0NzgzODINCiAgICAg ICAgICAgICBteWYud3JpdGUoDQogICAgICAgICAgICAgICAgICdcbicNCkBAIC0xMTU3LDExICsx MTg0LDE4IEBAIGNsYXNzIFN0YWdlQmFzZShUYXJnZXRCYXNlLCBDbGVhckJhc2UsIEdlbkJhc2Up Og0KICAgICAgICAgICAgIGxvZy53YXJuaW5nKCJZb3UndmUgYmVlbiBoYWNraW5nLiBDbGVhcmlu ZyB0YXJnZXQgcGF0Y2hlczogJXMiLCB0YXJnZXQpDQogICAgICAgICAgICAgY2xlYXJfcGF0aCh0 YXJnZXQpDQogDQotICAgICAgICAjIFJlbW92ZSBvdXIgb3ZlcmxheQ0KLSAgICAgICAgb3Zlcmxh eSA9IG5vcm1wYXRoKA0KLSAgICAgICAgICAgIHNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRoIl0g KyBzZWxmLnNldHRpbmdzWyJsb2NhbF9vdmVybGF5Il0pDQotICAgICAgICBpZiBvcy5wYXRoLmV4 aXN0cyhvdmVybGF5KToNCi0gICAgICAgICAgICBjbGVhcl9wYXRoKG92ZXJsYXkpDQorICAgICAg ICAjIFJlbW92ZSBvdXIgb3ZlcmxheXMNCisgICAgICAgIGlmICJwb3J0YWdlX292ZXJsYXkiIGlu IHNlbGYuc2V0dGluZ3M6DQorICAgICAgICAgICAgZm9yIHJlcG9fcGF0aCBpbiBzZWxmLnNldHRp bmdzWyJwb3J0YWdlX292ZXJsYXkiXToNCisgICAgICAgICAgICAgICAgcmVwb19uYW1lID0gZ2V0 X3JlcG9fbmFtZShyZXBvX3BhdGgpDQorDQorICAgICAgICAgICAgICAgIHJlcG9fY29uZiA9IHNl bGYuZ2V0X3JlcG9fY29uZl9wYXRoKHJlcG9fbmFtZSkNCisgICAgICAgICAgICAgICAgY2hyb290 X3JlcG9fY29uZiA9IHNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRoIl0gKyByZXBvX2NvbmYNCisg ICAgICAgICAgICAgICAgY2xlYXJfcGF0aChjaHJvb3RfcmVwb19jb25mKQ0KKw0KKyAgICAgICAg ICAgICAgICBsb2NhdGlvbiA9IHNlbGYuZ2V0X292ZXJsYXlfbG9jYXRpb24ocmVwb19uYW1lKQ0K KyAgICAgICAgICAgICAgICBjaHJvb3RfbG9jYXRpb24gPSBzZWxmLnNldHRpbmdzWydjaHJvb3Rf cGF0aCddICsgbG9jYXRpb24NCisgICAgICAgICAgICAgICAgY2xlYXJfcGF0aChjaHJvb3RfbG9j YXRpb24pDQogDQogICAgICAgICBpZiAic3RpY2t5LWNvbmZpZyIgbm90IGluIHNlbGYuc2V0dGlu Z3NbIm9wdGlvbnMiXToNCiAgICAgICAgICAgICAjIHJlLXdyaXRlIHRoZSBtYWtlLmNvbmYgdG8g YmUgc3VyZSBpdCBpcyBjbGVhbg0KZGlmZiAtLWdpdCBhL2NhdGFseXN0L2RlZmF1bHRzLnB5IGIv Y2F0YWx5c3QvZGVmYXVsdHMucHkNCmluZGV4IGMxNTNmY2M0Li45NjYwYTdmMyAxMDA2NDQNCi0t LSBhL2NhdGFseXN0L2RlZmF1bHRzLnB5DQorKysgYi9jYXRhbHlzdC9kZWZhdWx0cy5weQ0KQEAg LTM4LDYgKzM4LDcgQEAgY29uZmRlZmF1bHRzID0gew0KICAgICAibG9jYWxfb3ZlcmxheSI6ICIv dmFyL2RiL3JlcG9zL2xvY2FsIiwNCiAgICAgInBvcnRfY29uZiI6ICIvZXRjL3BvcnRhZ2UiLA0K ICAgICAibWFrZV9jb25mIjogIiUocG9ydF9jb25mKXMvbWFrZS5jb25mIiwNCisgICAgInJlcG9z X2NvbmYiOiAiJShwb3J0X2NvbmYpcy9yZXBvcy5jb25mIiwNCiAgICAgIm9wdGlvbnMiOiBzZXQo KSwNCiAgICAgInBrZ2RpciI6ICIvdmFyL2NhY2hlL2JpbnBrZ3MiLA0KICAgICAicG9ydF90bXBk aXIiOiAiL3Zhci90bXAvcG9ydGFnZSIsDQpkaWZmIC0tZ2l0IGEvY2F0YWx5c3Qvc3VwcG9ydC5w eSBiL2NhdGFseXN0L3N1cHBvcnQucHkNCmluZGV4IGE2YTY4NTRhLi5iODA2OWM3ZCAxMDA2NDQN Ci0tLSBhL2NhdGFseXN0L3N1cHBvcnQucHkNCisrKyBiL2NhdGFseXN0L3N1cHBvcnQucHkNCkBA IC03LDYgKzcsOCBAQCBpbXBvcnQgc2h1dGlsDQogaW1wb3J0IHRpbWUNCiBmcm9tIHN1YnByb2Nl c3MgaW1wb3J0IFBvcGVuDQogDQorZnJvbSBwb3J0YWdlLnJlcG9zaXRvcnkuY29uZmlnIGltcG9y dCBSZXBvQ29uZmlnDQorDQogZnJvbSBjYXRhbHlzdCBpbXBvcnQgbG9nDQogDQogQkFTSF9CSU5B UlkgPSAiL2Jpbi9iYXNoIg0KQEAgLTE3OSw2ICsxODEsMjIgQEAgZGVmIHJlYWRfbWFrZWNvbmYo bXltYWtlY29uZmZpbGUpOg0KICAgICAgICAgcmV0dXJuIG1ha2Vjb25mDQogDQogDQorZGVmIGdl dF9yZXBvX25hbWUocmVwb19wYXRoKToNCisgICAgIiIiIEdldCB0aGUgbmFtZSBvZiB0aGUgcmVw byBhdCB0aGUgZ2l2ZW4gcmVwb19wYXRoLg0KKw0KKyAgICAgICAgIFJlZmVyZW5jZXM6DQorICAg ICAgICAgaHR0cHM6Ly93aWtpLmdlbnRvby5vcmcvd2lraS9SZXBvc2l0b3J5X2Zvcm1hdC9wcm9m aWxlcy9yZXBvX25hbWUNCisgICAgICAgICBodHRwczovL3dpa2kuZ2VudG9vLm9yZy93aWtpL1Jl cG9zaXRvcnlfZm9ybWF0L21ldGFkYXRhL2xheW91dC5jb25mI3JlcG8tbmFtZQ0KKyAgICAiIiIN CisNCisgICAgcmVwb19jb25maWcgPSBSZXBvQ29uZmlnKE5vbmUsIHsibG9jYXRpb24iOiByZXBv X3BhdGh9KQ0KKw0KKyAgICBpZiByZXBvX2NvbmZpZy5taXNzaW5nX3JlcG9fbmFtZToNCisgICAg ICAgIHJhaXNlIENhdGFseXN0RXJyb3IoIk1pc3NpbmcgbmFtZSBpbiByZXBvc2l0b3J5IHt9Ii5m b3JtYXQocmVwb19wYXRoKSkNCisNCisgICAgcmV0dXJuIHJlcG9fY29uZmlnLm5hbWUNCisNCisN CiBkZWYgcGF0aGNvbXBhcmUocGF0aDEsIHBhdGgyKToNCiAgICAgIyBDaGFuZ2UgZG91YmxlIHNs YXNoZXMgdG8gc2xhc2gNCiAgICAgcGF0aDEgPSByZS5zdWIociIvLyIsIHIiLyIsIHBhdGgxKQ0K LS0gDQoyLjI4LjANCg0K