From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0GGWI2CmR2F5cgAAgWs5BA (envelope-from ) for ; Sun, 19 Sep 2021 23:06:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UIMhH2CmR2F1JAAAbx9fmQ (envelope-from ) for ; Sun, 19 Sep 2021 21:06:40 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5ADAC159F3 for ; Sun, 19 Sep 2021 23:06:39 +0200 (CEST) Received: from localhost ([::1]:41602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mS41F-0000Pn-F9 for larch@yhetil.org; Sun, 19 Sep 2021 17:06:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mS40g-0000PS-Jp for bug-guix@gnu.org; Sun, 19 Sep 2021 17:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mS40g-00077d-Br for bug-guix@gnu.org; Sun, 19 Sep 2021 17:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mS40g-0007qf-7C for bug-guix@gnu.org; Sun, 19 Sep 2021 17:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50677: [PATCH] Minetest basic_materials really depends on moreores Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Sep 2021 21:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50677 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Maxime Devos , 50677@debbugs.gnu.org Received: via spool by 50677-submit@debbugs.gnu.org id=B50677.163208552830123 (code B ref 50677); Sun, 19 Sep 2021 21:06:02 +0000 Received: (at 50677) by debbugs.gnu.org; 19 Sep 2021 21:05:28 +0000 Received: from localhost ([127.0.0.1]:40115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS3zy-0007pe-Gh for submit@debbugs.gnu.org; Sun, 19 Sep 2021 17:05:28 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS3zv-0007pR-Bu for 50677@debbugs.gnu.org; Sun, 19 Sep 2021 17:05:16 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b7237fc4; Sun, 19 Sep 2021 21:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:mime-version; s=*; bh=aAH1koHHjwMCA+Naz66TvLbq4/0=; b= b9+vD0PcwZMAVk/mqXTs4S3q+USBWTt7KIO/Pl8ncvNiLrj8O3eBVLZ9pdN6wV9+ zObTLdMCQ14o7hok9enqmdFus03ZPSI0HuE+Cb9gyzWREoko4hPfEg4u7WrLrH1l chNm2fG+kFMasdIGTrukT/3WHBgQUOLi7yrCtnQU0f0= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 339bf9ab (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Sun, 19 Sep 2021 21:05:10 +0000 (UTC) Message-ID: <9f206acf24c7fc265102712912d3d0e336b54fc7.camel@planete-kraus.eu> Date: Sun, 19 Sep 2021 23:05:09 +0200 In-Reply-To: <9d9f86773809358187afbe5c7052d09f3d4d1052.camel@telenet.be> References: <47d31be5bfc24646981f2f71942fedd89c556405.camel@planete-kraus.eu> <67c326ff5fd285311dab48b03f646c28690fa376.camel@planete-kraus.eu> <9d9f86773809358187afbe5c7052d09f3d4d1052.camel@telenet.be> Content-Type: multipart/mixed; boundary="=-Ny1YZFGu7u3JdCXT/WX+" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Vivien Kraus From: Vivien Kraus via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632085600; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=PFOrdIlNFIryiV0LJGYXuf/3mocieznWInwG8rMSxxE=; b=hJsQdM9tph4A7E40mSj+xzBTFBEh9vfm5hmoyqV27a1SP5nHpJBB6b/lGmD833UCqSMKWK FmT/AGwxPDpkUHT5x1hVdOoVVcjQoUTvnMRCnMvFflIOhgFENv9OXJts72Hr5TNACceCcM us6tPVdzc9aYNK2/frZZDYy7iN2hUiqiIGcZce3c+EU5FJqqTp0P2F/ulIPoqC9BXGQk4p GD59duxA1+ahzQlbTrCcGtjn+H8vkzfjh5YxwhCUgqeikhXrUpPS0rQVHqu2oVsox6bgej BXulknp6XkxbU8PPyeEH6wu2sQgKXn0+ivL/zW8JT2uvvQ41gDV8VYcVnj1fKw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632085600; a=rsa-sha256; cv=none; b=JlnScRi4eb0EIfzIaSTcJNLUYLDaqgOakG/MFsVb0a1dtjPcPRCVgIdN8rk31k8ZuklWpH Biknp/FV8zTBTU9xpNXl6o80Zfas4wOalDTguKBnxSXnEG4eMd4oX9nt2AVEVV8tM9sSr5 K6/30Ir6YLC+z3sbPM/+4soh7qh+QlD/PFPn1huyNLjv6rib7hbMcY35K9Bh8WDhVtk1ID O5OjQ9tSldZYM5sfTbc3T91mfxXoyuQi8ZbloKjQklSylhLYg7M9Tyh7lhqxrsR94+0WIP WFXGLq6eRY0TkXVCkgSibv1vCip/zQjIgF5zdos1S1bk3K4IuWceo1INNvd6Gg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -1.79 Authentication-Results: aspmx1.migadu.com; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 5ADAC159F3 X-Spam-Score: -1.79 X-Migadu-Scanner: scn0.migadu.com X-TUID: OqKw3eU5GbSo --=-Ny1YZFGu7u3JdCXT/WX+ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Le dimanche 19 septembre 2021 à 21:11 +0200, Maxime Devos a écrit : > I found a use of "config.txt" ( > https://forum.minetest.net/viewtopic.php?t=2290), > "settingstypes.txt" ( > https://github.com/NathanSalapat/more_fire/blob/master/settingtypes.txt > ) > and another "_config.txt" ( > https://forum.minetest.net/viewtopic.php?t=25275). > > "settingstypes.txt" is already in mod-install-plan (guix build > minetest-build-system). > I suppose you can add "config.txt" and "_config.txt" as well. OK. > Vivien Kraus schreef op zo 19-09-2021 om 20:59 [+0200]: > > Le dimanche 19 septembre 2021 à 20:54 +0200, Vivien Kraus a écrit : > > > I forgot to say, I could not figure out why the package did not > > > build, > > > because the check phase in the minetest build system stops after > the > > > first error line of output, which only stated that there was a > > > problem > > > with init.lua. I had to disable the error line detection in the > build > > > system implementation to know it was a problem with this file. > So, I > > > figured out that what we need to do is gather all error lines, > until > > > either the server stops or starts despite the error, and fail > only > > > then. > > > > > > I prefer the exceptions API because it can handle multiple lines > of > > > errors while displaying them cleanly (unlike the error function, > that > > > displays an ugly ~a and prints the arguments on 1 line). But, > it’s > > > only > > > for the "new" guile 3.0. > > This modified error reporting seems reasonable to me, but I haven't > tested > it. I link my output without 0001 (fail at first error line) nor 0002 (fail because of _config.txt): the build fails without a mention of _config.txt; and my output just without 0002: the build fails more nicely. Also, all other packages returned by "guix search minetest" still build successfully. Vivien --=-Ny1YZFGu7u3JdCXT/WX+ Content-Disposition: attachment; filename*0=0004-gnu-minetest-basic-materials-Depend-on-minetest-more.pat; filename*1=ch Content-Type: text/x-patch; name="0004-gnu-minetest-basic-materials-Depend-on-minetest-more.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAxNTRmZjQ2NjVlZGVkYzFhZjVkMDg4OTg3MzYyOTc1YjYyM2Q4MzAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBWaXZpZW4gS3JhdXMgPHZpdmllbkBwbGFuZXRlLWtyYXVzLmV1 PgpEYXRlOiBTdW4sIDE5IFNlcCAyMDIxIDE3OjAwOjQ1ICswMjAwClN1YmplY3Q6IFtQQVRDSCA0 LzRdIGdudTogbWluZXRlc3QtYmFzaWMtbWF0ZXJpYWxzOiBEZXBlbmQgb24KIG1pbmV0ZXN0LW1v cmVvcmVzLgoKKiBtaW5ldGVzdC5zY20gKG1pbmV0ZXN0LWJhc2ljLW1hdGVyaWFscyk6IEFkZCBt aW5ldGVzdC1tb3Jlb3JlcyBhcyBhIHByb3BhZ2F0ZWQgaW5wdXQuCi0tLQogZ251L3BhY2thZ2Vz L21pbmV0ZXN0LnNjbSB8IDQgKysrKwogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9taW5ldGVzdC5zY20gYi9nbnUvcGFja2FnZXMvbWlu ZXRlc3Quc2NtCmluZGV4IDA3MzBkZTczNTEuLjE4OTg4OWY4OTAgMTAwNjQ0Ci0tLSBhL2dudS9w YWNrYWdlcy9taW5ldGVzdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL21pbmV0ZXN0LnNjbQpAQCAt MjIxLDYgKzIyMSwxMCBAQCBudW1lcmljIGlkZW50aWZpZXIgVE9QSUMtSUQgb24gdGhlIG9mZmlj aWFsIE1pbmV0ZXN0IGZvcnVtcy4iCiAgICAgICAgIChiYXNlMzIgIjB2NmwzbHJqZ3NoeTRzY2Nq aGZobWZ4YzNnazBjZHk3M3FiMDJpOXdkMnZ3NTA2djVhc3giKSkKICAgICAgICAoZmlsZS1uYW1l IChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpKSkKICAgICAoYnVpbGQtc3lzdGVtIG1pbmV0 ZXN0LW1vZC1idWlsZC1zeXN0ZW0pCisgICAgKHByb3BhZ2F0ZWQtaW5wdXRzCisgICAgIDs7IGJh c2ljX21hdGVyaWFsczpzaWx2ZXJfd2lyZSBjYW5ub3QgYmUgY3JhZnRlZCB3aXRob3V0CisgICAg IDs7IG1vcmVvcmVzOnNpbHZlcl9pbmdvdC4KKyAgICAgYCgoIm1pbmV0ZXN0LW1vcmVvcmVzIiAs bWluZXRlc3QtbW9yZW9yZXMpKSkKICAgICAoaG9tZS1wYWdlIChtaW5ldGVzdC10b3BpYyAyMTAw MCkpCiAgICAgKHN5bm9wc2lzICJTb21lIFwiYmFzaWNcIiBtYXRlcmlhbHMgYW5kIGl0ZW1zIGZv ciBvdGhlciBNaW5ldGVzdCBtb2RzIHRvIHVzZSIpCiAgICAgKGRlc2NyaXB0aW9uCi0tIAoyLjMz LjAKCg== --=-Ny1YZFGu7u3JdCXT/WX+ Content-Disposition: attachment; filename="0003-gnu-Add-minetest-moreores.patch" Content-Type: text/x-patch; name="0003-gnu-Add-minetest-moreores.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA2MGViNjFiZjExMGE5YTM3MDJhZTZhN2QzNWVmYzM0NzM2M2Q3M2YxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBWaXZpZW4gS3JhdXMgPHZpdmllbkBwbGFuZXRlLWtyYXVzLmV1 PgpEYXRlOiBTdW4sIDE5IFNlcCAyMDIxIDE2OjU4OjUzICswMjAwClN1YmplY3Q6IFtQQVRDSCAz LzRdIGdudTogQWRkIG1pbmV0ZXN0LW1vcmVvcmVzLgoKKiBnbnUvcGFja2FnZXMvbWluZXRlc3Qu c2NtIChtaW5ldGVzdC1tb3Jlb3Jlcyk6IE5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMv bWluZXRlc3Quc2NtIHwgMTkgKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDE5 IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvbWluZXRlc3Quc2NtIGIv Z251L3BhY2thZ2VzL21pbmV0ZXN0LnNjbQppbmRleCBmZDE0MzlkNGQyLi4wNzMwZGU3MzUxIDEw MDY0NAotLS0gYS9nbnUvcGFja2FnZXMvbWluZXRlc3Quc2NtCisrKyBiL2dudS9wYWNrYWdlcy9t aW5ldGVzdC5zY20KQEAgLTE4Nyw2ICsxODcsMjUgQEAgbnVtZXJpYyBpZGVudGlmaWVyIFRPUElD LUlEIG9uIHRoZSBvZmZpY2lhbCBNaW5ldGVzdCBmb3J1bXMuIgogICAoc3RyaW5nLWFwcGVuZCAi aHR0cHM6Ly9mb3J1bS5taW5ldGVzdC5uZXQvdmlld3RvcGljLnBocD90PSIKICAgICAgICAgICAg ICAgICAgKG51bWJlci0+c3RyaW5nIHRvcGljLWlkKSkpCiAKKyhkZWZpbmUtcHVibGljIG1pbmV0 ZXN0LW1vcmVvcmVzCisgIChwYWNrYWdlCisgICAgKG5hbWUgIm1pbmV0ZXN0LW1vcmVvcmVzIikK KyAgICAodmVyc2lvbiAiMi4xLjAiKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAgICAg IChtZXRob2QgZ2l0LWZldGNoKQorICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKKyAgICAgICAg ICAgICAodXJsICJodHRwczovL2dpdGh1Yi5jb20vbWluZXRlc3QtbW9kcy9tb3Jlb3JlcyIpCisg ICAgICAgICAgICAgKGNvbW1pdCAiMGI2ZjY2OWRmNGM5Yjc3NzFjMDNlMGU2YmE4ZWZmYjQ3MWNk ZmNhZSIpKSkKKyAgICAgICAoc2hhMjU2IChiYXNlMzIgIjFjaGZxYmM2YmIyN2FhY2pjNjdqNWw1 d2Nkdm1jc3ZrMnJmbWFuZ2lwZDdud2luaTN5MzQiKSkKKyAgICAgICAoZmlsZS1uYW1lIChnaXQt ZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIG1pbmV0ZXN0LW1v ZC1idWlsZC1zeXN0ZW0pCisgICAgKGhvbWUtcGFnZSAobWluZXRlc3QtdG9waWMgNTQ5KSkKKyAg ICAoc3lub3BzaXMgIkFkZHMgbmV3IG9yZSB0eXBlcyIpCisgICAgKGRlc2NyaXB0aW9uICJNb3Jl IG9yZXMgZm9yIE1pbmV0ZXN0LiIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKQorICAgIChw cm9wZXJ0aWVzIGAoKHVwc3RyZWFtLW5hbWUgLiAiQ2FsaW5vdS9tb3Jlb3JlcyIpKSkpKQorCiAo ZGVmaW5lLXB1YmxpYyBtaW5ldGVzdC1iYXNpYy1tYXRlcmlhbHMKICAgKHBhY2thZ2UKICAgICAo bmFtZSAibWluZXRlc3QtYmFzaWMtbWF0ZXJpYWxzIikKLS0gCjIuMzMuMAoK --=-Ny1YZFGu7u3JdCXT/WX+ Content-Disposition: attachment; filename*0=0002-guix-minetest-build-system-Also-install-config.txt-a.pat; filename*1=ch Content-Type: text/x-patch; name="0002-guix-minetest-build-system-Also-install-config.txt-a.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBhMmRlNzBlNTA1ZTVlNTQxYTUxNmNiN2YyYjhmNDZlNThjMGQ5MThmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBWaXZpZW4gS3JhdXMgPHZpdmllbkBwbGFuZXRlLWtyYXVzLmV1 PgpEYXRlOiBTdW4sIDE5IFNlcCAyMDIxIDIyOjQyOjQ5ICswMjAwClN1YmplY3Q6IFtQQVRDSCAy LzRdIGd1aXg6IG1pbmV0ZXN0LWJ1aWxkLXN5c3RlbTogQWxzbyBpbnN0YWxsIGNvbmZpZy50eHQg YW5kCiBfY29uZmlnLnR4dAoKKiBtaW5ldGVzdC1idWlsZC1zeXN0ZW0uc2NtIChtb2QtaW5zdGFs bC1wbGFuKTogQWRkIGNvbmZpZy50eHQgYW5kIF9jb25maWcudHh0IHRvIHRoZSBsaXN0IG9mIGlu c3RhbGxlZCBmaWxlcy4KLS0tCiBndWl4L2J1aWxkL21pbmV0ZXN0LWJ1aWxkLXN5c3RlbS5zY20g fCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRp ZmYgLS1naXQgYS9ndWl4L2J1aWxkL21pbmV0ZXN0LWJ1aWxkLXN5c3RlbS5zY20gYi9ndWl4L2J1 aWxkL21pbmV0ZXN0LWJ1aWxkLXN5c3RlbS5zY20KaW5kZXggOTg1ODU5MDM2Yy4uNzllNWE2N2I4 OSAxMDA2NDQKLS0tIGEvZ3VpeC9idWlsZC9taW5ldGVzdC1idWlsZC1zeXN0ZW0uc2NtCisrKyBi L2d1aXgvYnVpbGQvbWluZXRlc3QtYnVpbGQtc3lzdGVtLnNjbQpAQCAtNDEsNyArNDEsNyBAQAog ICAgICA7OyBTZWUgPGh0dHBzOi8vZ2l0aHViLmNvbS9taW5ldGVzdC9taW5ldGVzdC9ibG9iL21h c3Rlci9kb2MvbHVhX2FwaS50eHQ+CiAgICAgIDs7IGZvciBhbiBpbmNvbXBsZSBsaXN0IG9mIGZp bGVzIHRoYXQgY2FuIGJlIGZvdW5kIGluIG1vZHMuCiAgICAgICM6aW5jbHVkZSAoIm1vZC5jb25m IiAibW9kcGFjay5jb25mIiAic2V0dGluZ3R5cGVzLnR4dCIgImRlcGVuZHMudHh0IgotICAgICAg ICAgICAgICAgICJkZXNjcmlwdGlvbi50eHQiKQorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlv bi50eHQiICJjb25maWcudHh0IiAiX2NvbmZpZy50eHQiKQogICAgICAjOmluY2x1ZGUtcmVnZXhw ICgiLmx1YSQiICIucG5nJCIgIi5vZ2ckIiAiLm9iaiQiICIuYjNkJCIgIi50ciQiCiAgICAgICAg ICAgICAgICAgICAgICAgICIubXRzJCIpKSkpCiAKLS0gCjIuMzMuMAoK --=-Ny1YZFGu7u3JdCXT/WX+ Content-Disposition: attachment; filename*0=0001-guix-minetest-build-system-Report-all-error-lines-be.pat; filename*1=ch Content-Type: text/x-patch; name="0001-guix-minetest-build-system-Report-all-error-lines-be.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA4ZGFlZGVkN2NlM2VlYjAyYTFiMjM5NTc3ZmQyNmZmZGY2YTJiMjQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBWaXZpZW4gS3JhdXMgPHZpdmllbkBwbGFuZXRlLWtyYXVzLmV1 PgpEYXRlOiBTdW4sIDE5IFNlcCAyMDIxIDIwOjAzOjEwICswMjAwClN1YmplY3Q6IFtQQVRDSCAx LzRdIGd1aXg6IG1pbmV0ZXN0LWJ1aWxkLXN5c3RlbTogUmVwb3J0IGFsbCBlcnJvciBsaW5lcwog YmVmb3JlIGZhaWxpbmcKCiogbWluZXRlc3QtYnVpbGQtc3lzdGVtLnNjbSAoY2hlY2spOiBSZXBv cnQgYWxsIGVycm9yIGxpbmVzIGJlZm9yZSBmYWlsaW5nLgotLS0KIGd1aXgvYnVpbGQvbWluZXRl c3QtYnVpbGQtc3lzdGVtLnNjbSB8IDI0ICsrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv Z3VpeC9idWlsZC9taW5ldGVzdC1idWlsZC1zeXN0ZW0uc2NtIGIvZ3VpeC9idWlsZC9taW5ldGVz dC1idWlsZC1zeXN0ZW0uc2NtCmluZGV4IDQ3N2NjM2QxZDAuLjk4NTg1OTAzNmMgMTAwNjQ0Ci0t LSBhL2d1aXgvYnVpbGQvbWluZXRlc3QtYnVpbGQtc3lzdGVtLnNjbQorKysgYi9ndWl4L2J1aWxk L21pbmV0ZXN0LWJ1aWxkLXN5c3RlbS5zY20KQEAgLTIzLDYgKzIzLDcgQEAKICAgIzp1c2UtbW9k dWxlIChpY2UtOSByZGVsaW0pCiAgICM6dXNlLW1vZHVsZSAoaWNlLTkgcmVjZWl2ZSkKICAgIzp1 c2UtbW9kdWxlIChpY2UtOSByZWdleCkKKyAgIzp1c2UtbW9kdWxlIChpY2UtOSBleGNlcHRpb25z KQogICAjOnVzZS1tb2R1bGUgKChndWl4IGJ1aWxkIGdudS1idWlsZC1zeXN0ZW0pICM6cHJlZml4 IGdudTopCiAgICM6dXNlLW1vZHVsZSAoKGd1aXggYnVpbGQgY29weS1idWlsZC1zeXN0ZW0pICM6 cHJlZml4IGNvcHk6KQogICAjOmV4cG9ydCAoJXN0YW5kYXJkLXBoYXNlcwpAQCAtMTk5LDIwICsy MDAsMjUgQEAgYXV0aF9iYWNrZW5kID0gc3FsaXRlMwogICAgICAgICAoZGVmaW5lIChzdG9wPyBs aW5lKQogICAgICAgICAgIChhbmQgKHN0cmluZz8gbGluZSkKICAgICAgICAgICAgICAgIChzdHJp bmctY29udGFpbnMgbGluZSAiQUNUSU9OW1NlcnZlcl06IHNpbmdsZXBsYXllciBbMTI3LjAuMC4x XSBqb2lucyBnYW1lLiIpKSkKLSAgICAgICAgKGxldCBsb29wICgpCi0gICAgICAgICAgKG1hdGNo IChyZWFkLWxpbmUgcG9ydCkKLSAgICAgICAgICAgICgoPyBlcnJvcj8gbGluZSkKLSAgICAgICAg ICAgICAoZXJyb3IgIm1pbmV0ZXN0IHJhaXNlZCBhbiBlcnJvcjogfmEiIGxpbmUpKQotICAgICAg ICAgICAgKCg/IHN0b3A/KQorICAgICAgICAobGV0IGxvb3AgKChlcnJvcnMgJygpKSkKKyAgICAg ICAgICAobWF0Y2ggYCgsKHJlYWQtbGluZSBwb3J0KSAsZXJyb3JzKQorICAgICAgICAgICAgKCgo PyBlcnJvcj8gbGluZSkgZXJyb3JzKQorICAgICAgICAgICAgIChsb29wIGAoLGxpbmUgLEBlcnJv cnMpKSkKKyAgICAgICAgICAgICgoKD8gc3RvcD8pICgpKQogICAgICAgICAgICAgIChraWxsIHBp ZCBTSUdJTlQpCiAgICAgICAgICAgICAgKGNsb3NlLXBvcnQgcG9ydCkKICAgICAgICAgICAgICAo d2FpdHBpZCBwaWQpKQotICAgICAgICAgICAgKCg/IHN0cmluZz8gbGluZSkKKyAgICAgICAgICAg ICgoKD8gZW9mLW9iamVjdD8pICgpKQorICAgICAgICAgICAgIChlcnJvciAibWluZXRlc3QgZGlk bid0IHN0YXJ0IikpCisgICAgICAgICAgICAoKChvciAoPyBzdG9wPykgKD8gZW9mLW9iamVjdD8p KSBlcnJvcnMpCisgICAgICAgICAgICAgKHJhaXNlLWV4Y2VwdGlvbgorICAgICAgICAgICAgICAo YXBwbHkgbWFrZS1leGNlcHRpb24KKyAgICAgICAgICAgICAgICAgICAgIChtYXAgbWFrZS1leGNl cHRpb24td2l0aC1tZXNzYWdlCisgICAgICAgICAgICAgICAgICAgICAgICAgIChyZXZlcnNlIGVy cm9ycykpKSkpCisgICAgICAgICAgICAoKCg/IHN0cmluZz8gbGluZSkgZXJyb3JzKQogICAgICAg ICAgICAgIChkaXNwbGF5IGxpbmUpCiAgICAgICAgICAgICAgKG5ld2xpbmUpCi0gICAgICAgICAg ICAgKGxvb3ApKQotICAgICAgICAgICAgKCg/IGVvZi1vYmplY3Q/KQotICAgICAgICAgICAgIChl cnJvciAibWluZXRlc3QgZGlkbid0IHN0YXJ0IikpKSkpKSkpCisgICAgICAgICAgICAgKGxvb3Ag ZXJyb3JzKSkpKSkpKSkKIAogKGRlZmluZSAlc3RhbmRhcmQtcGhhc2VzCiAgIChtb2RpZnktcGhh c2VzIGdudTolc3RhbmRhcmQtcGhhc2VzCi0tIAoyLjMzLjAKCg== --=-Ny1YZFGu7u3JdCXT/WX+ Content-Disposition: attachment; filename="without-0001-0002-patch.txt" Content-Type: text/plain; name="without-0001-0002-patch.txt"; charset="UTF-8" Content-Transfer-Encoding: base64 MjAyMS0wOS0xOSAyMDo1MjowNjogSU5GT1tNYWluXTogTW9kICJmYXJtaW5nIiBsb2FkZWQgYWZ0 ZXIgMiBtcwpCYWNrdHJhY2U6CiAgICAgICAgICAgNyAocHJpbWl0aXZlLWxvYWQgIi9nbnUvc3Rv cmUveHJ2c2R5cTlmOHdjM2FtNDBrbWM5eW1zOGM24oCmIikKSW4gaWNlLTkvZXZhbC5zY206CiAg IDE5MTozNSAgNiAoXyBfKQpJbiBndWl4L2J1aWxkL2dudS1idWlsZC1zeXN0ZW0uc2NtOgogICAg ODM4OjIgIDUgKGdudS1idWlsZCAjOnNvdXJjZSBfICM6b3V0cHV0cyBfICM6aW5wdXRzIF8gIzpw aGFzZXMgLiAjKQpJbiBpY2UtOS9ib290LTkuc2NtOgogIDE3MzY6MTAgIDQgKHdpdGgtZXhjZXB0 aW9uLWhhbmRsZXIgXyBfICM6dW53aW5kPyBfICMgXykKSW4gc3JmaS9zcmZpLTEuc2NtOgogICA4 NTc6MTYgIDMgKGV2ZXJ5MSAjPHByb2NlZHVyZSA3ZmZmZWViMjg2NDAgYXQgZ3VpeC9idWlsZC9n bnUtYnVp4oCmPiDigKYpCkluIGd1aXgvYnVpbGQvZ251LWJ1aWxkLXN5c3RlbS5zY206CiAgIDg0 NzozMCAgMiAoXyBfKQpJbiBndWl4L2J1aWxkL21pbmV0ZXN0LWJ1aWxkLXN5c3RlbS5zY206CiAg IDIwNToxMyAgMSAoY2hlY2sgIzpvdXRwdXRzIF8gIzp0ZXN0cz8gXykKSW4gaWNlLTkvYm9vdC05 LnNjbToKICAxNjY5OjE2ICAwIChyYWlzZS1leGNlcHRpb24gXyAjOmNvbnRpbnVhYmxlPyBfKQoK aWNlLTkvYm9vdC05LnNjbToxNjY5OjE2OiBJbiBwcm9jZWR1cmUgcmFpc2UtZXhjZXB0aW9uOgpt aW5ldGVzdCByYWlzZWQgYW4gZXJyb3I6IH5hICIyMDIxLTA5LTE5IDIwOjUyOjA2OiBFUlJPUltN YWluXTogTW9kRXJyb3I6IEZhaWxlZCB0byBsb2FkIGFuZCBydW4gc2NyaXB0IGZyb20gL2dudS9z dG9yZS9mYTM5cjI1d3NraGd2OG16cGtuYzQ3ampwYzVrbDFraC1taW5ldGVzdC1tb3Jlb3Jlcy0y LjEuMC9zaGFyZS9taW5ldGVzdC9tb2RzL21vcmVvcmVzL2luaXQubHVhOiIKYnVpbGRlciBmb3Ig YC9nbnUvc3RvcmUveGlqMnBpcnY1eWN5MHhwajZsM2FsaW4yMjlyNXhqNGwtbWluZXRlc3QtbW9y ZW9yZXMtMi4xLjAuZHJ2JyBmYWlsZWQgd2l0aCBleGl0IGNvZGUgMQpidWlsZCBvZiAvZ251L3N0 b3JlL3hpajJwaXJ2NXljeTB4cGo2bDNhbGluMjI5cjV4ajRsLW1pbmV0ZXN0LW1vcmVvcmVzLTIu MS4wLmRydiBmYWlsZWQKVmlldyBidWlsZCBsb2cgYXQgJy92YXIvbG9nL2d1aXgvZHJ2cy94aS9q MnBpcnY1eWN5MHhwajZsM2FsaW4yMjlyNXhqNGwtbWluZXRlc3QtbW9yZW9yZXMtMi4xLjAuZHJ2 LmJ6MicuCmd1aXggYnVpbGQ6IGVycm9yOiBidWlsZCBvZiBgL2dudS9zdG9yZS94aWoycGlydjV5 Y3kweHBqNmwzYWxpbjIyOXI1eGo0bC1taW5ldGVzdC1tb3Jlb3Jlcy0yLjEuMC5kcnYnIGZhaWxl ZAo= --=-Ny1YZFGu7u3JdCXT/WX+ Content-Disposition: attachment; filename="without-0002-patch.txt" Content-Type: text/plain; name="without-0002-patch.txt"; charset="UTF-8" Content-Transfer-Encoding: base64 MjAyMS0wOS0xOSAyMDo0NjozMzogSU5GT1tNYWluXTogTW9kICJmYXJtaW5nIiBsb2FkZWQgYWZ0 ZXIgMiBtcwoyMDIxLTA5LTE5IDIwOjQ2OjMzOiBJTkZPW01haW5dOiBBdWRpbzogRGVpbml0aWFs aXppbmcuLi4KMjAyMS0wOS0xOSAyMDo0NjozMzogSU5GT1tNYWluXTogQXVkaW86IERlaW5pdGlh bGl6ZWQuCjIwMjEtMDktMTkgMjA6NDY6MzM6IEFDVElPTltNYWluXTogU2VydmVyOiBTaHV0dGlu ZyBkb3duCjIwMjEtMDktMTkgMjA6NDY6MzM6IElORk9bTWFpbl06IFNlcnZlcjogU3RvcHBpbmcg YW5kIHdhaXRpbmcgdGhyZWFkcwoyMDIxLTA5LTE5IDIwOjQ2OjMzOiBJTkZPW01haW5dOiBTZXJ2 ZXI6IFRocmVhZHMgc3RvcHBlZAoyMDIxLTA5LTE5IDIwOjQ2OjMzOiBJTkZPW01haW5dOiBCYW5N YW5hZ2VyOiBzYXZpbmcgdG8gLi9pcGJhbi50eHQKMjAyMS0wOS0xOSAyMDo0NjozMzogSU5GT1tN YWluXTogU2VydmVyOiBEZWluaXRpYWxpemluZyBzY3JpcHRpbmcKMjAyMS0wOS0xOSAyMDo0Njoz MzogSU5GT1tNYWluXTogc2F2ZU1hcE1ldGE6IG1hcGdlbl9wYXJhbXMgbm90IHByZXNlbnQhIFNl cnZlciBzdGFydHVwIHdhcyBwcm9iYWJseSBpbnRlcnJ1cHRlZC4KMjAyMS0wOS0xOSAyMDo0Njoz MzogSU5GT1tNYWluXTogU2VydmVyTWFwOiBTYXZlZCBtYXAgdG8gLgoyMDIxLTA5LTE5IDIwOjQ2 OjMzOiBJTkZPW01haW5dOiB+VGV4dHVyZVNvdXJjZSgpIGJlZm9yZSBjbGVhbnVwOiA0IGFmdGVy OiAyCjIwMjEtMDktMTkgMjA6NDY6MzM6IElORk9bTWFpbl06IElycmxpY2h0IHJlc291cmNlcyBh ZnRlciBjbGVhbnVwOgoyMDIxLTA5LTE5IDIwOjQ2OjMzOiBJTkZPW01haW5dOiAJUmVtYWluaW5n IG1lc2hlcyAgIDogMAoyMDIxLTA5LTE5IDIwOjQ2OjMzOiBJTkZPW01haW5dOiAJUmVtYWluaW5n IHRleHR1cmVzIDogMgoyMDIxLTA5LTE5IDIwOjQ2OjMzOiBJTkZPW01haW5dOiAJCTA6I0RlZmF1 bHRGb250CjIwMjEtMDktMTkgMjA6NDY6MzM6IElORk9bTWFpbl06IAkJMTpUVEZvbnRHbHlwaFBh Z2VfQXJpbW8uUmVndWxhci4xNl8wCjIwMjEtMDktMTkgMjA6NDY6MzM6IElORk9bTWFpbl06IAlS ZW1haW5pbmcgbWF0ZXJpYWxzOiAyNCAobm90ZTogaXJybGljaHQgZG9lc24ndCBzdXBwb3J0IHJl bW92aW5nIHJlbmRlcmVycykKMjAyMS0wOS0xOSAyMDo0NjozMzogSU5GT1tNYWluXTogQXVkaW86 IEdsb2JhbCBEZWluaXRpYWxpemVkLgpCYWNrdHJhY2U6CiAgICAgICAgICAgNyAocHJpbWl0aXZl LWxvYWQgIi9nbnUvc3RvcmUveHJ2c2R5cTlmOHdjM2FtNDBrbWM5eW1zOGM24oCmIikKSW4gaWNl LTkvZXZhbC5zY206CiAgIDE5MTozNSAgNiAoXyBfKQpJbiBndWl4L2J1aWxkL2dudS1idWlsZC1z eXN0ZW0uc2NtOgogICAgODM4OjIgIDUgKGdudS1idWlsZCAjOnNvdXJjZSBfICM6b3V0cHV0cyBf ICM6aW5wdXRzIF8gIzpwaGFzZXMgLiAjKQpJbiBpY2UtOS9ib290LTkuc2NtOgogIDE3MzY6MTAg IDQgKHdpdGgtZXhjZXB0aW9uLWhhbmRsZXIgXyBfICM6dW53aW5kPyBfICMgXykKSW4gc3JmaS9z cmZpLTEuc2NtOgogICA4NTc6MTYgIDMgKGV2ZXJ5MSAjPHByb2NlZHVyZSA3ZmZmZWViMmRmNDAg YXQgZ3VpeC9idWlsZC9nbnUtYnVp4oCmPiDigKYpCkluIGd1aXgvYnVpbGQvZ251LWJ1aWxkLXN5 c3RlbS5zY206CiAgIDg0NzozMCAgMiAoXyBfKQpJbiBndWl4L2J1aWxkL21pbmV0ZXN0LWJ1aWxk LXN5c3RlbS5zY206CiAgIDIxNDoxMyAgMSAoY2hlY2sgIzpvdXRwdXRzIF8gIzp0ZXN0cz8gXykK SW4gaWNlLTkvYm9vdC05LnNjbToKICAxNjY5OjE2ICAwIChyYWlzZS1leGNlcHRpb24gXyAjOmNv bnRpbnVhYmxlPyBfKQoKaWNlLTkvYm9vdC05LnNjbToxNjY5OjE2OiBJbiBwcm9jZWR1cmUgcmFp c2UtZXhjZXB0aW9uOgpFUlJPUjoKICAxLiAmbWVzc2FnZTogIjIwMjEtMDktMTkgMjA6NDY6MzM6 IEVSUk9SW01haW5dOiBNb2RFcnJvcjogRmFpbGVkIHRvIGxvYWQgYW5kIHJ1biBzY3JpcHQgZnJv bSAvZ251L3N0b3JlL3FzaWtkcjMzNjk3c20xNnBmeGN2ZjQxaWprd3d6OGQyLW1pbmV0ZXN0LW1v cmVvcmVzLTIuMS4wL3NoYXJlL21pbmV0ZXN0L21vZHMvbW9yZW9yZXMvaW5pdC5sdWE6IgogIDIu ICZtZXNzYWdlOiAiMjAyMS0wOS0xOSAyMDo0NjozMzogRVJST1JbTWFpbl06IC9nbnUvc3RvcmUv cXNpa2RyMzM2OTdzbTE2cGZ4Y3ZmNDFpamt3d3o4ZDItbWluZXRlc3QtbW9yZW9yZXMtMi4xLjAv c2hhcmUvbWluZXRlc3QvbW9kcy9tb3Jlb3Jlcy9fY29uZmlnLnR4dDogTm8gc3VjaCBmaWxlIG9y IGRpcmVjdG9yeSIKICAzLiAmbWVzc2FnZTogIjIwMjEtMDktMTkgMjA6NDY6MzM6IEVSUk9SW01h aW5dOiBzdGFjayB0cmFjZWJhY2s6IgogIDQuICZtZXNzYWdlOiAiMjAyMS0wOS0xOSAyMDo0Njoz MzogRVJST1JbTWFpbl06IFx0W0NdOiBpbiBmdW5jdGlvbiAnZG9maWxlJyIKICA1LiAmbWVzc2Fn ZTogIjIwMjEtMDktMTkgMjA6NDY6MzM6IEVSUk9SW01haW5dOiBcdC4uLmVzdC1tb3Jlb3Jlcy0y LjEuMC9zaGFyZS9taW5ldGVzdC9tb2RzL21vcmVvcmVzL2luaXQubHVhOjE4OiBpbiBtYWluIGNo dW5rIgogIDYuICZtZXNzYWdlOiAiMjAyMS0wOS0xOSAyMDo0NjozMzogRVJST1JbTWFpbl06IENo ZWNrIGRlYnVnLnR4dCBmb3IgZGV0YWlscy4iCmJ1aWxkZXIgZm9yIGAvZ251L3N0b3JlL3FpNjcx anFzYXE0azJhaDFocjQ4bGJya3p4aWo5ZjU5LW1pbmV0ZXN0LW1vcmVvcmVzLTIuMS4wLmRydicg ZmFpbGVkIHdpdGggZXhpdCBjb2RlIDEKYnVpbGQgb2YgL2dudS9zdG9yZS9xaTY3MWpxc2FxNGsy YWgxaHI0OGxicmt6eGlqOWY1OS1taW5ldGVzdC1tb3Jlb3Jlcy0yLjEuMC5kcnYgZmFpbGVkClZp ZXcgYnVpbGQgbG9nIGF0ICcvdmFyL2xvZy9ndWl4L2RydnMvcWkvNjcxanFzYXE0azJhaDFocjQ4 bGJya3p4aWo5ZjU5LW1pbmV0ZXN0LW1vcmVvcmVzLTIuMS4wLmRydi5iejInLgpndWl4IGJ1aWxk OiBlcnJvcjogYnVpbGQgb2YgYC9nbnUvc3RvcmUvcWk2NzFqcXNhcTRrMmFoMWhyNDhsYnJrenhp ajlmNTktbWluZXRlc3QtbW9yZW9yZXMtMi4xLjAuZHJ2JyBmYWlsZWQK --=-Ny1YZFGu7u3JdCXT/WX+--