From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 16 06:46:44 2021 Received: (at 50072) by debbugs.gnu.org; 16 Aug 2021 10:46:44 +0000 Received: from localhost ([127.0.0.1]:48612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFa8e-0006mW-40 for submit@debbugs.gnu.org; Mon, 16 Aug 2021 06:46:43 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:37734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFa8X-0006mI-LY for 50072@debbugs.gnu.org; Mon, 16 Aug 2021 06:46:38 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id iAmX2500E0mfAB406AmXgz; Mon, 16 Aug 2021 12:46:32 +0200 Message-ID: Subject: Re: [bug#50072] [PATCH WIP 4/4] upstream: Support updating git-fetch origins. From: Maxime Devos To: Sarah Morgensen , 50072@debbugs.gnu.org Date: Mon, 16 Aug 2021 12:46:25 +0200 In-Reply-To: <8d1ae518b23fac5b15812a30b11df1c360ab3fbf.1629068119.git.iskarian@mgsn.dev> References: <8d1ae518b23fac5b15812a30b11df1c360ab3fbf.1629068119.git.iskarian@mgsn.dev> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-9mgKTjabCdrk2qjTMUh7" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629110792; bh=Hrbyv12u/y89xtr1hGfsNsqGzX/rZo4WgsLM0uWQY6I=; h=Subject:From:To:Date:In-Reply-To:References; b=eWARWO3vQfCHneBxhTvA6f6shcvmiwfJby2uElrnbkEr2NeKIYBdbMLjnJM04q9yA C+f6glE2MTGRJW0s52xHrJphHTQxqU1NqtDJZtMxhhbHavF3iMwZFsyBdBGoDw4+wW +fwedWbU8ortwAZ6AdguE+m6MHNiY2yO9iAWzravEKpXC+6Oza0UrG77WejI3Ob6o1 D+1hbAPgFDfJj9B5vqhfqIaiCbHpkBhi0g5CaxCLE2lyDEXuBh+xVVzIwm7pieQgW/ 0rmWdyIxD8q4xSZmuxm5g9LerCMKVerEEV1CD+p1kKLH37BEeTEtyHZ0Ggee6+/H8k 7VTDWQ9Ct3MFg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50072 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: -1.7 (-) --=-9mgKTjabCdrk2qjTMUh7 Content-Type: multipart/mixed; boundary="=-zr7+3QxMtVYPT37XqX5g" --=-zr7+3QxMtVYPT37XqX5g Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sarah Morgensen schreef op zo 15-08-2021 om 16:25 [-0700]: > * guix/git-download.scm (checkout-to-store): New procedure. > * guix/upstream.scm (guess-version-transform) > (package-update/git-fetch): New procedures. > (%method-updates): Add GIT-FETCH mapping. Does it support packages defined like (a) (define-public gnash (let ((commit "583ccbc1275c7701dc4843ec12142ff86bb305b4") (revision "0")) (package (name "gnash") (version (git-version "0.8.11" revision commit)) (source (git-reference (url "https://example.org") (commit commit))) [...]))) and (b) (define-public gnash (package (name "gnash") (version "0.8.11") (source (git-reference (url "https://example.org") (commit commit)) [...])) ? (Maybe (a) and (b) can be used as test cases.) FWIW, I had a try at supporting git-fetch origins in "--with-latest" and "guix refresh -e" myself, and had to modify 'package-update' to replace commit strings. IIRC, it supports (b), but not (a). The patch is attached, hopefully it will be useful. Greetings, Maxime. --=-zr7+3QxMtVYPT37XqX5g Content-Disposition: inline; filename="git-fetch.patch" Content-Type: text/x-patch; name="git-fetch.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2d1aXgvaW1wb3J0L21pbmV0ZXN0LnNjbSBiL2d1aXgvaW1wb3J0L21pbmV0 ZXN0LnNjbQppbmRleCA0MjY0MzQxZDZhLi4yOTA0YzNmOTRhIDEwMDY0NAotLS0gYS9ndWl4L2lt cG9ydC9taW5ldGVzdC5zY20KKysrIGIvZ3VpeC9pbXBvcnQvbWluZXRlc3Quc2NtCkBAIC0yOTcs NyArMjk3LDcgQEAgcmVzdWx0cy4gIFRoZSByZXR1cm4gdmFsdWUgaXMgYSBsaXN0IG9mIDxwYWNr YWdlL2tleXM+IHJlY29yZHMuIgogKGRlZmluZSAobWFrZS1taW5ldGVzdC1zZXhwIGF1dGhvci9u YW1lIHZlcnNpb24gcmVwb3NpdG9yeSBjb21taXQKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnB1dHMgaG9tZS1wYWdlIHN5bm9wc2lzCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGVzY3JpcHRpb24gbWVkaWEtbGljZW5zZSBsaWNlbnNlKQotICAiUmV0dXJuIGEgUy1leHByZXNz aW9uIGZvciB0aGUgbWluZXRlc3QgcGFja2FnZSB3aXRoIHRoZSBnaXZlbiBhdXRob3IvTkFNRSwK KyAgIlJldHVybiBhIFMtZXhwcmVzc2lvbiBmb3IgdGhlIG1pbmV0ZXN0IHBhY2thZ2Ugd2l0aCB0 aGUgZ2l2ZW4gQVVUSE9SL05BTUUsCiBWRVJTSU9OLCBSRVBPU0lUT1JZLCBDT01NSVQsIElOUFVU UywgSE9NRS1QQUdFLCBTWU5PUFNJUywgREVTQ1JJUFRJT04sCiBNRURJQS1MSUNFTlNFIGFuZCBM SUNFTlNFLiIKICAgYChwYWNrYWdlCkBAIC00NTIsMyArNDUyLDM3IEBAIGxpc3Qgb2YgQVVUSE9S L05BTUUgc3RyaW5ncy4iCiAgICAgICAgICAgICAgICAgICAgICM6cmVwby0+Z3VpeC1wYWNrYWdl IG1pbmV0ZXN0LT5ndWl4LXBhY2thZ2UqCiAgICAgICAgICAgICAgICAgICAgICM6Z3VpeC1uYW1l CiAgICAgICAgICAgICAgICAgICAgIChjb21wb3NlIGNvbnRlbnRkYi0+cGFja2FnZS1uYW1lIGF1 dGhvci9uYW1lLT5uYW1lKSkpCisKKyN8CisoZGVmaW5lIChtaW5ldGVzdC1wYWNrYWdlPyBwa2cp CisgIChhbmQgKHN0cmluZy1wcmVmaXg/ICJtaW5ldGVzdC0iIChwYWNrYWdlOnBhY2thZ2UtbmFt ZSBwa2cpKQorICAgICAgIChhc3NxLXJlZiAocGFja2FnZTpwYWNrYWdlLXByb3BlcnRpZXMgcGtn KSAndXBzdHJlYW0tbmFtZSkpKQorCisoZGVmaW5lIChsYXRlc3QtbWluZXRlc3QtcmVsZWFzZSBw a2cpCisgICJSZXR1cm4gYW4gPHVwc3RyZWFtLXNvdXJjZT4gZm9yIHRoZSBsYXRlc3QgcmVsZWFz ZSBvZiB0aGUgcGFja2FnZSBQS0cuIgorICAoZGVmaW5lIHVwc3RyZWFtLW5hbWUKKyAgICAoYXNz b2MtcmVmIChwYWNrYWdlOnBhY2thZ2UtcHJvcGVydGllcyBwa2cpICd1cHN0cmVhbS1uYW1lKSkK KyAgKGRlZmluZSBjb250ZW50ZGItcGFja2FnZSAoY29udGVudGRiLWZldGNoIHVwc3RyZWFtLW5h bWUpKQorICAoZGVmaW5lIHJlbGVhc2UgKGxhdGVzdC1yZWxlYXNlIHVwc3RyZWFtLW5hbWUpKQor ICAoYW5kIGNvbnRlbnRkYi1wYWNrYWdlIHJlbGVhc2UKKyAgICAgICAoYW5kLWxldCogKChvbGQt b3JpZ2luIChwYWNrYWdlOnBhY2thZ2Utc291cmNlIHBrZykpCisgICAgICAgICAgICAgICAgICAo b2xkLXJlZmVyZW5jZSAocGFja2FnZTpvcmlnaW4tdXJpIG9sZC1vcmlnaW4pKQorICAgICAgICAg ICAgICAgICAgKGlzLWdpdD8gKGRvd25sb2FkOmdpdC1yZWZlcmVuY2U/IG9sZC1yZWZlcmVuY2Up KQorICAgICAgICAgICAgICAgICAgKGNvbW1pdCAocmVsZWFzZS1jb21taXQgcmVsZWFzZSkpKQor ICAgICAgICAgKHVwc3RyZWFtLXNvdXJjZQorICAgICAgICAgIChwYWNrYWdlIChwYWNrYWdlOnBh Y2thZ2UtbmFtZSBwa2cpKQorICAgICAgICAgICh2ZXJzaW9uIChyZWxlYXNlLXRpdGxlIHJlbGVh c2UpKQorICAgICAgICAgICh1cmxzIChkb3dubG9hZDpnaXQtcmVmZXJlbmNlCisgICAgICAgICAg ICAgICAgICh1cmwgKHBhY2thZ2UtcmVwb3NpdG9yeSBjb250ZW50ZGItcGFja2FnZSkpCisgICAg ICAgICAgICAgICAgIChjb21taXQgY29tbWl0KSkpKSkpKQorCisoZGVmaW5lICVtaW5ldGVzdC11 cGRhdGVyCisgICh1cHN0cmVhbS11cGRhdGVyCisgICAobmFtZSAnbWluZXRlc3QpCisgICAoZGVz Y3JpcHRpb24gIlVwZGF0ZXIgZm9yIE1pbmV0ZXN0IHBhY2thZ2VzIG9uIENvbnRlbnREQiIpCisg ICAocHJlZCBtaW5ldGVzdC1wYWNrYWdlPykKKyAgIChsYXRlc3QgbGF0ZXN0LW1pbmV0ZXN0LXJl bGVhc2UpKSkKK3wjCis7OyAgIzp1c2UtbW9kdWxlIChndWl4IHVwc3RyZWFtKQorOzsgICM6dXNl LW1vZHVsZSAoKGd1aXggZ2l0LWRvd25sb2FkKSAjOnByZWZpeCBkb3dubG9hZDopCis7OyAgIzp1 c2UtbW9kdWxlICgoZ3VpeCBwYWNrYWdlcykgIzpwcmVmaXggcGFja2FnZTopCmRpZmYgLS1naXQg YS9ndWl4L3NjcmlwdHMvcmVmcmVzaC5zY20gYi9ndWl4L3NjcmlwdHMvcmVmcmVzaC5zY20KaW5k ZXggZmI2YzUyYTU2Ny4uNGYzYmJiY2I5NCAxMDA2NDQKLS0tIGEvZ3VpeC9zY3JpcHRzL3JlZnJl c2guc2NtCisrKyBiL2d1aXgvc2NyaXB0cy9yZWZyZXNoLnNjbQpAQCAtMjgsOCArMjgsMTAgQEAK ICAgIzp1c2UtbW9kdWxlIChndWl4IHVpKQogICAjOnVzZS1tb2R1bGUgKGdjcnlwdCBoYXNoKQog ICAjOnVzZS1tb2R1bGUgKGd1aXggc2NyaXB0cykKKyAgIzp1c2UtbW9kdWxlIChndWl4IHNlcmlh bGl6YXRpb24pCiAgICM6dXNlLW1vZHVsZSAoKGd1aXggc2NyaXB0cyBidWlsZCkgIzpzZWxlY3Qg KCVzdGFuZGFyZC1idWlsZC1vcHRpb25zKSkKICAgIzp1c2UtbW9kdWxlIChndWl4IHN0b3JlKQor ICAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQgdXRpbHMpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCB1 dGlscykKICAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2thZ2VzKQogICAjOnVzZS1tb2R1bGUgKGd1 aXggcHJvZmlsZXMpCkBAIC0zMDcsNiArMzA5LDE3IEBAIHVwZGF0ZSB3b3VsZCB0cmlnZ2VyIGEg Y29tcGxldGUgcmVidWlsZC4iCiAgICAgICAgICAgIChHXyAibm8gdXBkYXRlciBmb3IgfmF+JSIp CiAgICAgICAgICAgIChwYWNrYWdlLW5hbWUgcGFja2FnZSkpKQogCisKKzs7IFhYWCBhZGFwdGVk IGZyb20gKGd1aXggc2NyaXB0cyBoYXNoKQorKGRlZmluZSAoZmlsZS1oYXNoIGZpbGUgc2VsZWN0 PyByZWN1cnNpdmU/KQorICA7OyBDb21wdXRlIHRoZSBoYXNoIG9mIEZJTEUuCisgIChpZiByZWN1 cnNpdmU/CisgICAgICAobGV0LXZhbHVlcyAoKChwb3J0IGdldC1oYXNoKSAob3Blbi1zaGEyNTYt cG9ydCkpKQorICAgICAgICAod3JpdGUtZmlsZSBmaWxlIHBvcnQgIzpzZWxlY3Q/IHNlbGVjdD8p CisgICAgICAgIChmb3JjZS1vdXRwdXQgcG9ydCkKKyAgICAgICAgKGdldC1oYXNoKSkKKyAgICAg IChjYWxsLXdpdGgtaW5wdXQtZmlsZSBmaWxlIHBvcnQtc2hhMjU2KSkpCisKIChkZWZpbmUqICh1 cGRhdGUtcGFja2FnZSBzdG9yZSBwYWNrYWdlIHVwZGF0ZXJzCiAgICAgICAgICAgICAgICAgICAg ICAgICAgIzprZXkgKGtleS1kb3dubG9hZCAnaW50ZXJhY3RpdmUpIHdhcm4/KQogICAiVXBkYXRl IHRoZSBzb3VyY2UgZmlsZSB0aGF0IGRlZmluZXMgUEFDS0FHRSB3aXRoIHRoZSBuZXcgdmVyc2lv bi4KQEAgLTM0Nyw4ICszNjAsOCBAQCB3YXJuIGFib3V0IHBhY2thZ2VzIHRoYXQgaGF2ZSBubyBt YXRjaGluZyB1cGRhdGVyLiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWNrYWdlLW5h bWUgcGFja2FnZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICh1cHN0cmVhbS1pbnB1dC1j aGFuZ2UtbmFtZSBjaGFuZ2UpKSkKICAgICAgICAgICAgICAgICAgKHVwc3RyZWFtLXNvdXJjZS1p bnB1dC1jaGFuZ2VzIHNvdXJjZSkpCi0gICAgICAgICAgICAgICAgKGxldCAoKGhhc2ggKGNhbGwt d2l0aC1pbnB1dC1maWxlIHRhcmJhbGwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBv cnQtc2hhMjU2KSkpCisgICAgICAgICAgICAgICAgKGxldCAoKGhhc2ggKGZpbGUtaGFzaCB0YXJi YWxsIChjb25zdCAjdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChk aXJlY3RvcnktZXhpc3RzPyB0YXJiYWxsKSkpKQogICAgICAgICAgICAgICAgICAgKHVwZGF0ZS1w YWNrYWdlLXNvdXJjZSBwYWNrYWdlIHNvdXJjZSBoYXNoKSkpCiAgICAgICAgICAgICAgICh3YXJu aW5nIChHXyAifmE6IHZlcnNpb24gfmEgY291bGQgbm90IGJlIFwKIGRvd25sb2FkZWQgYW5kIGF1 dGhlbnRpY2F0ZWQ7IG5vdCB1cGRhdGluZ34lIikKZGlmZiAtLWdpdCBhL2d1aXgvdXBzdHJlYW0u c2NtIGIvZ3VpeC91cHN0cmVhbS5zY20KaW5kZXggNjMyZTllYmM0Zi4uNjFmNjdiNTdjMSAxMDA2 NDQKLS0tIGEvZ3VpeC91cHN0cmVhbS5zY20KKysrIGIvZ3VpeC91cHN0cmVhbS5zY20KQEAgLTI0 LDYgKzI0LDExIEBACiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBkaXNjb3ZlcnkpCiAgICM6dXNlLW1v ZHVsZSAoKGd1aXggZG93bmxvYWQpCiAgICAgICAgICAgICAgICAgIzpzZWxlY3QgKGRvd25sb2Fk LXRvLXN0b3JlIHVybC1mZXRjaCkpCisgICM6dXNlLW1vZHVsZSAoKGd1aXggZ2l0LWRvd25sb2Fk KQorICAgICAgICAgICAgICAgICM6c2VsZWN0IChnaXQtZmV0Y2ggZ2l0LXJlZmVyZW5jZT8KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdpdC1yZWZlcmVuY2UtdXJsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnaXQtcmVmZXJlbmNlLWNvbW1pdAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2l0LXJlZmVyZW5jZS1yZWN1cnNpdmU/ KSkKICAgIzp1c2UtbW9kdWxlIChndWl4IGdudXBnKQogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFj a2FnZXMpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBkaWFnbm9zdGljcykKQEAgLTMzLDYgKzM4LDcg QEAKICAgIzp1c2UtbW9kdWxlIChndWl4IHN0b3JlKQogICAjOnVzZS1tb2R1bGUgKChndWl4IGRl cml2YXRpb25zKSAjOnNlbGVjdCAoYnVpbHQtZGVyaXZhdGlvbnMgZGVyaXZhdGlvbi0+b3V0cHV0 LXBhdGgpKQogICAjOmF1dG9sb2FkICAgKGdjcnlwdCBoYXNoKSAocG9ydC1zaGEyNTYpCisgICM6 YXV0b2xvYWQgICAoZ3VpeCBnaXQpIChsYXRlc3QtcmVwb3NpdG9yeS1jb21taXQpCiAgICM6dXNl LW1vZHVsZSAoZ3VpeCBtb25hZHMpCiAgICM6dXNlLW1vZHVsZSAoc3JmaSBzcmZpLTEpCiAgICM6 dXNlLW1vZHVsZSAoc3JmaSBzcmZpLTkpCkBAIC05Myw3ICs5OSw4IEBACiAgIHVwc3RyZWFtLXNv dXJjZT8KICAgKHBhY2thZ2UgICAgICAgIHVwc3RyZWFtLXNvdXJjZS1wYWNrYWdlKSAgICAgICAg O3N0cmluZwogICAodmVyc2lvbiAgICAgICAgdXBzdHJlYW0tc291cmNlLXZlcnNpb24pICAgICAg ICA7c3RyaW5nCi0gICh1cmxzICAgICAgICAgICB1cHN0cmVhbS1zb3VyY2UtdXJscykgICAgICAg ICAgIDtsaXN0IG9mIHN0cmluZ3MKKyAgOyBsaXN0IG9mIHN0cmluZ3Mgb3IgYSA8Z2l0LXJlZmVy ZW5jZT4KKyAgKHVybHMgICAgICAgICAgIHVwc3RyZWFtLXNvdXJjZS11cmxzKQogICAoc2lnbmF0 dXJlLXVybHMgdXBzdHJlYW0tc291cmNlLXNpZ25hdHVyZS11cmxzICA7I2YgfCBsaXN0IG9mIHN0 cmluZ3MKICAgICAgICAgICAgICAgICAgIChkZWZhdWx0ICNmKSkKICAgKGlucHV0LWNoYW5nZXMg IHVwc3RyZWFtLXNvdXJjZS1pbnB1dC1jaGFuZ2VzCkBAIC0zNjEsNiArMzY4LDExIEBAIHZhbHVl czogJ2ludGVyYWN0aXZlJyAoZGVmYXVsdCksICdhbHdheXMnLCBhbmQgJ25ldmVyJy4iCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeXN0ZW0gdGFyZ2V0 KQogICAiRG93bmxvYWQgU09VUkNFIGZyb20gaXRzIGZpcnN0IFVSTCBhbmQgbG93ZXIgaXQgYXMg YSBmaXhlZC1vdXRwdXQKIGRlcml2YXRpb24gdGhhdCB3b3VsZCBmZXRjaCBpdC4iCisgIChkZWZp bmUgdXJsCisgICAgKG1hdGNoICh1cHN0cmVhbS1zb3VyY2UtdXJscyBzb3VyY2UpCisgICAgICAo KGZpcnN0IC4gXykgZmlyc3QpCisgICAgICAoXyAocmFpc2UgKGZvcm1hdHRlZC1tZXNzYWdlCisg ICAgICAgICAgICAgICAgIChHXyAiZ2l0IG9yaWdpbnMgYXJlIHVuc3VwcG9ydGVkIGJ5IC0td2l0 aC1sYXRlc3QiKSkpKSkpCiAgIChtbGV0KiAlc3RvcmUtbW9uYWQgKCh1cmwgLT4gKGZpcnN0ICh1 cHN0cmVhbS1zb3VyY2UtdXJscyBzb3VyY2UpKSkKICAgICAgICAgICAgICAgICAgICAgICAgKHNp Z25hdHVyZQogICAgICAgICAgICAgICAgICAgICAgICAgLT4gKGFuZD0+ICh1cHN0cmVhbS1zb3Vy Y2Utc2lnbmF0dXJlLXVybHMgc291cmNlKQpAQCAtNDMwLDkgKzQ0MiwyMyBAQCBTT1VSQ0UsIGFu IDx1cHN0cmVhbS1zb3VyY2U+LiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAjOmtleS1kb3dubG9hZCBrZXktZG93bmxvYWQpKSkKICAgICAgICAgICh2YWx1ZXMgdmVy c2lvbiB0YXJiYWxsIHNvdXJjZSkpKSkpKQogCisoZGVmaW5lKiAocGFja2FnZS11cGRhdGUvZ2l0 LWZldGNoIHN0b3JlIHBhY2thZ2Ugc291cmNlICM6a2V5IGtleS1kb3dubG9hZCkKKyAgIlJldHVy biB0aGUgdmVyc2lvbiwgc291cmNlIGNvZGUgZGlyZWN0b3J5LCBhbmQgU09VUkNFLCB0byB1cGRh dGUgUEFDS0FHRSB0bworU09VUkNFLCBhbiA8dXBzdHJlYW0tc291cmNlPi4iCisgIChtYXRjaCBz b3VyY2UKKyAgICAoKCQgPHVwc3RyZWFtLXNvdXJjZT4gXyB2ZXJzaW9uIHJlZiBfKQorICAgICAo dmFsdWVzIHZlcnNpb24KKyAgICAgICAgICAgICAobGF0ZXN0LXJlcG9zaXRvcnktY29tbWl0Cisg ICAgICAgICAgICAgIHN0b3JlCisgICAgICAgICAgICAgIChnaXQtcmVmZXJlbmNlLXVybCByZWYp CisgICAgICAgICAgICAgICM6cmVmIGAoY29tbWl0IC4gLChnaXQtcmVmZXJlbmNlLWNvbW1pdCBy ZWYpKQorICAgICAgICAgICAgICAjOnJlY3Vyc2l2ZT8gKGdpdC1yZWZlcmVuY2UtcmVjdXJzaXZl PyByZWYpKQorICAgICAgICAgICAgIHNvdXJjZSkpKSkKKwogKGRlZmluZSAlbWV0aG9kLXVwZGF0 ZXMKICAgOzsgTWFwcGluZyBvZiBvcmlnaW4gbWV0aG9kcyB0byBzb3VyY2UgdXBkYXRlIHByb2Nl ZHVyZXMuCi0gIGAoKCx1cmwtZmV0Y2ggLiAscGFja2FnZS11cGRhdGUvdXJsLWZldGNoKSkpCisg IGAoKCx1cmwtZmV0Y2ggLiAscGFja2FnZS11cGRhdGUvdXJsLWZldGNoKQorICAgICgsZ2l0LWZl dGNoIC4gLHBhY2thZ2UtdXBkYXRlL2dpdC1mZXRjaCkpKQogCiAoZGVmaW5lKiAocGFja2FnZS11 cGRhdGUgc3RvcmUgcGFja2FnZQogICAgICAgICAgICAgICAgICAgICAgICAgICM6b3B0aW9uYWwg KHVwZGF0ZXJzIChmb3JjZSAldXBkYXRlcnMpKQpAQCAtNDkyLDkgKzUxOCwyMiBAQCBuZXcgdmVy c2lvbiBzdHJpbmcgaWYgYW4gdXBkYXRlIHdhcyBtYWRlLCBhbmQgI2Ygb3RoZXJ3aXNlLiIKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yaWdpbi1oYXNoIChwYWNrYWdlLXNvdXJjZSBw YWNrYWdlKSkpKQogICAgICAgICAgICAgICAgKG9sZC11cmwgICAgIChtYXRjaCAob3JpZ2luLXVy aSAocGFja2FnZS1zb3VyY2UgcGFja2FnZSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoKD8gc3RyaW5nPyB1cmwpIHVybCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgo PyBnaXQtcmVmZXJlbmNlPyByZWYpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGdp dC1yZWZlcmVuY2UtdXJsIHJlZikpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoXyAj ZikpKQogICAgICAgICAgICAgICAgKG5ldy11cmwgICAgIChtYXRjaCAodXBzdHJlYW0tc291cmNl LXVybHMgc291cmNlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKChmaXJzdCBfIC4u LikgZmlyc3QpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgoZmlyc3QgXyAuLi4p IGZpcnN0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCg/IGdpdC1yZWZlcmVuY2U/ IHJlZikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZ2l0LXJlZmVyZW5jZS11cmwg cmVmKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChfICNmKSkpCisgICAgICAgICAg ICAgICAob2xkLWNvbW1pdCAgKG1hdGNoIChvcmlnaW4tdXJpIChwYWNrYWdlLXNvdXJjZSBwYWNr YWdlKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgoPyBnaXQtcmVmZXJlbmNlPyBy ZWYpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGdpdC1yZWZlcmVuY2UtY29tbWl0 IHJlZikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoXyAjZikpKQorICAgICAgICAg ICAgICAgKG5ldy1jb21taXQgIChtYXRjaCAodXBzdHJlYW0tc291cmNlLXVybHMgc291cmNlKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCg/IGdpdC1yZWZlcmVuY2U/IHJlZikKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZ2l0LXJlZmVyZW5jZS1jb21taXQgcmVmKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChfICNmKSkpCiAgICAgICAgICAgICAgICAo ZmlsZSAgICAgICAgKGFuZD0+IChsb2NhdGlvbi1maWxlIGxvYykKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKGN1dCBzZWFyY2gtcGF0aCAlbG9hZC1wYXRoIDw+KSkpKQogICAg ICAgICAgIChpZiBmaWxlCkBAIC01MDgsNiArNTQ3LDkgQEAgbmV3IHZlcnNpb24gc3RyaW5nIGlm IGFuIHVwZGF0ZSB3YXMgbWFkZSwgYW5kICNmIG90aGVyd2lzZS4iCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpbGVuYW1lIGZpbGUpKQogICAgICAgICAgICAg ICAgICAgICAocmVwbGFjZW1lbnRzIGAoKCxvbGQtdmVyc2lvbiAuICx2ZXJzaW9uKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCxvbGQtaGFzaCAuICxoYXNoKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLEAoaWYgKGFuZCBvbGQtY29tbWl0IG5ldy1j b21taXQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBgKCgsb2xk LWNvbW1pdCAuICxuZXctY29tbWl0KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICcoKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICxAKGlm IChhbmQgb2xkLXVybCBuZXctdXJsKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYCgoLChkaXJuYW1lIG9sZC11cmwpIC4KICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICwoZGlybmFtZSBuZXctdXJsKSkpCg== --=-zr7+3QxMtVYPT37XqX5g-- --=-9mgKTjabCdrk2qjTMUh7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYRpCAhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7mtFAQC2K6AYws89maCmlssXfSbym3b2 9CG2Ima2OaxW4a7k3wD/Z1vXqq7oTCNKbFPVwtQSEH++PEd83p7UKB2LMsw+cgg= =ilA3 -----END PGP SIGNATURE----- --=-9mgKTjabCdrk2qjTMUh7--