From unknown Wed Jun 18 23:05:20 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#45558 <45558@debbugs.gnu.org> To: bug#45558 <45558@debbugs.gnu.org> Subject: Status: [PATCH] Add js_of_ocaml Reply-To: bug#45558 <45558@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:05:20 +0000 retitle 45558 [PATCH] Add js_of_ocaml reassign 45558 guix-patches submitter 45558 divoplade severity 45558 normal tag 45558 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 30 14:23:33 2020 Received: (at submit) by debbugs.gnu.org; 30 Dec 2020 19:23:33 +0000 Received: from localhost ([127.0.0.1]:51092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kuh4F-00042o-Ba for submit@debbugs.gnu.org; Wed, 30 Dec 2020 14:23:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:37460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kuh4C-00042f-8t for submit@debbugs.gnu.org; Wed, 30 Dec 2020 14:23:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kuh4C-0003H3-2l for guix-patches@gnu.org; Wed, 30 Dec 2020 14:23:28 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:50887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kuh44-000273-Nr for guix-patches@gnu.org; Wed, 30 Dec 2020 14:23:27 -0500 X-Originating-IP: 86.239.3.142 Received: from pruneau.home (lfbn-poi-1-564-142.w86-239.abo.wanadoo.fr [86.239.3.142]) (Authenticated sender: d@divoplade.fr) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id D7DC1C0002 for ; Wed, 30 Dec 2020 19:23:11 +0000 (UTC) Message-ID: <559a908f91e39af40a1580447a708209785c69b8.camel@divoplade.fr> Subject: [PATCH] Add js_of_ocaml From: divoplade To: guix-patches@gnu.org Date: Wed, 30 Dec 2020 20:22:57 +0100 Content-Type: multipart/mixed; boundary="=-od9dn6KMyr7Ep2IyOD+p" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.198; envelope-from=d@divoplade.fr; helo=relay6-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) --=-od9dn6KMyr7Ep2IyOD+p Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Dear guix, I finally got js_of_ocaml packaged. I'm not sure I did everything correctly (especially indentation, but also how to make non-4.07 packages, and whether the package should have multiple outputs corresponding to the opam packages), so do not hesitate to sendfeedback. Best regards, divoplade --=-od9dn6KMyr7Ep2IyOD+p Content-Disposition: attachment; filename="0001-gnu-Add-ocaml-compiler-libs.patch" Content-Type: text/x-patch; name="0001-gnu-Add-ocaml-compiler-libs.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAwYTc1M2ViMmQ5NmIyZGViNzA1OWJjZTBiZTY4NDZmNjYyM2E4NWU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBkaXZvcGxhZGUgPGRAZGl2b3BsYWRlLmZyPgpEYXRlOiBXZWQs IDMwIERlYyAyMDIwIDE4OjQ1OjI4ICswMTAwClN1YmplY3Q6IFtQQVRDSCAxLzVdIGdudTogQWRk IG9jYW1sLWNvbXBpbGVyLWxpYnMKCiogZ251L3BhY2thZ2VzL29jYW1sLnNjbSAob2NhbWwtY29t cGlsZXItbGlicyk6IE5ldyB2YXJpYWJsZS4KKG9jYW1sNC4wNy1jb21waWxlci1saWJzKTogSW5o ZXJpdCBmcm9tIG9jYW1sLWNvbXBpbGVyLWxpYnMuCi0tLQogZ251L3BhY2thZ2VzL29jYW1sLnNj bSB8IDQ1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2dudS9wYWNrYWdlcy9vY2FtbC5zY20gYi9nbnUvcGFja2FnZXMvb2NhbWwuc2NtCmluZGV4IDJk ZjE2ZTdjZDIuLjRiMWVkMDlhNzkgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9vY2FtbC5zY20K KysrIGIvZ251L3BhY2thZ2VzL29jYW1sLnNjbQpAQCAtMzY4Myw3ICszNjgzLDcgQEAgc3ludGF4 IGNoZWNraW5nIG9uIGRlZHVrdGkgZmlsZXMuIikKICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKICAgICAgICAoIm9jYW1sLW1pZ3JhdGUt cGFyc2V0cmVlIgogICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0 ZS1wYXJzZXRyZWUpKQotICAgICAgICgib2NhbWwtY29tcGlsZXItbGlicyIgLG9jYW1sNC4wNy1j b21waWxlci1saWJzKQorICAgICAgICgib2NhbWwtY29tcGlsZXItbGlicyIgLChwYWNrYWdlLXdp dGgtb2NhbWw0LjA3IG9jYW1sLWNvbXBpbGVyLWxpYnMpKQogICAgICAgICgib2NhbWwtc2V4cGxp YjAiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1zZXhwbGliMCkpCiAgICAgICAgKCJv Y2FtbC1zdGRpbyIgLG9jYW1sNC4wNy1zdGRpbykKICAgICAgICAoIm9jYW1sLXBweGxpYiIgLG9j YW1sNC4wNy1wcHhsaWIpKSkKQEAgLTQyODUsMTAgKzQyODUsMTAgQEAgcHJvdmlkZWQgYnkgY29t cGFuaW9uIGxpYnJhcmllcyBzdWNoIGFzCiAgICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUp KQogICAgICAocHJvcGVydGllcyAnKCkpKSkpCiAKLShkZWZpbmUtcHVibGljIG9jYW1sNC4wNy1j b21waWxlci1saWJzCisoZGVmaW5lLXB1YmxpYyBvY2FtbC1jb21waWxlci1saWJzCiAgIChwYWNr YWdlCi0gICAgKG5hbWUgIm9jYW1sNC4wNy1jb21waWxlci1saWJzIikKLSAgICAodmVyc2lvbiAi MC4xMS4wIikKKyAgICAobmFtZSAib2NhbWwtY29tcGlsZXItbGlicyIpCisgICAgKHZlcnNpb24g IjAuMTIuMyIpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2phbmVzdHJlZXQv b2NhbWwtY29tcGlsZXItbGlicyIpCiAgICAgKHNvdXJjZQogICAgICAob3JpZ2luCkBAIC00Mjk5 LDIwICs0Mjk5LDQxIEBAIHByb3ZpZGVkIGJ5IGNvbXBhbmlvbiBsaWJyYXJpZXMgc3VjaCBhcwog ICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKICAgICAgICAo c2hhMjU2CiAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICIwM2pkczdic3poOHd3cGZ3eGIzZGcw Z3lyMWoxODcyd3h3eDF4cWhyeTVpcjBpODRiZzBzIikpKSkKKyAgICAgICAgICIwMG5yYXI3aDJw eWZsYmRpcTZ3d3dyYjRrNWpoOWlmZjBqbGxpaHptNm1zOGQ1cHNwc2c1IikpKSkKICAgICAoYnVp bGQtc3lzdGVtIGR1bmUtYnVpbGQtc3lzdGVtKQotICAgIChhcmd1bWVudHMKLSAgICAgYCgjOnRl c3RzPyAjZiA7bm8gdGVzdHMKLSAgICAgICAjOm9jYW1sICxvY2FtbC00LjA3Ci0gICAgICAgIzpm aW5kbGliICxvY2FtbDQuMDctZmluZGxpYgotICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUp KQotICAgIChwcm9wZXJ0aWVzIGAoKHVwc3RyZWFtLW5hbWUgLiAib2NhbWwtY29tcGlsZXItbGli cyIpKSkKKyAgICAoYXJndW1lbnRzIGAoIzp0ZXN0cz8gI2YpKQorICAgIChwcm9wZXJ0aWVzIGAo KHVwc3RyZWFtLW5hbWUgLiAib2NhbWwtY29tcGlsZXItbGlicyIpCisJCSAgKG9jYW1sNC4wNy12 YXJpYW50IC4gLChkZWxheSBvY2FtbDQuMDctY29tcGlsZXItbGlicykpKSkKICAgICAoc3lub3Bz aXMgIkNvbXBpbGVyIGxpYnJhcmllcyByZXBhY2thZ2VkIikKICAgICAoZGVzY3JpcHRpb24gIlRo aXMgcGFja2FnZSBzaW1wbHkgcmVwYWNrYWdlcyB0aGUgT0NhbWwgY29tcGlsZXIgbGlicmFyaWVz CiBzbyB0aGV5IGRvbid0IGV4cG9zZSBldmVyeXRoaW5nIGF0IHRvcGxldmVsLiAgRm9yIGluc3Rh bmNlLCBAY29kZXtBc3RfaGVscGVyfQogaXMgbm93IEBjb2Rle09jYW1sX2NvbW1vbi5Bc3RfaGVs cGVyfS4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6ZXhwYXQpKSkKIAorKGRlZmluZS1wdWJsaWMg b2NhbWw0LjA3LWNvbXBpbGVyLWxpYnMKKyAgKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcKKyAgIChw YWNrYWdlCisgICAgIChpbmhlcml0IG9jYW1sLWNvbXBpbGVyLWxpYnMpCisgICAgIChuYW1lICJv Y2FtbDQuMDctY29tcGlsZXItbGlicyIpCisgICAgICh2ZXJzaW9uICIwLjExLjAiKQorICAgICAo c291cmNlCisgICAgICAob3JpZ2luCisgICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQorICAgICAg ICAodXJpIChnaXQtcmVmZXJlbmNlCisgICAgICAgICAgICAgICh1cmwgKHN0cmluZy1hcHBlbmQg KHBhY2thZ2UtaG9tZS1wYWdlIG9jYW1sLWNvbXBpbGVyLWxpYnMpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIi5naXQiKSkKKyAgICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5n LWFwcGVuZCAidiIgdmVyc2lvbikpKSkKKyAgICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFt ZSBuYW1lIHZlcnNpb24pKQorICAgICAgICAoc2hhMjU2CisgICAgICAgICAoYmFzZTMyCisgICAg ICAgICAgIjAzamRzN2Jzemg4d3dwZnd4YjNkZzBneXIxajE4NzJ3eHd4MXhxaHJ5NWlyMGk4NGJn MHMiKSkpKQorICAgICAoYXJndW1lbnRzCisgICAgICBgKCM6dGVzdHM/ICNmIDtubyB0ZXN0cwor ICAgICAgICAjOm9jYW1sICxvY2FtbC00LjA3CisgICAgICAgICM6ZmluZGxpYiAsb2NhbWw0LjA3 LWZpbmRsaWIKKyAgICAgICAgIzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCisgICAgIChwcm9wZXJ0 aWVzICcoKSkpKSkKKwogKGRlZmluZS1wdWJsaWMgb2NhbWw0LjA3LXN0ZGlvCiAgIChwYWNrYWdl CiAgICAgKG5hbWUgIm9jYW1sNC4wNy1zdGRpbyIpCkBAIC00Mzg5LDcgKzQ0MTAsNyBAQCBhcyBw YXJ0IG9mIHRoZSBzYW1lIG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIGRyaXZlci4iKQogICAgIChi dWlsZC1zeXN0ZW0gZHVuZS1idWlsZC1zeXN0ZW0pCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzCiAg ICAgIGAoKCJvY2FtbC1iYXNlIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtYmFzZSkp Ci0gICAgICAgKCJvY2FtbC1jb21waWxlci1saWJzIiAsb2NhbWw0LjA3LWNvbXBpbGVyLWxpYnMp CisgICAgICAgKCJvY2FtbC1jb21waWxlci1saWJzIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcg b2NhbWwtY29tcGlsZXItbGlicykpCiAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIK ICAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVl KSkKICAgICAgICAoIm9jYW1sLXBweC1kZXJpdmVycyIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3 IG9jYW1sLXBweC1kZXJpdmVycykpCi0tIAoyLjI5LjIKCg== --=-od9dn6KMyr7Ep2IyOD+p Content-Disposition: attachment; filename="0002-gnu-Add-ocaml-stdio.patch" Content-Type: text/x-patch; name="0002-gnu-Add-ocaml-stdio.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAwNDJlY2IwNmQ5MTVhY2Q3ZTk3MzczMTIyNzcyYmY5NDU4ZWQ4MmYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBkaXZvcGxhZGUgPGRAZGl2b3BsYWRlLmZyPgpEYXRlOiBXZWQs IDMwIERlYyAyMDIwIDE4OjU2OjA5ICswMTAwClN1YmplY3Q6IFtQQVRDSCAyLzVdIGdudTogQWRk IG9jYW1sLXN0ZGlvCgoqIGdudS9wYWNrYWdlcy9vY2FtbC5zY20gKG9jYW1sLXN0ZGlvKTogTmV3 IHZhcmlhYmxlLgoob2NhbWw0LjA3LXN0ZGlvKTogSW5oZXJpdCBmcm9tIG9jYW1sLXN0ZGlvLgot LS0KIGdudS9wYWNrYWdlcy9vY2FtbC5zY20gfCAxNTUgKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4MSBpbnNlcnRpb25zKCspLCA3NCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtIGIvZ251L3Bh Y2thZ2VzL29jYW1sLnNjbQppbmRleCA0YjFlZDA5YTc5Li45ZTE5NzcyOTk3IDEwMDY0NAotLS0g YS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9vY2FtbC5zY20KQEAg LTE2MzYsNyArMTYzNiw3IEBAIGxpYnJhcnkuIikKICAgICAgICAjOmR1bmUgLG9jYW1sNC4wNy1k dW5lKSkKICAgICAobmF0aXZlLWlucHV0cwogICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdl LXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQotICAgICAgICgib2NhbWwtc3RkaW8iICxvY2Ft bDQuMDctc3RkaW8pCisgICAgICAgKCJvY2FtbC1zdGRpbyIgLChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3IG9jYW1sLXN0ZGlvKSkKICAgICAgICAoInBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCiAg ICAgKGlucHV0cwogICAgICBgKCgic3FsaXRlIiAsc3FsaXRlKSkpCkBAIC0zNjg1LDcgKzM2ODUs NyBAQCBzeW50YXggY2hlY2tpbmcgb24gZGVkdWt0aSBmaWxlcy4iKQogICAgICAgICAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQogICAgICAgICgib2Nh bWwtY29tcGlsZXItbGlicyIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWNvbXBpbGVy LWxpYnMpKQogICAgICAgICgib2NhbWwtc2V4cGxpYjAiICwocGFja2FnZS13aXRoLW9jYW1sNC4w NyBvY2FtbC1zZXhwbGliMCkpCi0gICAgICAgKCJvY2FtbC1zdGRpbyIgLG9jYW1sNC4wNy1zdGRp bykKKyAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwt c3RkaW8pKQogICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQogICAg IChwcm9wZXJ0aWVzIGAoKHVwc3RyZWFtLW5hbWUgLiAicHB4X2lubGluZV90ZXN0IikpKQogICAg IChzeW5vcHNpcyAiU3ludGF4IGV4dGVuc2lvbiBmb3Igd3JpdGluZyBpbi1saW5lIHRlc3RzIGlu IG9jYW1sIGNvZGUiKQpAQCAtNDAyOCw3ICs0MDI4LDcgQEAgQXRvbS4iKQogICAgICBgKCgiZ3Ns IiAsZ3NsKSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzCiAgICAgIGAoKCJvY2FtbC1iYXNlIiAs KHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtYmFzZSkpCi0gICAgICAgKCJvY2FtbC1zdGRp byIgLG9jYW1sNC4wNy1zdGRpbykpKQorICAgICAgICgib2NhbWwtc3RkaW8iICwocGFja2FnZS13 aXRoLW9jYW1sNC4wNyBvY2FtbC1zdGRpbykpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL21t b3R0bC5naXRodWIuaW8vZ3NsLW9jYW1sIikKICAgICAoc3lub3BzaXMgIkJpbmRpbmdzIHRvIHRo ZSBHTlUgU2NpZW50aWZpYyBMaWJyYXJ5IikKICAgICAoZGVzY3JpcHRpb24KQEAgLTQzMzQsMzcg KzQzMzQsNDQgQEAgaXMgbm93IEBjb2Rle09jYW1sX2NvbW1vbi5Bc3RfaGVscGVyfS4iKQogICAg ICAgICAjOmR1bmUgLG9jYW1sNC4wNy1kdW5lKSkKICAgICAgKHByb3BlcnRpZXMgJygpKSkpKQog Ci0oZGVmaW5lLXB1YmxpYyBvY2FtbDQuMDctc3RkaW8KKyhkZWZpbmUtcHVibGljIG9jYW1sLXN0 ZGlvCiAgIChwYWNrYWdlCi0gICAgKG5hbWUgIm9jYW1sNC4wNy1zdGRpbyIpCi0gICAgKHZlcnNp b24gIjAuMTEuMCIpCisgICAgKG5hbWUgIm9jYW1sLXN0ZGlvIikKKyAgICAodmVyc2lvbiAiMC4x NC4wIikKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0cmVldC9zdGRp byIpCiAgICAgKHNvdXJjZQotICAgICAob3JpZ2luCi0gICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gp Ci0gICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQotICAgICAgICAgICAgICh1cmwgKHN0cmluZy1h cHBlbmQgaG9tZS1wYWdlICIuZ2l0IikpCi0gICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5nLWFw cGVuZCAidiIgdmVyc2lvbikpKSkKLSAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5h bWUgdmVyc2lvbikpCi0gICAgICAgKHNoYTI1NgotICAgICAgICAoYmFzZTMyCi0gICAgICAgICAi MWZhY2FqcWh2cTM0ZzJ3cmczNjh5MGFqeGQ2bHJqNWIzbHl6eWowamhkbXJheGFqamN3biIpKSkp CisgICAgIChqYW5lc3RyZWV0LW9yaWdpbiAic3RkaW8iIHZlcnNpb24KKyAgICAgICAgICAgICAg ICAgICAgICAgICIxaGo1aHJhcHJxeTJpOTBhNjkwbDExeWpzenZiOTlqODE4cTNkNjg0cnl4NnAy bGRkazBsIikpCiAgICAgKGJ1aWxkLXN5c3RlbSBkdW5lLWJ1aWxkLXN5c3RlbSkKICAgICAocHJv cGFnYXRlZC1pbnB1dHMKLSAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1s NC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAoIm9jYW1sLXNleHBsaWIwIiAsKHBhY2thZ2Utd2l0 aC1vY2FtbDQuMDcgb2NhbWwtc2V4cGxpYjApKSkpCi0gICAgKGFyZ3VtZW50cwotICAgICBgKCM6 dGVzdHM/ICNmIDtubyB0ZXN0cwotICAgICAgICM6b2NhbWwgLG9jYW1sLTQuMDcKLSAgICAgICAj OmZpbmRsaWIgLG9jYW1sNC4wNy1maW5kbGliCi0gICAgICAgIzpkdW5lICxvY2FtbDQuMDctZHVu ZSkpCi0gICAgKHN5bm9wc2lzICJTdGFuZGFyZCBJTyBsaWJyYXJ5IGZvciBPQ2FtbCIpCisgICAg IGAoKCJvY2FtbC1iYXNlIiAsb2NhbWwtYmFzZSkKKyAgICAgICAoIm9jYW1sLXNleHBsaWIwIiAs b2NhbWwtc2V4cGxpYjApKSkKKyAgICAoYXJndW1lbnRzIGAoIzp0ZXN0cz8gI2YpKQorICAgIChw cm9wZXJ0aWVzIGAoKG9jYW1sNC4wNy12YXJpYW50IC4gLChkZWxheSBvY2FtbDQuMDctc3RkaW8p KSkpCisgICAgKHN5bm9wc2lzCisgICAgICJTdGFuZGFyZCBJTyBsaWJyYXJ5IGZvciBPQ2FtbCIp CiAgICAgKGRlc2NyaXB0aW9uCiAgICAgICJTdGRpbyBpbXBsZW1lbnRzIHNpbXBsZSBpbnB1dC9v dXRwdXQgZnVuY3Rpb25hbGl0aWVzIGZvciBPQ2FtbC4gIEl0CiByZS1leHBvcnRzIHRoZSBpbnB1 dC9vdXRwdXQgZnVuY3Rpb25zIG9mIHRoZSBPQ2FtbCBzdGFuZGFyZCBsaWJyYXJpZXMgdXNpbmcK IGEgbW9yZSBjb25zaXN0ZW50IEFQSS4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6ZXhwYXQpKSkK IAorKGRlZmluZS1wdWJsaWMgb2NhbWw0LjA3LXN0ZGlvCisgIChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3CisgICAocGFja2FnZQorICAgICAoaW5oZXJpdCBvY2FtbC1zdGRpbykKKyAgICAgKG5hbWUg Im9jYW1sNC4wNy1zdGRpbyIpCisgICAgICh2ZXJzaW9uICIwLjExLjAiKQorICAgICAoc291cmNl CisgICAgICAoamFuZXN0cmVldC1vcmlnaW4gInN0ZGlvIiB2ZXJzaW9uCisgICAgICAgICAgICAg ICAgICAgICAgICAgIjFmYWNhanFodnEzNGcyd3JnMzY4eTBhanhkNmxyajViM2x5enlqMGpoZG1y YXhhampjd24iKSkKKyAgICAgKGFyZ3VtZW50cworICAgICAgYCgjOnRlc3RzPyAjZiA7bm8gdGVz dHMKKyAgICAgICAgIzpvY2FtbCAsb2NhbWwtNC4wNworICAgICAgICAjOmZpbmRsaWIgLG9jYW1s NC4wNy1maW5kbGliCisgICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUpKQorICAgICAocHJv cGVydGllcyAnKCkpKSkpCisKIChkZWZpbmUtcHVibGljIG9jYW1sLXBweC1kZXJpdmVycwogICAo cGFja2FnZQogICAgIChuYW1lICJvY2FtbC1wcHgtZGVyaXZlcnMiKQpAQCAtNDQxNCw3ICs0NDIx LDcgQEAgYXMgcGFydCBvZiB0aGUgc2FtZSBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSBkcml2ZXIu IikKICAgICAgICAoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgogICAgICAgICAsKHBhY2thZ2Ut d2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQogICAgICAgICgib2NhbWwt cHB4LWRlcml2ZXJzIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcHB4LWRlcml2ZXJz KSkKLSAgICAgICAoIm9jYW1sLXN0ZGlvIiAsb2NhbWw0LjA3LXN0ZGlvKQorICAgICAgICgib2Nh bWwtc3RkaW8iICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1zdGRpbykpCiAgICAgICAg KCJvY2FtbC1yZXN1bHQiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1yZXN1bHQpKQog ICAgICAgICgib2NhbWwtc2V4cGxpYjAiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1z ZXhwbGliMCkpKSkKICAgICAoYXJndW1lbnRzCkBAIC01MDQxLDkgKzUwNDgsOSBAQCBlbHNlIGV4 cHJlc3Npb24uIikKICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5kbGliCiAgICAgICAg IzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzCi0gICAgICBg KCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQotICAg ICAgICAoIm9jYW1sLXN0ZGlvIiAsb2NhbWw0LjA3LXN0ZGlvKQotICAgICAgICAoIm9jYW1sLXBw eGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2Fn ZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBh Y2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc3RkaW8pKQorICAgICAgICgib2NhbWwtcHB4bGli IiAsb2NhbWw0LjA3LXBweGxpYikpKQogICAgIChwcm9wZXJ0aWVzIGAoKHVwc3RyZWFtLW5hbWUg LiAicHB4X29wdGNvbXAiKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2ph bmVzdHJlZXQvcHB4X29wdGNvbXAiKQogICAgIChzeW5vcHNpcyAiT3B0aW9uYWwgY29tcGlsYXRp b24gZm9yIE9DYW1sIikKQEAgLTUxNjIsMjAgKzUxNjksMjAgQEAgdXNlZnVsIGVycm9ycyBvbiBm YWlsdXJlLiIpCiAgICAgICAgIzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6 ZHVuZSAsb2NhbWw0LjA3LWR1bmUpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgo Im9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAg ICAgKCJvY2FtbC1wcHgtYXNzZXJ0IiAsb2NhbWw0LjA3LXBweC1hc3NlcnQpCi0gICAgICAgICgi b2NhbWwtcHB4LWNvbXBhcmUiICxvY2FtbDQuMDctcHB4LWNvbXBhcmUpCi0gICAgICAgICgib2Nh bWwtcHB4LWN1c3RvbS1wcmludGYiICxvY2FtbDQuMDctcHB4LWN1c3RvbS1wcmludGYpCi0gICAg ICAgICgib2NhbWwtcHB4LWZpZWxkcy1jb252IiAsb2NhbWw0LjA3LXBweC1maWVsZHMtY29udikK LSAgICAgICAgKCJvY2FtbC1wcHgtaGVyZSIgLG9jYW1sNC4wNy1wcHgtaGVyZSkKLSAgICAgICAg KCJvY2FtbC1wcHgtaW5saW5lLXRlc3QiICxvY2FtbDQuMDctcHB4LWlubGluZS10ZXN0KQotICAg ICAgICAoIm9jYW1sLXBweC1zZXhwLWNvbnYiICxvY2FtbDQuMDctcHB4LXNleHAtY29udikKLSAg ICAgICAgKCJvY2FtbC1wcHgtdmFyaWFudHMtY29udiIgLG9jYW1sNC4wNy1wcHgtdmFyaWFudHMt Y29udikKLSAgICAgICAgKCJvY2FtbC1zdGRpbyIgLG9jYW1sNC4wNy1zdGRpbykKLSAgICAgICAg KCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1s NC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAs b2NhbWw0LjA3LXBweGxpYikKLSAgICAgICAgKCJvY2FtbC1yZSIgLChwYWNrYWdlLXdpdGgtb2Nh bWw0LjA3IG9jYW1sLXJlKSkpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgt b2NhbWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtcHB4LWFzc2VydCIgLG9jYW1s NC4wNy1wcHgtYXNzZXJ0KQorICAgICAgICgib2NhbWwtcHB4LWNvbXBhcmUiICxvY2FtbDQuMDct cHB4LWNvbXBhcmUpCisgICAgICAgKCJvY2FtbC1wcHgtY3VzdG9tLXByaW50ZiIgLG9jYW1sNC4w Ny1wcHgtY3VzdG9tLXByaW50ZikKKyAgICAgICAoIm9jYW1sLXBweC1maWVsZHMtY29udiIgLG9j YW1sNC4wNy1wcHgtZmllbGRzLWNvbnYpCisgICAgICAgKCJvY2FtbC1wcHgtaGVyZSIgLG9jYW1s NC4wNy1wcHgtaGVyZSkKKyAgICAgICAoIm9jYW1sLXBweC1pbmxpbmUtdGVzdCIgLG9jYW1sNC4w Ny1wcHgtaW5saW5lLXRlc3QpCisgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1jb252IiAsb2NhbWw0 LjA3LXBweC1zZXhwLWNvbnYpCisgICAgICAgKCJvY2FtbC1wcHgtdmFyaWFudHMtY29udiIgLG9j YW1sNC4wNy1wcHgtdmFyaWFudHMtY29udikKKyAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc3RkaW8pKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1w YXJzZXRyZWUiCisgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRl LXBhcnNldHJlZSkpCisgICAgICAgKCJvY2FtbC1wcHhsaWIiICxvY2FtbDQuMDctcHB4bGliKQor ICAgICAgICgib2NhbWwtcmUiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1yZSkpKSkK ICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1uYW1lIC4gInBweF9leHBlY3QiKSkpCiAgICAg KGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2phbmVzdHJlZXQvcHB4X2V4cGVjdCIpCiAg ICAgKHN5bm9wc2lzICJDcmFtIGxpa2UgZnJhbWV3b3JrIGZvciBPQ2FtbCIpCkBAIC01NDQ2LDgg KzU0NTMsOCBAQCB2YXJpb3VzIEphbmUgU3RyZWV0IHBhY2thZ2VzLiIpCiAgICAgICAgIzpmaW5k bGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUpKQog ICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13 aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1zdGRpbyIgLG9jYW1s NC4wNy1zdGRpbykpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtc3RkaW8iICwocGFja2FnZS13aXRoLW9j YW1sNC4wNyBvY2FtbC1zdGRpbykpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5j b20vamFuZXN0cmVldC9jb25maWd1cmF0b3IiKQogICAgIChzeW5vcHNpcyAiSGVscGVyIGxpYnJh cnkgZm9yIGdhdGhlcmluZyBzeXN0ZW0gY29uZmlndXJhdGlvbiIpCiAgICAgKGRlc2NyaXB0aW9u ICJDb25maWd1cmF0b3IgaXMgYSBzbWFsbCBsaWJyYXJ5IHRoYXQgaGVscHMgd3JpdGluZyBPQ2Ft bApAQCAtNTUzMywxNyArNTU0MCwxNyBAQCB0aG91c2FuZHMgb2YgdGltZXMgZmFzdGVyIHRoYW4g Zm9yay4KICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5kbGliCiAgICAgICAgIzpkdW5l ICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzCi0gICAgICBgKCgib2Nh bWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQotICAgICAgICAo Im9jYW1sLWNvbmZpZ3VyYXRvciIgLG9jYW1sNC4wNy1jb25maWd1cmF0b3IpCi0gICAgICAgICgi b2NhbWwtY29yZS1rZXJuZWwiICxvY2FtbDQuMDctY29yZS1rZXJuZWwpCi0gICAgICAgICgib2Nh bWwtcHB4LWFzc2VydCIgLG9jYW1sNC4wNy1wcHgtYXNzZXJ0KQotICAgICAgICAoIm9jYW1sLXBw eC1qYW5lIiAsb2NhbWw0LjA3LXBweC1qYW5lKQotICAgICAgICAoIm9jYW1sLXNleHBsaWIiICwo cGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1zZXhwbGliKSkKLSAgICAgICAgKCJvY2FtbC1z cGF3biIgLG9jYW1sNC4wNy1zcGF3bikKLSAgICAgICAgKCJvY2FtbC1zdGRpbyIgLG9jYW1sNC4w Ny1zdGRpbykKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwo cGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAg ICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAgICBgKCgib2NhbWwtYmFz ZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwt Y29uZmlndXJhdG9yIiAsb2NhbWw0LjA3LWNvbmZpZ3VyYXRvcikKKyAgICAgICAoIm9jYW1sLWNv cmUta2VybmVsIiAsb2NhbWw0LjA3LWNvcmUta2VybmVsKQorICAgICAgICgib2NhbWwtcHB4LWFz c2VydCIgLG9jYW1sNC4wNy1wcHgtYXNzZXJ0KQorICAgICAgICgib2NhbWwtcHB4LWphbmUiICxv Y2FtbDQuMDctcHB4LWphbmUpCisgICAgICAgKCJvY2FtbC1zZXhwbGliIiAsKHBhY2thZ2Utd2l0 aC1vY2FtbDQuMDcgb2NhbWwtc2V4cGxpYikpCisgICAgICAgKCJvY2FtbC1zcGF3biIgLG9jYW1s NC4wNy1zcGF3bikKKyAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQu MDcgb2NhbWwtc3RkaW8pKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAg ICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisg ICAgICAgKCJvY2FtbC1wcHhsaWIiICxvY2FtbDQuMDctcHB4bGliKSkpCiAgICAgKGhvbWUtcGFn ZSAiaHR0cHM6Ly9naXRodWIuY29tL2phbmVzdHJlZXQvY29yZSIpCiAgICAgKHN5bm9wc2lzICJB bHRlcm5hdGl2ZSB0byBPQ2FtbCdzIHN0YW5kYXJkIGxpYnJhcnkiKQogICAgIChkZXNjcmlwdGlv biAiVGhlIENvcmUgc3VpdGUgb2YgbGlicmFyaWVzIGlzIGFuIGFsdGVybmF0aXZlIHRvIE9DYW1s J3MKQEAgLTU1NzMsMjUgKzU1ODAsMjUgQEAgc3RhbmRhcmQgbGlicmFyeSB0aGF0IHdhcyBkZXZl bG9wZWQgYnkgSmFuZSBTdHJlZXQuIikKICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5k bGliCiAgICAgICAgIzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5w dXRzCi0gICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1s LWJhc2UpKQotICAgICAgICAoIm9jYW1sLWJpbi1wcm90IiAsb2NhbWw0LjA3LWJpbi1wcm90KQot ICAgICAgICAoIm9jYW1sLWNvbmZpZ3VyYXRvciIgLG9jYW1sNC4wNy1jb25maWd1cmF0b3IpCi0g ICAgICAgICgib2NhbWwtZmllbGRzbGliIiAsb2NhbWw0LjA3LWZpZWxkc2xpYikKLSAgICAgICAg KCJvY2FtbC1qYW5lLXN0cmVldC1oZWFkZXJzIiAsb2NhbWw0LjA3LWphbmUtc3RyZWV0LWhlYWRl cnMpCi0gICAgICAgICgib2NhbWwtcHB4LWFzc2VydCIgLG9jYW1sNC4wNy1wcHgtYXNzZXJ0KQot ICAgICAgICAoIm9jYW1sLXBweC1iYXNlIiAsb2NhbWw0LjA3LXBweC1iYXNlKQotICAgICAgICAo Im9jYW1sLXBweC1oYXNoIiAsb2NhbWw0LjA3LXBweC1oYXNoKQotICAgICAgICAoIm9jYW1sLXBw eC1pbmxpbmUtdGVzdCIgLG9jYW1sNC4wNy1wcHgtaW5saW5lLXRlc3QpCi0gICAgICAgICgib2Nh bWwtcHB4LWphbmUiICxvY2FtbDQuMDctcHB4LWphbmUpCi0gICAgICAgICgib2NhbWwtcHB4LXNl eHAtY29udiIgLG9jYW1sNC4wNy1wcHgtc2V4cC1jb252KQotICAgICAgICAoIm9jYW1sLXBweC1z ZXhwLW1lc3NhZ2UiICxvY2FtbDQuMDctcHB4LXNleHAtbWVzc2FnZSkKLSAgICAgICAgKCJvY2Ft bC1zZXhwbGliIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc2V4cGxpYikpCi0gICAg ICAgICgib2NhbWwtc3BsaXR0YWJsZS1yYW5kb20iICxvY2FtbDQuMDctc3BsaXR0YWJsZS1yYW5k b20pCi0gICAgICAgICgib2NhbWwtc3RkaW8iICxvY2FtbDQuMDctc3RkaW8pCi0gICAgICAgICgi b2NhbWwtdHlwZXJlcCIgLG9jYW1sNC4wNy10eXBlcmVwKQotICAgICAgICAoIm9jYW1sLXZhcmlh bnRzbGliIiAsb2NhbWw0LjA3LXZhcmlhbnRzbGliKQotICAgICAgICAoIm9jYW1sLW1pZ3JhdGUt cGFyc2V0cmVlIgotICAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3Jh dGUtcGFyc2V0cmVlKSkpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2Nh bWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtYmluLXByb3QiICxvY2FtbDQuMDct YmluLXByb3QpCisgICAgICAgKCJvY2FtbC1jb25maWd1cmF0b3IiICxvY2FtbDQuMDctY29uZmln dXJhdG9yKQorICAgICAgICgib2NhbWwtZmllbGRzbGliIiAsb2NhbWw0LjA3LWZpZWxkc2xpYikK KyAgICAgICAoIm9jYW1sLWphbmUtc3RyZWV0LWhlYWRlcnMiICxvY2FtbDQuMDctamFuZS1zdHJl ZXQtaGVhZGVycykKKyAgICAgICAoIm9jYW1sLXBweC1hc3NlcnQiICxvY2FtbDQuMDctcHB4LWFz c2VydCkKKyAgICAgICAoIm9jYW1sLXBweC1iYXNlIiAsb2NhbWw0LjA3LXBweC1iYXNlKQorICAg ICAgICgib2NhbWwtcHB4LWhhc2giICxvY2FtbDQuMDctcHB4LWhhc2gpCisgICAgICAgKCJvY2Ft bC1wcHgtaW5saW5lLXRlc3QiICxvY2FtbDQuMDctcHB4LWlubGluZS10ZXN0KQorICAgICAgICgi b2NhbWwtcHB4LWphbmUiICxvY2FtbDQuMDctcHB4LWphbmUpCisgICAgICAgKCJvY2FtbC1wcHgt c2V4cC1jb252IiAsb2NhbWw0LjA3LXBweC1zZXhwLWNvbnYpCisgICAgICAgKCJvY2FtbC1wcHgt c2V4cC1tZXNzYWdlIiAsb2NhbWw0LjA3LXBweC1zZXhwLW1lc3NhZ2UpCisgICAgICAgKCJvY2Ft bC1zZXhwbGliIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc2V4cGxpYikpCisgICAg ICAgKCJvY2FtbC1zcGxpdHRhYmxlLXJhbmRvbSIgLG9jYW1sNC4wNy1zcGxpdHRhYmxlLXJhbmRv bSkKKyAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwt c3RkaW8pKQorICAgICAgICgib2NhbWwtdHlwZXJlcCIgLG9jYW1sNC4wNy10eXBlcmVwKQorICAg ICAgICgib2NhbWwtdmFyaWFudHNsaWIiICxvY2FtbDQuMDctdmFyaWFudHNsaWIpCisgICAgICAg KCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkpKQogICAgIChwcm9wZXJ0aWVzIGAoKHVwc3Ry ZWFtLW5hbWUgLiAiY29yZV9rZXJuZWwiKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRo dWIuY29tL2phbmVzdHJlZXQvY29yZV9rZXJuZWwiKQogICAgIChzeW5vcHNpcyAiUG9ydGFibGUg c3RhbmRhcmQgbGlicmFyeSBmb3IgT0NhbWwiKQpAQCAtNTg3Myw3ICs1ODgwLDcgQEAgbGlicmFy eSBGRlRXLiIpCiAgICAgIGAoKCJvcGVuYmxhcyIgLG9wZW5ibGFzKQogICAgICAgICgibGFwYWNr IiAsbGFwYWNrKQogICAgICAgICgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3 IG9jYW1sLWJhc2UpKQotICAgICAgICgib2NhbWwtc3RkaW8iICxvY2FtbDQuMDctc3RkaW8pKSkK KyAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc3Rk aW8pKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9tbW90dGwuZ2l0aHViLmlvL2xhY2FtbC8i KQogICAgIChzeW5vcHNpcwogICAgICAiT0NhbWwtYmluZGluZ3MgdG8gQkxBUyBhbmQgTEFQQUNL IikKLS0gCjIuMjkuMgoK --=-od9dn6KMyr7Ep2IyOD+p Content-Disposition: attachment; filename="0003-gnu-add-ocaml-ppxlib.patch" Content-Type: text/x-patch; name="0003-gnu-add-ocaml-ppxlib.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBjMDhkMGRjMzA4YzVkZDQyOTIxMmMxNzFiODI0MTM1NTc3ZTU3MGVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBkaXZvcGxhZGUgPGRAZGl2b3BsYWRlLmZyPgpEYXRlOiBXZWQs IDMwIERlYyAyMDIwIDE5OjA1OjM0ICswMTAwClN1YmplY3Q6IFtQQVRDSCAzLzVdIGdudTogYWRk IG9jYW1sLXBweGxpYgoKKiBnbnUvcGFja2FnZXMvb2NhbWwuc2NtIChvY2FtbC1wcHhsaWIpOiBO ZXcgdmFyaWFibGUuCihvY2FtbDQuMDctcHB4bGliKTogSW5oZXJpdCBmcm9tIG9jYW1sLXBweGxp Yi4KLS0tCiBnbnUvcGFja2FnZXMvb2NhbWwuc2NtIHwgMzU2ICsrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjA3IGluc2VydGlvbnMoKyks IDE0OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtIGIv Z251L3BhY2thZ2VzL29jYW1sLnNjbQppbmRleCA5ZTE5NzcyOTk3Li44MjhkZDZmZjczIDEwMDY0 NAotLS0gYS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9vY2FtbC5z Y20KQEAgLTM2ODYsNyArMzY4Niw3IEBAIHN5bnRheCBjaGVja2luZyBvbiBkZWR1a3RpIGZpbGVz LiIpCiAgICAgICAgKCJvY2FtbC1jb21waWxlci1saWJzIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQu MDcgb2NhbWwtY29tcGlsZXItbGlicykpCiAgICAgICAgKCJvY2FtbC1zZXhwbGliMCIgLChwYWNr YWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLXNleHBsaWIwKSkKICAgICAgICAoIm9jYW1sLXN0ZGlv IiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc3RkaW8pKQotICAgICAgICgib2NhbWwt cHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAgICAgICgib2NhbWwtcHB4bGliIiAsKHBh Y2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcHB4bGliKSkpKQogICAgIChwcm9wZXJ0aWVzIGAo KHVwc3RyZWFtLW5hbWUgLiAicHB4X2lubGluZV90ZXN0IikpKQogICAgIChzeW5vcHNpcyAiU3lu dGF4IGV4dGVuc2lvbiBmb3Igd3JpdGluZyBpbi1saW5lIHRlc3RzIGluIG9jYW1sIGNvZGUiKQog ICAgIChkZXNjcmlwdGlvbiAiVGhpcyBwYWNrYWdlIGNvbnRhaW5zIGEgc3ludGF4IGV4dGVuc2lv biBmb3Igd3JpdGluZwpAQCAtNDM5OSwxMCArNDM5OSwxMiBAQCBwcHhfZGVyaXZpbmcgYW5kIHBw eF90eXBlX2NvbnYgdG8gaW50ZXItb3BlcmF0ZSBncmFjZWZ1bGx5IHdoZW4gbGlua2VkCiBhcyBw YXJ0IG9mIHRoZSBzYW1lIG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIGRyaXZlci4iKQogICAgIChs aWNlbnNlIGxpY2Vuc2U6YnNkLTMpKSkKIAotKGRlZmluZS1wdWJsaWMgb2NhbWw0LjA3LXBweGxp YgorKGRlZmluZS1wdWJsaWMgb2NhbWwtcHB4bGliCisgIDs7IEZ1dHVyZSB2ZXJzaW9ucyBhcmUg bm90IGNvbXBhdGlibGUgd2l0aCBvY2FtbC1taWdyYXRlLXBhcnNldHJlZQorICA7OyAxLjcuMwog ICAocGFja2FnZQotICAgIChuYW1lICJvY2FtbDQuMDctcHB4bGliIikKLSAgICAodmVyc2lvbiAi MC42LjAiKQorICAgIChuYW1lICJvY2FtbC1wcHhsaWIiKQorICAgICh2ZXJzaW9uICIwLjE1LjAi KQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9vY2FtbC1wcHgvcHB4bGliIikK ICAgICAoc291cmNlCiAgICAgIChvcmlnaW4KQEAgLTQ0MTMsMjAgKzQ0MTUsMjggQEAgYXMgcGFy dCBvZiB0aGUgc2FtZSBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSBkcml2ZXIuIikKICAgICAgICAo ZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCiAgICAgICAgKHNoYTI1Ngog ICAgICAgICAoYmFzZTMyCi0gICAgICAgICAiMG15OXg3c3hiMzI5aDBsenNocHBkYWF3aXlmYmF3 Nmc1ZjQxeWl5N2JobDA3MXJubHZidiIpKSkpCisgICAgICAgICAiMXAwMzdrcWo1ODU4eHJoaDBk cHM2dmJmNGZuaWpsYTZ6OWZqejV6aWd2bnFwNGkyeGtybiIpKSkpCiAgICAgKGJ1aWxkLXN5c3Rl bSBkdW5lLWJ1aWxkLXN5c3RlbSkKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKLSAgICAgYCgoIm9j YW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAo Im9jYW1sLWNvbXBpbGVyLWxpYnMiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1jb21w aWxlci1saWJzKSkKLSAgICAgICAoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgotICAgICAgICAs KHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQotICAgICAg ICgib2NhbWwtcHB4LWRlcml2ZXJzIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcHB4 LWRlcml2ZXJzKSkKLSAgICAgICAoIm9jYW1sLXN0ZGlvIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQu MDcgb2NhbWwtc3RkaW8pKQotICAgICAgICgib2NhbWwtcmVzdWx0IiAsKHBhY2thZ2Utd2l0aC1v Y2FtbDQuMDcgb2NhbWwtcmVzdWx0KSkKLSAgICAgICAoIm9jYW1sLXNleHBsaWIwIiAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtc2V4cGxpYjApKSkpCisgICAgIGAoKCJvY2FtbC1wcHgt ZGVyaXZlcnMiICxvY2FtbC1wcHgtZGVyaXZlcnMpCisgICAgICAgKCJvY2FtbC1jb21waWxlci1s aWJzIiAsb2NhbWwtY29tcGlsZXItbGlicykKKyAgICAgICAoIm9jYW1sLXN0ZGxpYi1zaGltcyIg LG9jYW1sLXN0ZGxpYi1zaGltcykKKyAgICAgICAoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIiAs b2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpCisgICAgICAgKCJvY2FtbC1zZXhwbGliMCIgLG9jYW1s LXNleHBsaWIwKSkpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoIm9jYW1sLWJhc2UiICxv Y2FtbC1iYXNlKQorICAgICAgICgib2NhbWwtc3RkaW8iICxvY2FtbC1zdGRpbykpKQorICAgIChw cm9wZXJ0aWVzIGAoKG9jYW1sNC4wNy12YXJpYW50IC4gLChkZWxheSBvY2FtbDQuMDctcHB4bGli KSkpKQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOnBoYXNlcwogICAgICAgIChtb2RpZnktcGhh c2VzICVzdGFuZGFyZC1waGFzZXMKKyAgICAgICAgIChhZGQtYmVmb3JlICdidWlsZCAnZml4LWRl cHJlY2F0ZWQKKyAgICAgICAgICAgKGxhbWJkYSBfCisJICAgICA7OyBTaWxlbmNlIGEgZGVwcmVj YXRpb24gd2FybmluZworCSAgICAgKHN1YnN0aXR1dGUqICJzcmMvZ2VuL2R1bmUiCisJCQkgICgo Ii1zYWZlLXN0cmluZyIpCisJCQkgICAiLXNhZmUtc3RyaW5nIC13IC0zIikpCisJICAgICAjdCkp CiAgICAgICAgICAoYWRkLWJlZm9yZSAnY2hlY2sgJ3NldC10b3BmaW5kCiAgICAgICAgICAgIChs YW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQogICAgICAgICAgICAgIDs7 IGFkZCB0aGUgbGluZSAjZGlyZWN0b3J5ICIuLiIgYXQgdGhlIHRvcCBvZiBlYWNoIGZpbGUKQEAg LTQ0NDMsMTAgKzQ0NTMsNyBAQCBhcyBwYXJ0IG9mIHRoZSBzYW1lIG9jYW1sLW1pZ3JhdGUtcGFy c2V0cmVlIGRyaXZlci4iKQogICAgICAgICAgICAgICAgICAoKCIjdXNlIFwidG9wZmluZFwiOzsi IGFsbCkKICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICIjZGlyZWN0b3J5IFwiIiBm aW5kbGliLWxpYmRpciAiXCJcbiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFs bCkpKSkKLSAgICAgICAgICAgICAjdCkpKQotICAgICAgICM6b2NhbWwgLG9jYW1sLTQuMDcKLSAg ICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5kbGliCi0gICAgICAgIzpkdW5lICxvY2FtbDQu MDctZHVuZSkpCisgICAgICAgICAgICAgI3QpKSkpKQogICAgIChzeW5vcHNpcwogICAgICAiQmFz ZSBsaWJyYXJ5IGFuZCB0b29scyBmb3IgcHB4IHJld3JpdGVycyIpCiAgICAgKGRlc2NyaXB0aW9u CkBAIC00NDY0LDYgKzQ0NzEsNTcgQEAgT0NhbWwgQVNUIGluIHRoZSBPQ2FtbCBzeW50YXg7CiBA ZW5kIGl0ZW1pemUiKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6ZXhwYXQpKSkKIAorKGRlZmluZS1w dWJsaWMgb2NhbWw0LjA3LXBweGxpYgorICAocGFja2FnZS13aXRoLW9jYW1sNC4wNworICAgKHBh Y2thZ2UKKyAgICAgKGluaGVyaXQgb2NhbWwtcHB4bGliKQorICAgICAobmFtZSAib2NhbWw0LjA3 LXBweGxpYiIpCisgICAgICh2ZXJzaW9uICIwLjYuMCIpCisgICAgIChzb3VyY2UKKyAgICAgIChv cmlnaW4KKyAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICh1cmkgKGdpdC1yZWZl cmVuY2UKKyAgICAgICAgICAgICAgKHVybCAoc3RyaW5nLWFwcGVuZCAocGFja2FnZS1ob21lLXBh Z2Ugb2NhbWwtcHB4bGliKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIuZ2l0 IikpCisgICAgICAgICAgICAgIChjb21taXQgdmVyc2lvbikpKQorICAgICAgICAoZmlsZS1uYW1l IChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAgICAgIChzaGEyNTYKKyAgICAgICAg IChiYXNlMzIKKyAgICAgICAgICAiMG15OXg3c3hiMzI5aDBsenNocHBkYWF3aXlmYmF3Nmc1ZjQx eWl5N2JobDA3MXJubHZidiIpKSkpCisgICAgIChwcm9wYWdhdGVkLWlucHV0cworICAgICAgYCgo Im9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAg ICAgKCJvY2FtbC1jb21waWxlci1saWJzIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwt Y29tcGlsZXItbGlicykpCisgICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAg ICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQor ICAgICAgICAoIm9jYW1sLXBweC1kZXJpdmVycyIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9j YW1sLXBweC1kZXJpdmVycykpCisgICAgICAgICgib2NhbWwtc3RkaW8iICwocGFja2FnZS13aXRo LW9jYW1sNC4wNyBvY2FtbC1zdGRpbykpCisgICAgICAgICgib2NhbWwtcmVzdWx0IiAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcmVzdWx0KSkKKyAgICAgICAgKCJvY2FtbC1zZXhwbGli MCIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLXNleHBsaWIwKSkpKQorICAgICAoYXJn dW1lbnRzCisgICAgICBgKCM6cGhhc2VzCisgICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMKKyAgICAgICAgICAoYWRkLWJlZm9yZSAnY2hlY2sgJ3NldC10b3BmaW5kCisgICAg ICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAg ICAgICAgICAgOzsgYWRkIHRoZSBsaW5lICNkaXJlY3RvcnkgIi4uIiBhdCB0aGUgdG9wIG9mIGVh Y2ggZmlsZQorICAgICAgICAgICAgICA7OyB1c2luZyAjdXNlICJ0b3BmaW5kIjs7IHRvIGJlIGFi bGUgdG8gZmluZCB0b3BmaW5kCisgICAgICAgICAgICAgIChsZXQqICgoZmluZGxpYi1wYXRoIChh c3NvYy1yZWYgaW5wdXRzICJmaW5kbGliIikpCisgICAgICAgICAgICAgICAgICAgICAoZmluZGxp Yi1saWJkaXIKKyAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBmaW5kbGliLXBh dGggIi9saWIvb2NhbWwvc2l0ZS1saWIiKSkpCisgICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUq ICcoInRlc3QvYmFzZS90ZXN0Lm1sIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0 ZXN0L2NvZGVfcGF0aC90ZXN0Lm1sIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0 ZXN0L2Rlcml2aW5nL3Rlc3QubWwiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRl c3QvZHJpdmVyL2F0dHJpYnV0ZXMvdGVzdC5tbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAidGVzdC9kcml2ZXIvbm9uLWNvbXByZXNzaWJsZS1zdWZmaXgvdGVzdC5tbCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAidGVzdC9kcml2ZXIvdHJhbnNmb3JtYXRpb25zL3Rl c3QubWwiKQorICAgICAgICAgICAgICAgICAgKCgiI3VzZSBcInRvcGZpbmRcIjs7IiBhbGwpCisg ICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIiNkaXJlY3RvcnkgXCIiIGZpbmRsaWIt bGliZGlyICJcIlxuIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbCkpKSkK KyAgICAgICAgICAgICAgI3QpKSkKKyAgICAgICAgIzpvY2FtbCAsb2NhbWwtNC4wNworICAgICAg ICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5kbGliCisgICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3 LWR1bmUpKQorICAgIChwcm9wZXJ0aWVzICcoKSkpKSkKKwogKGRlZmluZS1wdWJsaWMgb2NhbWw0 LjA3LXBweC1jb21wYXJlCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgIm9jYW1sNC4wNy1wcHgtY29t cGFyZSIpCkBAIC00NDc5LDEwICs0NTM3LDEwIEBAIE9DYW1sIEFTVCBpbiB0aGUgT0NhbWwgc3lu dGF4OwogICAgICAgICAgICAgICAgICIwNmJxNG0xYnNtNGpseDRnN3doNW05OXFreTd4bTRjMmc1 MmthejZwdjI1aGRuNWFnaTJtIikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGR1bmUtYnVpbGQtc3lz dGVtKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1taWdyYXRl LXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdy YXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxp YikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1s LWJhc2UpKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJv Y2FtbC1wcHhsaWIiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKSkpCiAg ICAgKGFyZ3VtZW50cwogICAgICBgKCM6b2NhbWwgLG9jYW1sLTQuMDcKICAgICAgICAjOmZpbmRs aWIgLG9jYW1sNC4wNy1maW5kbGliCkBAIC00NTE4LDEwICs0NTc2LDEwIEBAIGJ5IG1ha2luZyBz dXJlIHRoYXQgeW91IG9ubHkgY29tcGFyZSBjb21wYXJhYmxlIHZhbHVlcy4iKQogICAgICAgICM6 ZmluZGxpYiAsb2NhbWw0LjA3LWZpbmRsaWIKICAgICAgICAjOmR1bmUgLG9jYW1sNC4wNy1kdW5l KSkKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKLSAgICAgIGAoKCJvY2FtbC1iYXNlIiAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtYmFzZSkpCi0gICAgICAgICgib2NhbWwtbWlncmF0ZS1w YXJzZXRyZWUiCi0gICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0 ZS1wYXJzZXRyZWUpKQotICAgICAgICAoIm9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIp KSkKKyAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1i YXNlKSkKKyAgICAgICAoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgorICAgICAgICAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQorICAgICAgICgib2Nh bWwtcHB4bGliIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcHB4bGliKSkpKQogICAg IChwcm9wZXJ0aWVzIGAoKHVwc3RyZWFtLW5hbWUgLiAiZmllbGRzbGliIikpKQogICAgIChob21l LXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9qYW5lc3RyZWV0L2ZpZWxkc2xpYiIpCiAgICAgKHN5 bm9wc2lzICJTeW50YXggZXh0ZW5zaW9uIHRvIHJlY29yZCBmaWVsZHMiKQpAQCAtNDU1MCwxMCAr NDYwOCwxMCBAQCBvZiBhIHJlY29yZCBhbmQgY3JlYXRlIG5ldyByZWNvcmQgdmFsdWVzLiIpCiAg ICAgICAgIzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0 LjA3LWR1bmUpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2Ui ICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1t aWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2Ft bC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3 LXBweGxpYikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3 IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAg ICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAg ICAgKCJvY2FtbC1wcHhsaWIiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIp KSkpCiAgICAgKHByb3BlcnRpZXMgYCgodXBzdHJlYW0tbmFtZSAuICJ2YXJpYW50c2xpYiIpKSkK ICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0cmVldC92YXJpYW50c2xp YiIpCiAgICAgKHN5bm9wc2lzICJPQ2FtbCB2YXJpYW50cyBhcyBmaXJzdCBjbGFzcyB2YWx1ZXMi KQpAQCAtNDU3NSwxMSArNDYzMywxMSBAQCBzdGFuZGFyZCBsaWJyYXJ5LiIpCiAgICAgICAgICAg ICAgICAgIjA3enJkM3FreTJwcGJmbDU1Z3BtOTBydnFhNTg2MHhnd2Nzdmlocmpta3J3NmQwamly a2MiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gZHVuZS1idWlsZC1zeXN0ZW0pCiAgICAgKHByb3Bh Z2F0ZWQtaW5wdXRzCi0gICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3IG9jYW1sLWJhc2UpKQotICAgICAgICAoIm9jYW1sLWZpZWxkc2xpYiIgLG9jYW1sNC4wNy1m aWVsZHNsaWIpCi0gICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCi0gICAgICAgICAs KHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQotICAgICAg ICAoIm9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgoIm9jYW1sLWJh c2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAgICAoIm9jYW1s LWZpZWxkc2xpYiIgLG9jYW1sNC4wNy1maWVsZHNsaWIpCisgICAgICAgKCJvY2FtbC1taWdyYXRl LXBhcnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3Jh dGUtcGFyc2V0cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2Nh bWw0LjA3IG9jYW1sLXBweGxpYikpKSkKICAgICAoYXJndW1lbnRzCiAgICAgIGAoIzpvY2FtbCAs b2NhbWwtNC4wNwogICAgICAgICM6ZmluZGxpYiAsb2NhbWw0LjA3LWZpbmRsaWIKQEAgLTQ2MDgs MTAgKzQ2NjYsMTAgQEAgbmV3IHJlY29yZCB2YWx1ZXMuIikKICAgICAgICAgICAgICAgICAiMHBx d25xeTF4cDMwOXd2ZGNhYXg0bGcwMnlrNjRscTJ3MDNtYmdmdmY2cHM1cnk0Z2lzOSIpKSkpCiAg ICAgKGJ1aWxkLXN5c3RlbSBkdW5lLWJ1aWxkLXN5c3RlbSkKICAgICAocHJvcGFnYXRlZC1pbnB1 dHMKLSAgICAgIGAoKCJvY2FtbC1iYXNlIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwt YmFzZSkpCi0gICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCi0gICAgICAgICAsKHBh Y2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQotICAgICAgICAo Im9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgoIm9jYW1sLWJhc2Ui ICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAgICAoIm9jYW1sLW1p Z3JhdGUtcGFyc2V0cmVlIgorICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwt bWlncmF0ZS1wYXJzZXRyZWUpKQorICAgICAgICgib2NhbWwtcHB4bGliIiAsKHBhY2thZ2Utd2l0 aC1vY2FtbDQuMDcgb2NhbWwtcHB4bGliKSkpKQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOm9j YW1sICxvY2FtbC00LjA3CiAgICAgICAgIzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgpAQCAt NDYzOCwxMSArNDY5NiwxMSBAQCBkZWZpbml0aW9ucy4iKQogICAgICAgICAgICAgICAgICIxeWMw Z3NkczVtMm52Mzl6Z2E4bm5yY2Eybjc1cmtxeTVkejR4ajE2MzV5YnoyMGhoYmpkIikpKSkKICAg ICAoYnVpbGQtc3lzdGVtIGR1bmUtYnVpbGQtc3lzdGVtKQogICAgIChwcm9wYWdhdGVkLWlucHV0 cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1i YXNlKSkKLSAgICAgICAgKCJvY2FtbC12YXJpYW50c2xpYiIgLG9jYW1sNC4wNy12YXJpYW50c2xp YikKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2Fn ZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2Nh bWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChw YWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtdmFyaWFu dHNsaWIiICxvY2FtbDQuMDctdmFyaWFudHNsaWIpCisgICAgICAgKCJvY2FtbC1taWdyYXRlLXBh cnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUt cGFyc2V0cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3IG9jYW1sLXBweGxpYikpKSkKICAgICAoYXJndW1lbnRzCiAgICAgIGAoIzpvY2FtbCAsb2Nh bWwtNC4wNwogICAgICAgICM6ZmluZGxpYiAsb2NhbWw0LjA3LWZpbmRsaWIKQEAgLTQ2NzEsMTEg KzQ3MjksMTEgQEAgdmFyaWFudCB0eXBlcy4iKQogICAgICAgICAgICAgICAgICIxMWI3M3NtZjNn M2JwZDlsZzAxNHByNHJ4Mjg1bms5bW5rNmc2NDY0cGg1MWp2MHNxemhqIikpKSkKICAgICAoYnVp bGQtc3lzdGVtIGR1bmUtYnVpbGQtc3lzdGVtKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAg ICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkK LSAgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1jb252IiAsb2NhbWw0LjA3LXBweC1zZXhwLWNvbnYp Ci0gICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCi0gICAgICAgICAsKHBhY2thZ2Ut d2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQotICAgICAgICAoIm9jYW1s LXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAgICAoIm9jYW1sLXBweC1zZXhw LWNvbnYiICxvY2FtbDQuMDctcHB4LXNleHAtY29udikKKyAgICAgICAoIm9jYW1sLW1pZ3JhdGUt cGFyc2V0cmVlIgorICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0 ZS1wYXJzZXRyZWUpKQorICAgICAgICgib2NhbWwtcHB4bGliIiAsKHBhY2thZ2Utd2l0aC1vY2Ft bDQuMDcgb2NhbWwtcHB4bGliKSkpKQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOm9jYW1sICxv Y2FtbC00LjA3CiAgICAgICAgIzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgpAQCAtNDc3MCwx MiArNDgyOCwxMiBAQCBzdG9yYWdlIG9mIGxhcmdlIGFtb3VudHMgb2YgZGF0YS4iKQogICAgICAg ICAgICAgICAgICIxcDBpYzZhaWp4bHJkZ2dwbXljajEycTNjeTl4a3NicTJ2cTcyNzIxNW1hejRz bnZsZjVwIikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGR1bmUtYnVpbGQtc3lzdGVtKQogICAgIChw cm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9j YW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1wcHgtY29tcGFyZSIgLG9jYW1s NC4wNy1wcHgtY29tcGFyZSkKLSAgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1jb252IiAsb2NhbWw0 LjA3LXBweC1zZXhwLWNvbnYpCi0gICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCi0g ICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUp KQotICAgICAgICAoIm9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgo Im9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAg ICAoIm9jYW1sLXBweC1jb21wYXJlIiAsb2NhbWw0LjA3LXBweC1jb21wYXJlKQorICAgICAgICgi b2NhbWwtcHB4LXNleHAtY29udiIgLG9jYW1sNC4wNy1wcHgtc2V4cC1jb252KQorICAgICAgICgi b2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4w NyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJvY2FtbC1wcHhsaWIiICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKSkpCiAgICAgKGFyZ3VtZW50cwogICAg ICBgKCM6b2NhbWwgLG9jYW1sLTQuMDcKICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5k bGliCkBAIC00ODA3LDEwICs0ODY1LDEwIEBAIGhhc2ggZnVuY3Rpb25zIGZyb20gdHlwZSBleHJw ZXNzaW9ucyBhbmQgZGVmaW5pdGlvbnMuIikKICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1m aW5kbGliCiAgICAgICAgIzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHByb3BhZ2F0ZWQt aW5wdXRzCi0gICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9j YW1sLWJhc2UpKQotICAgICAgICAoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgotICAgICAgICAg LChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkKLSAgICAg ICAgKCJvY2FtbC1wcHhsaWIiICxvY2FtbDQuMDctcHB4bGliKSkpCisgICAgIGAoKCJvY2FtbC1i YXNlIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtYmFzZSkpCisgICAgICAgKCJvY2Ft bC1taWdyYXRlLXBhcnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9j YW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdl LXdpdGgtb2NhbWw0LjA3IG9jYW1sLXBweGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1cHN0 cmVhbS1uYW1lIC4gInBweF9lbnVtZXJhdGUiKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9n aXRodWIuY29tL2phbmVzdHJlZXQvcHB4X2VudW1lcmF0ZSIpCiAgICAgKHN5bm9wc2lzICJHZW5l cmF0ZSBhIGxpc3QgY29udGFpbmluZyBhbGwgdmFsdWVzIG9mIGEgZmluaXRlIHR5cGUiKQpAQCAt NDgzOSwxMCArNDg5NywxMCBAQCBtYW55IHZhbHVlcykuIikKICAgICAgICAjOmZpbmRsaWIgLG9j YW1sNC4wNy1maW5kbGliCiAgICAgICAgIzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHBy b3BhZ2F0ZWQtaW5wdXRzCi0gICAgICBgKCgib2NhbWwtcHB4LWlubGluZS10ZXN0IiAsb2NhbWw0 LjA3LXBweC1pbmxpbmUtdGVzdCkKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIK LSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJl ZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAgICBg KCgib2NhbWwtcHB4LWlubGluZS10ZXN0IiAsb2NhbWw0LjA3LXBweC1pbmxpbmUtdGVzdCkKKyAg ICAgICAoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgorICAgICAgICAsKHBhY2thZ2Utd2l0aC1v Y2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQorICAgICAgICgib2NhbWwtcHB4bGli IiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcHB4bGliKSkpKQogICAgIChwcm9wZXJ0 aWVzIGAoKHVwc3RyZWFtLW5hbWUgLiAicHB4X2JlbmNoIikpKQogICAgIChob21lLXBhZ2UgImh0 dHBzOi8vZ2l0aHViLmNvbS9qYW5lc3RyZWV0L3BweF9iZW5jaCIpCiAgICAgKHN5bm9wc2lzICJT eW50YXggZXh0ZW5zaW9uIGZvciB3cml0aW5nIGluLWxpbmUgYmVuY2htYXJrcyBpbiBvY2FtbCBj b2RlIikKQEAgLTQ4NjksMTAgKzQ5MjcsMTAgQEAgbWFueSB2YWx1ZXMpLiIpCiAgICAgICAgIzpm aW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUp KQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2Fn ZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBh cnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRl LXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikp KQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJh c2UpKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFja2Fn ZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJvY2Ft bC1wcHhsaWIiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKSkpCiAgICAg KHByb3BlcnRpZXMgYCgodXBzdHJlYW0tbmFtZSAuICJwcHhfaGVyZSIpKSkKICAgICAoaG9tZS1w YWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0cmVldC9wcHhfaGVyZSIpCiAgICAgKHN5bm9w c2lzICJFeHBhbmRzIFslaGVyZV0gaW50byBpdHMgbG9jYXRpb24iKQpAQCAtNDkyMiwxMiArNDk4 MCwxMiBAQCBtYW55IHZhbHVlcykuIikKICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5k bGliCiAgICAgICAgIzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5w dXRzCi0gICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1s LWJhc2UpKQotICAgICAgICAoIm9jYW1sLXBweC1oZXJlIiAsb2NhbWw0LjA3LXBweC1oZXJlKQot ICAgICAgICAoIm9jYW1sLXBweC1zZXhwLWNvbnYiICxvY2FtbDQuMDctcHB4LXNleHAtY29udikK LSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13 aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwt cHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNr YWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtcHB4LWhlcmUi ICxvY2FtbDQuMDctcHB4LWhlcmUpCisgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1jb252IiAsb2Nh bWw0LjA3LXBweC1zZXhwLWNvbnYpCisgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIK KyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVl KSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1s LXBweGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1uYW1lIC4gInBweF9zZXhw X3ZhbHVlIikpKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9qYW5lc3RyZWV0 L3BweF9zZXhwX3ZhbHVlIikKICAgICAoc3lub3BzaXMgIlNpbXBsaWZ5IGJ1aWxkaW5nIHMtZXhw cmVzc2lvbnMgZnJvbSBvY2FtbCB2YWx1ZXMiKQpAQCAtNDk1MywxMiArNTAxMSwxMiBAQCBvY2Ft bCB2YWx1ZXMuIikKICAgICAgICAjOmZpbmRsaWIgLG9jYW1sNC4wNy1maW5kbGliCiAgICAgICAg IzpkdW5lICxvY2FtbDQuMDctZHVuZSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzCi0gICAgICBg KCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQotICAg ICAgICAoIm9jYW1sLXBweC1oZXJlIiAsb2NhbWw0LjA3LXBweC1oZXJlKQotICAgICAgICAoIm9j YW1sLXBweC1zZXhwLWNvbnYiICxvY2FtbDQuMDctcHB4LXNleHAtY29udikKLSAgICAgICAgKCJv Y2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4w NyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2Nh bWw0LjA3LXBweGxpYikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2Nh bWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtcHB4LWhlcmUiICxvY2FtbDQuMDct cHB4LWhlcmUpCisgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1jb252IiAsb2NhbWw0LjA3LXBweC1z ZXhwLWNvbnYpCisgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKKyAgICAgICAgLChw YWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkKKyAgICAgICAo Im9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLXBweGxpYikpKSkK ICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1uYW1lIC4gInBweF9zZXhwX21lc3NhZ2UiKSkp CiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2phbmVzdHJlZXQvcHB4X3NleHBf bWVzc2FnZSIpCiAgICAgKHN5bm9wc2lzICJBIHBweCByZXdyaXRlciBmb3IgZWFzeSBjb25zdHJ1 Y3Rpb24gb2Ygcy1leHByZXNzaW9ucyIpCkBAIC00OTg4LDkgKzUwNDYsOSBAQCBjb250ZXh0IHN1 Y2ggYXMgZnVuY3Rpb24gYXJndW1lbnRzLiIpCiAgICAgICAgIzpmaW5kbGliICxvY2FtbDQuMDct ZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUpKQogICAgIChwcm9wYWdhdGVk LWlucHV0cwotICAgICAgYCgoIm9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgotICAgICAgICAgLChw YWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkKLSAgICAgICAg KCJvY2FtbC1wcHhsaWIiICxvY2FtbDQuMDctcHB4bGliKSkpCisgICAgIGAoKCJvY2FtbC1taWdy YXRlLXBhcnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1p Z3JhdGUtcGFyc2V0cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgt b2NhbWw0LjA3IG9jYW1sLXBweGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1u YW1lIC4gInBweF9waXBlYmFuZyIpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5j b20vamFuZXN0cmVldC9wcHhfcGlwZWJhbmciKQogICAgIChzeW5vcHNpcyAiSW5saW5lIHJldmVy c2UgYXBwbGljYXRpb24gb3BlcmF0b3JzIGB8PmAgYW5kIGB8IWAiKQpAQCAtNTAxOCwxMCArNTA3 NiwxMCBAQCBjb250ZXh0IHN1Y2ggYXMgZnVuY3Rpb24gYXJndW1lbnRzLiIpCiAgICAgICAgIzpm aW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUp KQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2Fn ZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBh cnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRl LXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikp KQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJh c2UpKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFja2Fn ZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJvY2Ft bC1wcHhsaWIiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKSkpCiAgICAg KHByb3BlcnRpZXMgYCgodXBzdHJlYW0tbmFtZSAuICJwcHhfb3B0aW9uYWwiKSkpCiAgICAgKGhv bWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2phbmVzdHJlZXQvcHB4X29wdGlvbmFsIikKICAg ICAoc3lub3BzaXMgIlBhdHRlcm4gbWF0Y2hpbmcgb24gZmxhdCBvcHRpb25zIikKQEAgLTUwNTAs NyArNTEwOCw3IEBAIGVsc2UgZXhwcmVzc2lvbi4iKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwog ICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2Up KQogICAgICAgICgib2NhbWwtc3RkaW8iICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1z dGRpbykpCi0gICAgICAgKCJvY2FtbC1wcHhsaWIiICxvY2FtbDQuMDctcHB4bGliKSkpCisgICAg ICAgKCJvY2FtbC1wcHhsaWIiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIp KSkpCiAgICAgKHByb3BlcnRpZXMgYCgodXBzdHJlYW0tbmFtZSAuICJwcHhfb3B0Y29tcCIpKSkK ICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0cmVldC9wcHhfb3B0Y29t cCIpCiAgICAgKHN5bm9wc2lzICJPcHRpb25hbCBjb21waWxhdGlvbiBmb3IgT0NhbWwiKQpAQCAt NTA3NywxMCArNTEzNSwxMCBAQCBzaXplLCB0aGUgdmVyc2lvbiBvZiB0aGUgY29tcGlsZXIsIC4u LiIpCiAgICAgICAgIzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAs b2NhbWw0LjA3LWR1bmUpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1s LWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJv Y2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4w NyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2Nh bWw0LjA3LXBweGxpYikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2Nh bWw0LjA3IG9jYW1sLWJhc2UpKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisg ICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkp CisgICAgICAgKCJvY2FtbC1wcHhsaWIiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1w cHhsaWIpKSkpCiAgICAgKHByb3BlcnRpZXMgYCgodXBzdHJlYW0tbmFtZSAuICJwcHhfbGV0Iikp KQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9qYW5lc3RyZWV0L3BweF9sZXQi KQogICAgIChzeW5vcHNpcyAiTW9uYWRpYyBsZXQtYmluZGluZ3MiKQpAQCAtNTEwNiwxMSArNTE2 NCwxMSBAQCBtYXRjaCBleHByZXNzaW9ucywgYW5kIGlmIGV4cHJlc3Npb25zLiIpCiAgICAgICAg IzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1 bmUpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1wcHgtaGVy ZSIgLG9jYW1sNC4wNy1wcHgtaGVyZSkKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJl ZSIKLSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNl dHJlZSkpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAg ICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLWJhc2UpKQor ICAgICAgICgib2NhbWwtcHB4LWhlcmUiICxvY2FtbDQuMDctcHB4LWhlcmUpCisgICAgICAgKCJv Y2FtbC1taWdyYXRlLXBhcnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3 IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNr YWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLXBweGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1 cHN0cmVhbS1uYW1lIC4gInBweF9mYWlsIikpKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0 aHViLmNvbS9qYW5lc3RyZWV0L3BweF9mYWlsIikKICAgICAoc3lub3BzaXMgIkFkZCBsb2NhdGlv biB0byBjYWxscyB0byBmYWlsd2l0aHMiKQpAQCAtNTEzNiwxMyArNTE5NCwxMyBAQCBwb3NpdGlv bi4iKQogICAgICAgICM6ZmluZGxpYiAsb2NhbWw0LjA3LWZpbmRsaWIKICAgICAgICAjOmR1bmUg LG9jYW1sNC4wNy1kdW5lKSkKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKLSAgICAgIGAoKCJvY2Ft bC1iYXNlIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtYmFzZSkpCi0gICAgICAgICgi b2NhbWwtcHB4LWNvbXBhcmUiICxvY2FtbDQuMDctcHB4LWNvbXBhcmUpCi0gICAgICAgICgib2Nh bWwtcHB4LWhlcmUiICxvY2FtbDQuMDctcHB4LWhlcmUpCi0gICAgICAgICgib2NhbWwtcHB4LXNl eHAtY29udiIgLG9jYW1sNC4wNy1wcHgtc2V4cC1jb252KQotICAgICAgICAoIm9jYW1sLW1pZ3Jh dGUtcGFyc2V0cmVlIgotICAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1p Z3JhdGUtcGFyc2V0cmVlKSkKLSAgICAgICAgKCJvY2FtbC1wcHhsaWIiICxvY2FtbDQuMDctcHB4 bGliKSkpCisgICAgIGAoKCJvY2FtbC1iYXNlIiAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2Nh bWwtYmFzZSkpCisgICAgICAgKCJvY2FtbC1wcHgtY29tcGFyZSIgLG9jYW1sNC4wNy1wcHgtY29t cGFyZSkKKyAgICAgICAoIm9jYW1sLXBweC1oZXJlIiAsb2NhbWw0LjA3LXBweC1oZXJlKQorICAg ICAgICgib2NhbWwtcHB4LXNleHAtY29udiIgLG9jYW1sNC4wNy1wcHgtc2V4cC1jb252KQorICAg ICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFja2FnZS13aXRoLW9j YW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJvY2FtbC1wcHhsaWIi ICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKSkpCiAgICAgKHByb3BlcnRp ZXMgYCgodXBzdHJlYW0tbmFtZSAuICJwcHhfYXNzZXJ0IikpKQogICAgIChob21lLXBhZ2UgImh0 dHBzOi8vZ2l0aHViLmNvbS9qYW5lc3RyZWV0L3BweF9hc3NlcnQiKQogICAgIChzeW5vcHNpcyAi QXNzZXJ0LWxpa2UgZXh0ZW5zaW9uIG5vZGVzIHRoYXQgcmFpc2UgdXNlZnVsIGVycm9ycyBvbiBm YWlsdXJlIikKQEAgLTUxODEsNyArNTIzOSw3IEBAIHVzZWZ1bCBlcnJvcnMgb24gZmFpbHVyZS4i KQogICAgICAgICgib2NhbWwtc3RkaW8iICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1z dGRpbykpCiAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKICAgICAgICAgLChwYWNr YWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0cmVlKSkKLSAgICAgICAoIm9j YW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpCisgICAgICAgKCJvY2FtbC1wcHhsaWIiICwo cGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKQogICAgICAgICgib2NhbWwtcmUi ICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1yZSkpKSkKICAgICAocHJvcGVydGllcyBg KCh1cHN0cmVhbS1uYW1lIC4gInBweF9leHBlY3QiKSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6 Ly9naXRodWIuY29tL2phbmVzdHJlZXQvcHB4X2V4cGVjdCIpCkBAIC01MjEzLDExICs1MjcxLDEx IEBAIHRvIGRlbm90ZSB0aGUgZXhwZWN0ZWQgb3V0cHV0LiIpCiAgICAgICAgIzpmaW5kbGliICxv Y2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUpKQogICAgIChw cm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9j YW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIK LSAgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJl ZSkpCi0gICAgICAgICgib2NhbWwtb2N0YXZpdXMiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBv Y2FtbC1vY3Rhdml1cykpCi0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxp YikpKQorICAgICBgKCgib2NhbWwtYmFzZSIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1s LWJhc2UpKQorICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFj a2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJv Y2FtbC1vY3Rhdml1cyIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW9jdGF2aXVzKSkK KyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLXBw eGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1uYW1lIC4gInBweF9qc19zdHls ZSIpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0cmVldC9wcHhf anNfc3R5bGUiKQogICAgIChzeW5vcHNpcyAiQ29kZSBzdHlsZSBjaGVja2VyIGZvciBKYW5lIFN0 cmVldCBQYWNrYWdlcyIpCkBAIC01MjQ2LDExICs1MzA0LDExIEBAIHBhY2thZ2VzLiIpCiAgICAg ICAgIzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3 LWR1bmUpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLWJhc2UiICwo cGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKLSAgICAgICAgKCJvY2FtbC10eXBl cmVwIiAsb2NhbWw0LjA3LXR5cGVyZXApCi0gICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRy ZWUiCi0gICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJz ZXRyZWUpKQotICAgICAgICAoIm9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAg ICAgYCgoIm9jYW1sLWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkK KyAgICAgICAoIm9jYW1sLXR5cGVyZXAiICxvY2FtbDQuMDctdHlwZXJlcCkKKyAgICAgICAoIm9j YW1sLW1pZ3JhdGUtcGFyc2V0cmVlIgorICAgICAgICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcg b2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQorICAgICAgICgib2NhbWwtcHB4bGliIiAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtcHB4bGliKSkpKQogICAgIChwcm9wZXJ0aWVzIGAoKHVw c3RyZWFtLW5hbWUgLiAicHB4X3R5cGVyZXBfY29udiIpKSkKICAgICAoaG9tZS1wYWdlICJodHRw czovL2dpdGh1Yi5jb20vamFuZXN0cmVldC9wcHhfdHlwZXJlcF9jb252IikKICAgICAoc3lub3Bz aXMgIkdlbmVyYXRpb24gb2YgcnVudGltZSB0eXBlcyBmcm9tIHR5cGUgZGVjbGFyYXRpb25zIikK QEAgLTUyNzcsMTQgKzUzMzUsMTQgQEAgZnJvbSB0eXBlIGRlZmluaXRpb25zLiIpCiAgICAgICAg IzpmaW5kbGliICxvY2FtbDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1 bmUpKQogICAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLXBweC1jb21wYXJl IiAsb2NhbWw0LjA3LXBweC1jb21wYXJlKQotICAgICAgICAoIm9jYW1sLXBweC1lbnVtZXJhdGUi ICxvY2FtbDQuMDctcHB4LWVudW1lcmF0ZSkKLSAgICAgICAgKCJvY2FtbC1wcHgtaGFzaCIgLG9j YW1sNC4wNy1wcHgtaGFzaCkKLSAgICAgICAgKCJvY2FtbC1wcHgtanMtc3R5bGUiICxvY2FtbDQu MDctcHB4LWpzLXN0eWxlKQotICAgICAgICAoIm9jYW1sLXBweC1zZXhwLWNvbnYiICxvY2FtbDQu MDctcHB4LXNleHAtY29udikKLSAgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJlZSIKLSAg ICAgICAgICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkp Ci0gICAgICAgICgib2NhbWwtcHB4bGliIiAsb2NhbWw0LjA3LXBweGxpYikpKQorICAgICBgKCgi b2NhbWwtcHB4LWNvbXBhcmUiICxvY2FtbDQuMDctcHB4LWNvbXBhcmUpCisgICAgICAgKCJvY2Ft bC1wcHgtZW51bWVyYXRlIiAsb2NhbWw0LjA3LXBweC1lbnVtZXJhdGUpCisgICAgICAgKCJvY2Ft bC1wcHgtaGFzaCIgLG9jYW1sNC4wNy1wcHgtaGFzaCkKKyAgICAgICAoIm9jYW1sLXBweC1qcy1z dHlsZSIgLG9jYW1sNC4wNy1wcHgtanMtc3R5bGUpCisgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1j b252IiAsb2NhbWw0LjA3LXBweC1zZXhwLWNvbnYpCisgICAgICAgKCJvY2FtbC1taWdyYXRlLXBh cnNldHJlZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUt cGFyc2V0cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0 LjA3IG9jYW1sLXBweGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1uYW1lIC4g InBweF9iYXNlIikpKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9qYW5lc3Ry ZWV0L3BweF9iYXNlIikKICAgICAoc3lub3BzaXMgIkJhc2Ugc2V0IG9mIHBweCByZXdyaXRlcnMi KQpAQCAtNTMxNSwxMiArNTM3MywxMiBAQCB2ZXJpZmljYXRpb24gdG9vbC4iKQogICAgICAgICM6 ZmluZGxpYiAsb2NhbWw0LjA3LWZpbmRsaWIKICAgICAgICAjOmR1bmUgLG9jYW1sNC4wNy1kdW5l KSkKICAgICAocHJvcGFnYXRlZC1pbnB1dHMKLSAgICAgIGAoKCJvY2FtbC1iYXNlIiAsKHBhY2th Z2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtYmFzZSkpCi0gICAgICAgICgib2NhbWwtYmluLXByb3Qi ICxvY2FtbDQuMDctYmluLXByb3QpCi0gICAgICAgICgib2NhbWwtcHB4LWhlcmUiICxvY2FtbDQu MDctcHB4LWhlcmUpCi0gICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCi0gICAgICAg ICAsKHBhY2thZ2Utd2l0aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQotICAg ICAgICAoIm9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgoIm9jYW1s LWJhc2UiICwocGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1iYXNlKSkKKyAgICAgICAoIm9j YW1sLWJpbi1wcm90IiAsb2NhbWw0LjA3LWJpbi1wcm90KQorICAgICAgICgib2NhbWwtcHB4LWhl cmUiICxvY2FtbDQuMDctcHB4LWhlcmUpCisgICAgICAgKCJvY2FtbC1taWdyYXRlLXBhcnNldHJl ZSIKKyAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1pZ3JhdGUtcGFyc2V0 cmVlKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9j YW1sLXBweGxpYikpKSkKICAgICAocHJvcGVydGllcyBgKCh1cHN0cmVhbS1uYW1lIC4gInBweF9i aW5fcHJvdCIpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0cmVl dC9wcHhfYmluX3Byb3QiKQogICAgIChzeW5vcHNpcyAiR2VuZXJhdGlvbiBvZiBiaW5fcHJvdCBy ZWFkZXJzIGFuZCB3cml0ZXJzIGZyb20gdHlwZXMiKQpAQCAtNTM0NywyNyArNTQwNSwyNyBAQCBm dW5jdGlvbnMgZnJvbSB0eXBlIGRlZmluaXRpb25zLiIpCiAgICAgICAgIzpmaW5kbGliICxvY2Ft bDQuMDctZmluZGxpYgogICAgICAgICM6ZHVuZSAsb2NhbWw0LjA3LWR1bmUpKQogICAgIChwcm9w YWdhdGVkLWlucHV0cwotICAgICAgYCgoIm9jYW1sLXBweC1hc3NlcnQiICxvY2FtbDQuMDctcHB4 LWFzc2VydCkKLSAgICAgICAgKCJvY2FtbC1wcHgtYmFzZSIgLG9jYW1sNC4wNy1wcHgtYmFzZSkK LSAgICAgICAgKCJvY2FtbC1wcHgtYmVuY2giICxvY2FtbDQuMDctcHB4LWJlbmNoKQotICAgICAg ICAoIm9jYW1sLXBweC1iaW4tcHJvdCIgLG9jYW1sNC4wNy1wcHgtYmluLXByb3QpCi0gICAgICAg ICgib2NhbWwtcHB4LWN1c3RvbS1wcmludGYiICxvY2FtbDQuMDctcHB4LWN1c3RvbS1wcmludGYp Ci0gICAgICAgICgib2NhbWwtcHB4LWV4cGVjdCIgLG9jYW1sNC4wNy1wcHgtZXhwZWN0KQotICAg ICAgICAoIm9jYW1sLXBweC1mYWlsIiAsb2NhbWw0LjA3LXBweC1mYWlsKQotICAgICAgICAoIm9j YW1sLXBweC1maWVsZHMtY29udiIgLG9jYW1sNC4wNy1wcHgtZmllbGRzLWNvbnYpCi0gICAgICAg ICgib2NhbWwtcHB4LWhlcmUiICxvY2FtbDQuMDctcHB4LWhlcmUpCi0gICAgICAgICgib2NhbWwt cHB4LWlubGluZS10ZXN0IiAsb2NhbWw0LjA3LXBweC1pbmxpbmUtdGVzdCkKLSAgICAgICAgKCJv Y2FtbC1wcHgtbGV0IiAsb2NhbWw0LjA3LXBweC1sZXQpCi0gICAgICAgICgib2NhbWwtcHB4LW9w dGNvbXAiICxvY2FtbDQuMDctcHB4LW9wdGNvbXApCi0gICAgICAgICgib2NhbWwtcHB4LW9wdGlv bmFsIiAsb2NhbWw0LjA3LXBweC1vcHRpb25hbCkKLSAgICAgICAgKCJvY2FtbC1wcHgtcGlwZWJh bmciICxvY2FtbDQuMDctcHB4LXBpcGViYW5nKQotICAgICAgICAoIm9jYW1sLXBweC1zZXhwLW1l c3NhZ2UiICxvY2FtbDQuMDctcHB4LXNleHAtbWVzc2FnZSkKLSAgICAgICAgKCJvY2FtbC1wcHgt c2V4cC12YWx1ZSIgLG9jYW1sNC4wNy1wcHgtc2V4cC12YWx1ZSkKLSAgICAgICAgKCJvY2FtbC1w cHgtdHlwZXJlcC1jb252IiAsb2NhbWw0LjA3LXBweC10eXBlcmVwLWNvbnYpCi0gICAgICAgICgi b2NhbWwtcHB4LXZhcmlhbnRzLWNvbnYiICxvY2FtbDQuMDctcHB4LXZhcmlhbnRzLWNvbnYpCi0g ICAgICAgICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCi0gICAgICAgICAsKHBhY2thZ2Utd2l0 aC1vY2FtbDQuMDcgb2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUpKQotICAgICAgICAoIm9jYW1sLXBw eGxpYiIgLG9jYW1sNC4wNy1wcHhsaWIpKSkKKyAgICAgYCgoIm9jYW1sLXBweC1hc3NlcnQiICxv Y2FtbDQuMDctcHB4LWFzc2VydCkKKyAgICAgICAoIm9jYW1sLXBweC1iYXNlIiAsb2NhbWw0LjA3 LXBweC1iYXNlKQorICAgICAgICgib2NhbWwtcHB4LWJlbmNoIiAsb2NhbWw0LjA3LXBweC1iZW5j aCkKKyAgICAgICAoIm9jYW1sLXBweC1iaW4tcHJvdCIgLG9jYW1sNC4wNy1wcHgtYmluLXByb3Qp CisgICAgICAgKCJvY2FtbC1wcHgtY3VzdG9tLXByaW50ZiIgLG9jYW1sNC4wNy1wcHgtY3VzdG9t LXByaW50ZikKKyAgICAgICAoIm9jYW1sLXBweC1leHBlY3QiICxvY2FtbDQuMDctcHB4LWV4cGVj dCkKKyAgICAgICAoIm9jYW1sLXBweC1mYWlsIiAsb2NhbWw0LjA3LXBweC1mYWlsKQorICAgICAg ICgib2NhbWwtcHB4LWZpZWxkcy1jb252IiAsb2NhbWw0LjA3LXBweC1maWVsZHMtY29udikKKyAg ICAgICAoIm9jYW1sLXBweC1oZXJlIiAsb2NhbWw0LjA3LXBweC1oZXJlKQorICAgICAgICgib2Nh bWwtcHB4LWlubGluZS10ZXN0IiAsb2NhbWw0LjA3LXBweC1pbmxpbmUtdGVzdCkKKyAgICAgICAo Im9jYW1sLXBweC1sZXQiICxvY2FtbDQuMDctcHB4LWxldCkKKyAgICAgICAoIm9jYW1sLXBweC1v cHRjb21wIiAsb2NhbWw0LjA3LXBweC1vcHRjb21wKQorICAgICAgICgib2NhbWwtcHB4LW9wdGlv bmFsIiAsb2NhbWw0LjA3LXBweC1vcHRpb25hbCkKKyAgICAgICAoIm9jYW1sLXBweC1waXBlYmFu ZyIgLG9jYW1sNC4wNy1wcHgtcGlwZWJhbmcpCisgICAgICAgKCJvY2FtbC1wcHgtc2V4cC1tZXNz YWdlIiAsb2NhbWw0LjA3LXBweC1zZXhwLW1lc3NhZ2UpCisgICAgICAgKCJvY2FtbC1wcHgtc2V4 cC12YWx1ZSIgLG9jYW1sNC4wNy1wcHgtc2V4cC12YWx1ZSkKKyAgICAgICAoIm9jYW1sLXBweC10 eXBlcmVwLWNvbnYiICxvY2FtbDQuMDctcHB4LXR5cGVyZXAtY29udikKKyAgICAgICAoIm9jYW1s LXBweC12YXJpYW50cy1jb252IiAsb2NhbWw0LjA3LXBweC12YXJpYW50cy1jb252KQorICAgICAg ICgib2NhbWwtbWlncmF0ZS1wYXJzZXRyZWUiCisgICAgICAgICwocGFja2FnZS13aXRoLW9jYW1s NC4wNyBvY2FtbC1taWdyYXRlLXBhcnNldHJlZSkpCisgICAgICAgKCJvY2FtbC1wcHhsaWIiICwo cGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1wcHhsaWIpKSkpCiAgICAgKHByb3BlcnRpZXMg YCgodXBzdHJlYW0tbmFtZSAuICJwcHhfamFuZSIpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczov L2dpdGh1Yi5jb20vamFuZXN0cmVldC9wcHhfamFuZSIpCiAgICAgKHN5bm9wc2lzICJTdGFuZGFy ZCBKYW5lIFN0cmVldCBwcHggcmV3cml0ZXJzIikKQEAgLTU1NTAsNyArNTYwOCw3IEBAIHRob3Vz YW5kcyBvZiB0aW1lcyBmYXN0ZXIgdGhhbiBmb3JrLgogICAgICAgICgib2NhbWwtc3RkaW8iICwo cGFja2FnZS13aXRoLW9jYW1sNC4wNyBvY2FtbC1zdGRpbykpCiAgICAgICAgKCJvY2FtbC1taWdy YXRlLXBhcnNldHJlZSIKICAgICAgICAgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9jYW1sLW1p Z3JhdGUtcGFyc2V0cmVlKSkKLSAgICAgICAoIm9jYW1sLXBweGxpYiIgLG9jYW1sNC4wNy1wcHhs aWIpKSkKKyAgICAgICAoIm9jYW1sLXBweGxpYiIgLChwYWNrYWdlLXdpdGgtb2NhbWw0LjA3IG9j YW1sLXBweGxpYikpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vamFuZXN0 cmVldC9jb3JlIikKICAgICAoc3lub3BzaXMgIkFsdGVybmF0aXZlIHRvIE9DYW1sJ3Mgc3RhbmRh cmQgbGlicmFyeSIpCiAgICAgKGRlc2NyaXB0aW9uICJUaGUgQ29yZSBzdWl0ZSBvZiBsaWJyYXJp ZXMgaXMgYW4gYWx0ZXJuYXRpdmUgdG8gT0NhbWwncwotLSAKMi4yOS4yCgo= --=-od9dn6KMyr7Ep2IyOD+p Content-Disposition: attachment; filename="0004-gnu-Add-ocaml-graphics.patch" Content-Type: text/x-patch; name="0004-gnu-Add-ocaml-graphics.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBjNTM4MjRmMTM0NzJkOTFjZDcwODdlOTY1OTc2ODc2NzI1MTY0ZTY2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBkaXZvcGxhZGUgPGRAZGl2b3BsYWRlLmZyPgpEYXRlOiBXZWQs IDMwIERlYyAyMDIwIDE5OjA2OjU3ICswMTAwClN1YmplY3Q6IFtQQVRDSCA0LzVdIGdudTogQWRk IG9jYW1sLWdyYXBoaWNzCgotLS0KIGdudS9wYWNrYWdlcy9vY2FtbC5zY20gfCAyOSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKykK CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtIGIvZ251L3BhY2thZ2VzL29jYW1s LnNjbQppbmRleCA4MjhkZDZmZjczLi4zNTMzOTRlNGQ0IDEwMDY0NAotLS0gYS9nbnUvcGFja2Fn ZXMvb2NhbWwuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9vY2FtbC5zY20KQEAgLTYxNDgsMyArNjE0 OCwzMiBAQCBwcm92aWRlcyBzdXBwb3J0IHRvIHByb2dyYW0gd2l0aCB0aW1lIHZhcnlpbmcgdmFs dWVzOiBkZWNsYXJhdGl2ZSBldmVudHMgYW5kCiAgc2lnbmFscy4gIFJlYWN0IGRvZXNuJ3QgZGVm aW5lIGFueSBwcmltaXRpdmUgZXZlbnQgb3Igc2lnbmFsLCBpdCBsZXRzIHRoZQogY2xpZW50IGNo b29zZXMgdGhlIGNvbmNyZXRlIHRpbWVsaW5lLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpsZ3Bs Mi4xKykpKQorCisoZGVmaW5lLXB1YmxpYyBvY2FtbC1ncmFwaGljcworICAocGFja2FnZQorICAg IChuYW1lICJvY2FtbC1ncmFwaGljcyIpCisgICAgKHZlcnNpb24gIjUuMS4wIikKKyAgICAoaG9t ZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vb2NhbWwvZ3JhcGhpY3MiKQorICAgIChzb3VyY2UK KyAgICAgKG9yaWdpbgorICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQorICAgICAgICh1cmkgKGdp dC1yZWZlcmVuY2UKKyAgICAgICAgICAgICAodXJsIChzdHJpbmctYXBwZW5kIGhvbWUtcGFnZSAi LmdpdCIpKQorICAgICAgICAgICAgIChjb21taXQgdmVyc2lvbikpKQorICAgICAgIChmaWxlLW5h bWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKKyAgICAgICAoc2hhMjU2CisgICAgICAg IChiYXNlMzIKKyAgICAgICAgICIxaWx3NXIxbHB5ODhmcGZjcGlmeHhiZGc3NGY0NjhqYjV4aGlt dzkyaXdtcjQxMGducXAyIikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIGR1bmUtYnVpbGQtc3lzdGVt KQorICAgIChwcm9wYWdhdGVkLWlucHV0cworICAgICBgKCgiZHVuZS1jb25maWd1cmF0b3IiICxk dW5lLWNvbmZpZ3VyYXRvcikKKyAgICAgICAoImxpYngxMSIgLGxpYngxMSkKKyAgICAgICAoInBr Zy1jb25maWciICxwa2ctY29uZmlnKSkpCisgICAgKHN5bm9wc2lzICJUaGUgT0NhbWwgZ3JhcGhp Y3MgbGlicmFyeSIpCisgICAgKGRlc2NyaXB0aW9uCisgICAgICJUaGUgZ3JhcGhpY3MgbGlicmFy eSBwcm92aWRlcyBhIHNldCBvZiBwb3J0YWJsZSBkcmF3aW5nCitwcmltaXRpdmVzLiBEcmF3aW5n IHRha2VzIHBsYWNlIGluIGEgc2VwYXJhdGUgd2luZG93IHRoYXQgaXMgY3JlYXRlZAord2hlbiBH cmFwaGljcy5vcGVuX2dyYXBoIGlzIGNhbGxlZC4KKworVGhpcyBsaWJyYXJ5IHVzZWQgdG8gYmUg ZGlzdHJpYnV0ZWQgd2l0aCBPQ2FtbCB1cCB0byBPQ2FtbCA0LjA4LiIpCisgICAgKGxpY2Vuc2Ug bGljZW5zZTpsZ3BsMi4xKykpKQotLSAKMi4yOS4yCgo= --=-od9dn6KMyr7Ep2IyOD+p Content-Disposition: attachment; filename="0005-gnu-Add-ocaml-js-of-ocaml.patch" Content-Type: text/x-patch; name="0005-gnu-Add-ocaml-js-of-ocaml.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAxNTFmZmI5NjY1NzI2OGFkZjQwMTAzZDhjNGFhYzA0ZjRkM2E2MWZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBkaXZvcGxhZGUgPGRAZGl2b3BsYWRlLmZyPgpEYXRlOiBXZWQs IDMwIERlYyAyMDIwIDE5OjA4OjU3ICswMTAwClN1YmplY3Q6IFtQQVRDSCA1LzVdIGdudTogQWRk IG9jYW1sLWpzLW9mLW9jYW1sCgotLS0KIGdudS9wYWNrYWdlcy9vY2FtbC5zY20gfCAzOCArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDM4IGlu c2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtIGIvZ251L3Bh Y2thZ2VzL29jYW1sLnNjbQppbmRleCAzNTMzOTRlNGQ0Li5jZTFkMDlmOTM2IDEwMDY0NAotLS0g YS9nbnUvcGFja2FnZXMvb2NhbWwuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9vY2FtbC5zY20KQEAg LTYxNzcsMyArNjE3Nyw0MSBAQCB3aGVuIEdyYXBoaWNzLm9wZW5fZ3JhcGggaXMgY2FsbGVkLgog CiBUaGlzIGxpYnJhcnkgdXNlZCB0byBiZSBkaXN0cmlidXRlZCB3aXRoIE9DYW1sIHVwIHRvIE9D YW1sIDQuMDguIikKICAgICAobGljZW5zZSBsaWNlbnNlOmxncGwyLjErKSkpCisKKyhkZWZpbmUt cHVibGljIG9jYW1sLWpzLW9mLW9jYW1sCisgIChwYWNrYWdlCisgICAgKG5hbWUgIm9jYW1sLWpz LW9mLW9jYW1sIikKKyAgICAodmVyc2lvbiAiMy44LjAiKQorICAgIChzb3VyY2UKKyAgICAgKG9y aWdpbgorICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQorICAgICAgICh1cmkgKGdpdC1yZWZlcmVu Y2UKKyAgICAgICAgICAgICAodXJsICJodHRwczovL2dpdGh1Yi5jb20vb2NzaWdlbi9qc19vZl9v Y2FtbCIpCisgICAgICAgICAgICAgKGNvbW1pdCB2ZXJzaW9uKSkpCisgICAgICAgKGZpbGUtbmFt ZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQorICAgICAgIChzaGEyNTYKKyAgICAgICAg KGJhc2UzMiAiMWxzM25oYXZoaWZzZnd3ejQ1azR4dzkxbWw5emk2cm5rZnAzMTc1YjJoYXZiYXZi enJhbCIpKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBkdW5lLWJ1aWxkLXN5c3RlbSkKKyAgICAoYXJn dW1lbnRzIGAoIzp0ZXN0cz8gI2YpKQorICAgIChwcm9wYWdhdGVkLWlucHV0cworICAgICBgKCgi b2NhbWwtcHB4bGliIiAsb2NhbWwtcHB4bGliKQorICAgICAgICgib2NhbWwtdWNoYXIiICxvY2Ft bC11Y2hhcikKKyAgICAgICAoIm9jYW1sLW1lbmhpciIgLG9jYW1sLW1lbmhpcikKKyAgICAgICAo Im9jYW1sLXJlYWN0aXZlZGF0YSIgLG9jYW1sLXJlYWN0aXZlZGF0YSkKKyAgICAgICAoIm9jYW1s LWNtZGxpbmVyIiAsb2NhbWwtY21kbGluZXIpCisgICAgICAgKCJvY2FtbC1sd3QiICxvY2FtbC1s d3QpCisgICAgICAgKCJvY2FtbC10eXhtbCIgLG9jYW1sLXR5eG1sKQorICAgICAgICgib2NhbWwt cmUiICxvY2FtbC1yZSkKKyAgICAgICAoIm9jYW1sLXV1dGYiICxvY2FtbC11dXRmKQorICAgICAg ICgib2NhbWwtZ3JhcGhpY3MiICxvY2FtbC1ncmFwaGljcykpKQorICAgIChwcm9wZXJ0aWVzIGAo KHVwc3RyZWFtLW5hbWUgLiAianNfb2Zfb2NhbWwiKSkpCisgICAgKGhvbWUtcGFnZQorICAgICAi aHR0cDovL29jc2lnZW4uZ2l0aHViLmlvL2pzX29mX29jYW1sIikKKyAgICAoc3lub3BzaXMKKyAg ICAgIkNvbXBpbGVyIGZyb20gT0NhbWwgYnl0ZWNvZGUgdG8gSmF2YXNjcmlwdCIpCisgICAgKGRl c2NyaXB0aW9uCisgICAgICJKc19vZl9vY2FtbCBpcyBhIGNvbXBpbGVyIGZyb20gT0NhbWwgYnl0 ZWNvZGUgdG8gSmF2YVNjcmlwdC4KK0l0IG1ha2VzIGl0IHBvc3NpYmxlIHRvIHJ1biBwdXJlIE9D YW1sIHByb2dyYW1zIGluIEphdmFTY3JpcHQKK2Vudmlyb25tZW50IGxpa2UgYnJvd3NlcnMgYW5k IE5vZGUuanMKKyIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTpsZ3BsMi4xKykpKQotLSAKMi4yOS4y Cgo= --=-od9dn6KMyr7Ep2IyOD+p-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 02:13:19 2021 Received: (at submit) by debbugs.gnu.org; 4 May 2021 06:13:19 +0000 Received: from localhost ([127.0.0.1]:51043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldoJ0-0004zs-46 for submit@debbugs.gnu.org; Tue, 04 May 2021 02:13:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:55226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldoIv-0004zk-Pv for submit@debbugs.gnu.org; Tue, 04 May 2021 02:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldoIq-0004Sc-EX for guix-patches@gnu.org; Tue, 04 May 2021 02:13:07 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldoIj-00061c-IN for guix-patches@gnu.org; Tue, 04 May 2021 02:13:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 56A1624002B for ; Tue, 4 May 2021 08:12:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620108772; bh=A+JmP9LB9GU5SGyE4lD177yuljc2RzgQTR9Pxi9uusk=; h=From:To:Cc:Subject:Date:From; b=i5aZtJv+Jew5zZgB9kxftmtnSN92vF2jW2CbMRGmk7xFgkDDsirEk5GHoHXfRnACP RVBJCdFjH0ry4yLQUyiykJp9OShYabR1LS9Qsf9XcrjMnv6sgPHyzCDS5TrsWCNEPp GWz/qO8H4bfMkJ9duky7a8uFvFdYV7UMeyGJkbXP91RLM04ZaKF6DLThhIQknmfMsx zKaLba8eOGFC7ObNvFC5krZvTOqHlWPMDHTvQILrvPiOwXSIMLzKojkcYmcGfCQH7U 6HyEKzoqQU64ZT8BS7MNfqU1PjnEe2uBzp0Uz+7AeKNeTjYPEzvrWHzDix4YtgX1hc yihmmIxNhcx5g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FZ8dv1JL0z9rxP; Tue, 4 May 2021 08:12:50 +0200 (CEST) References: <559a908f91e39af40a1580447a708209785c69b8.camel@divoplade.fr> From: pukkamustard To: divoplade Subject: Re: [bug#45558] [PATCH] Add js_of_ocaml Date: Mon, 03 May 2021 12:38:13 +0000 In-reply-to: <559a908f91e39af40a1580447a708209785c69b8.camel@divoplade.fr> Message-ID: <86im3z9gdd.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=pukkamustard@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_12_24=1.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit Cc: 45558@debbugs.gnu.org, 47769@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --=-=-= Content-Type: text/plain; format=flowed Hi divoplade, divoplade writes: > I finally got js_of_ocaml packaged. Thank you! > I'm not sure I did everything correctly (especially indentation There do seem to be some indentation issues. Have you seen the section "Formatting Code" in the Guix manual? There is also a little script in the guix repository that will automatically indent a package definition. Also your commit logs don't seem to be exactly in the required format. For example: "gnu: add ocaml-ppxlib" should be "gnu: Add ocaml-ppxlib.". Check the section "Submitting Patches" in the Guix manual and also the commit history for examples. There are also some things that the linter discovers. For example you can omit the ".git" suffix for GitHub sources or that pkg-config is not needed in ocaml-graphics. You can run `git lint PACKAGE` too see what the linter has to say (and maybe should do that for modified package definitions). > , but also how to make non-4.07 packages This looks ok. I submitted a series of patches that does this for many OCaml packages including the ones included in your series (https://issues.guix.gnu.org/47768). I'm sorry I should have included your work in my patch series instead of duplicating. Maybe a small difference is that the patches in #47769 include a more recent version of ocaml-ppxlib (and the required version of ocaml-migrate-parsetree). I have updated your patches for ocaml-graphics and js_of_ocaml so that they can be applied on #47769. Some changes in the attached patches: ocaml-graphics: - Use version 5.1.1 instead of 5.1.0 (5.1.1 was released after you submitted the patches) - Remove unnecessary inputs - Change git-reference url to homepage (GitHub without the ".git" suffix) - Minor changes to description too make linter happy ocaml-js-of-ocaml: - Set home-page to https://ocsigen.org/js_of_ocaml/ - Use version 3.9.0 instead of 3.8.0 (again released after you submitted the patches) - Enable source maps by including ocaml-yojson as input - Enable tests (this requires ocaml-ppx-expect, ocaml-ppx-variants-conv, ocaml-variantslib and an updated version of ocaml-num) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-ocaml-graphics.patch >From ef943e9e01e979a3de7c84d88d5f8d3d6535da9a Mon Sep 17 00:00:00 2001 From: divoplade Date: Wed, 30 Dec 2020 19:06:57 +0100 Subject: [PATCH 1/6] gnu: Add ocaml-graphics. * gnu/packages/ocaml.scm (ocaml-graphics): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c390a8bce9..4727b294d9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6900,3 +6900,29 @@ Both interfaces give the user total control over the blocking behavior of their application, with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by default and support unbounded lookahead.") (license license:bsd-3))) + +(define-public ocaml-graphics + (package + (name "ocaml-graphics") + (version "5.1.1") + (home-page "https://github.com/ocaml/graphics") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14w07ydji2nbdk366nfp2pzs9484xp9vqv63n345id13v48z8bfi")))) + (build-system dune-build-system) + (propagated-inputs + `(("libx11" ,libx11))) + (synopsis "The OCaml graphics library") + (description + "The graphics library provides a set of portable drawing primitives. +Drawing takes place in a separate window that is created when +Graphics.open_graph is called. This library used to be distributed with OCaml +up to OCaml 4.08.") + (license license:lgpl2.1+))) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-ocaml-variantslib.patch >From 96f9bb75aa9a401f353619d112e414eab2745db1 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 3 May 2021 22:49:23 +0200 Subject: [PATCH 2/6] gnu: Add ocaml-variantslib. * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. (ocaml4.07-variantslib): Inherit from ocaml-variantslib. --- gnu/packages/ocaml.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4727b294d9..e40bc78db2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5137,37 +5137,45 @@ of a record and create new record values.") "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) (properties `((upstream-name . "fieldslib")))))) -(define-public ocaml4.07-variantslib +(define-public ocaml-variantslib (package - (name "ocaml4.07-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (name "ocaml-variantslib") + (version "0.14.0") + (source + (janestreet-origin "variantslib" version + "11zp27gh282dx9ifbhcp6i7fkc97fvk8amaj58mf1g1hwklc0lm3")) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "variantslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "variantslib") + (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) +(define-public ocaml4.07-variantslib + (package-with-ocaml4.07 + (package + (inherit ocaml-variantslib) + (name "ocaml-variantslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/variantslib-v" version ".tar.gz")) + (sha256 + (base32 + "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (properties `((upstream-name . "variantslib")))))) + (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") @@ -5268,7 +5276,7 @@ definitions.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6312,7 +6320,7 @@ standard library that was developed by Jane Street.") ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (properties `((upstream-name . "core_kernel"))) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-Add-ocaml-ppx-variants-conv.patch >From 4753a6bf81c13af58a866782c8b63bbf035c9bd3 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 3 May 2021 22:42:10 +0200 Subject: [PATCH 3/6] gnu: Add ocaml-ppx-variants-conv. * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. (ocaml4.07-ppx-variants-conv): Inherit from ocaml-ppx-variants-conv. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e40bc78db2..019bfea9f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5260,32 +5260,29 @@ definitions.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (properties `((upstream-name . "ppx_sexp_conv")))))) -(define-public ocaml4.07-ppx-variants-conv +(define-public ocaml-ppx-variants-conv (package - (name "ocaml4.07-ppx-variants-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (name "ocaml-ppx-variants-conv") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -5294,6 +5291,24 @@ definitions.") variant types.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-variants-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-variants-conv) + (name "ocaml-ppx-variants-conv") + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (properties `((upstream-name . "ppx_variants_conv")))))) + (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") @@ -5352,7 +5367,7 @@ string conversion.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments @@ -5888,7 +5903,7 @@ useful errors on failure.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -6088,7 +6103,7 @@ functions from type definitions.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-Add-ocaml-ppx-expect.patch >From 332c6ce5b26127f2f324a46489e4c01181de2e57 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 3 May 2021 22:32:27 +0200 Subject: [PATCH 4/6] gnu: Add ocaml-ppx-expect. * gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable. (ocaml4.07-ppx-expect): Inherit from ocaml-ppx-expect. --- gnu/packages/ocaml.scm | 83 +++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 019bfea9f9..c4a024c850 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3791,7 +3791,7 @@ library is currently designed for Unicode Standard 3.2.") `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -5876,40 +5876,31 @@ useful errors on failure.") ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_assert")))))) -(define-public ocaml4.07-ppx-expect +(define-public ocaml-ppx-expect (package - (name "ocaml4.07-ppx-expect") - (version "0.12.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_expect") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) + (name "ocaml-ppx-expect") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) - ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) - (properties `((upstream-name . "ppx_expect"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar @@ -5919,6 +5910,30 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-expect + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-expect) + (version "0.12.0") + (source + (janestreet-origin "ppx_expect" version + "1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect")))))) + (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") @@ -6091,7 +6106,7 @@ functions from type definitions.") ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) + ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) @@ -6236,7 +6251,7 @@ Configurator allows one to: #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-ocaml-num-Update-to-1.4.patch >From ac57c989bb2dab51e45561c3faeed8ef5a52cb3a Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Tue, 4 May 2021 07:58:43 +0200 Subject: [PATCH 5/6] gnu: ocaml-num: Update to 1.4. * gnu/packages/ocaml.scm (ocaml-num): Update to 1.4. --- gnu/packages/ocaml.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c4a024c850..349124c99e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -958,7 +958,7 @@ written in Objective Caml.") (define-public ocaml-num (package (name "ocaml-num") - (version "1.1") + (version "1.4") (source (origin (method git-fetch) @@ -967,33 +967,8 @@ written in Objective Caml.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0")))) - (build-system ocaml-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'fix-makefile - (lambda* (#:key outputs #:allow-other-keys) - ;; This package supposes we install to the same directory as - ;; the ocaml package. - (substitute* "src/META" - (("\"\\^\"") (string-append "\"" (assoc-ref outputs "out") - "/lib/ocaml/site-lib\""))) - (substitute* "src/Makefile" - (("\\) \\$\\(STDLIBDIR\\)") - (string-append ") " (assoc-ref outputs "out") - "/lib/ocaml/site-lib"))) - #t)) - (add-after 'install 'fix-stubslib - (lambda* (#:key outputs #:allow-other-keys) - (format #t "~a~%" (find-files "." ".*.so")) - (let ((stubdir (string-append (assoc-ref outputs "out") - "/lib/ocaml/site-lib/stublibs"))) - (delete-file stubdir) - (mkdir-p stubdir) - (install-file "src/dllnums.so" stubdir)) - #t))))) + (base32 "1vzdnvpj5dbj3ifx03v25pj2jj1ccav072v4d29pk1czdba2lzfc")))) + (build-system dune-build-system) (home-page "https://github.com/ocaml/num") (synopsis "Arbitrary-precision integer and rational arithmetic") (description "OCaml-Num contains the legacy Num library for -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-gnu-Add-ocaml-js-of-ocaml.patch >From 7a19c648423b31d2322a86dc762dd01e39c417c0 Mon Sep 17 00:00:00 2001 From: divoplade Date: Wed, 30 Dec 2020 19:08:57 +0100 Subject: [PATCH 6/6] gnu: Add ocaml-js-of-ocaml. * gnu/packages/ocaml.scm (ocaml-js-of-ocaml): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 349124c99e..24d9e814fa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -6939,3 +6940,43 @@ Drawing takes place in a separate window that is created when Graphics.open_graph is called. This library used to be distributed with OCaml up to OCaml 4.08.") (license license:lgpl2.1+))) + +(define-public ocaml-js-of-ocaml + (package + (name "ocaml-js-of-ocaml") + (version "3.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/js_of_ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (propagated-inputs + `(("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-uchar" ,ocaml-uchar) + ("ocaml-menhir" ,ocaml-menhir) + ("ocaml-reactivedata" ,ocaml-reactivedata) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-tyxml" ,ocaml-tyxml) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf) + ("ocaml-graphics" ,ocaml-graphics) + ("ocaml-yojson" ,ocaml-yojson))) + (native-inputs + ;; for tests + `(("node" ,node) + ("ocaml-ppx-expect" ,ocaml-ppx-expect) + ("ocaml-num" ,ocaml-num))) + (properties `((upstream-name . "js_of_ocaml"))) + (home-page "https://ocsigen.org/js_of_ocaml/") + (synopsis "Compiler from OCaml bytecode to Javascript") + (description "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. +It makes it possible to run pure OCaml programs in JavaScript environment like +browsers and Node.js.") + (license license:lgpl2.1+))) -- 2.31.1 --=-=-= Content-Type: text/plain; format=flowed Best regards, pukkamustard --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 05:10:35 2021 Received: (at submit) by debbugs.gnu.org; 4 May 2021 09:10:35 +0000 Received: from localhost ([127.0.0.1]:51956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldr4d-0004mu-Cd for submit@debbugs.gnu.org; Tue, 04 May 2021 05:10:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:42214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldr4c-0004mf-7b for submit@debbugs.gnu.org; Tue, 04 May 2021 05:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldr4b-0001FL-Rf for guix-patches@gnu.org; Tue, 04 May 2021 05:10:34 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:36289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldr4Z-0006uc-JJ for guix-patches@gnu.org; Tue, 04 May 2021 05:10:33 -0400 X-Originating-IP: 86.233.159.27 Received: from pruneau.home (lfbn-poi-1-196-27.w86-233.abo.wanadoo.fr [86.233.159.27]) (Authenticated sender: d@divoplade.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 7772F20006; Tue, 4 May 2021 09:10:23 +0000 (UTC) Message-ID: Subject: Re: [bug#45558] [PATCH] Add js_of_ocaml From: divoplade To: pukkamustard Date: Tue, 04 May 2021 11:10:17 +0200 In-Reply-To: <86im3z9gdd.fsf@posteo.net> References: <559a908f91e39af40a1580447a708209785c69b8.camel@divoplade.fr> <86im3z9gdd.fsf@posteo.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.200; envelope-from=d@divoplade.fr; helo=relay7-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: 45558@debbugs.gnu.org, 47769@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hello, Thank you for the interest in this issue. I realize I opened it at a rather inconvenient time, so I guess it ended up on the bottom of the pile for quite some time. Le lundi 03 mai 2021 à 12:38 +0000, pukkamustard a écrit : > I submitted a series of patches that does this for many OCaml > packages including the ones included in your series > (https://issues.guix.gnu.org/47768). The situation is quite complex to me, please bear with me. If I understand correctly, you pushed a lot of ocaml updates last month, making some of the changes I made in december somewhat obsolete. Right? So, now, I should your modified 5 patches in this issue on top of the 37 patches in the other issue to get js-of-ocaml. Is it correct? At this rate, if it is possible, maybe you could just append these 5 to the other issue, it would be easier to track. What do you think? I didn’t detect indentation problems by running ./etc/indent-code.el; even if other packages in the module have some indentation problems. From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:34:10 2021 Received: (at 45558-done) by debbugs.gnu.org; 10 May 2021 05:34:10 +0000 Received: from localhost ([127.0.0.1]:57128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyYU-0000zv-8R for submit@debbugs.gnu.org; Mon, 10 May 2021 01:34:10 -0400 Received: from mout02.posteo.de ([185.67.36.66]:42037) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyYS-0000ze-WC for 45558-done@debbugs.gnu.org; Mon, 10 May 2021 01:34:10 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D4D772400FC for <45558-done@debbugs.gnu.org>; Mon, 10 May 2021 07:34:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620624842; bh=w9qP788Lz7VMVw3lvyaFdgLKTSwGqcaqMT1vBIk7o+w=; h=From:To:Cc:Subject:Date:From; b=NIDRbRJkidD/InquAGy3sBD2Nv/Jz3+pOzC9bHsanl1UwkO4tqkjnAJVO+6hun2yA ekH1wxiCgKVRjZrhe0p/OLkuphPVNUSU0iaHY8lsd9FXaiiNgY8vsJmcUoHQRnk+t+ +ehoSHRlvMlDQHQY2PYoNyaSUX8JjcXVWQazEjJI1xTiQWAV1Gq/kiBwGXLNbDatJM LOlcbpK/NUMIEi6Eu3MTBvnKc7SIT/LTJWrgj1apu+jSxNry5KXN7QeRTTYnLhGLPn caxd28RyYvAyWGwR+O0j0SMMb7DtOeH3u0PAK2fIH3hC4gz/7UIfpPx59wavoTHUcz AVMbwC0uPsOrQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FdqVK1lcQz6tm5; Mon, 10 May 2021 07:34:00 +0200 (CEST) References: <559a908f91e39af40a1580447a708209785c69b8.camel@divoplade.fr> <86im3z9gdd.fsf@posteo.net> From: pukkamustard To: divoplade Subject: Re: [bug#45558] [PATCH] Add js_of_ocaml Date: Mon, 10 May 2021 05:18:53 +0000 In-reply-to: Message-ID: <86fsyvb1a4.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45558-done Cc: 45558-done@debbugs.gnu.org, 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi divoplade, divoplade writes: [...] > So, now, I should your modified 5 patches in this issue on top > of the > 37 patches in the other issue to get js-of-ocaml. Is it correct? > > At this rate, if it is possible, maybe you could just append > these 5 to > the other issue, it would be easier to track. > > What do you think? Yeah, that makes sense. I just submitted a V2 of #47768 (https://issues.guix.gnu.org/47768) that includes your patches for js_of_ocaml, merging the issues. Closing this issue in favor of #47769. -pukkamustard From unknown Wed Jun 18 23:05:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 07 Jun 2021 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator