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 B0EDC138359 for ; Sat, 17 Oct 2020 19:00:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9F49E0391; Sat, 17 Oct 2020 19:00:44 +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 B58B1E0391 for ; Sat, 17 Oct 2020 19:00:44 +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; Sat, 17 Oct 2020 21:00:42 +0200 Received: from GMU418.rsint.net ([10.0.230.144]) by amu316.rsint.net (Totemo SMTP Server) with SMTP ID 690 for ; Sat, 17 Oct 2020 21:00:42 +0200 (CEST) Received: from GMU019.rsint.net (10.0.2.69) by GMU418.rsint.net (10.0.230.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Sat, 17 Oct 2020 21:00:42 +0200 Received: from GMU017.rsint.net (10.0.2.67) by GMU019.rsint.net (10.0.2.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2044.4; Sat, 17 Oct 2020 21:00:36 +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; Sat, 17 Oct 2020 21:00:36 +0200 From: Felix Bier To: "gentoo-catalyst@lists.gentoo.org" Subject: [gentoo-catalyst] [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: AQHWpLfMEt3yhfvgs0euXdqBfxgtbg== Date: Sat, 17 Oct 2020 19:00:36 +0000 Message-ID: <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: 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/6Kl9tMLYYbrFjlLsC7MzvKA= X-Archives-Salt: 89d1f9a4-b955-4759-8379-b59b5da0dda6 X-Archives-Hash: 78f2e1499052372d64d1cb848d66e066 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 dHMgaW1wb3J0IChjb25mZGVmYXVsdHMsIE1PVU5UX0RFRkFVTFRTLA0KUE9SVF9MT0dESVJfQ0xF QU4pDQogZnJvbSBjYXRhbHlzdC5zdXBwb3J0IGltcG9ydCAoQ2F0YWx5c3RFcnJvciwgZmlsZV9s b2NhdGUsIG5vcm1wYXRoLA0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNtZCwgcmVh ZF9tYWtlY29uZiwgaXNtb3VudCwgZmlsZV9jaGVjaykNCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjbWQsIHJlYWRfbWFrZWNvbmYsIGdldF9yZXBvX25hbWUsDQppc21vdW50LA0KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGVfY2hlY2spDQogZnJvbSBjYXRhbHlzdC5i YXNlLnRhcmdldGJhc2UgaW1wb3J0IFRhcmdldEJhc2UNCiBmcm9tIGNhdGFseXN0LmJhc2UuY2xl YXJiYXNlIGltcG9ydCBDbGVhckJhc2UNCiBmcm9tIGNhdGFseXN0LmJhc2UuZ2VuYmFzZSBpbXBv cnQgR2VuQmFzZQ0KQEAgLTgyMSwxNyArODIzLDQ4IEBAIGNsYXNzIFN0YWdlQmFzZShUYXJnZXRC YXNlLCBDbGVhckJhc2UsIEdlbkJhc2UpOg0KICAgICAgICAgICAgICAgICAgICAgZW52PXNlbGYu ZW52KQ0KICAgICAgICAgICAgICAgICBzZWxmLnJlc3VtZS5lbmFibGUoInNldHVwX2NvbmZkaXIi KQ0KIA0KKyAgICBkZWYgZ2V0X3JlcG9fY29uZl9wYXRoKHNlbGYsIHJlcG9fbmFtZSk6DQorICAg ICAgICAiIiIgQ29uc3RydWN0IHJlcG8gY29uZiBwYXRoOg0KL2V0Yy9wb3J0YWdlL3JlcG9zLmNv bmYve25hbWV9LmNvbmYgIiIiDQorICAgICAgICByZXR1cm4gbm9ybXBhdGgob3MucGF0aC5qb2lu KHNlbGYuc2V0dGluZ3NbJ3JlcG9zX2NvbmYnXSwNCnJlcG9fbmFtZSArICIuY29uZiIpKQ0KKw0K KyAgICBkZWYgZ2V0X292ZXJsYXlfbG9jYXRpb24oc2VsZiwgcmVwb19uYW1lKToNCisgICAgICAg ICIiIiBDb25zdHJ1Y3Qgb3ZlcmxheSByZXBvIHBhdGg6DQovdmFyL2dlbnRvby9yZXBvcy9sb2Nh bC97bmFtZX0gIiIiDQorICAgICAgICByZXR1cm4gbm9ybXBhdGgob3MucGF0aC5qb2luKHNlbGYu c2V0dGluZ3NbJ2xvY2FsX292ZXJsYXknXSwNCnJlcG9fbmFtZSkpDQorDQorICAgIGRlZiB3cml0 ZV9yZXBvX2NvbmYoc2VsZiwgcmVwb19uYW1lLCBjb25maWcpOg0KKyAgICAgICAgIiIiIFdyaXRl IENvbmZpZ1BhcnNlciB0bw0Ke2Nocm9vdH0vZXRjL3BvcnRhZ2UvcmVwby5jb25mL3tuYW1lfS5j b25mICIiIg0KKyAgICAgICAgcmVwb19jb25mID0gc2VsZi5nZXRfcmVwb19jb25mX3BhdGgocmVw b19uYW1lKQ0KKyAgICAgICAgY2hyb290X3JlcG9fY29uZiA9IHNlbGYuc2V0dGluZ3NbJ2Nocm9v dF9wYXRoJ10gKyByZXBvX2NvbmYNCisgICAgICAgIGxvZy5pbmZvKCdDcmVhdGluZyByZXBvIGNv bmZpZyAlcy4nLCBjaHJvb3RfcmVwb19jb25mKQ0KKyAgICAgICAgZW5zdXJlX2RpcnMob3MucGF0 aC5kaXJuYW1lKGNocm9vdF9yZXBvX2NvbmYpKQ0KKw0KKyAgICAgICAgdHJ5Og0KKyAgICAgICAg ICAgIHdpdGggb3BlbihjaHJvb3RfcmVwb19jb25mLCAndycpIGFzIG15ZjoNCisgICAgICAgICAg ICAgICAgY29uZmlnLndyaXRlKG15ZikNCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yIGFzIGU6DQor ICAgICAgICAgICAgcmFpc2UgQ2F0YWx5c3RFcnJvcignQ291bGQgbm90IHdyaXRlIHt9OiB7fScu Zm9ybWF0KA0KKyAgICAgICAgICAgICAgICBjaHJvb3RfcmVwb19jb25mLCBlKSkgZnJvbSBlDQor DQogICAgIGRlZiBwb3J0YWdlX292ZXJsYXkoc2VsZik6DQotICAgICAgICAiIiIgV2UgY29weSB0 aGUgY29udGVudHMgb2Ygb3VyIG92ZXJsYXlzIHRvIC91c3IvbG9jYWwvcG9ydGFnZQ0KIiIiDQor ICAgICAgICAiIiIgV2UgY29weSB0aGUgY29udGVudHMgb2Ygb3VyIG92ZXJsYXlzIHRvDQovdmFy L2dlbnRvby9yZXBvcy9sb2NhbC97bmFtZX0gIiIiDQogICAgICAgICBpZiAicG9ydGFnZV9vdmVy bGF5IiBpbiBzZWxmLnNldHRpbmdzOg0KICAgICAgICAgICAgIGZvciB4IGluIHNlbGYuc2V0dGlu Z3NbInBvcnRhZ2Vfb3ZlcmxheSJdOg0KICAgICAgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0 cyh4KToNCi0gICAgICAgICAgICAgICAgICAgIGxvZy5pbmZvKCdDb3B5aW5nIG92ZXJsYXkgZGly ICVzJywgeCkNCi0gICAgICAgICAgICAgICAgICAgIGVuc3VyZV9kaXJzKA0KLSAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuc2V0dGluZ3NbJ2Nocm9vdF9wYXRoJ10gKw0Kc2VsZi5zZXR0aW5n c1snbG9jYWxfb3ZlcmxheSddKQ0KLSAgICAgICAgICAgICAgICAgICAgY21kKCJjcCAtYSAiICsg eCArICIvKiAiICsNCnNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRoIl0gKw0KLSAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuc2V0dGluZ3NbImxvY2FsX292ZXJsYXkiXSwNCi0gICAgICAgICAg ICAgICAgICAgICAgICBlbnY9c2VsZi5lbnYpDQorICAgICAgICAgICAgICAgICAgICBuYW1lID0g Z2V0X3JlcG9fbmFtZSh4KQ0KKw0KKyAgICAgICAgICAgICAgICAgICAgbG9jYXRpb24gPSBzZWxm LmdldF9vdmVybGF5X2xvY2F0aW9uKG5hbWUpDQorICAgICAgICAgICAgICAgICAgICBjb25maWcg PSBjb25maWdwYXJzZXIuQ29uZmlnUGFyc2VyKCkNCisgICAgICAgICAgICAgICAgICAgIGNvbmZp Z1tuYW1lXSA9IHsnbG9jYXRpb24nOiBsb2NhdGlvbn0NCisgICAgICAgICAgICAgICAgICAgIHNl bGYud3JpdGVfcmVwb19jb25mKG5hbWUsIGNvbmZpZykNCisNCisgICAgICAgICAgICAgICAgICAg IGNocm9vdF9sb2NhdGlvbiA9IG5vcm1wYXRoKA0KKyAgICAgICAgICAgICAgICAgICAgICAgIHNl bGYuc2V0dGluZ3NbJ2Nocm9vdF9wYXRoJ10gKyBsb2NhdGlvbikNCisgICAgICAgICAgICAgICAg ICAgIGxvZy5pbmZvKCdDb3B5aW5nIG92ZXJsYXkgZGlyICVzIHRvICVzJywNCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHgsIGNocm9vdF9sb2NhdGlvbikNCisgICAgICAgICAgICAgICAg ICAgIGVuc3VyZV9kaXJzKGNocm9vdF9sb2NhdGlvbikNCisgICAgICAgICAgICAgICAgICAgIGNt ZCgnY3AgLWEgJyArIHggKyAnLyogJyArIGNocm9vdF9sb2NhdGlvbiwNCmVudj1zZWxmLmVudikN CisgICAgICAgICAgICAgICAgZWxzZToNCisgICAgICAgICAgICAgICAgICAgIGxvZy53YXJuaW5n KCdTa2lwcGluZyBtaXNzaW5nIG92ZXJsYXkgJXMuJywgeCkNCiANCiAgICAgZGVmIHJvb3Rfb3Zl cmxheShzZWxmKToNCiAgICAgICAgICIiIiBDb3B5IG92ZXIgdGhlIHJvb3Rfb3ZlcmxheSAiIiIN CkBAIC0xMDgwLDEyICsxMTEzLDYgQEAgY2xhc3MgU3RhZ2VCYXNlKFRhcmdldEJhc2UsIENsZWFy QmFzZSwgR2VuQmFzZSk6DQogICAgICAgICAgICAgICAgICAgICB2YXJuYW1lID0geC5zcGxpdCgn XycpWzFdLnVwcGVyKCkNCiAgICAgICAgICAgICAgICAgICAgIG15Zi53cml0ZShmJ3t2YXJuYW1l fT0ie3NlbGYuc2V0dGluZ3NbeF19IlxuJykNCiANCi0gICAgICAgICAgICBpZiBzZXR1cDoNCi0g ICAgICAgICAgICAgICAgIyBTZXR1cCB0aGUgcG9ydGFnZSBvdmVybGF5DQotICAgICAgICAgICAg ICAgIGlmICJwb3J0YWdlX292ZXJsYXkiIGluIHNlbGYuc2V0dGluZ3M6DQotICAgICAgICAgICAg ICAgICAgICBteWYud3JpdGUoJ1BPUlRESVJfT1ZFUkxBWT0iJXMiXG4nICUNCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLnNldHRpbmdzWyJsb2NhbF9vdmVybGF5Il0pDQotDQog ICAgICAgICAgICAgIyBTZXQgZGVmYXVsdCBsb2NhbGUgZm9yIHN5c3RlbSByZXNwb25zZXMuICM0 NzgzODINCiAgICAgICAgICAgICBteWYud3JpdGUoDQogICAgICAgICAgICAgICAgICdcbicNCkBA IC0xMTU3LDExICsxMTg0LDE4IEBAIGNsYXNzIFN0YWdlQmFzZShUYXJnZXRCYXNlLCBDbGVhckJh c2UsDQpHZW5CYXNlKToNCiAgICAgICAgICAgICBsb2cud2FybmluZygiWW91J3ZlIGJlZW4gaGFj a2luZy4gQ2xlYXJpbmcgdGFyZ2V0IHBhdGNoZXM6DQolcyIsIHRhcmdldCkNCiAgICAgICAgICAg ICBjbGVhcl9wYXRoKHRhcmdldCkNCiANCi0gICAgICAgICMgUmVtb3ZlIG91ciBvdmVybGF5DQot ICAgICAgICBvdmVybGF5ID0gbm9ybXBhdGgoDQotICAgICAgICAgICAgc2VsZi5zZXR0aW5nc1si Y2hyb290X3BhdGgiXSArDQpzZWxmLnNldHRpbmdzWyJsb2NhbF9vdmVybGF5Il0pDQotICAgICAg ICBpZiBvcy5wYXRoLmV4aXN0cyhvdmVybGF5KToNCi0gICAgICAgICAgICBjbGVhcl9wYXRoKG92 ZXJsYXkpDQorICAgICAgICAjIFJlbW92ZSBvdXIgb3ZlcmxheXMNCisgICAgICAgIGlmICJwb3J0 YWdlX292ZXJsYXkiIGluIHNlbGYuc2V0dGluZ3M6DQorICAgICAgICAgICAgZm9yIHJlcG9fcGF0 aCBpbiBzZWxmLnNldHRpbmdzWyJwb3J0YWdlX292ZXJsYXkiXToNCisgICAgICAgICAgICAgICAg cmVwb19uYW1lID0gZ2V0X3JlcG9fbmFtZShyZXBvX3BhdGgpDQorDQorICAgICAgICAgICAgICAg IHJlcG9fY29uZiA9IHNlbGYuZ2V0X3JlcG9fY29uZl9wYXRoKHJlcG9fbmFtZSkNCisgICAgICAg ICAgICAgICAgY2hyb290X3JlcG9fY29uZiA9IHNlbGYuc2V0dGluZ3NbImNocm9vdF9wYXRoIl0g Kw0KcmVwb19jb25mDQorICAgICAgICAgICAgICAgIGNsZWFyX3BhdGgoY2hyb290X3JlcG9fY29u ZikNCisNCisgICAgICAgICAgICAgICAgbG9jYXRpb24gPSBzZWxmLmdldF9vdmVybGF5X2xvY2F0 aW9uKHJlcG9fbmFtZSkNCisgICAgICAgICAgICAgICAgY2hyb290X2xvY2F0aW9uID0gc2VsZi5z ZXR0aW5nc1snY2hyb290X3BhdGgnXSArDQpsb2NhdGlvbg0KKyAgICAgICAgICAgICAgICBjbGVh cl9wYXRoKGNocm9vdF9sb2NhdGlvbikNCiANCiAgICAgICAgIGlmICJzdGlja3ktY29uZmlnIiBu b3QgaW4gc2VsZi5zZXR0aW5nc1sib3B0aW9ucyJdOg0KICAgICAgICAgICAgICMgcmUtd3JpdGUg dGhlIG1ha2UuY29uZiB0byBiZSBzdXJlIGl0IGlzIGNsZWFuDQpkaWZmIC0tZ2l0IGEvY2F0YWx5 c3QvZGVmYXVsdHMucHkgYi9jYXRhbHlzdC9kZWZhdWx0cy5weQ0KaW5kZXggYzE1M2ZjYzQuLjk2 NjBhN2YzIDEwMDY0NA0KLS0tIGEvY2F0YWx5c3QvZGVmYXVsdHMucHkNCisrKyBiL2NhdGFseXN0 L2RlZmF1bHRzLnB5DQpAQCAtMzgsNiArMzgsNyBAQCBjb25mZGVmYXVsdHMgPSB7DQogICAgICJs b2NhbF9vdmVybGF5IjogIi92YXIvZGIvcmVwb3MvbG9jYWwiLA0KICAgICAicG9ydF9jb25mIjog Ii9ldGMvcG9ydGFnZSIsDQogICAgICJtYWtlX2NvbmYiOiAiJShwb3J0X2NvbmYpcy9tYWtlLmNv bmYiLA0KKyAgICAicmVwb3NfY29uZiI6ICIlKHBvcnRfY29uZilzL3JlcG9zLmNvbmYiLA0KICAg ICAib3B0aW9ucyI6IHNldCgpLA0KICAgICAicGtnZGlyIjogIi92YXIvY2FjaGUvYmlucGtncyIs DQogICAgICJwb3J0X3RtcGRpciI6ICIvdmFyL3RtcC9wb3J0YWdlIiwNCmRpZmYgLS1naXQgYS9j YXRhbHlzdC9zdXBwb3J0LnB5IGIvY2F0YWx5c3Qvc3VwcG9ydC5weQ0KaW5kZXggYTZhNjg1NGEu LmI4MDY5YzdkIDEwMDY0NA0KLS0tIGEvY2F0YWx5c3Qvc3VwcG9ydC5weQ0KKysrIGIvY2F0YWx5 c3Qvc3VwcG9ydC5weQ0KQEAgLTcsNiArNyw4IEBAIGltcG9ydCBzaHV0aWwNCiBpbXBvcnQgdGlt ZQ0KIGZyb20gc3VicHJvY2VzcyBpbXBvcnQgUG9wZW4NCiANCitmcm9tIHBvcnRhZ2UucmVwb3Np dG9yeS5jb25maWcgaW1wb3J0IFJlcG9Db25maWcNCisNCiBmcm9tIGNhdGFseXN0IGltcG9ydCBs b2cNCiANCiBCQVNIX0JJTkFSWSA9ICIvYmluL2Jhc2giDQpAQCAtMTc5LDYgKzE4MSwyMiBAQCBk ZWYgcmVhZF9tYWtlY29uZihteW1ha2Vjb25mZmlsZSk6DQogICAgICAgICByZXR1cm4gbWFrZWNv bmYNCiANCiANCitkZWYgZ2V0X3JlcG9fbmFtZShyZXBvX3BhdGgpOg0KKyAgICAiIiIgR2V0IHRo ZSBuYW1lIG9mIHRoZSByZXBvIGF0IHRoZSBnaXZlbiByZXBvX3BhdGguDQorDQorICAgICAgICAg UmVmZXJlbmNlczoNCisgICAgICAgIA0KaHR0cHM6Ly93aWtpLmdlbnRvby5vcmcvd2lraS9SZXBv c2l0b3J5X2Zvcm1hdC9wcm9maWxlcy9yZXBvX25hbWUNCisgICAgICAgIA0KaHR0cHM6Ly93aWtp LmdlbnRvby5vcmcvd2lraS9SZXBvc2l0b3J5X2Zvcm1hdC9tZXRhZGF0YS9sYXlvdXQuY29uZiNy ZXBvLW5hbWUNCisgICAgIiIiDQorDQorICAgIHJlcG9fY29uZmlnID0gUmVwb0NvbmZpZyhOb25l LCB7ImxvY2F0aW9uIjogcmVwb19wYXRofSkNCisNCisgICAgaWYgcmVwb19jb25maWcubWlzc2lu Z19yZXBvX25hbWU6DQorICAgICAgICByYWlzZSBDYXRhbHlzdEVycm9yKCJNaXNzaW5nIG5hbWUg aW4gcmVwb3NpdG9yeQ0Ke30iLmZvcm1hdChyZXBvX3BhdGgpKQ0KKw0KKyAgICByZXR1cm4gcmVw b19jb25maWcubmFtZQ0KKw0KKw0KIGRlZiBwYXRoY29tcGFyZShwYXRoMSwgcGF0aDIpOg0KICAg ICAjIENoYW5nZSBkb3VibGUgc2xhc2hlcyB0byBzbGFzaA0KICAgICBwYXRoMSA9IHJlLnN1Yihy Ii8vIiwgciIvIiwgcGF0aDEpDQotLSANCjIuMjguMA0KDQo=