From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id AHC9Dvl+p2JGhAEAbAwnHQ (envelope-from ) for ; Mon, 13 Jun 2022 20:16:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sF+0Dvl+p2JKXAAAauVa8A (envelope-from ) for ; Mon, 13 Jun 2022 20:16:25 +0200 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 BFDAB24F80 for ; Mon, 13 Jun 2022 20:16:24 +0200 (CEST) Received: from localhost ([::1]:40274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0obv-00025S-5u for larch@yhetil.org; Mon, 13 Jun 2022 14:16:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0oba-00025F-2G for guix-patches@gnu.org; Mon, 13 Jun 2022 14:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0obZ-0007yE-Qr for guix-patches@gnu.org; Mon, 13 Jun 2022 14:16:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0obZ-0005Pq-Mu for guix-patches@gnu.org; Mon, 13 Jun 2022 14:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55874] [PATCH v2] Add timewarrior 1.4.3 Resent-From: Zac Berkowitz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jun 2022 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55874 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55874@debbugs.gnu.org Received: via spool by 55874-submit@debbugs.gnu.org id=B55874.165514410720725 (code B ref 55874); Mon, 13 Jun 2022 18:16:01 +0000 Received: (at 55874) by debbugs.gnu.org; 13 Jun 2022 18:15:07 +0000 Received: from localhost ([127.0.0.1]:60364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0oah-0005OC-2D for submit@debbugs.gnu.org; Mon, 13 Jun 2022 14:15:07 -0400 Received: from mail-il1-f177.google.com ([209.85.166.177]:42911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0oae-0005NG-1v for 55874@debbugs.gnu.org; Mon, 13 Jun 2022 14:15:05 -0400 Received: by mail-il1-f177.google.com with SMTP id p1so4849843ilj.9 for <55874@debbugs.gnu.org>; Mon, 13 Jun 2022 11:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=D1epOSmB6FOp1voVVltBzphIl2xQ+tRUzCjbI94KRgk=; b=mvOTSdgY33A2RJfPlMDMCNrnMwC61l/xfNHL46HeGlcImsGnDL/CrtGNiaG9s2KDxG iijVRTweN8Fzjgv6TUwF4T5GAHsuhEzN2EXlyBJhRhOIolVjITyf7jClp97efWhzjwp9 QWsDRS+2MbPxNsaO1YJBaRcYRUHh3l/rGkX0QUghgsNuvixaCcE+jaxzj7hOk6BW2pUb WRA26RtzLe1lvNUuTl1lV4nf/2sD2LtEtWfZq380zh0U1a+W+w+mla9SyXZRJV1fOaHH YuOd1eUsdKma/qvt3VdPQoeJJjg8D5Ar+gZ6HmqXkMCkLZvK+AW7tmrEP7kNcSbihVRs EGKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=D1epOSmB6FOp1voVVltBzphIl2xQ+tRUzCjbI94KRgk=; b=5AQQCsLk7UNw66i04/hYXgvprY0ipG2oMcjtFQ5CSlr55pcNIeScBYq5vTuRhamP59 toxZwHi1y1GiqSnEGwvv4S9w5nDvgbW8SE4OW+4jv7wYz6fA3SdC0EirNFSJoLHhOCs0 Ybtefr1JCNcHS4OATKrgbDcQCucTLpodGI/ChvWo5mQOvKBVjfn9vhCh/lU+c1gq7CEq EqPOyjA/TiRM33BxMuFajfY+5v5LDNqKM+YONVwjXJmVXEBovoazzMj766RolvqCa9bA xx5jS3bEfXXOTIqo+Zz51KB1ctMaTmLykeRqIqt4RnoIveT/lJgascTeJelIBeCMWZYa AQmQ== X-Gm-Message-State: AJIora8622bDzPYe8U5K7cllIGvv4rB9rExZUceUQ89b5neDXQEdtT2G 6jEyHy2vB63pYW6GoskNMXq04ynKzf0JKUMtHj3WuCJR X-Google-Smtp-Source: AGRyM1sbLw5ekAU0uCzBZsG+iiJYNL76V3qHfI80e9mK4D558nvWua9MKBrNq0dHcZ0t1d0E2ZWQQlnynQ8GczgA2oQ= X-Received: by 2002:a92:c544:0:b0:2d3:9998:174a with SMTP id a4-20020a92c544000000b002d39998174amr584386ilj.257.1655144098182; Mon, 13 Jun 2022 11:14:58 -0700 (PDT) MIME-Version: 1.0 References: <56ba51f3df6a70e78518630ad45c3dfc07fdd2a9.camel@telenet.be> <5cd4cc70c147ec1e4615b6bbf917a36d88891c20.camel@telenet.be> In-Reply-To: <5cd4cc70c147ec1e4615b6bbf917a36d88891c20.camel@telenet.be> From: Zac Berkowitz Date: Mon, 13 Jun 2022 14:14:47 -0400 Message-ID: Content-Type: multipart/mixed; boundary="00000000000006707805e158449e" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655144185; h=from:from:sender:sender: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=D1epOSmB6FOp1voVVltBzphIl2xQ+tRUzCjbI94KRgk=; b=JN07YplnfAh0dihSJkAKN14xo8IrKRW8jrEIB1JCPmcgfjRHYKV/tKbEdAh6vwTPEUaQhL MfV/cBFKoCa648fWuOsADloX95otJi3uN1ZE5hFemlCjUpLoItReg7cUirPjNIQGZldxPq Nm6uYCwG5wW6sgh30rt+0o0uOnDdQpSCg65qNLdjwsm9ibyJ13WMpJN6UK23jFbAO64eqP hZJXm21QdDeWQdwNA0V3lWHQjRqeZiUYhEGQ+0zqrNZXLONc24BoTlfWkxV6LZaNRbTne4 FKgVke2ayOEfQdvykiZeVlXD45obd1tYbqeR9MqIfHFoIm1/V1/LgWC01VZPTg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655144185; a=rsa-sha256; cv=none; b=BykljYaJSTWrjcjqF68EN3sI8o/3+Z+25RfIQXK+c+QdN2NysUiWtlai2dHq7XVM0wgDZy RG+vuLD72rF/vJbJU0v7Lgpp3EiHW9gQRmw9O0YtNXmtDWrqPG+221bCIRAxcg5ccL5tps iAzHzG9IAcQg2fa9xi3YPcuRlFWM1P+uJ4WS52GVQPtJGm5ILY/U/o9urwioE0qgy2tCFs 3ZgsDCSOPMO14zZNrnNhoh/rFTpeCwrHypeVZ1InNOtP4Qff7Vvll1invXVH3sscSOwHEw xcgARWNlSfphfEVqOLbmEHGxdHQy/EAjyDQVqn1Nj4EhsoOHF0HnHU4kJJceZA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=mvOTSdgY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=mvOTSdgY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: BFDAB24F80 X-Spam-Score: 6.01 X-Migadu-Scanner: scn0.migadu.com X-TUID: bNzrFgJ10BvZ --00000000000006707805e158449e Content-Type: text/plain; charset="UTF-8" A new patch that addresses many of the issues from the first attempt: - python moved to an input dependency. Eases use of bundled but optional python scripts - man pages built and installed in share/man/man1/ and share/man/man7/ - bash completions installed to etc/bash_completion.d/ - non-deterministic tests skipped using same patch from debian That last one I'm sure if it's the best way to go. It still has the original attribution within the patch file itself, which is good. Alternatives would be equivalent changes through snippets (hard) or re-implementing the patch ourselves (silly). Zac On Fri, Jun 10, 2022 at 11:00 AM Maxime Devos wrote: > > Zac Berkowitz schreef op vr 10-06-2022 om 10:04 [-0400]: > > Wouldn't say "learn" - I'm very new to lisps! The code here is mostly > > adapted from taskwarrior (same developer) and other snippets from > > gnu/packages. I'm sure I grep'd for another package that required > > asciidoctor and adapted their portion of the code. > > > > Ok, not all old packages have been converted yet. --00000000000006707805e158449e Content-Type: text/x-patch; charset="US-ASCII"; name="0001-gnu-Add-timewarrior.patch" Content-Disposition: attachment; filename="0001-gnu-Add-timewarrior.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l4d21fja0 RnJvbSA3OGVjMDE5YzIxYzI1YTdiZGIzNDY1MGQ0MmIxNmYxYjE1OTA0MmMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBaYWMgQmVya293aXR6IDx6YWMuYmVya293aXR6QGdtYWlsLmNv bT4KRGF0ZTogRnJpLCAxMyBNYXkgMjAyMiAxMTo1Njo1MSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hd IGdudTogQWRkIHRpbWV3YXJyaW9yLgoKKiBnbnUvcGFja2FnZXMvdGFzay1tYW5hZ2VtZW50LnNj bSAodGltZXdhcnJpb3IpOiBOZXcgdmFyaWFibGUKLS0tCiAuLi4vdGltZXdhcnJpb3ItdGltZS1z ZW5zaXRpdmUtdGVzdHMucGF0Y2ggICAgfCAxNjMgKysrKysrKysrKysrKysrKysrCiBnbnUvcGFj a2FnZXMvdGFzay1tYW5hZ2VtZW50LnNjbSAgICAgICAgICAgICAgfCAgNTIgKysrKysrCiAyIGZp bGVzIGNoYW5nZWQsIDIxNSBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3Bh Y2thZ2VzL3BhdGNoZXMvdGltZXdhcnJpb3ItdGltZS1zZW5zaXRpdmUtdGVzdHMucGF0Y2gKCmRp ZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy90aW1ld2Fycmlvci10aW1lLXNlbnNpdGl2 ZS10ZXN0cy5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL3RpbWV3YXJyaW9yLXRpbWUtc2Vu c2l0aXZlLXRlc3RzLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAu LjU4NmQxYWEyNjEKLS0tIC9kZXYvbnVsbAorKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy90aW1l d2Fycmlvci10aW1lLXNlbnNpdGl2ZS10ZXN0cy5wYXRjaApAQCAtMCwwICsxLDE2MyBAQAorRnJv bTogR29yZG9uIEJhbGwgPGdvcmRvbkBjaHJvbml0aXMubmV0PgorRGF0ZTogU2F0LCAyMyBOb3Yg MjAxOSAxODo1OTozOSArMDAwMAorU3ViamVjdDogc2tpcCB0ZXN0cyB3aGljaCBhcmUgc2Vuc2l0 aXZlIHRvIHNlcnZlciB0aW1lCisKKy0tLQorIHRlc3QvY29udGludWUudCB8IDIgKy0KKyB0ZXN0 L2V4cG9ydC50ICAgfCAxICsKKyB0ZXN0L2hlbHAudCAgICAgfCAxICsKKyB0ZXN0L2xlbmd0aGVu LnQgfCAxICsKKyB0ZXN0L21vdmUudCAgICAgfCAyICsrCisgdGVzdC9ydW5fYWxsICAgIHwgMiAr LQorIHRlc3Qvc2hvcnRlbi50ICB8IDEgKworIHRlc3Qvc3VtbWFyeS50ICB8IDMgKysrCisgdGVz dC90YWcudCAgICAgIHwgMSArCisgdGVzdC90YWdzLnQgICAgIHwgMSArCisgMTAgZmlsZXMgY2hh bmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3Rl c3QvY29udGludWUudCBiL3Rlc3QvY29udGludWUudAoraW5kZXggOTE3Njk5ZS4uNDI4ZjcxNCAx MDA3NTUKKy0tLSBhL3Rlc3QvY29udGludWUudAorKysrIGIvdGVzdC9jb250aW51ZS50CitAQCAt MzcsNyArMzcsNyBAQCBzeXMucGF0aC5hcHBlbmQob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJz cGF0aChfX2ZpbGVfXykpKQorIAorIGZyb20gYmFzZXRlc3QgaW1wb3J0IFRpbWV3LCBUZXN0Q2Fz ZQorIAorLQorK0B1bml0dGVzdC5za2lwKCJUaW1lLW9mLWRheSBzZW5zaXRpdmUiKQorIGNsYXNz IFRlc3RDb250aW51ZShUZXN0Q2FzZSk6CisgICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAgICAg ICIiIkV4ZWN1dGVkIGJlZm9yZSBlYWNoIHRlc3QgaW4gdGhlIGNsYXNzIiIiCitkaWZmIC0tZ2l0 IGEvdGVzdC9leHBvcnQudCBiL3Rlc3QvZXhwb3J0LnQKK2luZGV4IGM2NzI2ZTYuLjhiNTExZmYg MTAwNzU1CistLS0gYS90ZXN0L2V4cG9ydC50CisrKysgYi90ZXN0L2V4cG9ydC50CitAQCAtNjIs NiArNjIsNyBAQCBjbGFzcyBUZXN0RXhwb3J0KFRlc3RDYXNlKToKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRFbmQ9bm93X3V0YywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRUYWdzPVsiZm9vIl0pCisgCisrICAgIEB1bml0dGVz dC5za2lwKCJmbGFreSIpCisgICAgIGRlZiB0ZXN0X2NoYW5naW5nX2V4Y2x1c2lvbl9kb2VzX25v dF9jaGFuZ2VfZmxhdHRlbmVkX2ludGVydmFscyhzZWxmKToKKyAgICAgICAgICIiIkNoYW5naW5n IGV4Y2x1c2lvbnMgZG9lcyBub3QgY2hhbmdlIGZsYXR0ZW5lZCBpbnRlcnZhbHMiIiIKKyAgICAg ICAgIG5vdyA9IGRhdGV0aW1lLm5vdygpCitkaWZmIC0tZ2l0IGEvdGVzdC9oZWxwLnQgYi90ZXN0 L2hlbHAudAoraW5kZXggNzg2ZGVmMC4uOWVjZjVlNiAxMDA3NTUKKy0tLSBhL3Rlc3QvaGVscC50 CisrKysgYi90ZXN0L2hlbHAudAorQEAgLTU4LDYgKzU4LDcgQEAgY2xhc3MgVGVzdEhlbHAoVGVz dENhc2UpOgorICAgICAgICAgY29kZSwgb3V0MiwgZXJyMiA9IHNlbGYudCgiLWgiKQorICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChvdXQxLCBvdXQyKQorIAorKyAgICBAdW5pdHRlc3Quc2tpcCgi Zmxha3kiKQorICAgICBkZWYgdGVzdF9oZWxwX3dpdGhfY29tbWFuZF9zaG91bGRfc2hvd19tYW5f cGFnZShzZWxmKToKKyAgICAgICAgICIiInRpbWV3IGhlbHAgd2l0aCBjb21tYW5kIHNob3VsZCBz aG93IG1hbiBwYWdlIiIiCisgICAgICAgICBjb2RlLCBvdXQsIGVyciA9IHNlbGYudCgiaGVscCBz dGFydCIpCitkaWZmIC0tZ2l0IGEvdGVzdC9sZW5ndGhlbi50IGIvdGVzdC9sZW5ndGhlbi50Citp bmRleCBhNmYxZDc3Li5mOWFiNTRkIDEwMDc1NQorLS0tIGEvdGVzdC9sZW5ndGhlbi50CisrKysg Yi90ZXN0L2xlbmd0aGVuLnQKK0BAIC01NSw2ICs1NSw3IEBAIGNsYXNzIFRlc3RMZW5ndGhlbihU ZXN0Q2FzZSk6CisgICAgICAgICBjb2RlLCBvdXQsIGVyciA9IHNlbGYudC5ydW5FcnJvcigibGVu Z3RoZW4gQDEgMTBtaW5zIikKKyAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ0Nhbm5vdCBsZW5ndGhl biBvcGVuIGludGVydmFsIEAxJywgZXJyKQorIAorKyAgICBAdW5pdHRlc3Quc2tpcCgidGltZSBz ZW5zaXRpdmUiKQorICAgICBkZWYgdGVzdF9sZW5ndGhlbl9zeW50aGV0aWNfaW50ZXJ2YWwoc2Vs Zik6CisgICAgICAgICAiIiJMZW5ndGhlbiBhIHN5bnRoZXRpYyBpbnRlcnZhbC4iIiIKKyAgICAg ICAgIG5vdyA9IGRhdGV0aW1lLm5vdygpCitkaWZmIC0tZ2l0IGEvdGVzdC9tb3ZlLnQgYi90ZXN0 L21vdmUudAoraW5kZXggMmQ3ZmRkOS4uYjIzMzZmNSAxMDA3NTUKKy0tLSBhL3Rlc3QvbW92ZS50 CisrKysgYi90ZXN0L21vdmUudAorQEAgLTE0NSw2ICsxNDUsNyBAQCBjbGFzcyBUZXN0TW92ZShU ZXN0Q2FzZSk6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVjdGVkRW5k PSIyMDE3MDMwMVQxNDMwMDBaIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZXhwZWN0ZWRUYWdzPVsiYmFyIl0pCisgCisrICAgIEB1bml0dGVzdC5za2lwKCJ0aW1lIHNlbnNp dGl2ZSIpCisgICAgIGRlZiB0ZXN0X21vdmVfc3ludGhldGljX2ludGVydmFsX2ludG9fZXhjbHVz aW9uKHNlbGYpOgorICAgICAgICAgIiIiTW92ZSBhIHN5bnRoZXRpYyBpbnRlcnZhbCBpbnRvIGV4 Y2x1c2lvbiIiIgorICAgICAgICAgbm93ID0gZGF0ZXRpbWUubm93KCkKK0BAIC0xNzUsNiArMTc2 LDcgQEAgY2xhc3MgVGVzdE1vdmUoVGVzdENhc2UpOgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZXhwZWN0ZWRUYWdzPVtdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGVzY3JpcHRpb249InVubW9kaWZpZWQgaW50ZXJ2YWwiKQorIAorKyAgICBAdW5pdHRlc3Qu c2tpcCgidGltZSBzZW5zaXRpdmUiKQorICAgICBkZWYgdGVzdF9tb3ZlX3N5bnRoZXRpY19pbnRl cnZhbF9hd2F5X2Zyb21fZXhjbHVzaW9uKHNlbGYpOgorICAgICAgICAgIiIiTW92ZSBhIHN5bnRo ZXRpYyBpbnRlcnZhbCBhd2F5IGZyb20gZXhjbHVzaW9uIiIiCisgICAgICAgICBub3cgPSBkYXRl dGltZS5ub3coKQorZGlmZiAtLWdpdCBhL3Rlc3QvcnVuX2FsbCBiL3Rlc3QvcnVuX2FsbAoraW5k ZXggZWE3ZGQ4Zi4uYWZjNjczMSAxMDA3NTUKKy0tLSBhL3Rlc3QvcnVuX2FsbAorKysrIGIvdGVz dC9ydW5fYWxsCitAQCAtMTQsNyArMTQsNyBAQCBmcm9tIHF1ZXVlIGltcG9ydCBRdWV1ZSwgRW1w dHkKKyBmcm9tIHN1YnByb2Nlc3MgaW1wb3J0IGNhbGwsIFBvcGVuLCBQSVBFCisgZnJvbSB0aHJl YWRpbmcgaW1wb3J0IFRocmVhZAorIAorLVRJTUVPVVQgPSAuMgorK1RJTUVPVVQgPSAyLgorIAor IAorIGRlZiBydW5fdGVzdCh0ZXN0cXVldWUsIG91dHF1ZXVlLCB0aHJlYWRuYW1lKToKK2RpZmYg LS1naXQgYS90ZXN0L3Nob3J0ZW4udCBiL3Rlc3Qvc2hvcnRlbi50CitpbmRleCA3MDU4Y2MwLi45 NGUwMDY3IDEwMDc1NQorLS0tIGEvdGVzdC9zaG9ydGVuLnQKKysrKyBiL3Rlc3Qvc2hvcnRlbi50 CitAQCAtNjksNiArNjksNyBAQCBjbGFzcyBUZXN0U2hvcnRlbihUZXN0Q2FzZSk6CisgICAgICAg ICBzZWxmLnQoIm1vdmUgQDEgMjAxNzAzMDhUMTEzMDAwIikKKyAgICAgICAgIHNlbGYudCgic2hv cnRlbiBAMSA1bWluIikgICMgRG9lcyBub3Qgd29yay4KKyAKKysgICAgQHVuaXR0ZXN0LnNraXAo InRpbWUgc2Vuc2l0aXZlIikKKyAgICAgZGVmIHRlc3Rfc2hvcnRlbl9zeW50aGV0aWNfaW50ZXJ2 YWwoc2VsZik6CisgICAgICAgICAiIiJTaG9ydGVuIGEgc3ludGhldGljIGludGVydmFsLiIiIgor ICAgICAgICAgbm93ID0gZGF0ZXRpbWUubm93KCkKK2RpZmYgLS1naXQgYS90ZXN0L3N1bW1hcnku dCBiL3Rlc3Qvc3VtbWFyeS50CitpbmRleCA2ZmQzMzUyLi5mOTFlOTkyIDEwMDc1NQorLS0tIGEv dGVzdC9zdW1tYXJ5LnQKKysrKyBiL3Rlc3Qvc3VtbWFyeS50CitAQCAtMTkyLDYgKzE5Miw3IEBA IFcxMCAyMDE3LTAzLTA5IFRodSBANCBUYWcxICAgICAgICA4OjQzOjA4ICA5OjM4OjE1IDA6NTU6 MDcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDE6MDk6MDMKKyAiIiIsIG91dCkKKyAKKysgICAgQHVuaXR0ZXN0LnNraXAoImZhaWxz IHcxLTkiKQorICAgICBkZWYgdGVzdF93aXRoX2FsbF9oaW50KHNlbGYpOgorICAgICAgICAgIiIi U3VtbWFyeSBzaG91bGQgd29yayB3aXRoIDphbGwgaGludCIiIgorICAgICAgICAgbm93ID0gZGF0 ZXRpbWUubm93KCkKK0BAIC0yMzYsNiArMjM3LDcgQEAgV3s1fSB7MjolWS0lbS0lZH0gezI6JWF9 IEAxIEJBWiAgMTA6MDA6MDAgMTE6MDA6MDAgMTowMDowMCAxOjAwOjAwCisgICAgICAgICBzZWxm LmFzc2VydEluKCJAMSIsIG91dCkKKyAgICAgICAgIHNlbGYuYXNzZXJ0UmVnZXgob3V0LCByJ1xz ezMwfTA6MDA6MDInKQorIAorKyAgICBAdW5pdHRlc3Quc2tpcCgiZmFpbHMgdzEtOSIpCisgICAg IGRlZiB0ZXN0X3dpdGhfbmFtZWRfZGF0ZV95ZXN0ZXJkYXkoc2VsZik6CisgICAgICAgICAiIiJT dW1tYXJ5IHNob3VsZCB3b3JrIHdpdGggJ3llc3RlcmRheSciIiIKKyAgICAgICAgIG5vdyA9IGRh dGV0aW1lLm5vdygpCitAQCAtMjYwLDYgKzI2Miw3IEBAIFd7MX0gezA6JVktJW0tJWR9IHswOiVh fSBAMyBGT08gIDEwOjAwOjAwIDExOjAwOjAwIDE6MDA6MDAgMTowMDowMAorIHsyfSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxOjAwOjAwCisgIiIi LmZvcm1hdCh5ZXN0ZXJkYXksIHdlZWtfeWVzdGVyZGF5LCAiICIgaWYgdHdvX2RpZ2l0X3dlZWsg aXMgVHJ1ZSBlbHNlICIiLCAiLSIgaWYgdHdvX2RpZ2l0X3dlZWsgaXMgVHJ1ZSBlbHNlICIiKSwg b3V0KQorIAorKyAgICBAdW5pdHRlc3Quc2tpcCgiZmFpbHMgdzEtOSIpCisgICAgIGRlZiB0ZXN0 X3dpdGhfbmFtZWRfZGF0ZV90b2RheShzZWxmKToKKyAgICAgICAgICIiIlN1bW1hcnkgc2hvdWxk IHdvcmsgd2l0aCAndG9kYXknIiIiCisgICAgICAgICBub3cgPSBkYXRldGltZS5ub3coKQorZGlm ZiAtLWdpdCBhL3Rlc3QvdGFnLnQgYi90ZXN0L3RhZy50CitpbmRleCA4YjJmODQ3Li4yMWI4YzE2 IDEwMDc1NQorLS0tIGEvdGVzdC90YWcudAorKysrIGIvdGVzdC90YWcudAorQEAgLTE3OCw2ICsx NzgsNyBAQCBjbGFzcyBUZXN0VGFnKFRlc3RDYXNlKToKKyAgICAgICAgIHNlbGYuYXNzZXJ0Q2xv c2VkSW50ZXJ2YWwoalswXSwgZXhwZWN0ZWRUYWdzPVsiYmFyIiwgImZvbyIsICJvbmUiXSkKKyAg ICAgICAgIHNlbGYuYXNzZXJ0Q2xvc2VkSW50ZXJ2YWwoalsxXSwgZXhwZWN0ZWRUYWdzPVsiYmFy IiwgImZvbyIsICJ0d28iXSkKKyAKKysgICAgQHVuaXR0ZXN0LnNraXAoInRpbWUgc2Vuc2l0aXZl IikKKyAgICAgZGVmIHRlc3RfdGFnX3N5bnRoZXRpY19pbnRlcnZhbChzZWxmKToKKyAgICAgICAg ICIiIlRhZyBhIHN5bnRoZXRpYyBpbnRlcnZhbC4iIiIKKyAgICAgICAgIG5vdyA9IGRhdGV0aW1l Lm5vdygpCitkaWZmIC0tZ2l0IGEvdGVzdC90YWdzLnQgYi90ZXN0L3RhZ3MudAoraW5kZXggNmNm ZTE0My4uNGY4NGQwNiAxMDA3NTUKKy0tLSBhL3Rlc3QvdGFncy50CisrKysgYi90ZXN0L3RhZ3Mu dAorQEAgLTYzLDYgKzYzLDcgQEAgY2xhc3MgVGVzdFRhZ3MoVGVzdENhc2UpOgorICAgICAgICAg c2VsZi5hc3NlcnRJbignZm9vJywgb3V0KQorICAgICAgICAgc2VsZi5hc3NlcnRJbignYmFyJywg b3V0KQorIAorKyAgICBAdW5pdHRlc3Quc2tpcCgidGltZSBzZW5zaXRpdmUiKQorICAgICBkZWYg dGVzdF90YWdzX2ZpbHRlcmVkKHNlbGYpOgorICAgICAgICAgIiIiVGVzdCB0aGF0IHRhZ3MgY29t bWFuZCBmaWx0ZXJpbmcgZXhjbHVkZXMgdGFncyB0aGF0IGFyZSBvdXRzaWRlIHRoZSBmaWx0ZXIg cmFuZ2UiIiIKKyAgICAgICAgIHNlbGYudCgidHJhY2sgMjAxNjAxMDFUMDEwMCAtIDIwMTYwMTAx VDEwMDAgZm9vIikKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy90YXNrLW1hbmFnZW1lbnQuc2Nt IGIvZ251L3BhY2thZ2VzL3Rhc2stbWFuYWdlbWVudC5zY20KaW5kZXggYWVlZGJmYmU2YS4uY2Vk NWUxZTY2MSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Rhc2stbWFuYWdlbWVudC5zY20KKysr IGIvZ251L3BhY2thZ2VzL3Rhc2stbWFuYWdlbWVudC5zY20KQEAgLTI1LDYgKzI1LDcgQEAgKGRl ZmluZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0YXNrLW1hbmFnZW1lbnQpCiAgICM6dXNlLW1vZHVs ZSAoKGd1aXggbGljZW5zZXMpICM6cHJlZml4IGxpY2Vuc2U6KQogICAjOnVzZS1tb2R1bGUgKGd1 aXggZ2V4cCkKICAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2thZ2VzKQorICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY2hlY2spCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGZyZWVkZXNrdG9wKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBnZXR0ZXh0KQpAQCAtMzgsNiArMzksNyBAQCAoZGVmaW5lLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHRhc2stbWFuYWdlbWVudCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg cGtnLWNvbmZpZykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcHl0aG9uKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBweXRob24teHl6KQorICAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyBydWJ5KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0aW1lKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0bHMpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBkb3dubG9h ZCkKQEAgLTE0NSw2ICsxNDcsNTYgQEAgKGRlZmluZS1wdWJsaWMgdGFza3dhcnJpb3IKIGFuZCBx dWVyeWluZyBkYXRhLCBleHBvc2luZyB0YXNrIGRhdGEgaW4gbXVsdGlwbGUgZm9ybWF0cyB0byBv dGhlciB0b29scy4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6ZXhwYXQpKSkKIAorKGRlZmluZS1w dWJsaWMgdGltZXdhcnJpb3IKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAidGltZXdhcnJpb3IiKQor ICAgICh2ZXJzaW9uICIxLjQuMyIpCisgICAgKHNvdXJjZQorICAgICAob3JpZ2luCisgICAgICAg KG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZAorICAgICAgICAg ICAgICJodHRwczovL2dpdGh1Yi5jb20vR290aGVuYnVyZ0JpdEZhY3RvcnkvdGltZXdhcnJpb3Iv cmVsZWFzZXMvZG93bmxvYWQvdiIgdmVyc2lvbgorICAgICAgICAgICAgICIvdGltZXctIiB2ZXJz aW9uICIudGFyLmd6IikpCisgICAgICAgKHBhdGNoZXMgKHNlYXJjaC1wYXRjaGVzICJ0aW1ld2Fy cmlvci10aW1lLXNlbnNpdGl2ZS10ZXN0cy5wYXRjaCIpKQorICAgICAgIChzaGEyNTYgKGJhc2Uz MgorICAgICAgICAgICAgICAgICIwbHlhcXpjZzhucDJmcHNtaWgwaGxranhkM3FiYWRjN2tocjI0 bTFwcTlsc2RocTd4cHk0IikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3Rl bSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICAobGlzdCBydWJ5LWFzY2lpZG9jdG9yKSkKKyAg ICAoaW5wdXRzCisgICAgIChsaXN0IGdudXRscyBgKCx1dGlsLWxpbnV4ICJsaWIiKSBweXRob24p KQorICAgIChhcmd1bWVudHMKKyAgICAgYCgjOnBoYXNlcworICAgICAgIChtb2RpZnktcGhhc2Vz ICVzdGFuZGFyZC1waGFzZXMKKyAgICAgICAgIChkZWxldGUgJ2luc3RhbGwtbGljZW5zZS1maWxl cykgOyBBbHJlYWR5IGluc3RhbGxlZCBieSBwYWNrYWdlCisgICAgICAgICAoYWRkLWFmdGVyICdw YXRjaC1zb3VyY2Utc2hlYmFuZ3MgJ3BhdGNoLWNtYWtlLXNoZWxsCisgICAgICAgICAgIChsYW1i ZGEgXworICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAic3JjL2NvbW1hbmRzL0NNYWtlTGlzdHMu dHh0IgorICAgICAgICAgICAgICAgKCgiL2Jpbi9zaCIpICJzaCIpKSkpCisgICAgICAgICA7OyBG aXggb3V0IG9mIHNvdXJjZSBidWlsZGluZyBvZiBtYW51YWwgcGFnZXMKKyAgICAgICAgIChhZGQt YWZ0ZXIgJ3BhdGNoLXNvdXJjZS1zaGViYW5ncyAncGF0Y2gtbWFuLWNtYWtlCisgICAgICAgICAg IChsYW1iZGEgXworICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiZG9jL21hbjEvQ01ha2VMaXN0 cy50eHQiCisgICAgICAgICAgICAgICAoKCJcXCRcXHtDTUFLRV9DVVJSRU5UX0JJTkFSWV9ESVJc XH0iKSAiJHtDTUFLRV9DVVJSRU5UX1NPVVJDRV9ESVJ9IikpCisgICAgICAgICAgICAgKHN1YnN0 aXR1dGUqICJkb2MvbWFuNy9DTWFrZUxpc3RzLnR4dCIKKyAgICAgICAgICAgICAgICgoIlxcJFxc e0NNQUtFX0NVUlJFTlRfQklOQVJZX0RJUlxcfSIpICIke0NNQUtFX0NVUlJFTlRfU09VUkNFX0RJ Un0iKSkpKQorICAgICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAnaW5zdGFsbC1jb21wbGV0aW9u cworICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhl ci1rZXlzKQorICAgICAgICAgICAgIChsZXQqICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0 IikpCisgICAgICAgICAgICAgICAgICAgIChiYXNoLWNvbXBsZXRpb24taW5zdGFsbC1kaXIKKyAg ICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIG91dCAiL2V0Yy9iYXNoX2NvbXBsZXRp b24uZCIpKSkKKyAgICAgICAgICAgICAgIChta2Rpci1wIGJhc2gtY29tcGxldGlvbi1pbnN0YWxs LWRpcikKKyAgICAgICAgICAgICAgIChjb3B5LWZpbGUKKyAgICAgICAgICAgICAgICAiLi4vdGlt ZXctMS40LjMvY29tcGxldGlvbi90aW1ldy1jb21wbGV0aW9uLmJhc2giCisgICAgICAgICAgICAg ICAgKHN0cmluZy1hcHBlbmQgYmFzaC1jb21wbGV0aW9uLWluc3RhbGwtZGlyICIvdGltZXciKSkp KSkpKSkKKyAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly90aW1ld2Fycmlvci5uZXQiKQorICAgIChz eW5vcHNpcyAiQ29tbWFuZCBsaW5lIHV0aWxpdHkgdG8gdHJhY2sgYW5kIHJlcG9ydCB0aW1lIikK KyAgICAoZGVzY3JpcHRpb24KKyAgICAgIlRpbWV3YXJyaW9yIGlzIGEgY29tbWFuZCBsaW5lIHRp bWUgdHJhY2tpbmcgYXBwbGljYXRpb24sIHdoaWNoIGFsbG93cworeW91IHRvIHJlY29yZCB0aW1l IHNwZW50IG9uIGFjdGl2aXRpZXMuICBZb3UgbWF5IGJlIHRyYWNraW5nIHlvdXIgdGltZSBmb3IK K2N1cmlvc2l0eSwgb3IgYmVjYXVzZSB5b3VyIHdvcmsgcmVxdWlyZXMgaXQuIikKKyAgICAobGlj ZW5zZSBsaWNlbnNlOmV4cGF0KSkpCisKIChkZWZpbmUtcHVibGljIHdvcmtsb2cKICAgKGxldCAo KGNvbW1pdCAiMGY1NDVhZDY2OTdlZjRkZTdmNjhkOTJjZDdjYzVjNmE0YzYwNTE3YiIpCiAgICAg ICAgIChyZXZpc2lvbiAiMSIpKQotLSAKMi4zNi4xCgo= --00000000000006707805e158449e--