From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CEziGQYm9GD9BgEAgWs5BA (envelope-from ) for ; Sun, 18 Jul 2021 15:00:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uFeZFQYm9GBWcgAA1q6Kng (envelope-from ) for ; Sun, 18 Jul 2021 13:00:54 +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 C14C81D8C for ; Sun, 18 Jul 2021 15:00:52 +0200 (CEST) Received: from localhost ([::1]:56838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56Pb-0007ng-L1 for larch@yhetil.org; Sun, 18 Jul 2021 09:00:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Op-0007g4-It for guix-patches@gnu.org; Sun, 18 Jul 2021 09:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Oo-0007uz-Lm for guix-patches@gnu.org; Sun, 18 Jul 2021 09:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m56Oo-00087W-Iz for guix-patches@gnu.org; Sun, 18 Jul 2021 09:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49517] [PATCH] gnu: txr: Build documentation and update to 265. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jul 2021 13:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Guillaume Le Vaillant Cc: Kaz Kylheku , 49517@debbugs.gnu.org Received: via spool by 49517-submit@debbugs.gnu.org id=B49517.162661319331168 (code B ref 49517); Sun, 18 Jul 2021 13:00:02 +0000 Received: (at 49517) by debbugs.gnu.org; 18 Jul 2021 12:59:53 +0000 Received: from localhost ([127.0.0.1]:55404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m56OU-00086S-Df for submit@debbugs.gnu.org; Sun, 18 Jul 2021 08:59:53 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:41489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m56OQ-00086C-DD for 49517@debbugs.gnu.org; Sun, 18 Jul 2021 08:59:41 -0400 Date: Sun, 18 Jul 2021 12:59:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1626613170; bh=ybvJB5s24mAGzLd3B6yZ/lOBMxoXKWYYpdVl/ABcy2E=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Tqpp4VRtX7gV2MQw+dCldt90XDVtikKWvD1OX7vVPNgbyDzbUWN5Z0Dhqcx6VIIY9 OTxoSSHP/AiLdeA5pTOlE5BGNdOW1jQO0YVgqgDIJfJIIxvaDfuM/as8AIlz6uK24P F2F5CGv+aNoycew4ugLqf00lITgykq3QVsuOxtdaeXCXCy1st9jrM9TsaPRYfKsdlq ce9HlwJ9BxDIaT/ZJG9RPeDKUXUF41lFkjbF3FYVaWwySDGxzBB5blH19sbYYDFQT7 WieQpJQs6zOdNHJAw+kCowverBY4LappGIDidQr+K85GXjMMR7FTm+/v3iVBfPkO4k QUsgDSZlu8NAQ== From: "Paul A. Patience" Message-ID: In-Reply-To: <874kcr7vt7.fsf@kitej> References: <87o8b1p8k1.fsf@kitej> <3ae1061ea0a61b579c48f9ea7b4f4832@mail.kylheku.com> <96d55c0d8940c64eca79aa4a15a3cb8f@mail.kylheku.com> <874kcr7vt7.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_quMKpgjzx0W5Y7MJU0UW45uWXMq08Ie9HIaVKSpU" 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626613254; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=ybvJB5s24mAGzLd3B6yZ/lOBMxoXKWYYpdVl/ABcy2E=; b=GoXboHcRRvXs+KDcT6eK5j9eEAuLzU6FR/SYH5HI5NEe4sS4SJaURiTN2av+4ICa/epwH7 rKpIw4SzrHWtXK++YexGvqS0+ulqSJdurzSO2mwYmAUu2/mMRez6cm3elyBTwMyzxKCrdO 5Nq7i/GtAXLuc7zHx9F5/vgJaHGrN05mY6Yj2wbIXAKioGGyOAopP1o+UcaJ+Aau+dQqHY 4abn4o5lWmr6kToVjRDbyekqtdcRGp9Bp95Ejpf4oRDcbXuLz34gj3lLbJ9/LQJLSRu/p0 XcB20cRfBG2uYohnYF1rBugENzzjAAq8u+HrPdulRB6yNiRVKK0I+kJaViRd7w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626613254; a=rsa-sha256; cv=none; b=AFUJIwKmwqM9/Hdq5N1th7PVPASa1m3M+ry8FcJWNtmx0oLNZ9UaEam3uzzQzf8XPj03Fi EQWuEpexNFw8kcvJD/ORCNtXYX5JtNgapFDYI7PDX1L+4UR6Q9a5Wj+GcbCzjHX2tOPcfm Y2xsSod2csTugf9nAhl2cRxKNA6yanVmvcj6PZCVYUKTCVCHPXmZHJA+qHc2W2fV/z6Exw jSYSxlR1nKQbra8T7zTlMO37wKnpNK96E6R2shCZaeDIHuj3QacvC9mn6uYOhEo/BVxIFO 8B0zHClfGr0rnqMtRXZAELTTuQfYpwKe1+O3Gyp+fV+mmKfWpAps7NCgY7QHUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=Tqpp4VRt; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=Tqpp4VRt; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C14C81D8C X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: j74YsQOaU+1i This is a multi-part message in MIME format. --b1_quMKpgjzx0W5Y7MJU0UW45uWXMq08Ie9HIaVKSpU Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Guillaume, On Sunday, July 18th, 2021 at 06:36, Guillaume Le Vaillant = wrote: > Hi Kaz, > > I tried your patch and it doesn't fix all the timestamps in the > environment used to build Guix packages: I had sent an email last night but accidentally only to Kaz. Here it is bel= ow: On Saturday, July 17th, 2021 at 18:51, Kaz Kylheku wrote: > On 2021-07-17 02:57, Guillaume Le Vaillant wrote: >> When testing the patch to build the HTML and PDF documentation, >> I noticed that the 'share/doc/txr-263/txr-manpage.pdf' file is not >> reproducible. There are some timestamps and UUIDs in it that change at >> each build (diffoscope output attached). I've updated the first patch to fix this by setting GS_GENERATE_UUIDS to 0, which seems to be the standard Guix way to patch groff's use of Ghostscript. It removes most of the date (i.e., the hours, minutes and seconds) and the UUID, but leaves the year, month and day: $ xxd /gnu/store/h94iilsa2xsp2ymn3k9x3ckmvfjha731-txr-266/share/doc/txr-2= 66/txr-manpage.pdf | grep -C 1 Date 00231430: 702f 312e 302f 273e 3c78 6d70 3a4d 6f64 p/1.0/'>2021-07- 00231450: 3138 3c2f 786d 703a 4d6f 6469 6679 4461 182021-07-18. 00231490: 3c78 6d70 3a43 7265 6174 6f72 546f 6f6c Thank you for your report. I don't see anything in the pdfroff > documentation about getting rid of this. The problem is in fact with Ghostscript [1]. Ghostscript is the program adding the metadata. > 2. Is there some recommended practice with regard to some > ./configure option or environment/make variable to react to > for ensuring reproducible builds? So that is to say, suppose > I don't wish to do the above embedded XML cleaning, except > when building for a distro that strives for reproducibility. > > For opting in to reproducibilty, should I again rely on > SOURCE_DATE_EPOCH and have the build react to it? I think the goal of SOURCE_DATE_EPOCH is for projects such as TXR to need do nothing, and rather have Guix arrange for the "builder" applications (i.e., Ghostscript here) to produce reproducible outputs. In this case with GS_GENERATE_UUIDS=3D0. So I don't think TXR need change anything. Since I had to make a change in one of the patches, I have added a third patch (squeezed in between the other two) adjusting the installation of the license files. The three patches are attached. (Kaz, if there's anything TXR should change, perhaps it is the target directory of the license files, i.e., $(datadir) -> $(docdir). I think it's more common in general to install license files into /usr/share/doc/APP rather than /usr/share/APP -- at least, that's where Guix installs them. This would render the second attached patch unnecessary.) Best regards, Paul [1]: https://bugs.ghostscript.com/show_bug.cgi?id=3D696765 --b1_quMKpgjzx0W5Y7MJU0UW45uWXMq08Ie9HIaVKSpU Content-Type: text/x-patch; name=0001-gnu-txr-Build-documentation.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-txr-Build-documentation.patch RnJvbSA2OTNjNTIwZThjYzE1ZmIzYTNlMmU4NWQ1NjFiYmVkOWQyMjc3ODQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiUGF1bCBBLiBQYXRpZW5jZSIgPHBhdWxAYXBhdGllbmNlLmNv bT4KRGF0ZTogU2F0LCAxMCBKdWwgMjAyMSAyMDoyMzo0OSAtMDQwMApTdWJqZWN0OiBbUEFUQ0gg MS8zXSBnbnU6IHR4cjogQnVpbGQgZG9jdW1lbnRhdGlvbi4KCiogZ251L3BhY2thZ2VzL2xpc3Au c2NtIChtYW4tZm9yLXR4cik6IE5ldyB2YXJpYWJsZS4KKHR4cilbbmF0aXZlLWlucHV0c106IE5l dyBmaWVsZC4KW2lucHV0c106IE1vdmUgYWJvdmUgdGhlIGFyZ3VtZW50cyBmaWVsZC4KW2FyZ3Vt ZW50c108IzpwaGFzZXM+e2luaGliaXQtZG9jLXN5bXMtZ2VuZXJhdGlvbiwgYnVpbGQtZG9jfQp7 aW5zdGFsbC1kb2N9OiBOZXcgcGhhc2VzLgp7Zml4LXRlc3RzfTogQWRkIGFmdGVyIHRoZSB1bnBh Y2sgcGhhc2UgcmF0aGVyIHRoYW4gYWZ0ZXIgdGhlIGNvbmZpZ3VyZQpwaGFzZSBzbyB0aGF0IGFs bCBmaWxlLW1vZGlmeWluZyBwaGFzZXMgYXJlIHBlcmZvcm1lZCBhZnRlciB1bnBhY2tpbmcuCi0t LQogZ251L3BhY2thZ2VzL2xpc3Auc2NtIHwgOTYgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDkwIGluc2VydGlvbnMoKyksIDYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2xpc3Auc2NtIGIvZ251L3BhY2th Z2VzL2xpc3Auc2NtCmluZGV4IDM4MmY0OGJlYjEuLjc2MjVjNTdiNjAgMTAwNjQ0Ci0tLSBhL2du dS9wYWNrYWdlcy9saXNwLnNjbQorKysgYi9nbnUvcGFja2FnZXMvbGlzcC5zY20KQEAgLTE4LDYg KzE4LDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkgMjAyMCBNYXJpdXMgQmFra2UgPG1iYWtrZUBmYXN0 bWFpbC5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjAgWmh1IFppaGFvIDxhbGxfYnV0X2xhc3RA MTYzLmNvbT4KIDs7OyBDb3B5cmlnaHQgwqkgMjAyMSBTaGFybGF0YW4gSGVsbHNlaGVyIDxzaGFy bGF0YW51c0BnbWFpbC5jb20+Cis7OzsgQ29weXJpZ2h0IMKpIDIwMjEgUGF1bCBBLiBQYXRpZW5j ZSA8cGF1bEBhcGF0aWVuY2UuY29tPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05V IEd1aXguCiA7OzsKQEAgLTU5LDggKzYwLDEwIEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGZvbnR1dGlscykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2NjKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnZXR0ZXh0KQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBnaG9zdHNjcmlwdCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2wpCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdsaWIpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGdyb2ZmKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBtNCkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgbWF0aHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG11 bHRpcHJlY2lzaW9uKQpAQCAtODQ2LDYgKzg0OSw2MCBAQCBlbm91Z2ggdG8gcGxheSB0aGUgb3Jp Z2luYWwgbWFpbmZyYW1lIFpvcmsgYWxsIHRoZSB3YXkgdGhyb3VnaC4iKQogICAgICAgKGhvbWUt cGFnZSAiaHR0cDovL3d3dy5ydXNzb3R0by5uZXQvZ2l0L21ydXNzb3R0by9jb25mdXNpb24vc3Jj L21hc3Rlci9zcmMvUkVBRE1FIikKICAgICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMyspKSkpCiAK KyhkZWZpbmUgbWFuLWZvci10eHIKKyAgKGxldCAoKGNvbW1pdCAiZGZiZjE5YjlhOTY0NzRiOGMx YmFjYWM4NWU0MzYwNWU1NjkxY2ViMiIpCisgICAgICAgIDs7IE51bWJlciBvZiBhZGRpdGlvbmFs IGNvbW1pdHMgc2luY2UgdGhlIGxhc3QgdGFnIChzZWUgdGhlIG91dHB1dCBvZgorICAgICAgICA7 OyAiZ2l0IGRlc2NyaWJlIC0tdGFncyIpLgorICAgICAgICAocmV2aXNpb24gIjQxIikpCisgICAg KHBhY2thZ2UKKyAgICAgIChuYW1lICJtYW4tZm9yLXR4ciIpCisgICAgICAodmVyc2lvbiAoZ2l0 LXZlcnNpb24gIjEuNmciIHJldmlzaW9uIGNvbW1pdCkpCisgICAgICAoc291cmNlCisgICAgICAg KG9yaWdpbgorICAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICAodXJpIChnaXQt cmVmZXJlbmNlCisgICAgICAgICAgICAgICAodXJsICJodHRwOi8vd3d3Lmt5bGhla3UuY29tL2dp dC9tYW4vIikKKyAgICAgICAgICAgICAgIChjb21taXQgY29tbWl0KSkpCisgICAgICAgICAoZmls ZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAgICAgICAoc2hhMjU2Cisg ICAgICAgICAgKGJhc2UzMiAiMXp5MGc4Zmo5bnNmd3p2Zzg4aHlhaXk5NHI4ajE0eGhzOHZ5Mmxu Mm5pcWRtNngybHZ5MiIpKSkpCisgICAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0p CisgICAgICAoYXJndW1lbnRzCisgICAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAg ICAgOyBUaGVyZSBhcmUgbm8gdGVzdHMuCisgICAgICAgICAjOnBoYXNlcworICAgICAgICAgKG1v ZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgICAoYWRkLWFmdGVyICd1bnBh Y2sgJ2ZpeC1tYW4yaHRtbC1tYWtlZmlsZQorICAgICAgICAgICAgIChsYW1iZGEgXworICAgICAg ICAgICAgICAgKHN1YnN0aXR1dGUqICJtYW4yaHRtbC9NYWtlZmlsZS5pbiIKKyAgICAgICAgICAg ICAgICAgOzsgSXQgaW5hZHZlcnRlbnRseSBpZ25vcmVzIEBiaW5kaXJALgorICAgICAgICAgICAg ICAgICAoKCJeKGJpbmRpciA9IFxcJFxcKERFU1RESVJcXClcXCRcXChQUkVGSVhcXCkpLioiIF8g cHJlZml4KQorICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgcHJlZml4ICJAYmluZGly QFxuIikpKQorICAgICAgICAgICAgICAgI3QpKQorICAgICAgICAgICAoYWRkLWFmdGVyICd1bnBh Y2sgJ2RlbGV0ZS1nZW5lcmF0ZWQtZmlsZXMKKyAgICAgICAgICAgICAobGFtYmRhIF8KKyAgICAg ICAgICAgICAgIChmb3ItZWFjaCBkZWxldGUtZmlsZQorICAgICAgICAgICAgICAgICAgICAgICAg IChhcHBlbmQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKGxpc3QgImNvbmZfc2NyaXB0IikK KyAgICAgICAgICAgICAgICAgICAgICAgICAgKG1hcCAobGFtYmRhIChkKSAoc3RyaW5nLWFwcGVu ZCBkICIvTWFrZWZpbGUiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKCIuIiAi bWFuIiAibWFuMmh0bWwiICJzcmMiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKG1hcCAo bGFtYmRhIChmKSAoc3RyaW5nLWFwcGVuZCAic3JjLyIgZikpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJygibWFrZXdoYXRpcy5pbiIgIm1hbi5jb25mIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInBhdGhzLmgiICJ2ZXJzaW9uLmgiKSkpKQorICAgICAgICAgICAg ICAgI3QpKQorICAgICAgICAgICAocmVwbGFjZSAnY29uZmlndXJlCisgICAgICAgICAgICAgKGxh bWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAgICAg KHNldGVudiAiQ0MiICwoY2MtZm9yLXRhcmdldCkpCisgICAgICAgICAgICAgICA7OyBIdW1vciB0 aGUgbWFudWFsbHkgd3JpdHRlbiBjb25maWd1cmUgc2NyaXB0LgorICAgICAgICAgICAgICAgKGlu dm9rZSAiLi9jb25maWd1cmUiICIrbGFuZyIgImVuIiAiK2ZocyIKKyAgICAgICAgICAgICAgICAg ICAgICAgKHN0cmluZy1hcHBlbmQgIi1wcmVmaXg9IiAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIp KSkKKyAgICAgICAgICAgICAgICN0KSkpKSkKKyAgICAgIChob21lLXBhZ2UgImh0dHA6Ly93d3cu a3lsaGVrdS5jb20vY2dpdC9tYW4vIikKKyAgICAgIChzeW5vcHNpcyAiTW9kaWZpY2F0aW9ucyB0 byB0aGUgbWFuIHV0aWxpdGllcywgc3BlY2lmaWNhbGx5IG1hbjJodG1sIikKKyAgICAgIChkZXNj cmlwdGlvbgorICAgICAgICJUaGlzIGlzIGEgZm9yayBvZiB0aGUgbWFuIHV0aWxpdGllcyBpbnRl bmRlZCBzcGVjaWZpY2FsbHkgZm9yIGJ1aWxkaW5nCit0aGUgSFRNTCBkb2N1bWVudGF0aW9uIG9m IFRYUi4iKQorICAgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKSkpKQorCiAoZGVmaW5lLXB1Ymxp YyB0eHIKICAgKHBhY2thZ2UKICAgICAobmFtZSAidHhyIikKQEAgLTg2MCw2ICs5MTcsMTMgQEAg ZW5vdWdoIHRvIHBsYXkgdGhlIG9yaWdpbmFsIG1haW5mcmFtZSBab3JrIGFsbCB0aGUgd2F5IHRo cm91Z2guIikKICAgICAgICAoc2hhMjU2CiAgICAgICAgIChiYXNlMzIgIjE0emF6aXltbmJyMmxk Nzl4NGg3c2Y4OGJ6enpqODJ3M3hwYXZtY3g3bWh3YW5uYjJzd2giKSkpKQogICAgIChidWlsZC1z eXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICA7OyBSZXF1 aXJlZCB0byBidWlsZCB0aGUgZG9jdW1lbnRhdGlvbi4KKyAgICAgYCgoImdob3N0c2NyaXB0IiAs Z2hvc3RzY3JpcHQpCisgICAgICAgKCJncm9mZiIgLGdyb2ZmKQorICAgICAgICgibWFuMmh0bWwi ICxtYW4tZm9yLXR4cikpKQorICAgIChpbnB1dHMKKyAgICAgYCgoImxpYmZmaSIgLGxpYmZmaSkp KQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOmNvbmZpZ3VyZS1mbGFncwogICAgICAgIChsaXN0 ICwoc3RyaW5nLWFwcGVuZCAiY2M9IiAoY2MtZm9yLXRhcmdldCkpCkBAIC04NjcsNiArOTMxLDIy IEBAIGVub3VnaCB0byBwbGF5IHRoZSBvcmlnaW5hbCBtYWluZnJhbWUgWm9yayBhbGwgdGhlIHdh eSB0aHJvdWdoLiIpCiAgICAgICAgIzp0ZXN0LXRhcmdldCAidGVzdHMiCiAgICAgICAgIzpwaGFz ZXMKICAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAoYWRk LWFmdGVyICd1bnBhY2sgJ2luaGliaXQtZG9jLXN5bXMtZ2VuZXJhdGlvbgorICAgICAgICAgICAo bGFtYmRhIF8KKyAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogImdlbm1hbi50eHIiCisgICAgICAg ICAgICAgICA7OyBFeGl0IGZyb20gZ2VubWFuLnR4ciBiZWZvcmUgaXQgdHJpZXMgdG8gd3JpdGUg dG8KKyAgICAgICAgICAgICAgIDs7IHN0ZGxpYi9kb2Mtc3ltcy50bCwgd2hpY2ggaXMgYW55d2F5 IGtlcHQgdXAgdG8gZGF0ZSB3aXRoCisgICAgICAgICAgICAgICA7OyBlYWNoIHJlbGVhc2UgKGFu ZCBpcyBhbHJlYWR5IGNvbXBpbGVkIHRvIHN0ZGxpYi9kb2Mtc3ltcy50bG8KKyAgICAgICAgICAg ICAgIDs7IHdoZW4gZ2VubWFuLnR4ciBpcyBydW4pLgorICAgICAgICAgICAgICAgKCgiXkBcXChv dXRwdXQgXCJzaGFyZS90eHIvc3RkbGliL2RvYy1zeW1zXFwudGxcIlxcKS4qIiBsaW5lKQorICAg ICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJAKGRvIChleGl0KSlcbiIgbGluZSkpKQorICAg ICAgICAgICAgICN0KSkKKyAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZml4LXRlc3RzCisg ICAgICAgICAgIChsYW1iZGEgXworICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAobGlzdCAidGVz dHMvMDE3L3JlYWxwYXRoLnRsIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGVz dHMvMDE3L3JlYWxwYXRoLmV4cGVjdGVkIikKKyAgICAgICAgICAgICAgICgoIi91c3IvYmluIikg Ii8iKSkKKyAgICAgICAgICAgICAjdCkpCiAgICAgICAgICAocmVwbGFjZSAnY29uZmlndXJlCiAg ICAgICAgICAgIDs7IC4vY29uZmlndXJlIGlzIGEgaGFuZC13cml0dGVuIHNjcmlwdCB0aGF0IGNh bid0IGhhbmRsZSBzdGFuZGFyZAogICAgICAgICAgICA7OyBhdXRvdG9vbHMgYXJndW1lbnRzIGxp a2UgQ09ORklHX1NIRUxMLgpAQCAtODc0LDE0ICs5NTQsMTggQEAgZW5vdWdoIHRvIHBsYXkgdGhl IG9yaWdpbmFsIG1haW5mcmFtZSBab3JrIGFsbCB0aGUgd2F5IHRocm91Z2guIikKICAgICAgICAg ICAgICAoc2V0ZW52ICJ0eHJfc2hlbGwiICh3aGljaCAiYmFzaCIpKQogICAgICAgICAgICAgIChh cHBseSBpbnZva2UgIi4vY29uZmlndXJlIiBjb25maWd1cmUtZmxhZ3MpCiAgICAgICAgICAgICAg I3QpKQotICAgICAgICAgKGFkZC1hZnRlciAnY29uZmlndXJlICdmaXgtdGVzdHMKKyAgICAgICAg IChhZGQtYWZ0ZXIgJ2J1aWxkICdidWlsZC1kb2MKICAgICAgICAgICAgKGxhbWJkYSBfCi0gICAg ICAgICAgICAgKHN1YnN0aXR1dGUqIChsaXN0ICJ0ZXN0cy8wMTcvcmVhbHBhdGgudGwiCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0ZXN0cy8wMTcvcmVhbHBhdGguZXhwZWN0ZWQi KQotICAgICAgICAgICAgICAgKCgiL3Vzci9iaW4iKSAiLyIpKQorICAgICAgICAgICAgIChzZXRl bnYgIkdTX0dFTkVSQVRFX1VVSURTIiAiMCIpCisgICAgICAgICAgICAgKGludm9rZSAibWFrZSIg InR4ci1tYW5wYWdlLmh0bWwiICJ0eHItbWFucGFnZS5wZGYiKQorICAgICAgICAgICAgICN0KSkK KyAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2luc3RhbGwtZG9jCisgICAgICAgICAgIChs YW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAo bGV0ICgoZG9jIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvc2hhcmUvZG9jLyIgLG5hbWUgIi0i ICx2ZXJzaW9uKSkpCisgICAgICAgICAgICAgICAoZm9yLWVhY2ggKGxhbWJkYSAoZikgKGluc3Rh bGwtZmlsZSBmIGRvYykpCisgICAgICAgICAgICAgICAgICAgICAgICAgJygidHhyLW1hbnBhZ2Uu aHRtbCIgInR4ci1tYW5wYWdlLnBkZiIpKSkKICAgICAgICAgICAgICAjdCkpKSkpCi0gICAgKGlu cHV0cwotICAgICBgKCgibGliZmZpIiAsbGliZmZpKSkpCiAgICAgKHN5bm9wc2lzICJHZW5lcmFs LXB1cnBvc2UsIG11bHRpLXBhcmFkaWdtIHByb2dyYW1taW5nIGxhbmd1YWdlIikKICAgICAoZGVz Y3JpcHRpb24KICAgICAgIlRYUiBpcyBhIGdlbmVyYWwtcHVycG9zZSwgbXVsdGktcGFyYWRpZ20g cHJvZ3JhbW1pbmcgbGFuZ3VhZ2UuICBJdAotLSAKMi4zMi4wCgo= --b1_quMKpgjzx0W5Y7MJU0UW45uWXMq08Ie9HIaVKSpU Content-Type: text/x-patch; name=0002-gnu-txr-Fix-license-installation.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-txr-Fix-license-installation.patch RnJvbSBlMTljNWI1OGVjOGNkODI5ZjNmMmJmYjkwMGYwNzlmYTgwMWZkYTMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiUGF1bCBBLiBQYXRpZW5jZSIgPHBhdWxAYXBhdGllbmNlLmNv bT4KRGF0ZTogU2F0LCAxNyBKdWwgMjAyMSAyMzoxOTozMSAtMDQwMApTdWJqZWN0OiBbUEFUQ0gg Mi8zXSBnbnU6IHR4cjogRml4IGxpY2Vuc2UgaW5zdGFsbGF0aW9uLgoKVGhlIGluc3RhbGwtbGlj ZW5zZS1maWxlcyBwaGFzZSB3YXMgaW5zdGFsbGluZyBMSUNFTlNFLUNZRyB3aGVuIGl0CnNob3Vs ZG4ndCBoYXZlLCBiZWNhdXNlIHRoYXQgbGljZW5zZSBhcHBsaWVzIG9ubHkgdG8gVFhSIGJ1aWxk cyBmb3IKTWljcm9zb2Z0IFdpbmRvd3M7IGFuZCBpdCB3YXMgYWxzbyBpZ25vcmluZyB0aGUgTUVU QUxJQ0VOU0UgZmlsZS4KSG93ZXZlciwgVFhSJ3MgTWFrZWZpbGUgd2FzIGFscmVhZHkgaW5zdGFs bGluZyB0aGUgTElDRU5TRSBhbmQKTUVUQUxJQ0VOU0UgZmlsZXMgaW50byBzaGFyZS90eHIgKHRo ZSBkYXRhZGlyKSwgc28gcmVkaXJlY3QgdGhlbSBpbnRvCnRoZSBhcHByb3ByaWF0ZSBkb2MgZGly ZWN0b3J5IGFuZCBkZWxldGUgdGhlIGluc3RhbGwtbGljZW5zZS1maWxlcwpwaGFzZS4KCiogZ251 L3BhY2thZ2VzL2xpc3Auc2NtICh0eHIpW2FyZ3VtZW50c108IzpwaGFzZXM+CntmaXgtbGljZW5z ZS1pbnN0YWxsYXRpb259OiBOZXcgcGhhc2UuCntpbnN0YWxsLWxpY2Vuc2UtZmlsZXN9OiBEZWxl dGUgcGhhc2UuCi0tLQogZ251L3BhY2thZ2VzL2xpc3Auc2NtIHwgOSArKysrKysrKysKIDEgZmls ZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvbGlz cC5zY20gYi9nbnUvcGFja2FnZXMvbGlzcC5zY20KaW5kZXggNzYyNWM1N2I2MC4uNmExY2M0ZGNm ZCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2xpc3Auc2NtCisrKyBiL2dudS9wYWNrYWdlcy9s aXNwLnNjbQpAQCAtOTMxLDYgKzkzMSwxNSBAQCB0aGUgSFRNTCBkb2N1bWVudGF0aW9uIG9mIFRY Ui4iKQogICAgICAgICM6dGVzdC10YXJnZXQgInRlc3RzIgogICAgICAgICM6cGhhc2VzCiAgICAg ICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgKGFkZC1hZnRlciAn dW5wYWNrICdmaXgtbGljZW5zZS1pbnN0YWxsYXRpb24KKyAgICAgICAgICAgKGxhbWJkYSogKCM6 a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAgIChzdWJzdGl0dXRl KiAiTWFrZWZpbGUiCisgICAgICAgICAgICAgICAoKCJJTlNUQUxMKCwuKkxJQ0VOU0UsLiopXFwk XFwoZGF0YWRpclxcKSIgXyBtYXRjaCkKKyAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAi SU5TVEFMTCIgbWF0Y2gKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVm IG91dHB1dHMgIm91dCIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9zaGFyZS9k b2MvIiAsbmFtZSAiLSIgLHZlcnNpb24pKSkKKyAgICAgICAgICAgICAjdCkpCisgICAgICAgICAo ZGVsZXRlICdpbnN0YWxsLWxpY2Vuc2UtZmlsZXMpCiAgICAgICAgICAoYWRkLWFmdGVyICd1bnBh Y2sgJ2luaGliaXQtZG9jLXN5bXMtZ2VuZXJhdGlvbgogICAgICAgICAgICAobGFtYmRhIF8KICAg ICAgICAgICAgICAoc3Vic3RpdHV0ZSogImdlbm1hbi50eHIiCi0tIAoyLjMyLjAKCg== --b1_quMKpgjzx0W5Y7MJU0UW45uWXMq08Ie9HIaVKSpU Content-Type: text/x-patch; name=0003-gnu-txr-Update-to-266.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-gnu-txr-Update-to-266.patch RnJvbSBkZmQ0MTQ3ZjU5OTJiNTYxYWMxYTcyYmJjMzJjNzM4NzI0Yzg1NWY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiUGF1bCBBLiBQYXRpZW5jZSIgPHBhdWxAYXBhdGllbmNlLmNv bT4KRGF0ZTogVHVlLCAxMyBKdWwgMjAyMSAxOTozODoxMiAtMDQwMApTdWJqZWN0OiBbUEFUQ0gg My8zXSBnbnU6IHR4cjogVXBkYXRlIHRvIDI2Ni4KCiogZ251L3BhY2thZ2VzL2xpc3Auc2NtICh0 eHIpW3ZlcnNpb25dOiBVcGRhdGUgdG8gMjY2LgpbYXJndW1lbnRzXTwjOnBoYXNlcz57aW5oaWJp dC1kb2Mtc3ltcy1nZW5lcmF0aW9ufTogQ29ycmVjdCB0aGUgcGF0aCB0bwpkb2Mtc3ltcy50bCB0 byBpdHMgbmV3IGxvY2F0aW9uLgp7Zml4LXRlc3RzfTogRml4IGFub3RoZXIgdGVzdC4Ke2Rpc2Fi bGUtZmFpbGluZy10ZXN0c306IE5ldyBwaGFzZS4KLS0tCiBnbnUvcGFja2FnZXMvbGlzcC5zY20g fCAyMiArKysrKysrKysrKysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9u cygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvbGlzcC5zY20g Yi9nbnUvcGFja2FnZXMvbGlzcC5zY20KaW5kZXggNmExY2M0ZGNmZC4uNmVjNTlmNTIzMSAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL2xpc3Auc2NtCisrKyBiL2dudS9wYWNrYWdlcy9saXNwLnNj bQpAQCAtOTA2LDcgKzkwNiw3IEBAIHRoZSBIVE1MIGRvY3VtZW50YXRpb24gb2YgVFhSLiIpCiAo ZGVmaW5lLXB1YmxpYyB0eHIKICAgKHBhY2thZ2UKICAgICAobmFtZSAidHhyIikKLSAgICAodmVy c2lvbiAiMjYzIikKKyAgICAodmVyc2lvbiAiMjY2IikKICAgICAoc291cmNlCiAgICAgIChvcmln aW4KICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKQEAgLTkxNSw3ICs5MTUsNyBAQCB0aGUgSFRN TCBkb2N1bWVudGF0aW9uIG9mIFRYUi4iKQogICAgICAgICAgICAgIChjb21taXQgKHN0cmluZy1h cHBlbmQgInR4ci0iIHZlcnNpb24pKSkpCiAgICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFt ZSBuYW1lIHZlcnNpb24pKQogICAgICAgIChzaGEyNTYKLSAgICAgICAgKGJhc2UzMiAiMTR6YXpp eW1uYnIybGQ3OXg0aDdzZjg4Ynp6emo4MnczeHBhdm1jeDdtaHdhbm5iMnN3aCIpKSkpCisgICAg ICAgIChiYXNlMzIgIjFrOW1qM3pheGRzeWxnbmI4ZzZjcTBjbXA2NDIweDdmcDNubnNxZG1kczRn aDhpYjk1d24iKSkpKQogICAgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKICAgICAo bmF0aXZlLWlucHV0cwogICAgICA7OyBSZXF1aXJlZCB0byBidWlsZCB0aGUgZG9jdW1lbnRhdGlv bi4KQEAgLTk0Nyw3ICs5NDcsNyBAQCB0aGUgSFRNTCBkb2N1bWVudGF0aW9uIG9mIFRYUi4iKQog ICAgICAgICAgICAgICAgOzsgc3RkbGliL2RvYy1zeW1zLnRsLCB3aGljaCBpcyBhbnl3YXkga2Vw dCB1cCB0byBkYXRlIHdpdGgKICAgICAgICAgICAgICAgIDs7IGVhY2ggcmVsZWFzZSAoYW5kIGlz IGFscmVhZHkgY29tcGlsZWQgdG8gc3RkbGliL2RvYy1zeW1zLnRsbwogICAgICAgICAgICAgICAg Ozsgd2hlbiBnZW5tYW4udHhyIGlzIHJ1bikuCi0gICAgICAgICAgICAgICAoKCJeQFxcKG91dHB1 dCBcInNoYXJlL3R4ci9zdGRsaWIvZG9jLXN5bXNcXC50bFwiXFwpLioiIGxpbmUpCisgICAgICAg ICAgICAgICAoKCJeQFxcKG91dHB1dCBcInN0ZGxpYi9kb2Mtc3ltc1xcLnRsXCJcXCkuKiIgbGlu ZSkKICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiQChkbyAoZXhpdCkpXG4iIGxpbmUp KSkKICAgICAgICAgICAgICAjdCkpCiAgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2ZpeC10 ZXN0cwpAQCAtOTU1LDYgKzk1NSwyMiBAQCB0aGUgSFRNTCBkb2N1bWVudGF0aW9uIG9mIFRYUi4i KQogICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAobGlzdCAidGVzdHMvMDE3L3JlYWxwYXRoLnRs IgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGVzdHMvMDE3L3JlYWxwYXRoLmV4 cGVjdGVkIikKICAgICAgICAgICAgICAgICgoIi91c3IvYmluIikgIi8iKSkKKyAgICAgICAgICAg ICAoc3Vic3RpdHV0ZSogInRlc3RzLzAxOC9wYXRoLXRlc3QudGwiCisgICAgICAgICAgICAgICAo KCIvYmluIikgKGRpcm5hbWUgKHdoaWNoICJzaCIpKSkpCisgICAgICAgICAgICAgI3QpKQorICAg ICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdkaXNhYmxlLWZhaWxpbmctdGVzdHMKKyAgICAgICAg ICAgKGxhbWJkYSBfCisgICAgICAgICAgICAgKGZvci1lYWNoIGRlbGV0ZS1maWxlCisgICAgICAg ICAgICAgICAgICAgICAgIDs7IFRoZXNlIHRlc3RzIGZhaWwgYmVjYXVzZSB0aGV5IGNhbGwgZXh0 ZXJuYWwgY29tbWFuZHMKKyAgICAgICAgICAgICAgICAgICAgICAgOzsgKGxpa2UgbHMgYW5kIGNh dCkgdGhhdCBkb24ndCBydW4gYmVjYXVzZSB0aGUgZm9ya2VkCisgICAgICAgICAgICAgICAgICAg ICAgIDs7IGNoaWxkIHByb2Nlc3NlcycgZXhlY3ZwIGNhbGxzIGNhbm5vdCBmaW5kIHRoZQorICAg ICAgICAgICAgICAgICAgICAgICA7OyBoYXJkY29kZWQgL2Jpbi9zaC4KKyAgICAgICAgICAgICAg ICAgICAgICAgOzsgKFRoZSB0ZXN0cyBwYXNzIHdoZW4gcnVuIG1hbnVhbGx5IGluIHRoZSBkaXJl Y3RvcnkKKyAgICAgICAgICAgICAgICAgICAgICAgOzsgbGVmdCBieSAtLWtlZXAtZmFpbGVkLikK KyAgICAgICAgICAgICAgICAgICAgICAgKG1hcCAobGFtYmRhIChmKSAoc3RyaW5nLWFwcGVuZCAi dGVzdHMvIiBmKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKCIwMDIvcXVlcnktMS50 eHIiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMDEwL2pzb24udGwiCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiMDE4L3Byb2Nlc3MudGwiKSkpCiAgICAgICAgICAgICAg I3QpKQogICAgICAgICAgKHJlcGxhY2UgJ2NvbmZpZ3VyZQogICAgICAgICAgICA7OyAuL2NvbmZp Z3VyZSBpcyBhIGhhbmQtd3JpdHRlbiBzY3JpcHQgdGhhdCBjYW4ndCBoYW5kbGUgc3RhbmRhcmQK LS0gCjIuMzIuMAoK --b1_quMKpgjzx0W5Y7MJU0UW45uWXMq08Ie9HIaVKSpU--